Skip to content

Commit cb5a603

Browse files
luke-hillp0deje
authored andcommitted
Refactor/remove unused Rake tasks files
1 parent 7498da6 commit cb5a603

36 files changed

+115
-169
lines changed

Rakefile

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,43 @@
33
$LOAD_PATH.unshift File.expand_path(".")
44

55
require 'rake'
6-
require 'rake-tasks/files'
6+
require 'rake_tasks/files'
77
require 'net/telnet'
88
require 'stringio'
99
require 'fileutils'
1010

11-
include Rake::DSL if defined?(Rake::DSL)
11+
include Rake::DSL
1212

1313
Rake.application.instance_variable_set "@name", "go"
1414
orig_verbose = verbose
1515
verbose(false)
1616

1717
# The CrazyFun build grammar. There's no magic here, just ruby
18-
require 'rake-tasks/crazy_fun'
19-
require 'rake-tasks/crazy_fun/mappings/export'
20-
require 'rake-tasks/crazy_fun/mappings/folder'
21-
require 'rake-tasks/crazy_fun/mappings/javascript'
22-
require 'rake-tasks/crazy_fun/mappings/rake'
23-
require 'rake-tasks/crazy_fun/mappings/rename'
24-
require 'rake-tasks/crazy_fun/mappings/ruby'
25-
26-
# The original build rules
27-
require 'rake-tasks/task-gen'
28-
require 'rake-tasks/checks'
29-
require 'rake-tasks/c'
30-
require 'rake-tasks/ie_code_generator'
31-
require 'rake-tasks/ci'
18+
require 'rake_tasks/crazy_fun/main'
19+
require 'rake_tasks/selenium_rake/detonating_handler'
20+
require 'rake_tasks/selenium_rake/crazy_fun'
21+
22+
require 'rake_tasks/crazy_fun/mappings/export'
23+
require 'rake_tasks/crazy_fun/mappings/folder'
24+
require 'rake_tasks/crazy_fun/mappings/javascript'
25+
require 'rake_tasks/crazy_fun/mappings/rake'
26+
require 'rake_tasks/crazy_fun/mappings/rename'
27+
require 'rake_tasks/crazy_fun/mappings/ruby'
28+
29+
# Location of all new methods
30+
require 'rake_tasks/selenium_rake/c_tasks'
31+
require 'rake_tasks/selenium_rake/checks'
32+
require 'rake_tasks/selenium_rake/ie_code_generator'
33+
require 'rake_tasks/selenium_rake/java_formatter'
34+
require 'rake_tasks/selenium_rake/cpp_formatter'
35+
require 'rake_tasks/selenium_rake/type_definitions_generator'
3236

3337
# Our modifications to the Rake library
34-
require 'rake-tasks/rake/task'
38+
require 'rake_tasks/rake/task'
3539

3640
$DEBUG = orig_verbose != Rake::FileUtilsExt::DEFAULT ? true : false
37-
if (ENV['debug'] == 'true')
38-
$DEBUG = true
39-
end
41+
$DEBUG = true if ENV['debug'] == 'true'
42+
4043
verbose($DEBUG)
4144

4245
def release_version
@@ -487,8 +490,27 @@ namespace :ci do
487490
end
488491
end
489492

493+
# Required for above ci:upload_to_sauce rake only
494+
require 'uri'
495+
require 'net/http'
496+
require 'digest/md5'
497+
require 'json'
498+
require 'pathname'
499+
500+
def net_http
501+
http_proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
502+
if http_proxy
503+
http_proxy = "http://#{http_proxy}" unless http_proxy.start_with?('http://')
504+
proxy_uri = URI.parse(http_proxy)
505+
506+
Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port)
507+
else
508+
Net::HTTP
509+
end
510+
end
511+
490512
at_exit do
491-
if File.exist?(".git") && !Platform.windows?
513+
if File.exist?(".git") && !SeleniumRake::Checks.windows?
492514
system "sh", ".git-fixfiles"
493515
end
494516
end

rake-tasks/browsers.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

rake-tasks/c.rb

Lines changed: 0 additions & 6 deletions
This file was deleted.

rake-tasks/checks.rb

Lines changed: 0 additions & 2 deletions
This file was deleted.

rake-tasks/ci.rb

Lines changed: 0 additions & 19 deletions
This file was deleted.

rake-tasks/crazy_fun.rb

Lines changed: 0 additions & 4 deletions
This file was deleted.

rake-tasks/ie_code_generator.rb

Lines changed: 0 additions & 4 deletions
This file was deleted.

rake-tasks/task-gen.rb

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)