hydra 0.21.0 → 0.22.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Nick Gauthier
+Copyright (c) 2009-2010 Nick Gauthier
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/VERSION

@@ -1 +1 @@
-0.21.0
+0.22.0

data/bin/warmsnake.rb

@@ -1,64 +1,76 @@
 #!/usr/bin/env ruby
-if File.expand_path($0) == File.expand_path(__FILE__)
-  require 'rubygems'
-  require 'hydra'
-  
-  @files = ARGV.inject([]){|memo,f| memo += Dir.glob f}
-  
-  if @files.empty?
-    puts "You must specify a list of files to run"
-    puts "If you specify a pattern, it must be in quotes"
-    puts %{USAGE: #{$0} test/unit/my_test.rb "test/functional/**/*_test.rb"}
-    exit(1)
-  end
-  
-  Signal.trap("TERM", "KILL") do
-    puts "Warm Snake says bye bye"
-    exit(0)
-  end
-  
-  bold_yellow = "\033[1;33m"
-  reset = "\033[0m"
-  
-  
-  loop do
-    env_proc = Process.fork do
-      puts "#{bold_yellow}Booting Environment#{reset}"
+#
+# warmsnake.rb
+#
+# This is a first attempt at making a hydra binary.
+#
+# Currently, all it does is run the files you pass into it. When you
+# press Enter it will run them again, maintaining your rails environment.
+# When you type 'r' and hit Enter it will reboot the rails environment.
+#
+# It is extremely specific about its behavior and only works in rails.
+#
+# It is not really ready for any kind of release, but it is useful, so
+# it's included.
+#
+require 'rubygems'
+require 'hydra'
+
+@files = ARGV.inject([]){|memo,f| memo += Dir.glob f}
+
+if @files.empty?
+  puts "You must specify a list of files to run"
+  puts "If you specify a pattern, it must be in quotes"
+  puts %{USAGE: #{$0} test/unit/my_test.rb "test/functional/**/*_test.rb"}
+  exit(1)
+end
+
+Signal.trap("TERM", "KILL") do
+  puts "Warm Snake says bye bye"
+  exit(0)
+end
+
+bold_yellow = "\033[1;33m"
+reset = "\033[0m"
+
+
+loop do
+  env_proc = Process.fork do
+    puts "#{bold_yellow}Booting Environment#{reset}"
+    start = Time.now
+    ENV['RAILS_ENV']='test'
+    require 'config/environment'
+    require 'test/test_helper'
+    finish = Time.now
+    puts "#{bold_yellow}Environment Booted (#{finish-start})#{reset}"
+
+    loop do
+      puts "#{bold_yellow}Running#{reset} [#{@files.inspect}]"
       start = Time.now
-      ENV['RAILS_ENV']='test'
-      require 'config/environment'
-      require 'test/test_helper'
+      Hydra::Master.new(
+        :files => @files.dup,
+        :listeners => Hydra::Listener::ProgressBar.new(STDOUT),
+        :workers => [{:type => :local, :runners => 4}]
+      )
       finish = Time.now
-      puts "#{bold_yellow}Environment Booted (#{finish-start})#{reset}"
-  
-      loop do
-        puts "#{bold_yellow}Running#{reset} [#{@files.inspect}]"
-        start = Time.now
-        Hydra::Master.new(
-          :files => @files.dup,
-          :listeners => Hydra::Listener::ProgressBar.new(STDOUT),
-          :workers => [{:type => :local, :runners => 4}]
-        )
-        finish = Time.now
-        puts "#{bold_yellow}Tests finished#{reset} (#{finish-start})"
-        
-        puts ""
-  
-        $stdout.write "Press #{bold_yellow}ENTER#{reset} to retest. Type #{bold_yellow}r#{reset} then hit enter to reboot environment. #{bold_yellow}CTRL-C#{reset} to quit\n> "
-        begin
-          command = $stdin.gets
-        rescue Interrupt
-          exit(0)
-        end
-        break if !command.nil? and command.chomp == "r"
+      puts "#{bold_yellow}Tests finished#{reset} (#{finish-start})"
+      
+      puts ""
+
+      $stdout.write "Press #{bold_yellow}ENTER#{reset} to retest. Type #{bold_yellow}r#{reset} then hit enter to reboot environment. #{bold_yellow}CTRL-C#{reset} to quit\n> "
+      begin
+        command = $stdin.gets
+      rescue Interrupt
+        exit(0)
       end
+      break if !command.nil? and command.chomp == "r"
     end
-    begin
-      Process.wait env_proc
-    rescue Interrupt
-      puts "\n#{bold_yellow}SSsssSsssSSssSs#{reset}"
-      break
-    end
+  end
+  begin
+    Process.wait env_proc
+  rescue Interrupt
+    puts "\n#{bold_yellow}SSsssSsssSSssSs#{reset}"
+    break
   end
 end
 

data/hydra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hydra}
-  s.version = "0.21.0"
+  s.version = "0.22.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Gauthier"]
-  s.date = %q{2010-08-23}
+  s.date = %q{2010-09-02}
   s.default_executable = %q{warmsnake.rb}
   s.description = %q{Spread your tests over multiple machines to test your code faster.}
   s.email = %q{nick@smartlogicsolutions.com}
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
      "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",
