spork 1.0.0rc2-x86-mingw32 → 1.0.0rc4-x86-mingw32

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8d9d9fee10c8579a916a1a9ea40f6f819d288324
+  data.tar.gz: dc63d581fde6cb9b5e88b252edfbe5351063a8ac
+SHA512:
+  metadata.gz: 7f7bba2f1d0adb05376fb69abf4a4b1ae84b1300824550be0822cf7eeef9e91f8338d009bf70872c6e93f8d6553033c7097769bb5ed9e9630a0b5ed03b5275f1
+  data.tar.gz: e9f8559eb56aed5a5f2a750651cb025d59629660f440942aa20ed49dc7ce8064c44372db536d0b975ab87bc76b72f09b3e5ab66846dd3f78aefc4e9dfa2efdfa

data/Gemfile

@@ -1,12 +1,12 @@
-source :gemcutter
+source 'https://rubygems.org'
 gemspec
-gem 'cucumber', '~> 1.0.0'
-gem 'rspec', '~> 2.8'
+gem 'cucumber', '~>1.3.2'
+gem 'rspec', '~>2.13.0'
 gem 'rake'
 gem "spork", :path => File.expand_path("../", __FILE__)
 
-if RUBY_VERSION =~ /^1\.9/
-  gem 'ruby-debug19'
+if RUBY_VERSION =~ /^2\.0|^1\.9/
+  gem 'debugger'
 else
   gem 'ruby-debug'
 end

data/README.rdoc

