sskirby-hydra 0.17.1 → 0.21.0

data/lib/hydra/trace.rb

@@ -1,6 +1,8 @@
 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
@@ -16,7 +18,10 @@ module Hydra #:nodoc:
       # Trace some output with the class's prefix and a newline.
       # Checks to ensure we're running verbosely.
       def trace(str)
-        $stdout.write "#{Time.now.to_f} #{self.class._traceable_prefix}| #{str}\n" if @verbose
+        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"
       end
     end
   end

data/lib/hydra/worker.rb

@@ -9,24 +9,29 @@ module Hydra #:nodoc:
   class Worker
     include Hydra::Messages::Worker
     traceable('WORKER')
+
+    attr_reader :runners
     # Create a new worker.
     # * io: The IO object to use to communicate with the master
     # * 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 = []
 
       boot_runners(opts.fetch(:runners) { 1 })
+      @io.write(Hydra::Messages::Worker::WorkerBegin.new)
+
       process_messages
-      
+
       @runners.each{|r| Process.wait r[:pid] }
     end
 
 
     # message handling methods
-    
+
     # When a runner wants a file, it hits this method with a message.
     # Then the worker bubbles the file request up to the master.
     def request_file(message, runner)
@@ -70,7 +75,7 @@ module Hydra #:nodoc:
         pipe = Hydra::Pipe.new
         child = SafeFork.fork do
           pipe.identify_as_child
-          Hydra::Runner.new(:io => pipe, :verbose => @verbose)
+          Hydra::Runner.new(:io => pipe, :verbose => @verbose, :remote => @remote)
         end
         pipe.identify_as_parent
         @runners << { :pid => child, :io => pipe, :idle => false }
@@ -99,7 +104,7 @@ module Hydra #:nodoc:
           begin
             message = @io.gets
             if message and !message.class.to_s.index("Master").nil?
-              trace "Received Message from Master" 
+              trace "Received Message from Master"
               trace "\t#{message.inspect}"
               message.handle(self)
             else

data/test/fixtures/conflicting.rb

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+# this test is around to make sure that we handle all the errors
+# that can occur when 'require'ing a test file.
+class SyncTest < Object
+  def test_it_again
+    assert true
+  end
+end
+

data/test/fixtures/js_file.js

@@ -0,0 +1,4 @@
+"use strict";
+var thisvar;
+var thatvar
+

data/test/fixtures/json_data.json

@@ -0,0 +1,4 @@
+{
+  "var1": "something",
+  "var2": "trailing comma",
+}

data/test/fixtures/write_file_alternate_spec.rb

@@ -1,5 +1,5 @@
 require 'tmpdir'
-require 'spec'
+require 'rspec'
 context "file writing" do
   it "writes to a file" do
     File.open(File.join(Dir.tmpdir, 'alternate_hydra_test.txt'), 'a') do |f|

data/test/fixtures/write_file_spec.rb

@@ -1,5 +1,5 @@
 require 'tmpdir'
-require 'spec'
+require 'rspec'
 context "file writing" do
   it "writes to a file" do
     File.open(File.join(Dir.tmpdir, 'hydra_test.txt'), 'a') do |f|

data/test/fixtures/write_file_with_pending_spec.rb

@@ -1,5 +1,5 @@
 require 'tmpdir'
-require 'spec'
+require 'rspec'
 context "file writing" do
   it "writes to a file" do
     File.open(File.join(Dir.tmpdir, 'hydra_test.txt'), 'a') do |f|

data/test/master_test.rb

@@ -20,6 +20,35 @@ class MasterTest < Test::Unit::TestCase
       assert_equal "HYDRA", File.read(target_file)
     end
 
+    # this test simulates what happens when we have 2 tests with the same
+    # class name but with different parent classes.  This can happen when 
+    # we have a functional and an integration test class with the same name.
+    should "run even with a test that will not require" do
+      class FileOutputListener < Hydra::Listener::Abstract
+        attr_accessor :output
+        def initialize(&block)
+          self.output = {}
+        end
+
+        def file_end(file, output)
+          self.output[file] = output
+        end
+      end
+
+      listener =  FileOutputListener.new
+      sync_test = File.join(File.dirname(__FILE__), 'fixtures', 'sync_test.rb')
+      Hydra::Master.new(
+        # we want the actual test to run last to make sure the runner can still run tests
+        :files => [sync_test, conflicting_test_file, test_file],
+        :autosort => false,
+        :listeners => [listener]
+      )
+      assert_match /superclass mismatch for class SyncTest/, listener.output[conflicting_test_file]
+      assert_match conflicting_test_file, listener.output[conflicting_test_file]
+      assert File.exists?(target_file)
+      assert_equal "HYDRA", File.read(target_file)
+    end
+
     should "run a spec with pending examples" do
       progress_bar = Hydra::Listener::ProgressBar.new(StringIO.new)
       Hydra::Master.new(

data/test/runner_test.rb

@@ -37,6 +37,18 @@ class RunnerTest < Test::Unit::TestCase
       Process.wait(child)
     end
 
+    should "run a js lint file and find errors" do
+      runner = Hydra::Runner.new(:io => File.new('/dev/null', 'w'))
+      results = runner.run_file(javascript_file)
+      assert results =~ /Missing semicolon/, results
+    end
+
+    should "run a json data file and find errors" do
+      runner = Hydra::Runner.new(:io => File.new('/dev/null', 'w'))
+      results = runner.run_file(json_file)
+      assert results =~ /trailing comma/, results
+    end
+
     should "run two rspec tests" do
       runner = Hydra::Runner.new(:io => File.new('/dev/null', 'w'))
       runner.run_file(rspec_file)
@@ -48,7 +60,7 @@ class RunnerTest < Test::Unit::TestCase
       runner.run_file(alternate_rspec_file)
       assert File.exists?(alternate_target_file)
       assert_equal "HYDRA", File.read(alternate_target_file)
-      assert !File.exists?(target_file)
+      assert !File.exists?(target_file), "Tests are double running!"
     end
 
     should "run rspec tests with pending examples" do
@@ -68,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)
@@ -82,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
@@ -124,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/test_helper.rb