@@ -88,21 +89,21 @@ Gem::Specification.new do |s|
   s.summary = %q{Distributed testing toolkit}
   s.test_files = [
     "test/pipe_test.rb",
-     "test/sync_test.rb",
+     "test/test_helper.rb",
      "test/ssh_test.rb",
+     "test/message_test.rb",
+     "test/master_test.rb",
+     "test/fixtures/write_file.rb",
+     "test/fixtures/slow.rb",
+     "test/fixtures/write_file_with_pending_spec.rb",
+     "test/fixtures/write_file_spec.rb",
+     "test/fixtures/features/step_definitions.rb",
+     "test/fixtures/hello_world.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/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/sync_test.rb",
      "test/worker_test.rb"
   ]
 

data/lib/hydra/master.rb

@@ -1,6 +1,6 @@
 require 'hydra/hash'
 require 'open3'
-require 'tmpdir'
+require 'hydra/tmpdir'
 require 'erb'
 require 'yaml'
 
@@ -232,7 +232,7 @@ module Hydra #:nodoc:
     end
 
     def heuristic_file
-      @heuristic_file ||= File.join(Dir.tmpdir, 'hydra_heuristics.yml')
+      @heuristic_file ||= File.join(Dir.consistent_tmpdir, 'hydra_heuristics.yml')
     end
   end
 end

data/lib/hydra/tmpdir.rb

@@ -0,0 +1,11 @@
+require 'tmpdir'
+
+class Dir
+  def self.consistent_tmpdir
+    if RUBY_PLATFORM =~ /darwin/i
+      '/tmp' # OS X normally returns a crazy tmpdir, BUT when logged in via SSH, it is '/tmp'. This unifies it.
+    else
+      Dir.tmpdir
+    end
+  end
+end

data/lib/hydra/worker.rb

@@ -20,6 +20,7 @@ module Hydra #:nodoc:
       @runners = []
       @listeners = []
 
+      load_worker_initializer
       boot_runners(opts.fetch(:runners) { 1 })
       @io.write(Hydra::Messages::Worker::WorkerBegin.new)
 
@@ -28,7 +29,15 @@ module Hydra #:nodoc:
       @runners.each{|r| Process.wait r[:pid] }
     end
 
-
+    def load_worker_initializer
+      if File.exist?('./hydra_worker_init.rb')
+        trace('Requiring hydra_worker_init.rb')
+        require 'hydra_worker_init'
+      else
+        trace('hydra_worker_init.rb not present')
+      end
+    end
+    
     # message handling methods
 
     # When a runner wants a file, it hits this method with a message.

data/test/fixtures/features/step_definitions.rb

@@ -1,9 +1,9 @@
 Given /^a target file$/ do
-  @target_file = File.expand_path(File.join(Dir.tmpdir, 'hydra_test.txt'))
+  @target_file = File.expand_path(File.join(Dir.consistent_tmpdir, 'hydra_test.txt'))
 end
 
 Given /^an alternate target file$/ do
-  @target_file = File.expand_path(File.join(Dir.tmpdir, 'alternate_hydra_test.txt'))
+  @target_file = File.expand_path(File.join(Dir.consistent_tmpdir, 'alternate_hydra_test.txt'))
 end
 
 When /^I write "([^\"]*)" to the file$/ do |text|

data/test/fixtures/write_file.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class WriteFileTest < Test::Unit::TestCase
   def test_write_a_file
-    File.open(File.join(Dir.tmpdir, 'hydra_test.txt'), 'a') do |f|
+    File.open(File.join(Dir.consistent_tmpdir, 'hydra_test.txt'), 'a') do |f|
       f.write "HYDRA"
     end
   end

data/test/fixtures/write_file_alternate_spec.rb

@@ -1,8 +1,8 @@
-require 'tmpdir'
 require 'rspec'
+require 'hydra/tmpdir'
 context "file writing" do
   it "writes to a file" do
-    File.open(File.join(Dir.tmpdir, 'alternate_hydra_test.txt'), 'a') do |f|
+    File.open(File.join(Dir.consistent_tmpdir, 'alternate_hydra_test.txt'), 'a') do |f|
       f.write "HYDRA"
     end
   end

data/test/fixtures/write_file_spec.rb

@@ -1,8 +1,8 @@
-require 'tmpdir'
 require 'rspec'
+require 'hydra/tmpdir'
 context "file writing" do
   it "writes to a file" do
-    File.open(File.join(Dir.tmpdir, 'hydra_test.txt'), 'a') do |f|
+    File.open(File.join(Dir.consistent_tmpdir, 'hydra_test.txt'), 'a') do |f|
       f.write "HYDRA"
     end
   end

data/test/fixtures/write_file_with_pending_spec.rb

@@ -2,7 +2,7 @@ require 'tmpdir'
 require 'rspec'
 context "file writing" do
   it "writes to a file" do
-    File.open(File.join(Dir.tmpdir, 'hydra_test.txt'), 'a') do |f|
+    File.open(File.join(Dir.consistent_tmpdir, 'hydra_test.txt'), 'a') do |f|
       f.write "HYDRA"
     end
   end

data/test/master_test.rb

@@ -35,7 +35,7 @@ class MasterTest < Test::Unit::TestCase
       Hydra::Master.new(:files => [test_file])
       assert File.exists?(target_file)
       assert_equal "HYDRA", File.read(target_file)
-      report_file = File.join(Dir.tmpdir, 'hydra_heuristics.yml')
+      report_file = File.join(Dir.consistent_tmpdir, 'hydra_heuristics.yml')
       assert File.exists?(report_file)
       assert report = YAML.load_file(report_file)
       assert_not_nil report[test_file]
@@ -104,8 +104,8 @@ class MasterTest < Test::Unit::TestCase
     end
 
     should "synchronize a test file over ssh with rsync" do
-      local = File.join(Dir.tmpdir, 'hydra', 'local')
-      remote = File.join(Dir.tmpdir, 'hydra', 'remote')
+      local = File.join(Dir.consistent_tmpdir, 'hydra', 'local')
+      remote = File.join(Dir.consistent_tmpdir, 'hydra', 'remote')
       sync_test = File.join(File.dirname(__FILE__), 'fixtures', 'sync_test.rb')
       [local, remote].each{|f| FileUtils.rm_rf f; FileUtils.mkdir_p f}
 

data/test/runner_test.rb

@@ -50,7 +50,6 @@ class RunnerTest < Test::Unit::TestCase
     end
 
     should "run two rspec tests" do
-      puts "First test"
       runner = Hydra::Runner.new(:io => File.new('/dev/null', 'w'))
       runner.run_file(rspec_file)
       assert File.exists?(target_file)
@@ -81,8 +80,8 @@ class RunnerTest < Test::Unit::TestCase
       # we run this in a fork to not contaminate
       # the main test environment
       pid = Process.fork do
