spe_cuke 0.3.1 → 0.4.0

data/ChangeLog

@@ -1,6 +1,8 @@
-== master
+== 0.3.1 / 2010-11-05
 * improve command invokation error message.
 * workaround for hanging up during spork detection.
+* import direct spork execution from http://blog.twiwt.org/e/cafcfe and https://gist.github.com/662448
+* run with RSpec 2.0 (and Rails 3)
 
 == 0.3.0 / 2010-09-14
 * assume test file from product code name.

data/Gemfile

@@ -3,6 +3,7 @@ source :gemcutter
 gem 'rake'
 group :test do
   gem 'rspec'
+  gem 'ruby-debug19' if RUBY_VERSION >= "1.9"
 end
 # Specify your gem's dependencies in spe_cuke.gemspec
 gemspec

data/Gemfile.lock

@@ -1,13 +1,35 @@
 PATH
   remote: .
   specs:
-    spe_cuke (0.3.1)
+    spe_cuke (0.4.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    rake (0.8.7)
-    rspec (1.3.0)
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.6)
+    diff-lcs (1.1.3)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    rake (0.9.2.2)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
 
 PLATFORMS
   ruby
@@ -16,4 +38,5 @@ DEPENDENCIES
   bundler (>= 1.0.0.rc.5)
   rake
   rspec
+  ruby-debug19
   spe_cuke!

data/README.rdoc

@@ -30,7 +30,7 @@ and has option to specify invoking via rake.
 
 append below to your .vimrc or so.
 
- function s:SetupSpeCuke()
+ function! s:SetupSpeCuke()
    command! RunTestFile exe '!sc ' . expand('%:p')
    command! RunTestCase exe '!sc --line ' . line('.') . ' ' . expand('%:p')
 

data/Rakefile

@@ -1,8 +1,9 @@
 require 'bundler'
 require 'bundler/setup'
-require 'spec/rake/spectask'
+require 'rspec'
+require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
-Spec::Rake::SpecTask.new do |s|
-  s.spec_opts = %w[--color --format=profile]
+RSpec::Core::RakeTask.new do |s|
+  s.rspec_opts = %w[--color --format=progress]
 end

data/lib/spe_cuke/environment.rb

@@ -3,7 +3,10 @@ require 'pathname'
 require 'yaml'
 require 'drb'
 require 'timeout'
-require 'bundler'
+begin
+  require 'bundler'
+rescue LoadError => bundler_not_installed_ignore
+end
 
 module SpeCuke
   class Environment
@@ -17,7 +20,7 @@ module SpeCuke
     end
 
     def bundlized?
-      (@root + 'Gemfile').exist?
+      defined?(Bundler) && (@root + 'Gemfile').exist?
     end
 
     def gem_format_executable?
@@ -40,16 +43,16 @@ module SpeCuke
       lp.specs.detect{|bs| bs.name == gem_name}.version rescue nil
     end
 
-    def spork_running?
+    def spork_running?(port)
       begin
-        timeout(1) { spork_server && spork_server.respond_to?(:run) }
+        timeout(1) { (s = spork_server(port)) && s.respond_to?(:run) }
       rescue DRb::DRbConnError, Errno::ECONNREFUSED, Timeout::Error, SocketError, Errno::EADDRNOTAVAIL
         return false
       end
     end
 
-    def spork_server
-      @_spork_server ||= DRbObject.new_with_uri("druby://127.0.0.1:8989")
+    def spork_server(port = 8989)
+      DRbObject.new_with_uri("druby://127.0.0.1:#{port}")
     end
 
     private

data/lib/spe_cuke/target/base.rb

@@ -24,6 +24,22 @@ module SpeCuke
         commands = @env.prefer_rake? ? rake_commands : raw_commands
         SpeCuke.wrap_execute!( commands.flatten )
       end
+
+      private
+      # XXX refactor
+      def execute_direct!(port)
+        begin
+          DRb.start_service("druby://localhost:0")
+        rescue SocketError, Errno::EADDRNOTAVAIL
+          DRb.start_service("druby://:0")
+        end
+        puts "direct executing `spork_server.run(#{Array(drb_commands).inspect})'"
+        @env.spork_server(port).run(drb_commands, STDERR, STDOUT)
+      end
+
+      def drb_commands
+        Array(fn_and_line)
+      end
     end
   end
 end

data/lib/spe_cuke/target/cucumber.rb

@@ -2,6 +2,7 @@ require 'spe_cuke/target/base'
 
 module SpeCuke::Target
   class Cucumber < Base
+    SPORK_DEFAULT_PORT = 8990
     class << self
       def suitable?(file)
         file =~ /\.feature\Z/
@@ -9,6 +10,10 @@ module SpeCuke::Target
     end
     self.default_options = ['--color']
 
+    def execute!
+      @env.spork_running?(SPORK_DEFAULT_PORT) ? execute_direct!(SPORK_DEFAULT_PORT) : super
+    end
+
     private
     def raw_commands
       cmds = [@env.command('cucumber')]
@@ -19,6 +24,10 @@ module SpeCuke::Target
       cmds << fn_and_line
     end
 
+    def drb_commands
+      raw_commands[(1..-1)].flatten
+    end
+
     def rake_commands
       cmds = [@env.command('rake'), 'cucumber', "FEATURE=#{fn_and_line}"]
       if @line

