invo-sporknife 0.1.0.1 → 0.1.0.2

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

@@ -4,24 +4,27 @@ require 'rinda/ring'
 require 'rinda/tuplespace'
 require 'magazine_slave'
 
-
-
-# pass on
+class MagazineSlaveProvider
+  def initialize(id, app_pwd, test_framework_short_name)
+    # 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
+  end
+end
 
 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
+# Create slave provider
+MagazineSlaveProvider.new(id, app_pwd, test_framework_short_name)

data/lib/spork/runner.rb

@@ -1,5 +1,4 @@
 require 'optparse'
-require 'stringio'
 
 module Spork
   # This is used by bin/spork. It's wrapped in a class because it's easier to test that way.
@@ -70,6 +69,7 @@ module Spork
         Spork::Diagnoser.output_results(@output)
         return true
       else
+        Spork.using_spork!
         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)

data/lib/spork/server.rb

@@ -44,9 +44,7 @@ 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}..."
     run_strategy.run(argv, stderr, stdout)
-    puts "Done.\n\n"
   end
   
   def abort

data/lib/spork/test_framework.rb

@@ -9,7 +9,7 @@ class Spork::TestFramework
 
   class NoFrameworksAvailable < FactoryException
     def message
-      "I can\'t find any testing frameworks to use.  Are you running me from a project directory?"
+      "I can't find any testing frameworks to use.  Are you running me from a project directory?"
     end
   end
 
@@ -19,7 +19,7 @@ class Spork::TestFramework
     end
 
     def message
-      "I can\'t find the file #{@framework.helper_file} for the #{@framework.short_name} testing framework.\nAre you running me from the project directory?"
+      "I can't find the file #{@framework.helper_file} for the #{@framework.short_name} testing framework.\nAre you running me from the project directory?"
     end
   end
 
@@ -29,7 +29,7 @@ class Spork::TestFramework
     end
 
     def message
-      "Couldn\'t find a supported test framework that begins with '#{@beginning_with}'"
+      "Couldn't find a supported test framework that begins with '#{@beginning_with}'"
     end
   end
 
@@ -118,12 +118,12 @@ class Spork::TestFramework
 
   def preload
     Spork.exec_prefork do
-      if not bootstrapped?
+      unless bootstrapped?
         stderr.puts "#{helper_file} has not been bootstrapped.  Run spork --bootstrap to do so."
         stderr.flush
 
         if framework.bootstrap_required?
-          stderr.puts "I can't do anything for you by default for the framework you're using: #{framework.short_name}.\nYou must bootstrap #{helper_file} to continue."
+          stderr.puts "I can't do anything for you by default for the framework your using: #{framework.short_name}.\nYou must bootstrap #{helper_file} to continue."
           stderr.flush
           return false
         else

data/lib/spork/test_framework/cucumber.rb

@@ -10,15 +10,15 @@ class Spork::TestFramework::Cucumber < Spork::TestFramework
   def preload
     require 'cucumber'
     begin
-      @step_mother = ::Cucumber::StepMother.new
-      @step_mother.load_programming_language('rb')
+      @runtime = ::Cucumber::Runtime.new
+      @runtime.load_programming_language('rb')
     rescue NoMethodError => pre_cucumber_0_4 # REMOVE WHEN SUPPORT FOR PRE-0.4 IS DROPPED
-      @step_mother = Spork::Server::Cucumber.mother_object
+      @runtime = Spork::Server::Cucumber.mother_object
     end
     super
   end
 
   def run_tests(argv, stderr, stdout)
-    ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!(@step_mother)
+    ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!(@runtime)
   end
 end

data/spec/spec_helper.rb

@@ -8,9 +8,8 @@ unless $spec_helper_loaded
   require 'spork'
   require 'stringio'
   require 'fileutils'
-  require 'rspec'
 
-  RSpec.configure do |config|
+  Spec::Runner.configure do |config|
     config.before(:each) do
       $test_stdout = StringIO.new
       $test_stderr = StringIO.new
@@ -46,14 +45,10 @@ unless $spec_helper_loaded
     def change_current_dir(sub_path)
       @current_dir = File.expand_path(sub_path, SPEC_TMP_DIR)
     end
-    
-    def windows?
-      ENV['OS'] == 'Windows_NT'
-    end
   end
 
 
-  module RSpec
+  module Spec
     module Matchers
       class IncludeAStringLike
         def initialize(substring_or_regex)

data/spec/spork/app_framework/rails_spec.rb

@@ -1,21 +1,21 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Spork::AppFramework::Rails do
-  describe ".deprecated_version" do
+  describe ".version" do
     it "detects the current version of rails" do
       create_file("config/environment.rb", "RAILS_GEM_VERSION = '2.1.0'")
       in_current_dir do
-        Spork::AppFramework::Rails.new.deprecated_version.should == "2.1.0"
+        Spork::AppFramework::Rails.new.version.should == "2.1.0"
       end
       
       create_file("config/environment.rb", 'RAILS_GEM_VERSION = "2.1.0"')
       in_current_dir do
