Consistent use of vendor/environment and include paths

bwitt · Nov 6, 2013 · db59de6 · db59de6
1 parent a2eff83
commit db59de6
Show file tree

Hide file tree

Showing 26 changed files with 18 additions and 124 deletions.
diff --git a/bin/rq b/bin/rq
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), ".."))
+$: << File.expand_path('..', File.dirname(__FILE__))
 require 'code/rq'
diff --git a/code/cleaner_script.rb b/code/cleaner_script.rb
@@ -1,35 +1,11 @@
 #!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), ".."))
 
+require 'vendor/environment'
 require 'fileutils'
 require 'date'
 require 'time'
-
-$rq_msg_dir = Dir.pwd
-Dir.chdir("#{File.dirname(__FILE__)}")
-require 'hashdir'
-Dir.chdir($rq_msg_dir)
-
-################################################################################
-# Stuff that goes everywhere in RQ
-################################################################################
-
-Dir.glob(File.join("..", "..", "..", "..", "..", "code", "vendor", "gems", "*", "lib")).each do |lib|
-  $LOAD_PATH.unshift(File.expand_path(lib))
-end
-Dir.glob(File.join("..", "..", "..", "..", "..")).each do |lib|
-  $LOAD_PATH.unshift(File.expand_path(lib))
-end
-
-require 'rubygems'
-gem_paths = [File.expand_path(File.join("..", "..", "..", "..", "..", "code", "vendor", "gems")),  Gem.default_dir]
-Gem.clear_paths
-if Gem::Version.new(Gem::VERSION) < Gem::Version.new('1.8.0')
-  Gem.send :set_paths, gem_paths.join(":")
-else
-  Gem.paths = gem_paths.join(":")
-end
-
-
+require 'code/hashdir'
 
 # Setup a global binding so the GC doesn't close the file
 $RQ_IO = IO.for_fd(ENV['RQ_PIPE'].to_i)

diff --git a/code/queueclient.rb b/code/queueclient.rb
@@ -1,3 +1,4 @@
+require 'vendor/environment'
 require 'socket'
 require 'json'
 require 'unixrack'

diff --git a/code/relay_script.rb b/code/relay_script.rb
@@ -1,11 +1,15 @@
 #!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), ".."))
 
+require 'vendor/environment'
+require 'json'
 require 'net/http'
 require 'uri'
 require 'fileutils'
 require 'fcntl'
 require 'digest'
 require 'resolv-replace'
+require 'code/queueclient'
 
 def log(mesg)
   puts "\033[0;36m#{$$} - #{Time.now}\033[0m - #{mesg}"
@@ -14,11 +18,6 @@ def log(mesg)
 
 log(Dir.pwd.inspect)
 
-$LOAD_PATH.unshift(File.expand_path("../../../../.."))
-$LOAD_PATH.unshift(File.expand_path("../../../../../vendor/gems/json_pure-1.1.6/lib"))
-$LOAD_PATH.unshift(File.expand_path("../../../../../vendor/gems/rack-1.4.1/lib"))
-require 'json'
-
 # Setup a global binding so the GC doesn't close the file
 $RQ_IO = IO.for_fd(ENV['RQ_PIPE'].to_i)
 
@@ -310,8 +309,6 @@ def file_md5(path)
 end
 
 # If valid queue, attempt to relay message
-require 'code/queueclient'
-
 log("Attempting connect with local queue #{destq}")
 
 qc = RQ::QueueClient.new(destq, "../../../../..") rescue soft_fail("#{destq} does not exist")

diff --git a/code/test/env_var_test.rb b/code/test/env_var_test.rb
@@ -2,8 +2,6 @@
 require 'test/unit'
 require 'net/http'
 require 'uri'
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
 
 class TC_EnvVarTest < Test::Unit::TestCase

diff --git a/code/test/send_dup.rb b/code/test/send_dup.rb
@@ -4,8 +4,6 @@
 require 'fcntl'
 require 'net/http'
 require 'uri'
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
 
 require 'test/unit'

diff --git a/code/test/send_test_web_done.rb b/code/test/send_test_web_done.rb
@@ -1,19 +1,9 @@
 #!/usr/bin/env ruby
 
-
 require 'net/http'
 require 'uri'
 require 'fileutils'
 require 'fcntl'
-
-def log(mesg)
-  print "#{Process.pid} - #{Time.now} - #{mesg}\n"
-end
-
-
-log(Dir.pwd.inspect)
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
 
 ## TEST SECTION

diff --git a/code/test/send_test_web_http11_prepattachdone.rb b/code/test/send_test_web_http11_prepattachdone.rb
@@ -4,14 +4,6 @@
 require 'uri'
 require 'fileutils'
 require 'fcntl'
-
-def log(mesg)
-  print "#{Process.pid} - #{Time.now} - #{mesg}\n"
-end
-
-log(Dir.pwd.inspect)
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
 
 ## TEST SECTION

diff --git a/code/test/send_test_web_prepattachdone.rb b/code/test/send_test_web_prepattachdone.rb
@@ -4,14 +4,6 @@
 require 'uri'
 require 'fileutils'
 require 'fcntl'
-
-def log(mesg)
-  print "#{Process.pid} - #{Time.now} - #{mesg}\n"
-end
-
-log(Dir.pwd.inspect)
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
 
 ## TEST SECTION

diff --git a/code/test/send_test_web_prepattachdone_large.rb b/code/test/send_test_web_prepattachdone_large.rb
@@ -4,14 +4,6 @@
 require 'uri'
 require 'fileutils'
 require 'fcntl'
