sskirby-hydra 0.21.0 → 0.23.3

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/Rakefile

@@ -9,10 +9,10 @@ begin
     gem.description = %Q{Spread your tests over multiple machines to test your code faster.}
     gem.email = "nick@smartlogicsolutions.com"
     gem.homepage = "http://github.com/ngauthier/hydra"
-    gem.authors = ["Nick Gauthier"]
+    gem.authors = ["Nick Gauthier", "Sean Kirby", "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", "= 0.8.5"
+    gem.add_development_dependency "cucumber", "= 0.9.2"
     gem.add_development_dependency "therubyracer", "= 0.7.4"
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.21.0
+0.23.3

data/lib/hydra/master.rb

@@ -1,6 +1,6 @@
 require 'hydra/hash'
 require 'open3'
-require 'tmpdir'
+require 'hydra/tmpdir'
 require 'erb'
 require 'yaml'
 
@@ -14,6 +14,7 @@ module Hydra #:nodoc:
     include Hydra::Messages::Master
     include Open3
     traceable('MASTER')
+    attr_reader :failed_files
 
     # Create a new Master
     #
@@ -54,6 +55,7 @@ module Hydra #:nodoc:
       @files = Array(opts.fetch('files') { nil })
       raise "No files, nothing to do" if @files.empty?
       @incomplete_files = @files.dup
+      @failed_files = []
       @workers = []
       @listeners = []
       @event_listeners = Array(opts.fetch('listeners') { nil } )
@@ -66,7 +68,6 @@ module Hydra #:nodoc:
       @autosort = opts.fetch('autosort') { true }
       @sync = opts.fetch('sync') { nil }
       @environment = opts.fetch('environment') { 'test' }
-      @remote_require = opts.fetch('remote_require') {[]}
 
       if @autosort
         sort_files_from_report
@@ -117,6 +118,9 @@ module Hydra #:nodoc:
         @incomplete_files.delete_at(@incomplete_files.index(message.file))
         trace "#{@incomplete_files.size} Files Remaining"
         @event_listeners.each{|l| l.file_end(message.file, message.output) }
+        unless message.output == '.'
+          @failed_files << message.file
+        end
         if @incomplete_files.empty?
           @workers.each do |worker|
             @event_listeners.each{|l| l.worker_end(worker) }
@@ -166,11 +170,9 @@ module Hydra #:nodoc:
     def boot_ssh_worker(worker)
       sync = Sync.new(worker, @sync, @verbose)
 
-      custom_require = @remote_require.map {|r| " require '#{r}';"}.join(' ')
-
       runners = worker.fetch('runners') { raise "You must specify the number of runners"  }
       command = worker.fetch('command') {
-        "RAILS_ENV=#{@environment} ruby -e \"require 'rubygems'; require 'hydra';#{custom_require} Hydra::Worker.new(:io => Hydra::Stdio.new, :runners => #{runners}, :verbose => #{@verbose}, :remote => '#{sync.connect}');\""
+        "RAILS_ENV=#{@environment} ruby -e \"require 'rubygems'; require 'hydra'; Hydra::Worker.new(:io => Hydra::Stdio.new, :runners => #{runners}, :verbose => #{@verbose});\""
       }
 
       trace "Booting SSH worker"
@@ -235,7 +237,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/messaging_io.rb

@@ -8,15 +8,17 @@ module Hydra #:nodoc:
     #  IO.gets
     #    => Hydra::Message # or subclass
     def gets
-      raise IOError unless @reader
-      message = @reader.gets
-      return nil unless message
-      puts message if message.include?(Hydra::Trace::REMOTE_IDENTIFIER)
-      return Message.build(eval(message.chomp))
-    rescue SyntaxError, NameError
-      # uncomment to help catch remote errors by seeing all traffic
-      #$stderr.write "Not a message: [#{message.inspect}]\n"
-      return gets
+      while true
+        begin
+          raise IOError unless @reader
+          message = @reader.gets
+          return nil unless message
+          return Message.build(eval(message.chomp))
+        rescue SyntaxError, NameError
+          # uncomment to help catch remote errors by seeing all traffic
+          #$stderr.write "Not a message: [#{message.inspect}]\n"
+        end
+      end
     end
 
     # Write a Message to the output IO object. It will automatically

data/lib/hydra/runner.rb

@@ -18,7 +18,6 @@ module Hydra #:nodoc:
     def initialize(opts = {})
       @io = opts.fetch(:io) { raise "No IO Object" } 
       @verbose = opts.fetch(:verbose) { false }      
-      @remote = opts.fetch(:remote) { false }      
       $stdout.sync = true
       trace 'Booted. Sending Request for file'
 
@@ -57,14 +56,6 @@ module Hydra #:nodoc:
       @running = false
     end
 
-    def format_ex_in_file(file, ex)
-      "Error in #{file}:\n  #{format_exception(ex)}"
-    end
-
-    def format_exception(ex)
-      "#{ex.class.name}: #{ex.message}\n    #{ex.backtrace.join("\n    ")}"
-    end
-
     private
 
     # The runner will continually read messages and handle them.
@@ -88,6 +79,14 @@ module Hydra #:nodoc:
       end
     end
 
+    def format_ex_in_file(file, ex)
+      "Error in #{file}:\n  #{format_exception(ex)}"
+    end
+
+    def format_exception(ex)
+      "#{ex.class.name}: #{ex.message}\n    #{ex.backtrace.join("\n    ")}"
+    end
+
     # Run all the Test::Unit Suites in a ruby file
     def run_test_unit_file(file)
       begin
@@ -122,7 +121,7 @@ module Hydra #:nodoc:
         require 'rspec'
         require 'hydra/spec/hydra_formatter'
         # Ensure we override rspec's at_exit
-        require 'hydra/spec/autorun_override'
+        RSpec::Core::Runner.disable_autorun!
       rescue LoadError => ex
         return ex.to_s
       end
@@ -150,29 +149,35 @@ module Hydra #:nodoc:
       dev_null = StringIO.new
       hydra_response = StringIO.new
 
-      unless @step_mother
+      unless @cuke_runtime
         require 'cucumber'
         require 'hydra/cucumber/formatter'
-        @step_mother = Cucumber::StepMother.new
+        Cucumber.logger.level = Logger::INFO
+        @cuke_runtime = Cucumber::Runtime.new
         @cuke_configuration = Cucumber::Cli::Configuration.new(dev_null, dev_null)
         @cuke_configuration.parse!(['features']+files)
 
-        @step_mother.options = @cuke_configuration.options
-        @step_mother.log = @cuke_configuration.log
-        @step_mother.load_code_files(@cuke_configuration.support_to_load)
-        @step_mother.after_configuration(@cuke_configuration)
-        @step_mother.load_code_files(@cuke_configuration.step_defs_to_load)
+        support_code = Cucumber::Runtime::SupportCode.new(@cuke_runtime, @cuke_configuration.guess?)
+        support_code.load_files!(@cuke_configuration.support_to_load + @cuke_configuration.step_defs_to_load)
+        support_code.fire_hook(:after_configuration, @cuke_configuration)
+        # i don't like this, but there no access to set the instance of SupportCode in Runtime
+        @cuke_runtime.instance_variable_set('@support_code',support_code)
       end
       cuke_formatter = Cucumber::Formatter::Hydra.new(
-        @step_mother, hydra_response, @cuke_configuration.options
+        @cuke_runtime, hydra_response, @cuke_configuration.options
       )
 
       cuke_runner ||= Cucumber::Ast::TreeWalker.new(
-        @step_mother, [cuke_formatter], @cuke_configuration.options, dev_null
+        @cuke_runtime, [cuke_formatter], @cuke_configuration
       )
-      @step_mother.visitor = cuke_runner
+      @cuke_runtime.visitor = cuke_runner
 
-      features = @step_mother.load_plain_text_features(files)
+      loader = Cucumber::Runtime::FeaturesLoader.new(
+        files,
+        @cuke_configuration.filters,
+        @cuke_configuration.tag_expression
+      )
+      features = loader.features
       tag_excess = tag_excess(features, @cuke_configuration.options[:tag_expression].limits)
       @cuke_configuration.options[:tag_excess] = tag_excess
 

data/lib/hydra/tasks.rb

@@ -36,10 +36,7 @@ module Hydra #:nodoc:
     # files that may not play nice with others.
     attr_accessor :serial
 
-    # When running remote workers with extensions to hydra (such as 
-    # custom messages), you will need to make those extensions 
-    # available to the remote workers by specifying them here.
-    attr_accessor :remote_require
+    attr_accessor :environment
 
     #
     # Search for the hydra config file
@@ -69,7 +66,6 @@ module Hydra #:nodoc:
   #     t.add_files 'test/integration/**/*_test.rb'
   #     t.verbose = false # optionally set to true for lots of debug messages
   #     t.autosort = false # disable automatic sorting based on runtime of tests
-  #     t.remote_require << 'hydra_extensions'
   #   end
   class TestTask < Hydra::Task
 
@@ -81,12 +77,13 @@ module Hydra #:nodoc:
       @autosort = true
       @serial = false
       @listeners = [Hydra::Listener::ProgressBar.new]
-      @remote_require = []
 
       yield self if block_given?
 
       # Ensure we override rspec's at_exit
-      require 'hydra/spec/autorun_override'
+      if defined?(RSpec)
+        RSpec::Core::Runner.disable_autorun!
+      end
 
       unless @serial
         @config = find_config_file
@@ -97,7 +94,7 @@ module Hydra #:nodoc:
         :autosort => @autosort,
         :files => @files,
         :listeners => @listeners,
-        :remote_require => @remote_require
+        :environment => @environment
       }
       if @config
         @opts.merge!(:config => @config)
@@ -113,11 +110,14 @@ module Hydra #:nodoc:
     def define
       desc "Hydra Tests" + (@name == :hydra ? "" : " for #{@name}")
       task @name do
-        if Object.const_defined?('RAILS_ENV') && RAILS_ENV == 'development'
-          $stderr.puts %{WARNING: RAILS_ENV is "development". Make sure to set it properly (ex: "RAILS_ENV=test rake hydra")}
+        if Object.const_defined?('Rails') && Rails.env == 'development'
+          $stderr.puts %{WARNING: Rails Environment is "development". Make sure to set it properly (ex: "RAILS_ENV=test rake hydra")}
         end
 
-        Hydra::Master.new(@opts)
+        master = Hydra::Master.new(@opts)
+        unless master.failed_files.empty?
+          raise "Hydra: Not all tests passes"
+        end
       end
     end
   end
@@ -243,8 +243,9 @@ module Hydra #:nodoc:
     include Open3
     # Create a new hydra remote task with the given name.
     # The task will be named hydra:remote:<name>
-    def initialize(name)
+    def initialize(name, command=nil)
       @name = name
+      @command = command
       yield self if block_given?
       @config = find_config_file
       if @config
@@ -262,6 +263,7 @@ module Hydra #:nodoc:
         environment = config.fetch('environment') { 'test' }
         workers = config.fetch('workers') { [] }
         workers = workers.select{|w| w['type'] == 'ssh'}
+        @command = "RAILS_ENV=#{environment} rake #{@name}" unless @command
 
         $stdout.write "==== Hydra Running #{@name} ====\n"
         Thread.abort_on_exception = true
@@ -270,7 +272,7 @@ module Hydra #:nodoc:
         workers.each do |worker|
           @listeners << Thread.new do
             begin
-              @results[worker] = if run_task(worker, environment)
+              @results[worker] = if run_command(worker, @command)
                 "==== #{@name} passed on #{worker['connect']} ====\n"
               else
                 "==== #{@name} failed on #{worker['connect']} ====\nPlease see above for more details.\n"
@@ -286,13 +288,13 @@ module Hydra #:nodoc:
       end
     end
 
-    def run_task worker, environment
+    def run_command worker, command
       $stdout.write "==== Hydra Running #{@name} on #{worker['connect']} ====\n"
       ssh_opts = worker.fetch('ssh_opts') { '' }
       writer, reader, error = popen3("ssh -tt #{ssh_opts} #{worker['connect']} ")
       writer.write("cd #{worker['directory']}\n")
       writer.write "echo BEGIN HYDRA\n"
-      writer.write("RAILS_ENV=#{environment} rake #{@name}\n")
+      writer.write(command + "\r")
       writer.write "echo END HYDRA\n"
       writer.write("exit\n")
       writer.close

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/trace.rb

@@ -1,8 +1,6 @@
 module Hydra #:nodoc:
   # Trace output when in verbose mode.
   module Trace
-    REMOTE_IDENTIFIER = 'REMOTE'
-
     module ClassMethods
       # Make a class traceable. Takes one parameter,
       # which is the prefix for the trace to identify this class
@@ -18,10 +16,7 @@ module Hydra #:nodoc:
       # Trace some output with the class's prefix and a newline.
       # Checks to ensure we're running verbosely.
       def trace(str)
-        return unless @verbose
-        remote_info = @remote ? "#{REMOTE_IDENTIFIER} #{@remote} " : ''
-        str = str.gsub /\n/, "\n#{remote_info}"
-        $stdout.write "#{Time.now.to_f} #{remote_info}#{self.class._traceable_prefix}| #{str}\n"
+        $stdout.write "#{Time.now.to_f} #{self.class._traceable_prefix}| #{str}\n" if @verbose
       end
     end
   end

data/lib/hydra/worker.rb

@@ -16,11 +16,11 @@ module Hydra #:nodoc:
     # * num_runners: The number of runners to launch
     def initialize(opts = {})
       @verbose = opts.fetch(:verbose) { false }
-      @remote = opts.fetch(:remote) { false }
       @io = opts.fetch(:io) { raise "No IO Object" }
       @runners = []
       @listeners = []
 
+      load_worker_initializer
       boot_runners(opts.fetch(:runners) { 1 })
       @io.write(Hydra::Messages::Worker::WorkerBegin.new)
 
@@ -29,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.
@@ -75,7 +83,7 @@ module Hydra #:nodoc:
         pipe = Hydra::Pipe.new
         child = SafeFork.fork do
           pipe.identify_as_child
-          Hydra::Runner.new(:io => pipe, :verbose => @verbose, :remote => @remote)
+          Hydra::Runner.new(:io => pipe, :verbose => @verbose)
         end
         pipe.identify_as_parent
         @runners << { :pid => child, :io => pipe, :idle => false }

data/sskirby-hydra.gemspec