@@ -1,4 +1,4 @@
-= Spork
+= Spork {<img src="https://travis-ci.org/sporkrb/spork.png" alt="Build Status" />}[https://travis-ci.org/sporkrb/spork]
 
 * Repository: http://github.com/sporkrb/spork
 * Issues: http://github.com/sporkrb/spork/issues

data/features/support/bundler_helpers.rb

@@ -2,8 +2,10 @@ module BundlerHelpers
   extend self
   def install_bundle(dir)
     Dir.chdir(dir) do
-      command = "env RUBYOPT= BUNDLE_GEMFILE=Gemfile bundle install"
-      system(command)
+      command = "bundle install --gemfile=#{Dir.pwd}/Gemfile --path=#{Dir.pwd}/.bundle"
+      Bundler.with_clean_env do
+        system(command)
+      end
       $?.exitstatus
     end
   end

data/features/support/spork_world.rb

@@ -53,7 +53,15 @@ class SporkWorld
     stderr_file = Tempfile.new('spork')
     stderr_file.close
     in_current_dir do
-      @last_stdout = `env RUBYOPT= bundle exec #{command} 2> #{stderr_file.path}`
+      if command.start_with?("rails new")
+        @last_stdout = `bundle exec #{command} 2> #{stderr_file.path}`
+      else
+        gemfile = ENV['BUNDLE_GEMFILE']
+        Bundler.with_clean_env do
+          ENV['BUNDLE_GEMFILE'] = gemfile
+          @last_stdout = `bundle exec #{command} 2> #{stderr_file.path}`
+        end
+      end
       @last_exit_status = $?.exitstatus
     end
     @last_stderr = IO.read(stderr_file.path)
@@ -61,7 +69,11 @@ class SporkWorld
 
   def run_in_background(command)
     in_current_dir do
-      @background_job = BackgroundJob.run("env RUBYOPT= bundle exec " +  command)
+      gemfile = ENV['BUNDLE_GEMFILE']
+      Bundler.with_clean_env do
+        ENV['BUNDLE_GEMFILE'] = gemfile
+        @background_job = BackgroundJob.run("bundle exec " +  command)
+      end
     end
     @background_jobs << @background_job
     @background_job

data/lib/spork/diagnoser.rb

@@ -32,7 +32,7 @@ class Spork::Diagnoser
         end
         private :require
         
-        def load(string)
+        def load(string, wrap = false)
           ::Spork::Diagnoser.add_included_file(string, caller)
           load_without_diagnoser(string)
         end

data/lib/spork/forker.rb

@@ -6,10 +6,10 @@
 #     sleep 3
 #     "success"
 #   end
-#   
+#
 #   forker.result # => "success"
 class Spork::Forker
-  
+
   # Raised if the fork died (was killed) before it sent it's response back.
   class ForkDiedException < Exception; end
   def initialize(&block)
@@ -23,35 +23,38 @@ class Spork::Forker
         master_response = Marshal.load(@child_io)
       rescue EOFError
         nil
+      rescue SystemExit => e
+        puts "Error: exit code #{e.status}" unless e.status == 0
       rescue Exception => e
         puts "Exception encountered: #{e.inspect}\nbacktrace:\n#{e.backtrace * %(\n)}"
       end
-      
+
       # terminate, skipping any at_exit blocks.
       exit!(0)
     end
     @child_io.close
   end
-  
+
   # Wait for the fork to finish running, and then return its return value.
   #
   # If the fork was aborted, then result returns nil.
   def result
-    return unless running?
+    return @result if defined?(@result) || ! running?
     result_thread = Thread.new do
       begin
         @result = Marshal.load(@server_io)
         Marshal.dump('ACK', @server_io)
-      rescue ForkDiedException, EOFError
+      rescue EOFError
         @result = nil
+      rescue ForkDiedException
       end
     end
     Process.wait(@child_pid)
-    result_thread.raise(ForkDiedException) if @result.nil?
+    result_thread.raise(ForkDiedException) if result_thread.status == "sleep"
     @child_pid = nil
     @result
   end
-  
+
   # abort the current running fork
   def abort
     if running?
@@ -60,7 +63,7 @@ class Spork::Forker
       true
     end
   end
-  
+
   def running?
     return false unless @child_pid
     Process.getpgid(@child_pid)

data/lib/spork/run_strategy/magazine.rb

@@ -2,6 +2,7 @@
 # to boldly just run test after test
 # as they come in
 require 'drb'
+require 'timeout'
 require 'rinda/ring'
 if RUBY_PLATFORM =~ /mswin|mingw/  and RUBY_VERSION < '1.9.1'
   begin
@@ -16,6 +17,7 @@ require 'rubygems' # used for Gem.ruby
 
 $:.unshift(File.dirname(__FILE__))
 require 'magazine/magazine_slave'
+require 'magazine/rinda_ring_finger_patch' if RUBY_VERSION > '1.9.1'
 
 class Spork::RunStrategy::Magazine < Spork::RunStrategy
 
@@ -84,24 +86,21 @@ class Spork::RunStrategy::Magazine < Spork::RunStrategy
   end
 
   def run(argv, stderr, stdout)
-        DRb.start_service
-        ts = Rinda::RingFinger.primary
-        if ts.read_all([:name, :MagazineSlave, nil, nil]).size > 0
-          print '  <-- take tuple'; stdout.flush
-          tuple = ts.take([:name, :MagazineSlave, nil, nil])
-          slave = tuple[2]
-          id = tuple[3]
-
-          puts "(#{slave.id_num}); slave.run..."; $stdout.flush
-          begin
-            slave.run(argv,stderr,stdout)
-            puts "   -- (#{slave.id_num});run done"; $stdout.flush
-          ensure
-            restart_slave(id)
-          end
-        else
-          puts '- NO tuple'; $stdout.flush
-        end
+    DRb.start_service
+    ts = Rinda::RingFinger.primary
+    Timeout.timeout(60) {sleep 0.1 until ts.read_all([:name, :MagazineSlave, nil, nil]).size > 0}
+    print '  <-- take tuple'; stdout.flush
+    tuple = ts.take([:name, :MagazineSlave, nil, nil])
+    slave = tuple[2]
+    id = tuple[3]
+
+    puts "(#{slave.id_num}); slave.run..."; $stdout.flush
+    begin
+      slave.run(argv,stderr,stdout)
+      puts "   -- (#{slave.id_num});run done"; $stdout.flush
+    ensure
+      restart_slave(id)
+    end
   end
 
   def restart_slave(id)

data/lib/spork/run_strategy/magazine/magazine_slave_provider.rb

@@ -1,6 +1,7 @@
 # magazine_slave_provider.rb
 require 'drb'
 require 'rinda/ring'
+require './rinda_ring_finger_patch' if RUBY_VERSION > '1.9.1'
 require 'rinda/tuplespace'
 require './magazine_slave'
 

data/lib/spork/run_strategy/magazine/rinda_ring_finger_patch.rb

@@ -0,0 +1,26 @@
+# Patch for Rinda::RingFinger.primary hanging forever on Ruby 1.9.2 & 1.9.3
+# from http://www.ruby-forum.com/topic/4229908
+require 'rinda/ring'
+
+module Rinda
+  class RingFinger
+    def lookup_ring_any(timeout=5)
+      queue = Queue.new
+
+      Thread.new do
+        self.lookup_ring(timeout) do |ts|
+          queue.push(ts)
+        end
+        queue.push(nil)
+      end
+
+      @primary = queue.pop
+      raise('RingNotFound') if @primary.nil?
+      while it = queue.pop
+        @rings.push(it)
+      end
+
+      @primary
+    end
+  end
+end

data/lib/spork/run_strategy/magazine/ring_server.rb

@@ -1,5 +1,6 @@
 # ring_server.rb
 require 'rinda/ring'
+require './rinda_ring_finger_patch' if RUBY_VERSION > '1.9.1'
 require 'rinda/tuplespace'
 
 DRb.start_service

data/lib/spork/runner.rb

@@ -22,6 +22,7 @@ module Spork
       opt.on("-b", "--bootstrap")  {|ignore| @options[:bootstrap] = true }
       opt.on("-d", "--diagnose")  {|ignore| @options[:diagnose] = true }
       opt.on("-h", "--help")  {|ignore| @options[:help] = true }
+      opt.on("-q", "--quiet")  {|ignore| @options[:quiet] = true }
       opt.on("-p", "--port [PORT]") {|port| @options[:port] = port }
       non_option_args = args.select { |arg| ! args[0].match(/^-/) }
       @options[:server_matcher] = non_option_args[0]
@@ -72,7 +73,7 @@ module Spork
       else
         run_strategy = Spork::RunStrategy.factory(test_framework)
         return(false) unless run_strategy.preload
-        Spork::Server.run(:port => @options[:port] || test_framework.default_port, :run_strategy => run_strategy)
+        Spork::Server.run(:port => @options[:port] || test_framework.default_port, :run_strategy => run_strategy, :quiet => @options[:quiet])
         return true
       end
     end

data/lib/spork/server.rb

@@ -14,6 +14,7 @@ class Spork::Server
   def initialize(options = {})
     @run_strategy = options[:run_strategy]
     @port = options[:port]
+    @quiet = options[:quiet]
   end
   
   def self.run(options = {})
@@ -44,9 +45,9 @@ class Spork::Server
   #
   # When implementing a test server, don't override this method: override run_tests instead.
   def run(argv, stderr, stdout)
-    puts "Running tests with args #{argv.inspect}..."
+    puts "Running tests with args #{argv.inspect}..." unless @quiet
     result = run_strategy.run(argv, stderr, stdout)
-    puts "Done.\n\n"
+    puts "Done.\n\n" unless @quiet
     result
   end
   

data/spec/spork/forker_spec.rb

@@ -29,7 +29,12 @@ describe Spork::Forker do
     it "aborts a fork and returns nil for the result" do
       started_at = Time.now
       ended_at = nil
-      forker = Spork::Forker.new { sleep 5 }
+      forker = Spork::Forker.new do
+        begin
+          sleep 5
+        rescue SignalException
+        end
+      end
       Thread.new do
         forker.result.should == nil
         ended_at = Time.now

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spork
 version: !ruby/object:Gem::Version
-  version: 1.0.0rc2
-  prerelease: 5
+  version: 1.0.0rc4
 platform: x86-mingw32
 authors:
 - Tim Harper
@@ -10,19 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2013-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-process
-  requirement: &70167780927780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70167780927780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A forking Drb spec server
 email:
 - timcharper+spork@gmail.com
@@ -46,6 +48,7 @@ files:
 - lib/spork/run_strategy/forking.rb
 - lib/spork/run_strategy/magazine/magazine_slave.rb
 - lib/spork/run_strategy/magazine/magazine_slave_provider.rb
+- lib/spork/run_strategy/magazine/rinda_ring_finger_patch.rb
 - lib/spork/run_strategy/magazine/ring_server.rb
 - lib/spork/run_strategy/magazine.rb
 - lib/spork/run_strategy.rb
@@ -89,6 +92,7 @@ files:
 - bin/spork
 homepage: http://github.com/sporkrb/spork
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -96,20 +100,18 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 3
 summary: spork
@@ -142,4 +144,3 @@ test_files:
 - spec/support/should_include_a_string_like.rb
 - spec/support/test_io_streams.rb
 - spec/support/tmp_project_helpers.rb
-has_rdoc: