spork 0.7.8 → 0.8.0

data/ext/mkrf_conf.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb' 
+STDERR.puts "Actually, there aren't any native extensions. I'm just dynamically installing dependencies based off of your operating system"
+begin
+  Gem::Command.build_args = ARGV
+  rescue NoMethodError
+end 
+inst = Gem::DependencyInstaller.new
+begin
+  inst.install "rake"
+  inst.install "win32-process", "~> 0.6.1" if RUBY_PLATFORM =~ /mswin|mingw/
+rescue
+  exit(1)
+end 
+
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
+f.write("task :default\n")
+f.close

data/geminstaller.yml

@@ -7,3 +7,4 @@ gems:
 - { name: 'rspec-rails',             version: '>= 1.2.9' }
 - { name: 'rails',                   version: '>= 2.3' }
 - { name: 'ruby-debug',              version: '>= 0.10.3' }
+<%  %>

data/lib/spork/run_strategy.rb

@@ -28,7 +28,11 @@ class Spork::RunStrategy
 
   protected
     def self.factory(test_framework)
-      Spork::RunStrategy::Forking.new(test_framework)
+      if RUBY_PLATFORM =~ /mswin|mingw/
+        Spork::RunStrategy::Magazine.new(test_framework)
+      else
+        Spork::RunStrategy::Forking.new(test_framework)
+      end
     end
 
     def self.inherited(subclass)

data/lib/spork/run_strategy/magazine.rb

@@ -0,0 +1,114 @@
+# this class' goal:
+# to boldly just run test after test
+# as they come in
+require 'drb'
+require 'rinda/ring'
+require 'win32/process' if RUBY_PLATFORM =~ /mswin|mingw/
+
+$:.unshift(File.dirname(__FILE__))
+require 'magazine/magazine_slave'
+
+
+class Spork::RunStrategy::Magazine < Spork::RunStrategy
+
+  Slave_Id_Range = 1..2 # Ringserver uses id: 0. Slave use: 1..MAX_SLAVES
+
+  def slave_max
+    Slave_Id_Range.to_a.size
+  end
+
+  def initialize(test_framework)
+    @test_framework = test_framework
+    this_path = File.expand_path(File.dirname(__FILE__))
+    @path = File.join(this_path, 'magazine')
+    @pids = []
+
+    @pids << start_Rinda_ringserver
+    sleep 1
+
+    fill_slave_pool
+  rescue RuntimeError => e
+    kill_all_processes
+    raise e
+  end
+
+  def start_Rinda_ringserver
+    app_name = 'ruby ring_server.rb'
+    Process.create( :app_name => app_name, :cwd => @path ).process_id
+  end
+
+  def fill_slave_pool
+    Slave_Id_Range.each do |id|
+      start_slave(id)
+    end
+    puts "  -- Starting to fill pool..."
+    puts "     Wait until at least one slave is provided before running tests..."
+    puts "  ** CTRL+BREAK to stop Spork and kill all ruby slave processes **"
+    $stdout.flush
+  end
+
+  def start_slave(id)
+    app_pwd = Dir.pwd  # path running app in
+    app = "ruby magazine_slave_provider.rb #{id} #{app_pwd} #{@test_framework.short_name}"
+    @pids[id] = Process.create( :app_name => app, :cwd => @path ).process_id
+  end
+
+
+  def self.available?
+    true
+  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
+  end
+
+  def restart_slave(id)
+    pid   = @pids[id]
+    Process.kill(4, pid)
+    start_slave(id)
+  end
+
+  def kill_all_processes
+
+    @pids.each {|pid| Process.kill(4, pid)}
+    puts "\nKilling processes."; $stdout.flush
+  end
+
+  def slave_count
+    DRb.start_service
+    ts = Rinda::RingFinger.primary
+    ts.read_all([:name, :MagazineSlave, nil, nil]).size
+  end
+
+
+  def abort
+    kill_all_processes
+  end
+
+  def preload
+    true
+    #    @test_framework.preload
+  end
+
+  def running?
+    @running
+  end
+
+end

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

@@ -0,0 +1,30 @@
+require 'rubygems'
+require 'drb'
+$:.unshift(File.dirname(__FILE__) + "/../../..")  # directory of spork.rb
+require 'spork'
+
+class MagazineSlave
+  include DRb::DRbUndumped
+  attr_reader :id_num
+  def initialize(id_num, test_framework_short_name)
+    @id_num = id_num
+    @test_framework = Spork::TestFramework.factory(STDOUT, STDERR,
+                                                   test_framework_short_name)
+#    ENV["DRB"] = 'true'
+#    Spork.using_spork!
+    return(nil) unless preload
+  end
+
+  def run(argv, stderr, stdout)
+    $stdout, $stderr = stdout, stderr
+    Spork.exec_each_run
+    load @test_framework.helper_file
+    @test_framework.run_tests(argv, stderr, stdout)
+    puts "  <-- Slave(#{@id_num}) run done!"; stdout.flush
+  end
+
+  def preload
+    @test_framework.preload
+  end
+
+end

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

