specjour 0.5.5 → 0.5.6

data/History.markdown

@@ -1,6 +1,12 @@
 History
 =======
 
+0.5.6 / 2012-06-22
+---------------------------
+* [fixed] Specjour hang when attempting to resolve a bonjour reply
+* [fixed] Specjour executes loader under current $LOAD\_PATH  
+  Specjour no longer assumes the required gems are available globally. Useful when running specjour under a vendored environment (bundle install --path=vendor).
+
 0.5.5 / 2012-05-31
 ---------------------------
 * [fixed] Now compatible with thor 0.15.x

data/Rakefile

@@ -1,4 +1,5 @@
 require 'bundler/gem_tasks'
+require "bundler/setup"
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)

data/lib/specjour/cucumber/distributed_formatter.rb

@@ -1,5 +1,4 @@
 module Specjour::Cucumber
-  ::Term::ANSIColor.coloring = true
   class DistributedFormatter < ::Cucumber::Formatter::Progress
 
     def initialize(step_mother, io, options)

data/lib/specjour/dispatcher.rb

@@ -102,8 +102,8 @@ module Specjour
         end
         raise Timeout::Error
       end
-      rescue Timeout::Error
-        replies.each {|r| resolve_reply(r)}
+    rescue Timeout::Error
+      replies.each {|r| resolve_reply(r)}
     end
 
     def local_manager_needed?
@@ -127,17 +127,20 @@ module Specjour
     end
 
     def resolve_reply(reply)
-      DNSSD.resolve!(reply.name, reply.type, reply.domain, flags=0, reply.interface) do |resolved|
-        Specjour.logger.debug "Bonjour discovered #{resolved.target}"
-        if resolved.text_record && resolved.text_record['version'] == Specjour::VERSION
-          resolved_ip = ip_from_hostname(resolved.target)
-          uri = URI::Generic.build :scheme => reply.service_name, :host => resolved_ip, :port => resolved.port
-          fetch_manager(uri)
-        else
-          puts "Found #{resolved.target} but its version doesn't match v#{Specjour::VERSION}. Skipping..."
+      Timeout.timeout(1) do
+        DNSSD.resolve!(reply.name, reply.type, reply.domain, flags=0, reply.interface) do |resolved|
+          Specjour.logger.debug "Bonjour discovered #{resolved.target}"
+          if resolved.text_record && resolved.text_record['version'] == Specjour::VERSION
+            resolved_ip = ip_from_hostname(resolved.target)
+            uri = URI::Generic.build :scheme => reply.service_name, :host => resolved_ip, :port => resolved.port
+            fetch_manager(uri)
+          else
+            puts "Found #{resolved.target} but its version doesn't match v#{Specjour::VERSION}. Skipping..."
+          end
+          break unless resolved.flags.more_coming?
         end
-        break unless resolved.flags.more_coming?
       end
+    rescue Timeout::Error
     end
 
     def rsync_daemon

data/lib/specjour/manager.rb

@@ -62,9 +62,9 @@ module Specjour
         exec_cmd << " --test-paths #{test_paths.join(" ")}" if test_paths.any?
         exec_cmd << " --log" if Specjour.log?
         exec_cmd << " --quiet" if quiet?
-        load_path = $LOAD_PATH.detect {|l| l =~ %r(specjour[^/]*/lib$)}
-        bin_path = File.expand_path(File.join(load_path, "../bin"))
-        Kernel.exec({"RUBYLIB" => load_path}, "#{bin_path}/specjour #{exec_cmd}")
+        specjour_path = $LOAD_PATH.detect {|l| l =~ %r(specjour[^/]*/lib$)}
+        bin_path = File.expand_path(File.join(specjour_path, "../bin"))
+        Kernel.exec({"RUBYLIB" => $LOAD_PATH.join(":")}, "#{bin_path}/specjour #{exec_cmd}")
       end
       Process.waitall
     ensure

data/lib/specjour.rb

@@ -29,7 +29,7 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :RSpec, 'specjour/rspec'
 
-  VERSION ||= "0.5.5"
+  VERSION ||= "0.5.6"
   HOOKS_PATH ||= "./.specjour/hooks.rb"
   PROGRAM_NAME ||= $PROGRAM_NAME # keep a reference of the original program name
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specjour
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
-  requirement: &2156301100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156301100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2156300360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156300360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156299500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2156299500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2156298880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *2156298880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156314020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: *2156314020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156313440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2156313440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 description: ! "    Specjour splits your RSpec suite across multiple machines, and
   multiple\n    cores per machine, to run super-parallel-fast!  Also works with Cucumber.\n"
 email: sandro.turriate@gmail.com
@@ -129,6 +159,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1360517515995431807
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -137,8 +170,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Distribute your spec suite amongst your LAN via Bonjour.
 test_files: []
+has_rdoc: