arturop-hydra 0.24.0 → 0.25.0

data/README.rdoc

@@ -1,6 +1,10 @@
 = Hydra
 
-Spread your tests over processors and/or multiple machines to test your code faster.
+Spread your tests over processors and/or multiple machines to test your code faster.  
+
+Ruby 1.8 and 1.9*
+
+\* Install gem 'test-unit' if using Ruby 1.9
 
 == Description
 

data/Rakefile

@@ -7,13 +7,13 @@ begin
     gem.name = "arturop-hydra"
     gem.summary = %Q{Distributed testing toolkit}
     gem.description = %Q{Spread your tests over multiple machines to test your code faster.}
-    gem.email = "arturotd08@yahoo.ca"
-    gem.homepage = "http://github.com/nulogy/hydra"
-    gem.authors = ["Nick Gauthier", "Justin Fitzsimmons", "Victor Savkin", "Arturo Pie"]
+    gem.email = "nick@smartlogicsolutions.com"
+    gem.homepage = "https://github.com/arturopie/hydra"
+    gem.authors = ["Nick Gauthier", "Arturo Pie"]
     gem.add_development_dependency "shoulda", "= 2.10.3"
     gem.add_development_dependency "rspec", "= 2.0.0.beta.19"
-    gem.add_development_dependency "cucumber", "= 1.1.4"
-    gem.add_development_dependency "therubyracer", "= 0.9.9"
+    gem.add_development_dependency "cucumber", "= 0.9.2"
+    gem.add_development_dependency "therubyracer", "= 0.7.4"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.24.0
+0.25.0

data/{nulogy-hydra.gemspec → arturop-hydra.gemspec}

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "nulogy-hydra"
-  s.version = "0.24.0"
+  s.name = "arturop-hydra"
+  s.version = "0.25.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nick Gauthier", "Justin Fitzsimmons", "Victor Savkin", "Arturo Pie"]
-  s.date = "2012-02-15"
+  s.authors = ["Nick Gauthier", "Arturo Pie"]
+  s.date = "2012-03-08"
   s.description = "Spread your tests over multiple machines to test your code faster."
-  s.email = "engineering@nulogy.com"
+  s.email = "nick@smartlogicsolutions.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc",
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "TODO",
     "VERSION",
+    "arturop-hydra.gemspec",
     "caliper.yml",
     "hydra-icon-64x64.png",
     "hydra.gemspec",
@@ -48,7 +49,6 @@ Gem::Specification.new do |s|
     "lib/hydra/message/worker_messages.rb",
     "lib/hydra/messaging_io.rb",
     "lib/hydra/pipe.rb",
-    "lib/hydra/proxy_config.rb",
     "lib/hydra/runner.rb",
     "lib/hydra/runner_listener/abstract.rb",
     "lib/hydra/safe_fork.rb",
@@ -58,13 +58,10 @@ Gem::Specification.new do |s|
     "lib/hydra/stdio.rb",
     "lib/hydra/sync.rb",
     "lib/hydra/tasks.rb",
-    "lib/hydra/threadsafe_io.rb",
     "lib/hydra/tmpdir.rb",
     "lib/hydra/trace.rb",
     "lib/hydra/worker.rb",
-    "nulogy-hydra.gemspec",
     "test/fixtures/assert_true.rb",
-    "test/fixtures/bad_proxy_config.yml",
     "test/fixtures/config.yml",
     "test/fixtures/conflicting.rb",
     "test/fixtures/features/step_definitions.rb",
@@ -76,8 +73,6 @@ Gem::Specification.new do |s|
     "test/fixtures/json_data.json",
     "test/fixtures/many_outputs_to_console.rb",
     "test/fixtures/master_listeners.rb",
-    "test/fixtures/proxy_config.yml",
-    "test/fixtures/proxy_config_http.yml",
     "test/fixtures/runner_listeners.rb",
     "test/fixtures/slow.rb",
     "test/fixtures/sync_test.rb",
@@ -89,7 +84,6 @@ Gem::Specification.new do |s|
     "test/master_test.rb",
     "test/message_test.rb",
     "test/pipe_test.rb",