@@ -0,0 +1,136 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{sskirby-hydra}
+  s.version = "0.23.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Nick Gauthier", "Sean Kirby", "Arturo Pie"]
+  s.date = %q{2011-04-26}
+  s.description = %q{Spread your tests over multiple machines to test your code faster.}
+  s.email = %q{nick@smartlogicsolutions.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc",
+     "TODO"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "TODO",
+     "VERSION",
+     "caliper.yml",
+     "hydra-icon-64x64.png",
+     "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",
+     "sskirby-hydra.gemspec",
+     "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/many_outputs_to_console.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/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 = %q{http://github.com/ngauthier/hydra}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Distributed testing toolkit}
+  s.test_files = [
+    "test/sync_test.rb",
+     "test/test_helper.rb",
+     "test/message_test.rb",
+     "test/runner_test.rb",
+     "test/fixtures/write_file.rb",
+     "test/fixtures/sync_test.rb",
+     "test/fixtures/hello_world.rb",
+     "test/fixtures/write_file_alternate_spec.rb",
+     "test/fixtures/write_file_with_pending_spec.rb",
+     "test/fixtures/slow.rb",
+     "test/fixtures/assert_true.rb",
+     "test/fixtures/write_file_spec.rb",
+     "test/fixtures/many_outputs_to_console.rb",
+     "test/fixtures/features/step_definitions.rb",
+     "test/fixtures/conflicting.rb",
+     "test/ssh_test.rb",
+     "test/pipe_test.rb",
+     "test/task_test.rb",
+     "test/master_test.rb",
+     "test/worker_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= 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>, ["= 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>, ["= 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>, ["= 0.9.2"])
+    s.add_dependency(%q<therubyracer>, ["= 0.7.4"])
+  end
+end
+

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/many_outputs_to_console.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+10000.times do 
+  $stdout.write "A non-hydra message...\n"
+  $stdout.flush
+end
+
+$stdout.write "{:class=>Hydra::Messages::TestMessage, :text=>\"My message\"}\n"
+$stdout.flush

data/test/fixtures/task_test_config.yml

@@ -0,0 +1,6 @@
+---
+  workers:
+    - type: ssh
+      connect: localhost
+      directory: /tmp
+      runners: 1

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

@@ -64,7 +64,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]
@@ -133,8 +133,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

@@ -80,9 +80,6 @@ class RunnerTest < Test::Unit::TestCase
       # we run this in a fork to not contaminate
       # the main test environment
       pid = Process.fork do
-        # 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)
         assert File.exists?(target_file)

data/test/ssh_test.rb

@@ -11,4 +11,15 @@ class SSHTest < Test::Unit::TestCase
     assert_equal "Hello World", response.text
     ssh.close
   end
+
+  should "be able to handle a large number of non-Hydra console output" do
+    ssh = Hydra::SSH.new(
+      'localhost', # connect to this machine
+      File.expand_path(File.join(File.dirname(__FILE__))), # move to the test directory
+      "ruby fixtures/many_outputs_to_console.rb"
+    )
+    response = ssh.gets
+    assert_equal "My message", response.text
+    ssh.close
+  end
 end

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/task_test.rb

@@ -0,0 +1,21 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+require 'hydra/tasks'
+require 'rake'
+
+class TaskTest < Test::Unit::TestCase
+  context "a task" do
+    should "execute the command in a remote machine" do
+      
+      File.delete( "/tmp/new_file" ) if File.exists? "/tmp/new_file"
+
+      Hydra::RemoteTask.new('cat:text_file', 'touch new_file') do |t|
+        t.config = "test/fixtures/task_test_config.yml"
+      end
+
+      Rake.application['hydra:remote:cat:text_file'].invoke
+
+      assert( File.exists? "/tmp/new_file" )
+      
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'test/unit'
+gem 'shoulda', '2.10.3'
+gem 'rspec', '2.0.0.beta.19'
 require 'shoulda'
 require 'tmpdir'
 
@@ -12,11 +14,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

@@ -1,32 +1,31 @@
 --- !ruby/object:Gem::Specification 
 name: sskirby-hydra
 version: !ruby/object:Gem::Version 
-  hash: 75
   prerelease: false
   segments: 
   - 0
-  - 21
-  - 0
-  version: 0.21.0
+  - 23
+  - 3
+  version: 0.23.3
 platform: ruby
 authors: 
 - Nick Gauthier
+- Sean Kirby
+- Arturo Pie
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 -04:00
-default_executable: warmsnake.rb
+date: 2011-04-26 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 33
         segments: 
         - 2
         - 10
@@ -38,11 +37,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196421
         segments: 
         - 2
         - 0
@@ -56,27 +53,23 @@ dependencies:
   name: cucumber
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 53
         segments: 
         - 0
-        - 8
-        - 5
-        version: 0.8.5
+        - 9
+        - 2
+        version: 0.9.2
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: therubyracer
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 7
@@ -86,8 +79,8 @@ dependencies:
   version_requirements: *id004
 description: Spread your tests over multiple machines to test your code faster.
 email: nick@smartlogicsolutions.com
-executables: 
-- warmsnake.rb
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -102,7 +95,6 @@ files:
 - Rakefile
 - TODO
 - VERSION
-- bin/warmsnake.rb
 - caliper.yml
 - hydra-icon-64x64.png
 - hydra_gray.png
@@ -130,8 +122,10 @@ 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
+- sskirby-hydra.gemspec
 - test/fixtures/assert_true.rb
 - test/fixtures/config.yml
 - test/fixtures/conflicting.rb
@@ -141,8 +135,10 @@ files:
 - test/fixtures/hello_world.rb
 - test/fixtures/js_file.js
 - test/fixtures/json_data.json
+- test/fixtures/many_outputs_to_console.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
@@ -153,8 +149,8 @@ files:
 - test/runner_test.rb
 - test/ssh_test.rb
 - test/sync_test.rb
+- test/task_test.rb
 - test/test_helper.rb
-- test/trace_test.rb
 - test/worker_test.rb
 has_rdoc: true
 homepage: http://github.com/ngauthier/hydra
@@ -166,47 +162,44 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Distributed testing toolkit
 test_files: 
+- test/sync_test.rb
+- test/test_helper.rb
 - test/message_test.rb
-- test/master_test.rb
-- test/ssh_test.rb
-- test/fixtures/assert_true.rb
-- test/fixtures/slow.rb
-- test/fixtures/write_file_alternate_spec.rb
+- test/runner_test.rb
+- test/fixtures/write_file.rb
+- test/fixtures/sync_test.rb
 - test/fixtures/hello_world.rb
+- test/fixtures/write_file_alternate_spec.rb
 - test/fixtures/write_file_with_pending_spec.rb
-- test/fixtures/write_file.rb
-- test/fixtures/conflicting.rb
+- test/fixtures/slow.rb
+- test/fixtures/assert_true.rb
 - test/fixtures/write_file_spec.rb
+- test/fixtures/many_outputs_to_console.rb
 - test/fixtures/features/step_definitions.rb
-- test/fixtures/sync_test.rb
-- test/test_helper.rb
-- test/runner_test.rb
-- test/trace_test.rb
-- test/sync_test.rb
+- test/fixtures/conflicting.rb
+- test/ssh_test.rb
 - test/pipe_test.rb
+- test/task_test.rb
+- test/master_test.rb
 - test/worker_test.rb

data/bin/warmsnake.rb

@@ -1,76 +0,0 @@
-#!/usr/bin/env ruby
-#
-# 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
-      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"
-    end
-  end
-  begin
-    Process.wait env_proc
-  rescue Interrupt
-    puts "\n#{bold_yellow}SSsssSsssSSssSs#{reset}"
-    break
-  end
-end
-

data/test/trace_test.rb

@@ -1,72 +0,0 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
-
-class TraceTester
-  traceable("TEST")
-  attr_accessor :verbose, :remote
-  def initialize verbose, remote
-    self.verbose, self.remote = verbose, remote
-  end
-end
-
-class TraceTest < Test::Unit::TestCase
-  def setup
-    @result = StringIO.new("")
-  end
-
-  def run_trace object, str
-    old_stdout = $stdout
-    $stdout = @result
-    object.trace str
-    return @result.string
-  ensure
-    $stdout = old_stdout
-  end
-
-  context "with no tracing enabled" do 
-    setup do
-      @tracer = TraceTester.new false, false
-    end
-
-    should "not output" do
-      result = run_trace @tracer, "testing"
-      assert_equal '', result
-    end
-  end
-
-  context "with a local object" do
-    setup do
-      @tracer = TraceTester.new true, false
-    end
-    
-    should "output" do
-      result = run_trace @tracer, 'testing'
-      assert_match /TEST/, result
-      assert_match /testing/, result
-      assert_no_match /#{Hydra::Trace::REMOTE_IDENTIFIER}/, result
-    end
-  end
-
-  context "with a remote object" do
-    setup do
-      @tracer = TraceTester.new true, 'localhost'
-    end
-    
-    should "output" do
-      result = run_trace @tracer, 'testing'
-      assert_match /TEST/, result
-      assert_match /testing/, result
-      assert_equal "\n"[0], result[-1]
-      assert_match /#{Hydra::Trace::REMOTE_IDENTIFIER} localhost/, result
-    end
-
-    should "output a multiline message" do
-      result = run_trace @tracer, "testing\ntrace line #1\ntrace line #2"
-      assert_match /TEST/, result
-      assert_match /testing/, result
-      assert_match /#{Hydra::Trace::REMOTE_IDENTIFIER} localhost TEST/, result
-      assert_match /\n#{Hydra::Trace::REMOTE_IDENTIFIER} localhost trace line #1/, result
-      assert_match /\n#{Hydra::Trace::REMOTE_IDENTIFIER} localhost trace line #2/, result
-    end
-  end
-end
-