@@ -0,0 +1,27 @@
+# magazine_slave_provider.rb
+require 'drb'
+require 'rinda/ring'
+require 'rinda/tuplespace'
+require 'magazine_slave'
+
+
+
+# pass on
+
+id = ARGV[0].to_i || "?"
+app_pwd = ARGV[1]
+test_framework_short_name = ARGV[2]
+
+# start up the Rinda service
+
+DRb.start_service
+
+Dir.chdir app_pwd
+puts "   -- build slave #{id}..."; $stdout.flush
+magazine_slave = MagazineSlave.new(id, test_framework_short_name )
+Rinda::RingProvider.new(:MagazineSlave, magazine_slave, id).provide
+
+puts "  --> DRb magazine_slave_service: #{id} provided..."; $stdout.flush
+
+# wait for the DRb service to finish before exiting
+DRb.thread.join

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

@@ -0,0 +1,10 @@
+# ring_server.rb
+require 'rinda/ring'
+require 'rinda/tuplespace'
+
+DRb.start_service
+
+Rinda::RingServer.new(Rinda::TupleSpace.new)
+puts "  -- Rinda Ring Server listening for connections...\n\n"
+$stdout.flush
+DRb.thread.join

data/lib/spork/server.rb

@@ -27,7 +27,7 @@ class Spork::Server
     trap("SIGTERM") { abort; exit!(0) }
     trap("USR2") { abort; restart } if Signal.list.has_key?("USR2")
     @drb_service = DRb.start_service("druby://127.0.0.1:#{port}", self)
-    Spork.each_run { @drb_service.stop_service }
+    Spork.each_run { @drb_service.stop_service } if @run_strategy.class == Spork::RunStrategy::Forking
     stderr.puts "Spork is ready and listening on #{port}!"
     stderr.flush
     DRb.thread.join

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  version: 0.7.8
+  version: 0.8.0
 platform: ruby
 authors: 
 - Tim Harper
+- Donald Parish
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 -07:00
+date: 2010-03-04 00:00:00 -07:00
 default_executable: spork
 dependencies: []
 
@@ -18,62 +19,39 @@ email:
 - timcharper+spork@gmail.com
 executables: 
 - spork
-extensions: []
-
+extensions: 
+- ext/mkrf_conf.rb
 extra_rdoc_files: 
 - MIT-LICENSE
 - README.rdoc
 files: 
-- MIT-LICENSE
-- README.rdoc
-- assets/bootstrap.rb
-- features/at_exit_during_each_run.feature
-- features/cucumber_rails_integration.feature
-- features/diagnostic_mode.feature
-- features/rails_delayed_loading_workarounds.feature
-- features/rspec_rails_integration.feature
-- features/spork_debugger.feature
-- features/steps/general_steps.rb
-- features/steps/rails_steps.rb
-- features/steps/sandbox_steps.rb
-- features/support/background_job.rb
-- features/support/env.rb
-- features/unknown_app_framework.feature
 - geminstaller.yml
-- lib/spork.rb
-- lib/spork/app_framework.rb
+- README.rdoc
+- MIT-LICENSE
 - lib/spork/app_framework/rails.rb
 - lib/spork/app_framework/rails_stub_files/application.rb
 - lib/spork/app_framework/rails_stub_files/application_controller.rb
 - lib/spork/app_framework/rails_stub_files/application_helper.rb
 - lib/spork/app_framework/unknown.rb
+- lib/spork/app_framework.rb
 - lib/spork/custom_io_streams.rb
 - lib/spork/diagnoser.rb
 - lib/spork/ext/rails-reloader.rb
 - lib/spork/ext/ruby-debug.rb
 - lib/spork/forker.rb
-- lib/spork/run_strategy.rb
 - 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/ring_server.rb
+- lib/spork/run_strategy/magazine.rb
+- lib/spork/run_strategy.rb
 - lib/spork/runner.rb
 - lib/spork/server.rb
-- lib/spork/test_framework.rb
 - lib/spork/test_framework/cucumber.rb
 - lib/spork/test_framework/rspec.rb
-- spec/spec_helper.rb
-- spec/spork/app_framework/rails_spec.rb
-- spec/spork/app_framework/unknown_spec.rb
-- spec/spork/app_framework_spec.rb
-- spec/spork/diagnoser_spec.rb
-- spec/spork/forker_spec.rb
-- spec/spork/run_strategy/forking_spec.rb
-- spec/spork/runner_spec.rb
-- spec/spork/server_spec.rb
-- spec/spork/test_framework/cucumber_spec.rb
-- spec/spork/test_framework/rspec_spec.rb
-- spec/spork/test_framework_spec.rb
-- spec/spork_spec.rb
-- spec/support/fake_framework.rb
-- spec/support/fake_run_strategy.rb
+- lib/spork/test_framework.rb
+- lib/spork.rb
+- assets/bootstrap.rb
 has_rdoc: true
 homepage: http://github.com/timcharper/spork
 licenses: []
@@ -104,6 +82,18 @@ signing_key:
 specification_version: 3
 summary: spork
 test_files: 
+- features/at_exit_during_each_run.feature
+- features/cucumber_rails_integration.feature
+- features/diagnostic_mode.feature
+- features/rails_delayed_loading_workarounds.feature
+- features/rspec_rails_integration.feature
+- features/spork_debugger.feature
+- features/steps/general_steps.rb
+- features/steps/rails_steps.rb
+- features/steps/sandbox_steps.rb
+- features/support/background_job.rb
+- features/support/env.rb
+- features/unknown_app_framework.feature
 - spec/spec_helper.rb
 - spec/spork/app_framework/rails_spec.rb
 - spec/spork/app_framework/unknown_spec.rb