data/lib/spe_cuke/target/rspec.rb

@@ -2,6 +2,7 @@ require 'spe_cuke/target/base'
 
 module SpeCuke::Target
   class Rspec < Base
+    SPORK_DEFAULT_PORT = 8989
     class << self
       attr_accessor :default_options
       def suitable?(file)
@@ -11,21 +12,10 @@ module SpeCuke::Target
     self.default_options = ['--color']
 
     def execute!
-      @env.spork_running? ? execute_direct! : super
+      @env.spork_running?(SPORK_DEFAULT_PORT) ? execute_direct!(SPORK_DEFAULT_PORT) : super
     end
 
     private
-    # XXX refactor
-    def execute_direct!
-      begin
-        DRb.start_service("druby://localhost:0")
-      rescue SocketError, Errno::EADDRNOTAVAIL
-        DRb.start_service("druby://:0")
-      end
-      puts "direct executing `spork_server.run(#{cmd_parameters.flatten.join(" ")})'"
-      @env.spork_server.run([fn_and_line], STDERR, STDOUT)
-    end
-
     def raw_commands
       ([@env.command(spec_command_base)] + cmd_parameters).flatten
     end
@@ -40,7 +30,7 @@ module SpeCuke::Target
     def spec_command_base
       v = @env.bundled_version('rspec')
 
-      (v.nil? || v < Gem::Version.new("2.0.0.beta.0")) ? 'spec' : 'rspec'
+      (v.nil? || v > Gem::Version.new("2.0.0.beta.0")) ? 'rspec' : 'spec'
     end
 
     def rake_commands

data/lib/spe_cuke/version.rb

@@ -1,3 +1,3 @@
 module SpeCuke
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/spe_cuke/target_cucumber_spec.rb

@@ -13,6 +13,7 @@ describe Target::Cucumber do
     @env = Environment.new
     @env.stub!(:bundlized?).and_return false
     @env.stub!(:gem_format_executable?).and_return false
+    @env.stub!(:spork_running?).and_return false
 
     Target::Cucumber.default_options = ['--color']
   end

data/spec/spe_cuke/target_product_code_spec.rb

@@ -16,7 +16,7 @@ describe ProductCode do
 
       spec = 'spec/spe_cuke/target/product_code_spec.rb'
       File.should_receive(:exist?).with(spec).and_return true
-      SpeCuke.should_receive(:wrap_execute!).with(%w[spec --color] << spec)
+      SpeCuke.should_receive(:wrap_execute!).with(%w[rspec --color] << spec)
     end
     it("should call wrap_execute with valid args"){ @target.execute! }
   end

data/spec/spe_cuke/target_rspec_spec.rb

@@ -22,10 +22,10 @@ describe Target::Rspec do
     before do
       @env.stub!(:prefer_rake?).and_return false
       @target = Target::Rspec.new(@env, 'spec/foo/bar_spec.rb')
-      SpeCuke.should_receive(:wrap_execute!).with(%w[spec --color spec/foo/bar_spec.rb])
+      SpeCuke.should_receive(:wrap_execute!).with(%w[rspec --color spec/foo/bar_spec.rb])
     end
 
-    it(%q[spec --color spec/foo/bar_spec.rb]){ @target.execute! }
+    it(%q[rspec --color spec/foo/bar_spec.rb]){ @target.execute! }
   end
 
 
@@ -33,14 +33,15 @@ describe Target::Rspec do
     before do
       @env.stub!(:prefer_rake?).and_return false
       @target = Target::Rspec.new(@env, 'spec/foo/bar_spec.rb', 40)
-      SpeCuke.should_receive(:wrap_execute!).with(%w[spec --color -fn spec/foo/bar_spec.rb:40])
+      SpeCuke.should_receive(:wrap_execute!).with(%w[rspec --color -fn spec/foo/bar_spec.rb:40])
     end
 
-    it(%q[spec --color -l 40 spec/foo/bar_spec.rb]){ @target.execute! }
+    it(%q[rspec --color -l 40 spec/foo/bar_spec.rb]){ @target.execute! }
   end
 
   context 'spec/foo/bar_spec.rb on line:40/spork:true' do
     before do
+      pending("unknow purpose test")
       @env.stub!(:spork_running?).and_return true
       @env.stub!(:prefer_rake?).and_return false
       @target = Target::Rspec.new(@env, 'spec/foo/bar_spec.rb', 40)

metadata

@@ -1,49 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spe_cuke
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - MOROHASHI Kyosuke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-05 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70104675484580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0.rc.5
   type: :development
-  version_requirements: *id001
-description: An abstraction command for testing frameworks and invokation methods of them.
-email: 
+  prerelease: false
+  version_requirements: *70104675484580
+description: An abstraction command for testing frameworks and invokation methods
+  of them.
+email:
 - moronatural@gmail.com
-executables: 
+executables:
 - sc
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - ChangeLog
 - Gemfile
@@ -67,39 +54,31 @@ files:
 - spec/spe_cuke/target_product_code_spec.rb
 - spec/spe_cuke/target_rspec_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/spe_cuke
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3598838883337441829
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: spe_cuke
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Provides common interface for rake spec or bin/spec.
 test_files: []
-