-
-def log(mesg)
-  print "#{Process.pid} - #{Time.now} - #{mesg}\n"
-end
-
-log(Dir.pwd.inspect)
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
 
 ## TEST SECTION

diff --git a/code/test/send_test_web_prepattachmime.rb b/code/test/send_test_web_prepattachmime.rb
@@ -4,14 +4,6 @@
 require 'uri'
 require 'fileutils'
 require 'fcntl'
-
-def log(mesg)
-  print "#{Process.pid} - #{Time.now} - #{mesg}\n"
-end
-
-log(Dir.pwd.inspect)
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
 
 ## TEST SECTION

diff --git a/code/test/send_test_web_prepdone.rb b/code/test/send_test_web_prepdone.rb
@@ -4,14 +4,6 @@
 require 'uri'
 require 'fileutils'
 require 'fcntl'
-
-def log(mesg)
-  print "#{Process.pid} - #{Time.now} - #{mesg}\n"
-end
-
-log(Dir.pwd.inspect)
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
 
 ## TEST SECTION

diff --git a/code/test/test_adminoper.rb b/code/test/test_adminoper.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$: << File.expand_path('../..', File.dirname(__FILE__))
 
 require 'test/unit'
 require 'fileutils'

diff --git a/code/test/test_config_change.rb b/code/test/test_config_change.rb
@@ -1,14 +1,11 @@
 #!/usr/bin/env ruby
+$: << File.expand_path('../..', File.dirname(__FILE__))
 
 require 'fileutils'
 require 'fcntl'
 require 'net/http'
 require 'uri'
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/rack-1.4.1/lib"))
-
 require 'code/queueclient'
 require 'test/unit'
 

diff --git a/code/test/test_hashdir.rb b/code/test/test_hashdir.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$: << File.expand_path('../..', File.dirname(__FILE__))
 
 require 'fileutils'
 require 'fcntl'

diff --git a/code/test/test_htmlutils.rb b/code/test/test_htmlutils.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$: << File.expand_path('../..', File.dirname(__FILE__))
 
 require 'test/unit'
 require 'code/htmlutils'

diff --git a/code/test/test_jsonconfigfile.rb b/code/test/test_jsonconfigfile.rb
@@ -1,12 +1,9 @@
 #!/usr/bin/env ruby
+$: << File.expand_path('../..', File.dirname(__FILE__))
 
 require 'fileutils'
 require 'fcntl'
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'code/jsonconfigfile'
-
-
 require 'test/unit'
 
 class TC_JSONConfigFileTest < Test::Unit::TestCase

diff --git a/code/test/test_overrides.rb b/code/test/test_overrides.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$: << File.expand_path('../..', File.dirname(__FILE__))
 
 require 'test/unit'
 require 'code/overrides'

diff --git a/code/test/test_portaproc.rb b/code/test/test_portaproc.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$: << File.expand_path('../..', File.dirname(__FILE__))
 
 require 'test/unit'
 require 'code/portaproc'

diff --git a/code/test/test_queues_setup.rb b/code/test/test_queues_setup.rb
@@ -1,21 +1,17 @@
 #!/usr/bin/env ruby
 
-
 require 'net/http'
 require 'uri'
 require 'fileutils'
 require 'fcntl'
+require 'json'
 
 def log(mesg)
   print "#{Process.pid} - #{Time.now} - #{mesg}\n"
 end
 
-
 log(Dir.pwd.inspect)
 
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
-require 'json'
-
 ## TEST SECTION
 
 rq_port = (ENV['RQ_PORT'] || 3333).to_i

diff --git a/code/test/test_rule_processor.rb b/code/test/test_rule_processor.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$: << File.expand_path('../..', File.dirname(__FILE__))
 
 require 'test/unit'
 require 'code/rule_processor'

diff --git a/code/test/test_run_msgs_moved_on_kill.rb b/code/test/test_run_msgs_moved_on_kill.rb
@@ -15,15 +15,6 @@
 require 'uri'
 require 'fileutils'
 require 'fcntl'
-
-def log(mesg)
-  print "#{Process.pid} - #{Time.now} - #{mesg}\n"
-end
-
-
-log(Dir.pwd.inspect)
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
 
 ## TEST SECTION

diff --git a/code/test/test_web_done_json.rb b/code/test/test_web_done_json.rb
@@ -4,8 +4,6 @@
 require 'uri'
 require 'fileutils'
 require 'fcntl'
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
 
 ## TEST SECTION

diff --git a/code/test/test_web_html_log.rb b/code/test/test_web_html_log.rb
@@ -4,12 +4,8 @@
 require 'fcntl'
 require 'net/http'
 require 'uri'
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
-
 require 'test/unit'
-require 'rubygems'
 require 'nokogiri'
 
 class TC_HtmlLogsTest < Test::Unit::TestCase

diff --git a/code/test/test_web_max_count.rb b/code/test/test_web_max_count.rb
@@ -4,10 +4,7 @@
 require 'fcntl'
 require 'net/http'
 require 'uri'
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
-
 require 'test/unit'
 
 class TC_WebAttachErrTest < Test::Unit::TestCase

diff --git a/code/test/test_web_overrides.rb b/code/test/test_web_overrides.rb
@@ -4,12 +4,8 @@
 require 'fcntl'
 require 'net/http'
 require 'uri'
-
-$LOAD_PATH.unshift(File.expand_path("./vendor/gems/json_pure-1.1.6/lib"))
 require 'json'
-
 require 'test/unit'
-require 'rubygems'
 require 'nokogiri'
 
 class TC_WebOverridesTest < Test::Unit::TestCase