@@ -42,6 +42,18 @@ class Test::Unit::TestCase
   def alternate_cucumber_feature_file
     File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'features', 'write_alternate_file.feature'))
   end
+
+  def javascript_file
+    File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'js_file.js'))
+  end
+
+  def json_file
+    File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'json_data.json'))
+  end
+
+  def conflicting_test_file
+    File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'conflicting.rb'))
+  end
 end
 
 module Hydra #:nodoc:

data/test/trace_test.rb

@@ -0,0 +1,72 @@
+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
+

data/test/worker_test.rb

@@ -41,8 +41,10 @@ class WorkerTest < Test::Unit::TestCase
 
     def request_a_file_and_verify_completion(pipe, num_runners)
       pipe.identify_as_parent
+      pipe.gets # grab the WorkerBegin
       num_runners.times do
-        assert pipe.gets.is_a?(Hydra::Messages::Worker::RequestFile)
+        response = pipe.gets # grab the RequestFile
+        assert response.is_a?(Hydra::Messages::Worker::RequestFile), "Expected RequestFile but got #{response.class.to_s}"
       end
       pipe.write(Hydra::Messages::Master::RunFile.new(:file => test_file))
 

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification 
 name: sskirby-hydra
 version: !ruby/object:Gem::Version 
+  hash: 75
   prerelease: false
   segments: 
   - 0
-  - 17
-  - 1
-  version: 0.17.1
+  - 21
+  - 0
+  version: 0.21.0
 platform: ruby
 authors: 
 - Nick Gauthier
-- Sean Kirby
-- Tanzeeb Khalili
-- Matt Briggs
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -04:00
-default_executable: 
+date: 2010-08-29 00:00:00 -04:00
+default_executable: warmsnake.rb
 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,34 +38,56 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 62196421
         segments: 
-        - 1
-        - 3
+        - 2
         - 0
-        version: 1.3.0
+        - 0
+        - beta
+        - 19
+        version: 2.0.0.beta.19
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 53
         segments: 
         - 0
-        - 7
-        - 2
-        version: 0.7.2
+        - 8
+        - 5
+        version: 0.8.5
   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
+        - 4
+        version: 0.7.4
+  type: :development
+  version_requirements: *id004
 description: Spread your tests over multiple machines to test your code faster.
-email: sskirby@gmail.com
-executables: []
-
+email: nick@smartlogicsolutions.com
+executables: 
+- warmsnake.rb
 extensions: []
 
 extra_rdoc_files: 
@@ -80,13 +102,14 @@ files:
 - Rakefile
 - TODO
 - VERSION
+- bin/warmsnake.rb
 - 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
@@ -111,10 +134,13 @@ files:
 - 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
@@ -128,9 +154,10 @@ files:
 - test/ssh_test.rb
 - test/sync_test.rb
 - test/test_helper.rb
+- test/trace_test.rb
 - test/worker_test.rb
 has_rdoc: true
-homepage: http://github.com/sskirby/hydra
+homepage: http://github.com/ngauthier/hydra
 licenses: []
 
 post_install_message: 
@@ -139,41 +166,47 @@ 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.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Distributed testing toolkit
 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/master_test.rb
+- test/ssh_test.rb
+- test/fixtures/assert_true.rb
+- test/fixtures/slow.rb
 - test/fixtures/write_file_alternate_spec.rb
+- test/fixtures/hello_world.rb
 - test/fixtures/write_file_with_pending_spec.rb
-- test/fixtures/slow.rb
-- test/fixtures/assert_true.rb
+- test/fixtures/write_file.rb
+- test/fixtures/conflicting.rb
 - test/fixtures/write_file_spec.rb
 - test/fixtures/features/step_definitions.rb
-- test/ssh_test.rb
+- test/fixtures/sync_test.rb
+- test/test_helper.rb
+- test/runner_test.rb
+- test/trace_test.rb
+- test/sync_test.rb
 - test/pipe_test.rb
-- test/master_test.rb
 - test/worker_test.rb