-        puts "THE FOLLOWING WARNINGS CAN BE IGNORED"
-        puts "It is caused by Cucumber loading all rb files near its features"
+        # need to get into the fixtures directory so cucumber doesn't load up the whole project
+        Dir.chdir(File.join(File.dirname(__FILE__), 'fixtures'))
 
         runner = Hydra::Runner.new(:io => File.new('/dev/null', 'w'))
         runner.run_file(cucumber_feature_file)
@@ -95,8 +94,6 @@ class RunnerTest < Test::Unit::TestCase
         assert File.exists?(alternate_target_file)
         assert_equal "HYDRA", File.read(alternate_target_file)
         assert !File.exists?(target_file)
-        
-        puts "END IGNORABLE OUTPUT"
       end
       Process.wait pid
     end
@@ -137,7 +134,6 @@ class RunnerTest < Test::Unit::TestCase
       
       # grab its response. This makes us wait for it to finish
       response = pipe.gets
-      puts response.output
       
       # tell it to shut down
       pipe.write(Hydra::Messages::Worker::Shutdown.new)

data/test/sync_test.rb

@@ -13,8 +13,8 @@ class SyncTest < Test::Unit::TestCase
     end
 
     should "synchronize a test file over ssh with rsync" do
-      local = File.join(Dir.tmpdir, 'hydra', 'local')
-      remote = File.join(Dir.tmpdir, 'hydra', 'remote')
+      local = File.join(Dir.consistent_tmpdir, 'hydra', 'local')
+      remote = File.join(Dir.consistent_tmpdir, 'hydra', 'remote')
       sync_test = File.join(File.dirname(__FILE__), 'fixtures', 'sync_test.rb')
       [local, remote].each{|f| FileUtils.rm_rf f; FileUtils.mkdir_p f}
 
@@ -58,9 +58,9 @@ class SyncTest < Test::Unit::TestCase
     end
 
     should "synchronize a test file over ssh with rsync to multiple workers" do
-      local = File.join(Dir.tmpdir, 'hydra', 'local')
-      remote_a = File.join(Dir.tmpdir, 'hydra', 'remote_a')
-      remote_b = File.join(Dir.tmpdir, 'hydra', 'remote_b')
+      local = File.join(Dir.consistent_tmpdir, 'hydra', 'local')
+      remote_a = File.join(Dir.consistent_tmpdir, 'hydra', 'remote_a')
+      remote_b = File.join(Dir.consistent_tmpdir, 'hydra', 'remote_b')
       sync_test = File.join(File.dirname(__FILE__), 'fixtures', 'sync_test.rb')
       [local, remote_a, remote_b].each{|f| FileUtils.rm_rf f; FileUtils.mkdir_p f}
 

data/test/test_helper.rb

@@ -12,11 +12,11 @@ Test::Unit.run = false
 
 class Test::Unit::TestCase
   def target_file
-    File.expand_path(File.join(Dir.tmpdir, 'hydra_test.txt'))
+    File.expand_path(File.join(Dir.consistent_tmpdir, 'hydra_test.txt'))
   end
   
   def alternate_target_file
-    File.expand_path(File.join(Dir.tmpdir, 'alternate_hydra_test.txt'))
+    File.expand_path(File.join(Dir.consistent_tmpdir, 'alternate_hydra_test.txt'))
   end
 
   def test_file

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 21
+  - 22
   - 0
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors: 
 - Nick Gauthier
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -04:00
+date: 2010-09-02 00:00:00 -05:00
 default_executable: warmsnake.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -122,6 +122,7 @@ files:
 - 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
@@ -178,19 +179,19 @@ specification_version: 3
 summary: Distributed testing toolkit
 test_files: 
 - test/pipe_test.rb
-- test/sync_test.rb
+- test/test_helper.rb
 - test/ssh_test.rb
+- test/message_test.rb
+- test/master_test.rb
+- test/fixtures/write_file.rb
+- test/fixtures/slow.rb
+- test/fixtures/write_file_with_pending_spec.rb
+- test/fixtures/write_file_spec.rb
+- test/fixtures/features/step_definitions.rb
+- test/fixtures/hello_world.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/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/sync_test.rb
 - test/worker_test.rb