-        Spork::AppFramework::Rails.new.deprecated_version.should == "2.1.0"
+        Spork::AppFramework::Rails.new.version.should == "2.1.0"
       end
       
       create_file("config/environment.rb", 'RAILS_GEM_VERSION = "> 2.1.0"')
       in_current_dir do
-        Spork::AppFramework::Rails.new.deprecated_version.should == "> 2.1.0"
+        Spork::AppFramework::Rails.new.version.should == "> 2.1.0"
       end
     end
   end

data/spec/spork/forker_spec.rb

@@ -41,4 +41,4 @@ describe Spork::Forker do
       forker.running?.should == false
     end
   end
-end unless windows?
+end

data/spec/spork/run_strategy/forking_spec.rb

@@ -35,4 +35,4 @@ describe Spork::RunStrategy::Forking do
 
     (Time.now - started_at).should < @fake_framework.wait_time
   end
-end unless windows?
+end

data/spec/spork/test_framework/cucumber_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + "/../test_framework_shared_examples"
+require File.dirname(__FILE__) + "/../test_framework_spec"
 
 describe Spork::TestFramework::Cucumber do
   before(:each) do

data/spec/spork/test_framework/rspec_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + "/../test_framework_shared_examples"
+require File.dirname(__FILE__) + "/../test_framework_spec"
 
 describe Spork::TestFramework::RSpec do
   before(:each) do

data/spec/spork/test_framework_spec.rb

@@ -1,5 +1,29 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
+describe "a TestFramework", :shared => true do
+  describe ".default_port" do
+    it "uses the DEFAULT_PORT when the environment variable is not set" do
+      @klass.default_port.should == @klass::DEFAULT_PORT
+    end
+
+    it 'uses ENV["#{short_name.upcase}_DRB"] as port if present' do
+      env_name = "#{@klass.short_name.upcase}_DRB"
+      orig, ENV[env_name] = ENV[env_name], "9000"
+      begin
+        @klass.default_port.should == 9000
+      ensure
+        ENV[env_name] = orig
+      end
+    end
+  end
+
+  describe ".helper_file" do
+    it "returns ::HELPER_FILE for the TestFramework" do
+      @klass.helper_file.should == @klass::HELPER_FILE
+    end
+  end
+end
+
 describe Spork::TestFramework do
 
   before(:each) do

data/spec/spork_spec.rb

@@ -3,19 +3,17 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 Spork.class_eval do
   def self.reset!
     @state = nil
-    @using_spork = false
     @already_ran = nil
-    @each_run_procs = nil
   end
 end
 
 describe Spork do
   before(:each) do
     Spork.reset!
-    @ran = []
   end
   
   def spec_helper_simulator
+    @ran ||= []
     Spork.prefork do
       @ran << :prefork
     end
@@ -65,14 +63,14 @@ describe Spork do
   describe "#using_spork?" do
     it "returns true if Spork is being used" do
       Spork.using_spork?.should be_false
-      Spork.exec_prefork { }
+      Spork.using_spork!
       Spork.using_spork?.should be_true
     end
   end
 
   describe "#trap_method" do
     before(:each) do
-      Spork.exec_prefork { }
+      Spork.using_spork!
       
       Object.class_eval do
         class TrapTest
@@ -101,7 +99,7 @@ describe Spork do
     end
     
     it "delays execution of a method until after Spork.exec_each_run is called" do
-      Spork.exec_prefork { }
+      Spork.using_spork!
       Spork.trap_method(TrapTest, :hello)
       @trap_test.hello
       @trap_test.goodbye
@@ -142,7 +140,7 @@ describe Spork do
     end
     
     it "delays execution of a method until after Spork.exec_each_run is called" do
-      Spork.exec_prefork { }
+      Spork.using_spork!
       Spork.trap_class_method(TrapTest, :hello)
       TrapTest.hello
       TrapTest.goodbye

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: invo-sporknife
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 67
   prerelease: false
   segments: 
   - 0
   - 1
   - 0
-  - 1
-  version: 0.1.0.1
+  - 2
+  version: 0.1.0.2
 platform: ruby
 authors: 
 - gten
@@ -16,26 +16,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 +05:30
-default_executable: spork
+date: 2010-11-19 00:00:00 +05:30
+default_executable: sporknife
 dependencies: []
 
 description: A forking Drb spec server. Forked from Timcharper's spork
 email: 
 - geetan123321@gmail.com
 executables: 
-- spork
+- sporknife
 extensions: 
 - ext/mkrf_conf.rb
 extra_rdoc_files: 
 - MIT-LICENSE
 - README.rdoc
 files: 
-- Gemfile
 - README.rdoc
 - MIT-LICENSE
 - lib/spork/app_framework/padrino.rb
 - 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
@@ -59,8 +61,6 @@ files:
 - features/at_exit_during_each_run.feature
 - features/cucumber_rails_integration.feature
 - features/diagnostic_mode.feature
