hydra 0.15.1 → 0.16.0

data/VERSION

@@ -1 +1 @@
-0.15.1
+0.16.0

data/hydra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hydra}
-  s.version = "0.15.1"
+  s.version = "0.16.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Gauthier"]
-  s.date = %q{2010-03-31}
+  s.date = %q{2010-04-04}
   s.description = %q{Spread your tests over multiple machines to test your code faster.}
   s.email = %q{nick@smartlogicsolutions.com}
   s.extra_rdoc_files = [
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
      "lib/hydra/pipe.rb",
      "lib/hydra/runner.rb",
      "lib/hydra/safe_fork.rb",
+     "lib/hydra/spec/hydra_formatter.rb",
      "lib/hydra/ssh.rb",
      "lib/hydra/stdio.rb",
      "lib/hydra/tasks.rb",
@@ -60,6 +61,8 @@ Gem::Specification.new do |s|
      "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/master_test.rb",
      "test/message_test.rb",
      "test/pipe_test.rb",
@@ -71,22 +74,24 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ngauthier/hydra}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Distributed testing toolkit}
   s.test_files = [
-    "test/message_test.rb",
+    "test/pipe_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_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/assert_true.rb",
-     "test/fixtures/hello_world.rb",
-     "test/fixtures/features/step_definitions.rb",
-     "test/master_test.rb",
-     "test/worker_test.rb",
      "test/runner_test.rb",
-     "test/pipe_test.rb"
+     "test/worker_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/hydra/master.rb

@@ -1,6 +1,7 @@
 require 'hydra/hash'
 require 'open3'
 require 'tmpdir'
+require 'yaml'
 module Hydra #:nodoc:
   # Hydra class responsible for delegate work down to workers.
   #

data/lib/hydra/message/runner_messages.rb

@@ -29,6 +29,18 @@ module Hydra #:nodoc:
           # the connectivity of the IO
         end
       end
+
+      # The runner forks to run rspec messages
+      # so that specs don't get rerun. It uses
+      # this message to report the results. See
+      # Runner::run_rspec_file.
+      class RSpecResult < Hydra::Message
+        # the output of the spec
+        attr_accessor :output
+        def serialize #:nodoc:
+          super(:output => @output)
+        end
+      end
     end
   end
 end

data/lib/hydra/runner.rb

@@ -35,10 +35,12 @@ module Hydra #:nodoc:
       trace "Running file: #{file}"
 
       output = ""
-      if file =~ /.rb$/
-        output = run_ruby_file(file)
+      if file =~ /_spec.rb$/
+        output = run_rspec_file(file)
       elsif file =~ /.feature$/
         output = run_cucumber_file(file)
+      else
+        output = run_test_unit_file(file)
       end
 
       output = "." if output == ""
@@ -75,11 +77,6 @@ module Hydra #:nodoc:
       end
     end
 
-    # Run a ruby file (ending in .rb)
-    def run_ruby_file(file)
-      run_test_unit_file(file) + run_rspec_file(file)
-    end
-
     # Run all the Test::Unit Suites in a ruby file
     def run_test_unit_file(file)
       begin
@@ -106,11 +103,35 @@ module Hydra #:nodoc:
 
     # run all the Specs in an RSpec file (NOT IMPLEMENTED)
     def run_rspec_file(file)
-      #TODO
-      # Given the file
-      # return "" if all the tests passed
-      # or return the error messages for the entire file
-      return ""
+      # pull in rspec
+      begin
+        require 'spec'
+        require 'hydra/spec/hydra_formatter'
+      rescue LoadError => ex
+        return ex.to_s
+      end
+      hydra_output = StringIO.new
+      Spec::Runner.options.instance_variable_set(:@formatters, [
+        Spec::Runner::Formatter::HydraFormatter.new(
+          Spec::Runner.options.formatter_options,
+          hydra_output
+        )
+      ])
+      Spec::Runner.options.instance_variable_set(
+        :@example_groups, []
+      )
+      Spec::Runner.options.instance_variable_set(
+        :@files, [file]
+      )
+      Spec::Runner.options.instance_variable_set(
+        :@files_loaded, false
+      )
+      Spec::Runner.options.run_examples
+      hydra_output.rewind
+      output = hydra_output.read.chomp
+      output = "" if output =~ /^\.*$/
+
+      return output
     end
 
     # run all the scenarios in a cucumber feature file

data/lib/hydra/safe_fork.rb

@@ -7,7 +7,11 @@ class SafeFork
       child = Process.fork do
         begin
           # create a new connection and perform the action
+          begin
           ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+          rescue ActiveRecord::AdapterNotSpecified
+            # AR was defined but we didn't have a connection
+          end
           yield
         ensure
           # make sure we remove the connection before we're done
@@ -16,7 +20,11 @@ class SafeFork
       end
     ensure
       # make sure we re-establish the connection before returning to the main instance
+      begin
       ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+      rescue ActiveRecord::AdapterNotSpecified
+        # AR was defined but we didn't have a connection
+      end
     end
     return child
   end

data/lib/hydra/spec/hydra_formatter.rb

@@ -0,0 +1,20 @@
+require 'spec/autorun'
+require 'spec/runner/formatter/progress_bar_formatter'
+module Spec
+  module Runner
+    class << self
+      # stop the auto-run at_exit
+      def run
+        return 0
+      end 
+    end
+    module Formatter
+      class HydraFormatter < ProgressBarFormatter
+        # Stifle the post-test summary
+        def dump_summary(duration, example, failure, pending)
+        end
+      end
+    end
+  end
+end
+

data/lib/hydra/tasks.rb

@@ -72,6 +72,9 @@ module Hydra #:nodoc:
 
       yield self if block_given?
 
+      # Ensure we override rspec's at_exit
+      require 'hydra/spec/hydra_formatter'
+
       @config = find_config_file
 
       @opts = {
@@ -95,7 +98,7 @@ module Hydra #:nodoc:
       desc "Hydra Tests" + (@name == :hydra ? "" : " for #{@name}")
       task @name do
         Hydra::Master.new(@opts)
-        exit(0) #bypass test on_exit output
+        #exit(0) #bypass test on_exit output
       end
     end
   end

data/test/fixtures/write_file_alternate_spec.rb

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

data/test/fixtures/write_file_spec.rb

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

data/test/runner_test.rb

@@ -37,22 +37,43 @@ class RunnerTest < Test::Unit::TestCase
       Process.wait(child)
     end
 
-    should "run two cucumber tests" do
-      puts "THE FOLLOWING WARNINGS CAN BE IGNORED"
-      puts "It is caused by Cucumber loading all rb files near its features"
-
+    should "run two rspec tests" do
       runner = Hydra::Runner.new(:io => File.new('/dev/null', 'w'))
-      runner.run_file(cucumber_feature_file)
+      runner.run_file(rspec_file)
       assert File.exists?(target_file)
       assert_equal "HYDRA", File.read(target_file)
-      
+
       FileUtils.rm_f(target_file)
       
-      runner.run_file(alternate_cucumber_feature_file)
+      runner.run_file(alternate_rspec_file)
       assert File.exists?(alternate_target_file)
       assert_equal "HYDRA", File.read(alternate_target_file)
-      
-      puts "END IGNORABLE OUTPUT"
+      assert !File.exists?(target_file)
+    end
+
+    should "run two cucumber tests" do
+      # because of all the crap cucumber pulls in
+      # 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"
+
+        runner = Hydra::Runner.new(:io => File.new('/dev/null', 'w'))
+        runner.run_file(cucumber_feature_file)
+        assert File.exists?(target_file)
+        assert_equal "HYDRA", File.read(target_file)
+        
+        FileUtils.rm_f(target_file)
+        
+        runner.run_file(alternate_cucumber_feature_file)
+        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
 
     should "be able to run a runner over ssh" do

data/test/test_helper.rb

@@ -23,6 +23,14 @@ class Test::Unit::TestCase
     File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'write_file.rb'))
   end
 
+  def rspec_file
+    File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'write_file_spec.rb'))
+  end
+
+  def alternate_rspec_file
+    File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'write_file_alternate_spec.rb'))
+  end
+
   def cucumber_feature_file
     File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'features', 'write_file.feature'))
   end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: hydra
 version: !ruby/object:Gem::Version 
-  version: 0.15.1
+  prerelease: false
+  segments: 
+  - 0
+  - 16
+  - 0
+  version: 0.16.0
 platform: ruby
 authors: 
 - Nick Gauthier
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 -04:00
+date: 2010-04-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 3
         version: 2.10.3
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Spread your tests over multiple machines to test your code faster.
 email: nick@smartlogicsolutions.com
 executables: []
@@ -61,6 +70,7 @@ files:
 - lib/hydra/pipe.rb
 - lib/hydra/runner.rb
 - lib/hydra/safe_fork.rb
+- lib/hydra/spec/hydra_formatter.rb
 - lib/hydra/ssh.rb
 - lib/hydra/stdio.rb
 - lib/hydra/tasks.rb
@@ -75,6 +85,8 @@ files:
 - 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/master_test.rb
 - test/message_test.rb
 - test/pipe_test.rb
@@ -95,32 +107,36 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Distributed testing toolkit
 test_files: 
-- test/message_test.rb
+- test/pipe_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_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/assert_true.rb
-- test/fixtures/hello_world.rb
-- test/fixtures/features/step_definitions.rb
-- test/master_test.rb
-- test/worker_test.rb
 - test/runner_test.rb
-- test/pipe_test.rb
+- test/worker_test.rb