-    "test/proxy_config_test.rb",
     "test/runner_test.rb",
     "test/ssh_test.rb",
     "test/sync_test.rb",
@@ -97,7 +91,7 @@ Gem::Specification.new do |s|
     "test/test_helper.rb",
     "test/worker_test.rb"
   ]
-  s.homepage = "http://github.com/nulogy/hydra"
+  s.homepage = "https://github.com/arturopie/hydra"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.15"
   s.summary = "Distributed testing toolkit"
@@ -108,19 +102,19 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, ["= 2.10.3"])
       s.add_development_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
-      s.add_development_dependency(%q<cucumber>, ["= 1.1.4"])
-      s.add_development_dependency(%q<therubyracer>, ["= 0.9.9"])
+      s.add_development_dependency(%q<cucumber>, ["= 0.9.2"])
+      s.add_development_dependency(%q<therubyracer>, ["= 0.7.4"])
     else
       s.add_dependency(%q<shoulda>, ["= 2.10.3"])
       s.add_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
-      s.add_dependency(%q<cucumber>, ["= 1.1.4"])
-      s.add_dependency(%q<therubyracer>, ["= 0.9.9"])
+      s.add_dependency(%q<cucumber>, ["= 0.9.2"])
+      s.add_dependency(%q<therubyracer>, ["= 0.7.4"])
     end
   else
     s.add_dependency(%q<shoulda>, ["= 2.10.3"])
     s.add_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
-    s.add_dependency(%q<cucumber>, ["= 1.1.4"])
-    s.add_dependency(%q<therubyracer>, ["= 0.9.9"])
+    s.add_dependency(%q<cucumber>, ["= 0.9.2"])
+    s.add_dependency(%q<therubyracer>, ["= 0.7.4"])
   end
 end
 

data/hydra.gemspec

@@ -1,113 +1,101 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{hydra}
-  s.version = "0.23.2"
+  s.name = "hydra"
+  s.version = "0.23.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nick Gauthier"]
-  s.date = %q{2010-11-03}
-  s.description = %q{Spread your tests over multiple machines to test your code faster.}
-  s.email = %q{nick@smartlogicsolutions.com}
+  s.authors = ["Nick Gauthier", "Arturo Pie"]
+  s.date = "2012-03-08"
+  s.description = "Spread your tests over multiple machines to test your code faster."
+  s.email = "nick@smartlogicsolutions.com"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc",
-     "TODO"
+    "README.rdoc",
+    "TODO"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "VERSION",
-     "caliper.yml",
-     "hydra-icon-64x64.png",
-     "hydra.gemspec",
-     "hydra_gray.png",
-     "lib/hydra.rb",
-     "lib/hydra/cucumber/formatter.rb",
-     "lib/hydra/hash.rb",
-     "lib/hydra/js/lint.js",
-     "lib/hydra/listener/abstract.rb",
-     "lib/hydra/listener/minimal_output.rb",
-     "lib/hydra/listener/notifier.rb",
-     "lib/hydra/listener/progress_bar.rb",
-     "lib/hydra/listener/report_generator.rb",
-     "lib/hydra/master.rb",
-     "lib/hydra/message.rb",
-     "lib/hydra/message/master_messages.rb",
-     "lib/hydra/message/runner_messages.rb",
-     "lib/hydra/message/worker_messages.rb",
-     "lib/hydra/messaging_io.rb",
-     "lib/hydra/pipe.rb",
-     "lib/hydra/runner.rb",
-     "lib/hydra/safe_fork.rb",
-     "lib/hydra/spec/autorun_override.rb",
-     "lib/hydra/spec/hydra_formatter.rb",
-     "lib/hydra/ssh.rb",
-     "lib/hydra/stdio.rb",
-     "lib/hydra/sync.rb",
-     "lib/hydra/tasks.rb",
-     "lib/hydra/tmpdir.rb",
-     "lib/hydra/trace.rb",
-     "lib/hydra/worker.rb",
-     "test/fixtures/assert_true.rb",
-     "test/fixtures/config.yml",
-     "test/fixtures/conflicting.rb",
-     "test/fixtures/features/step_definitions.rb",
-     "test/fixtures/features/write_alternate_file.feature",
-     "test/fixtures/features/write_file.feature",
-     "test/fixtures/hello_world.rb",
-     "test/fixtures/js_file.js",
-     "test/fixtures/json_data.json",
-     "test/fixtures/slow.rb",
-     "test/fixtures/sync_test.rb",
-     "test/fixtures/write_file.rb",
-     "test/fixtures/write_file_alternate_spec.rb",
-     "test/fixtures/write_file_spec.rb",
-     "test/fixtures/write_file_with_pending_spec.rb",
-     "test/master_test.rb",
-     "test/message_test.rb",
-     "test/pipe_test.rb",
-     "test/runner_test.rb",
-     "test/ssh_test.rb",
-     "test/sync_test.rb",
-     "test/test_helper.rb",
-     "test/worker_test.rb"
-  ]
-  s.homepage = %q{http://github.com/ngauthier/hydra}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Distributed testing toolkit}
-  s.test_files = [
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "TODO",
+    "VERSION",
+    "caliper.yml",
+    "hydra-icon-64x64.png",
+    "hydra.gemspec",
+    "hydra_gray.png",
+    "lib/hydra.rb",
+    "lib/hydra/cucumber/formatter.rb",
+    "lib/hydra/cucumber/partial_html.rb",
+    "lib/hydra/hash.rb",
+    "lib/hydra/js/lint.js",
+    "lib/hydra/listener/abstract.rb",
+    "lib/hydra/listener/cucumber.css",
+    "lib/hydra/listener/cucumber_html_report.rb",
+    "lib/hydra/listener/jquery-min.js",
+    "lib/hydra/listener/minimal_output.rb",
+    "lib/hydra/listener/notifier.rb",
+    "lib/hydra/listener/progress_bar.rb",
+    "lib/hydra/listener/report_generator.rb",
+    "lib/hydra/master.rb",
+    "lib/hydra/message.rb",
+    "lib/hydra/message/master_messages.rb",
+    "lib/hydra/message/runner_messages.rb",
+    "lib/hydra/message/worker_messages.rb",
+    "lib/hydra/messaging_io.rb",
+    "lib/hydra/pipe.rb",
+    "lib/hydra/runner.rb",
+    "lib/hydra/runner_listener/abstract.rb",
+    "lib/hydra/safe_fork.rb",
+    "lib/hydra/spec/autorun_override.rb",
+    "lib/hydra/spec/hydra_formatter.rb",
+    "lib/hydra/ssh.rb",
+    "lib/hydra/stdio.rb",
+    "lib/hydra/sync.rb",
+    "lib/hydra/tasks.rb",
+    "lib/hydra/tmpdir.rb",
+    "lib/hydra/trace.rb",
+    "lib/hydra/worker.rb",
+    "test/fixtures/assert_true.rb",
+    "test/fixtures/config.yml",
+    "test/fixtures/conflicting.rb",
+    "test/fixtures/features/step_definitions.rb",
+    "test/fixtures/features/write_alternate_file.feature",
+    "test/fixtures/features/write_file.feature",
+    "test/fixtures/hello_world.rb",
+    "test/fixtures/hydra_worker_init.rb",
+    "test/fixtures/js_file.js",
+    "test/fixtures/json_data.json",
+    "test/fixtures/many_outputs_to_console.rb",
+    "test/fixtures/master_listeners.rb",
+    "test/fixtures/runner_listeners.rb",
+    "test/fixtures/slow.rb",
+    "test/fixtures/sync_test.rb",
+    "test/fixtures/task_test_config.yml",
+    "test/fixtures/write_file.rb",
+    "test/fixtures/write_file_alternate_spec.rb",
+    "test/fixtures/write_file_spec.rb",
+    "test/fixtures/write_file_with_pending_spec.rb",
+    "test/master_test.rb",
+    "test/message_test.rb",
     "test/pipe_test.rb",
-     "test/sync_test.rb",
-     "test/ssh_test.rb",
-     "test/fixtures/write_file_alternate_spec.rb",
-     "test/fixtures/sync_test.rb",
-     "test/fixtures/hello_world.rb",
-     "test/fixtures/features/step_definitions.rb",
-     "test/fixtures/assert_true.rb",
-     "test/fixtures/slow.rb",
-     "test/fixtures/write_file_spec.rb",
-     "test/fixtures/conflicting.rb",
-     "test/fixtures/write_file_with_pending_spec.rb",
-     "test/fixtures/write_file.rb",
-     "test/message_test.rb",
-     "test/test_helper.rb",
-     "test/master_test.rb",
-     "test/runner_test.rb",
-     "test/worker_test.rb"
+    "test/runner_test.rb",
+    "test/ssh_test.rb",
+    "test/sync_test.rb",
+    "test/task_test.rb",
+    "test/test_helper.rb",
+    "test/worker_test.rb"
   ]
+  s.homepage = "https://github.com/arturopie/hydra"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.15"
+  s.summary = "Distributed testing toolkit"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/hydra/master.rb

@@ -1,10 +1,8 @@
 require 'hydra/hash'
 require 'open3'
 require 'hydra/tmpdir'
-require 'hydra/proxy_config'
 require 'erb'
 require 'yaml'
-require 'hydra/threadsafe_io'
 
 module Hydra #:nodoc:
   # Hydra class responsible for delegate work down to workers.
@@ -36,9 +34,6 @@ module Hydra #:nodoc:
     # * :autosort
     #   * Set to false to disable automatic sorting by historical run-time per file
     def initialize(opts = { })
-
-      $stdout = ThreadsafeIO.new($stdout)
-      
       opts.stringify_keys!
       config_file = opts.delete('config') { nil }
       if config_file
@@ -50,7 +45,7 @@ module Hydra #:nodoc:
         end
 
         begin
-          config_yml = ProxyConfig.load(config_erb)
+          config_yml = YAML::load(config_erb)
         rescue StandardError => e
           raise(YmlLoadError,"config file was found, but could not be parsed.\n#{$!.inspect}")
         end

data/lib/hydra/runner.rb

@@ -227,7 +227,7 @@ module Hydra #:nodoc:
         }
         context['reportErrors'] = lambda{|js_errors|
           js_errors.each do |e|
-            e = context.instance_variable_get("@to").rb(e)
+            e = V8::To.rb(e)
             errors << "\n\e[1;31mJSLINT: #{file}\e[0m"
             errors << "  Error at line #{e['line'].to_i + 1} " + 
               "character #{e['character'].to_i + 1}: \e[1;33m#{e['reason']}\e[0m"

data/lib/hydra/sync.rb

@@ -60,7 +60,7 @@ module Hydra #:nodoc:
       opts.stringify_keys!
       config_file = opts.delete('config') { nil }
       if config_file
-        opts.merge!(ProxyConfig.load(IO.read(config_file)).stringify_keys!)
+        opts.merge!(YAML.load_file(config_file).stringify_keys!)
       end
       @verbose = opts.fetch('verbose') { false }
       @sync = opts.fetch('sync') { {} }

data/lib/hydra/tasks.rb

@@ -2,6 +2,8 @@ require 'open3'
 module Hydra #:nodoc:
   # Hydra Task Common attributes and methods
   class Task
+    include Rake::DSL if defined?(Rake::DSL)
+
     # Name of the task. Default 'hydra'
     attr_accessor :name
 
@@ -130,6 +132,8 @@ module Hydra #:nodoc:
 
         start = Time.now if @show_time
 
+        puts '********************'
+        puts @options.inspect
         master = Hydra::Master.new(@opts)
 
         $stdout.puts "\nFinished in #{'%.6f' % (Time.now - start)} seconds." if @show_time
@@ -278,7 +282,7 @@ module Hydra #:nodoc:
     def define
       desc "Run #{@name} remotely on all workers"
       task "hydra:remote:#{@name}" do
-        config = Hydra::ProxyConfig.load(IO.read(@config))
+        config = YAML.load_file(@config)
         environment = config.fetch('environment') { 'test' }
         workers = config.fetch('workers') { [] }
         workers = workers.select{|w| w['type'] == 'ssh'}

data/lib/hydra/trace.rb

@@ -17,11 +17,6 @@ module Hydra #:nodoc:
       # Checks to ensure we're running verbosely.
       def trace(str)
         $stdout.write "#{Time.now.to_f} #{self.class._traceable_prefix}| #{str}\n" if @verbose
-
-        prefix = self.class._traceable_prefix.upcase
-        unless (prefix == 'MASTER' || prefix == 'SYNC')
-          $stdout.write "\n"
-        end
       end
     end
   end

data/lib/hydra/worker.rb

@@ -23,7 +23,14 @@ module Hydra #:nodoc:
 
       load_worker_initializer
 
-      eval_listeners(opts.fetch(:runner_listeners) { nil })
+      @runner_event_listeners = Array(opts.fetch(:runner_listeners) { nil })
+
+      @runner_event_listeners.select{|l| l.is_a? String}.each do |l|
+        @runner_event_listeners.delete_at(@runner_event_listeners.index(l))
+        listener = Array.wrap eval(l)
+
+        @runner_event_listeners << listener[0] if listener[0].is_a?(Hydra::RunnerListener::Abstract)
+      end
 
       @runner_log_file = opts.fetch(:runner_log_file) { nil }
 
@@ -38,7 +45,7 @@ module Hydra #:nodoc:
     def load_worker_initializer
       if File.exist?('./hydra_worker_init.rb')
         trace('Requiring hydra_worker_init.rb')
-        require 'hydra_worker_init'
+        require './hydra_worker_init'
       else
         trace('hydra_worker_init.rb not present')
       end
@@ -162,15 +169,5 @@ module Hydra #:nodoc:
       end
       return idle_r
     end
-
-    def eval_listeners runner_listeners
-      @runner_event_listeners = Array(runner_listeners)
-      @runner_event_listeners.select{|l| l.is_a? String}.each do |l|
-        @runner_event_listeners.delete_at(@runner_event_listeners.index(l))
-        listener = eval(l)
-        @runner_event_listeners << listener if listener.is_a?(Hydra::RunnerListener::Abstract)
-        @runner_event_listeners << listener[0] if listener.is_a?(Array) and listener[0].is_a?(Hydra::RunnerListener::Abstract)
-      end
-    end
   end
 end

metadata

@@ -1,24 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: arturop-hydra
 version: !ruby/object:Gem::Version 
-  hash: 127
+  hash: 123
   prerelease: 
   segments: 
   - 0
-  - 24
+  - 25
   - 0
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors: 
 - Nick Gauthier
-- Justin Fitzsimmons
-- Victor Savkin
 - Arturo Pie
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-02-15 00:00:00 Z
+date: 2012-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -62,12 +60,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 63
         segments: 
-        - 1
-        - 1
-        - 4
-        version: 1.1.4
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -78,16 +76,16 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 11
         segments: 
         - 0
-        - 9
-        - 9
-        version: 0.9.9
+        - 7
+        - 4
+        version: 0.7.4
   type: :development
   version_requirements: *id004
 description: Spread your tests over multiple machines to test your code faster.
-email: arturotd08@yahoo.ca
+email: nick@smartlogicsolutions.com
 executables: []
 
 extensions: []
@@ -103,6 +101,7 @@ files:
 - Rakefile
 - TODO
 - VERSION
+- arturop-hydra.gemspec
 - caliper.yml
 - hydra-icon-64x64.png
 - hydra.gemspec
@@ -127,7 +126,6 @@ files:
 - lib/hydra/message/worker_messages.rb
 - lib/hydra/messaging_io.rb
 - lib/hydra/pipe.rb
-- lib/hydra/proxy_config.rb
 - lib/hydra/runner.rb
 - lib/hydra/runner_listener/abstract.rb
 - lib/hydra/safe_fork.rb
@@ -137,13 +135,10 @@ files:
 - lib/hydra/stdio.rb
 - lib/hydra/sync.rb
 - lib/hydra/tasks.rb
-- lib/hydra/threadsafe_io.rb
 - lib/hydra/tmpdir.rb
 - lib/hydra/trace.rb
 - lib/hydra/worker.rb
-- nulogy-hydra.gemspec
 - test/fixtures/assert_true.rb
-- test/fixtures/bad_proxy_config.yml
 - test/fixtures/config.yml
 - test/fixtures/conflicting.rb
 - test/fixtures/features/step_definitions.rb
@@ -155,8 +150,6 @@ files:
 - test/fixtures/json_data.json
 - test/fixtures/many_outputs_to_console.rb
 - test/fixtures/master_listeners.rb
-- test/fixtures/proxy_config.yml
-- test/fixtures/proxy_config_http.yml
 - test/fixtures/runner_listeners.rb
 - test/fixtures/slow.rb
 - test/fixtures/sync_test.rb
@@ -168,14 +161,13 @@ files:
 - test/master_test.rb
 - test/message_test.rb
 - test/pipe_test.rb
-- test/proxy_config_test.rb
 - test/runner_test.rb
 - test/ssh_test.rb
 - test/sync_test.rb
 - test/task_test.rb
 - test/test_helper.rb
 - test/worker_test.rb
-homepage: http://github.com/nulogy/hydra
+homepage: https://github.com/arturopie/hydra
 licenses: []
 
 post_install_message: 

data/lib/hydra/proxy_config.rb

@@ -1,27 +0,0 @@
-require 'yaml'
-require 'net/http'
-
-module Hydra
-  class UnknownProxyType < RuntimeError
-
-  end
-
-  class ProxyConfig
-    def self.load(config_yml)
-      config = YAML::load(config_yml)
-      if config.has_key?('proxy')
-        proxy_info = config['proxy']
-        #only file supported so far
-        if proxy_info['type'] == "file"
-          YAML::load_file(proxy_info['path'])
-        elsif proxy_info['type'] == "http"
-          YAML::load(Net::HTTP.get(URI.parse(proxy_info['path'])))
-        else
-          raise UnknownProxyType.new("Proxy config file does not know what to do with type '#{proxy_info["type"]}'.")
-        end
-      else
-        config
-      end
-    end
-  end
-end

data/lib/hydra/threadsafe_io.rb

@@ -1,18 +0,0 @@
-require 'thread'
-require 'fcntl'
-
-module Hydra
-  class ThreadsafeIO < IO
-    def initialize(existing_io)
-      fd = existing_io.fcntl(Fcntl::F_DUPFD)
-      super(fd)
-      @mutex = Mutex.new
-    end
-
-    def write(*args)
-      @mutex.synchronize do
-        super(*args)
-      end
-    end
-  end
-end

data/test/fixtures/bad_proxy_config.yml

@@ -1,4 +0,0 @@
---- 
-proxy: 
-  path: test/fixtures/config.yml
-  type: fjoeaij

data/test/fixtures/proxy_config.yml

@@ -1,4 +0,0 @@
---- 
-proxy: 
-  path: test/fixtures/config.yml
-  type: file

data/test/fixtures/proxy_config_http.yml

@@ -1,4 +0,0 @@
---- 
-proxy: 
-  path: http://mocked/url
-  type: http

data/test/proxy_config_test.rb

@@ -1,31 +0,0 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
-require 'yaml'
-require 'hydra/proxy_config'
-
-class ProxyConfigTest < Test::Unit::TestCase
-
-  context "proxy config" do
-    should "fetch and parse yml from a file source" do
-      assert_equal YAML::load_file("test/fixtures/config.yml"), Hydra::ProxyConfig.load(File.read("test/fixtures/proxy_config.yml"))
-    end
-    should "fetch and parse yml from a http source" do
-      class Net::HTTP
-        def self.get(path)
-          return File.new("test/fixtures/config.yml", "r").read
-        end
-      end
-      assert_equal YAML::load_file("test/fixtures/config.yml"), Hydra::ProxyConfig.load(File.read("test/fixtures/proxy_config_http.yml"))
-    end
-    should "raise exception when type is unknown" do
-      assert_raise Hydra::UnknownProxyType do
-        Hydra::ProxyConfig.load(File.read("test/fixtures/bad_proxy_config.yml"))
-      end
-    end
-  end
-
-  context "normal hydra config" do
-    should "return unserialized configuration" do
-      assert_equal YAML::load_file("test/fixtures/config.yml"), Hydra::ProxyConfig.load(File.read("test/fixtures/config.yml"))
-    end
-  end
-end