-- features/gemfiles/rails3.0/Gemfile
-- features/gemfiles/rails3.0/Gemfile.lock
 - features/rails_delayed_loading_workarounds.feature
 - features/rspec_rails_integration.feature
 - features/spork_debugger.feature
@@ -68,7 +68,6 @@ files:
 - features/steps/rails_steps.rb
 - features/steps/sandbox_steps.rb
 - features/support/background_job.rb
-- features/support/bundler_helpers.rb
 - features/support/env.rb
 - features/unknown_app_framework.feature
 - spec/spec_helper.rb
@@ -82,12 +81,11 @@ files:
 - spec/spork/server_spec.rb
 - spec/spork/test_framework/cucumber_spec.rb
 - spec/spork/test_framework/rspec_spec.rb
-- spec/spork/test_framework_shared_examples.rb
 - spec/spork/test_framework_spec.rb
 - spec/spork_spec.rb
 - spec/support/fake_framework.rb
 - spec/support/fake_run_strategy.rb
-- bin/spork
+- bin/sporknife
 - ext/mkrf_conf.rb
 has_rdoc: true
 homepage: http://github.com/gten/invo-sporknife
@@ -119,17 +117,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: ""
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: spork
+summary: invo-sporknife
 test_files: 
 - features/at_exit_during_each_run.feature
 - features/cucumber_rails_integration.feature
 - features/diagnostic_mode.feature
-- features/gemfiles/rails3.0/Gemfile
-- features/gemfiles/rails3.0/Gemfile.lock
 - features/rails_delayed_loading_workarounds.feature
 - features/rspec_rails_integration.feature
 - features/spork_debugger.feature
@@ -137,7 +133,6 @@ test_files:
 - features/steps/rails_steps.rb
 - features/steps/sandbox_steps.rb
 - features/support/background_job.rb
-- features/support/bundler_helpers.rb
 - features/support/env.rb
 - features/unknown_app_framework.feature
 - spec/spec_helper.rb
@@ -151,7 +146,6 @@ test_files:
 - spec/spork/server_spec.rb
 - spec/spork/test_framework/cucumber_spec.rb
 - spec/spork/test_framework/rspec_spec.rb
-- spec/spork/test_framework_shared_examples.rb
 - spec/spork/test_framework_spec.rb
 - spec/spork_spec.rb
 - spec/support/fake_framework.rb

data/Gemfile

@@ -1,6 +0,0 @@
-source :gemcutter
-gem 'cucumber', '0.7.3'
-gem 'gherkin', '1.0.27'
-gem "rspec", "2.0.0.beta.20"
-gem 'rake'
-gem 'ruby-debug'

data/features/gemfiles/rails3.0/Gemfile

@@ -1,10 +0,0 @@
-source :gemcutter
-gem 'sqlite3-ruby', '1.2.5'
-gem 'cucumber', '0.8.5'
-gem 'cucumber-rails', '0.3.2'
-gem "gherkin", "2.1.4"
-gem "rspec", "2.0.0.beta.20"
-gem 'rspec-rails', "2.0.0.beta.20"
-gem 'rails', '3.0.0'
-gem 'ruby-debug', '>= 0.10.3'
-gem 'spork', :path => File.expand_path("../../..", File.dirname(__FILE__))

data/features/gemfiles/rails3.0/Gemfile.lock

@@ -1,116 +0,0 @@
-PATH
-  remote: /Users/timcharper/projects/spork
-  specs:
-    spork (0.9.0.rc2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    columnize (0.3.1)
-    cucumber (0.8.5)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.1.4)
-      json_pure (~> 1.4.3)
-      term-ansicolor (~> 1.0.4)
-    cucumber-rails (0.3.2)
-      cucumber (>= 0.8.0)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    gherkin (2.1.4)
-      trollop (~> 1.16.2)
-    i18n (0.4.1)
-    json_pure (1.4.6)
-    linecache (0.43)
-    mail (2.2.6.1)
-      activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.4)
-      rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
-      bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
-    rake (0.8.7)
-    rspec (2.0.0.beta.20)
-      rspec-core (= 2.0.0.beta.20)
-      rspec-expectations (= 2.0.0.beta.20)
-      rspec-mocks (= 2.0.0.beta.20)
-    rspec-core (2.0.0.beta.20)
-    rspec-expectations (2.0.0.beta.20)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.20)
-    rspec-rails (2.0.0.beta.20)
-      rspec (= 2.0.0.beta.20)
-    ruby-debug (0.10.3)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
-      linecache (>= 0.3)
-    sqlite3-ruby (1.2.5)
-    term-ansicolor (1.0.5)
-    thor (0.14.0)
-    treetop (1.4.8)
-      polyglot (>= 0.3.1)
-    trollop (1.16.2)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cucumber (= 0.8.5)
-  cucumber-rails (= 0.3.2)
-  gherkin (= 2.1.4)
-  rails (= 3.0.0)
-  rspec (= 2.0.0.beta.20)
-  rspec-rails (= 2.0.0.beta.20)
-  ruby-debug (>= 0.10.3)
-  spork!
-  sqlite3-ruby (= 1.2.5)