spork-local_process 0.0.6 → 0.0.7

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3

data/Gemfile

@@ -1,2 +1,7 @@
 source "http://rubygems.org"
 gemspec
+
+group :development, :test do
+  gem "rake"
+  gem "rspec"
+end

data/README.rdoc

@@ -2,6 +2,7 @@
 
 * Web: http://www.github.com/jarmo/spork-local_process
 * Author: Jarmo Pertman (mailto:jarmo.p[at]gmail.com)
+{<img src="http://travis-ci.org/jarmo/spork-local_process.png" />}[http://travis-ci.org/jarmo/spork-local_process]
 
 == DESCRIPTION
 

data/Rakefile

@@ -1,2 +1,9 @@
 require 'rubygems'
+require 'bundler'
+Bundler.setup
 require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/spork/run_strategy/local_process.rb

@@ -22,7 +22,7 @@ class Spork::RunStrategy::LocalProcess < Spork::RunStrategy
       begin
         run_proc :each
         test_framework.additional_options = additional_options if additional_options
-        test_framework.run_tests([filter].flatten, stderr, stdout)
+        test_framework.run_tests(filter, stderr, stdout)
         run_proc :after_each
       rescue Exception => e
         puts "#{e.class}: #{e.message}"
@@ -31,13 +31,25 @@ class Spork::RunStrategy::LocalProcess < Spork::RunStrategy
         test_framework.reset
       end
 
-      new_filter = Readline.readline("> '#{test_framework.options_str(filter, additional_options)}' or: ").strip
+      new_filter = Readline.readline("> '#{(filter + (additional_options || [])).join(" ")}' or: ").strip
       exit 0 if new_filter.downcase == "exit"
 
       unless new_filter.empty?
         Readline::HISTORY.push new_filter
-        filter, additional_options = new_filter.scan(/(.*[^"])(?:\s+"(.*)")/).flatten
-        filter = new_filter unless filter
+        new_filter, *additional_options = new_filter.split(/\s+/)
+        additional_options = nil if additional_options.empty?
+        current_filter_without_lineno = filter_without_line_no filter[0]
+
+        if new_filter == "*"
+          filter = [current_filter_without_lineno]
+        elsif new_filter =~ /^:\d+$/
+          filter = [current_filter_without_lineno + new_filter]
+        elsif File.exist? filter_without_line_no new_filter
+          filter = [new_filter]
+        else
+          filter = [current_filter_without_lineno]
+          additional_options = [new_filter]
+        end
       end
     end
   end
@@ -56,6 +68,10 @@ class Spork::RunStrategy::LocalProcess < Spork::RunStrategy
 
   private
 
+  def filter_without_line_no filter
+    filter.gsub(/:\d+$/, "")
+  end
+
   def run_proc type
     Spork.instance_eval do
       run_procs = send("#{type}_run_procs").dup

data/lib/spork/test_framework/rspec.rb

@@ -4,20 +4,12 @@ class Spork::TestFramework::RSpec < Spork::TestFramework
       raise NotImplementedError
     else
       ::RSpec.reset
-      ::RSpec.configuration.formatters.clear if ::RSpec.configuration.formatters
-      ::RSpec.configuration.clear_inclusion_filter
-      ::RSpec.world.shared_example_groups.clear
+      ::RSpec.configuration.inclusion_filter.clear
     end
   end
   
   def additional_options= options
-    ::RSpec::configuration.full_description = options
+    ::RSpec::configuration.full_description = options.join(" ")
   end
   
-  def options_str options, additional_options=nil
-    str = options.is_a?(Array) ? options.join(" ") : options
-    str = str.gsub("\\", "/")
-    str << " \"#{additional_options}\"" if additional_options
-    str
-  end
 end

data/spec/spork/run_strategies/local_process_spec.rb

@@ -23,35 +23,80 @@ describe Spork::RunStrategy::LocalProcess do
   end
   
   it "allows to specify new filter" do
-    test_framework = mock_test_framework "other_specs", 2
+    test_framework = mock_test_framework 2
     test_framework.should_receive(:run_tests).with(["other_specs"], STDERR, STDOUT)
     test_framework.should_not_receive(:additional_options=)
-    test_framework.should_receive(:options_str).with("other_specs", nil).and_return("other_specs")
 
     Readline.should_receive(:readline).with("> 'some_specs' or: ").and_return("other_specs\n")
+    File.should_receive(:exist?).with("other_specs").and_return(true)
     Readline.should_receive(:readline).with("> 'other_specs' or: ").and_return("\n")
     Spork::RunStrategy::LocalProcess.new(test_framework).run(["some_specs"], STDERR, STDOUT)
   end
 
-  it "allows to specify additional options" do
-    test_framework = mock_test_framework "other_specs", 2
+  it "allows to specify additional options as a string" do
+    test_framework = mock_test_framework 2
     test_framework.should_receive(:run_tests).with(["other_specs"], STDERR, STDOUT)
-    test_framework.should_receive(:additional_options=).with(%q[some additional opts])
-    test_framework.should_receive(:options_str).with("other_specs", "some additional opts").and_return(%q[other_specs "some additional opts"])
+    test_framework.should_receive(:additional_options=).with(%w[some additional opts])
 
-    Readline.should_receive(:readline).with("> 'some_specs' or: ").and_return(%Q[other_specs "some additional opts"\n])
-    Readline.should_receive(:readline).with(%Q[> 'other_specs "some additional opts"' or: ]).and_return("\n")
+    Readline.should_receive(:readline).with("> 'some_specs' or: ").and_return(%Q[other_specs some additional opts\n])
+    File.should_receive(:exist?).with("other_specs").and_return(true)
+    Readline.should_receive(:readline).with(%Q[> 'other_specs some additional opts' or: ]).and_return("\n")
     Spork::RunStrategy::LocalProcess.new(test_framework).run(["some_specs"], STDERR, STDOUT)
   end
 
-  it "allows to rerun specs with the same additional options" do
-    test_framework = mock_test_framework "other_specs", 3
+  it "allows to rerun specs with the same additional options without entering new filter" do
+    test_framework = mock_test_framework 3
     test_framework.should_receive(:run_tests).with(["other_specs"], STDERR, STDOUT).exactly(2).times
-    test_framework.should_receive(:additional_options=).with(%q[some additional opts]).exactly(2).times
-    test_framework.should_receive(:options_str).with("other_specs", "some additional opts").exactly(2).times.and_return(%q[other_specs "some additional opts"])
+    test_framework.should_receive(:additional_options=).with(%w[some additional opts]).exactly(2).times
 
-    Readline.should_receive(:readline).with("> 'some_specs' or: ").and_return(%Q[other_specs "some additional opts"\n])
-    Readline.should_receive(:readline).exactly(2).times.with(%Q[> 'other_specs "some additional opts"' or: ]).and_return("\n")
+    Readline.should_receive(:readline).with("> 'some_specs' or: ").and_return(%Q[other_specs some additional opts\n])
+    File.should_receive(:exist?).with("other_specs").and_return(true)
+    Readline.should_receive(:readline).exactly(2).times.with(%Q[> 'other_specs some additional opts' or: ]).and_return("\n")
+    Spork::RunStrategy::LocalProcess.new(test_framework).run(["some_specs"], STDERR, STDOUT)
+  end
+
+  it "allows to specify '*' as a filter resetting additional options" do
+    test_framework = mock_test_framework 3
+    test_framework.should_receive(:run_tests).with(["other_specs"], STDERR, STDOUT).exactly(2).times
+    test_framework.should_receive(:additional_options=).with(%w[some additional opts])
+
+    Readline.should_receive(:readline).with("> 'some_specs' or: ").and_return(%Q[other_specs some additional opts\n])
+    File.should_receive(:exist?).with("other_specs").and_return(true)
+    Readline.should_receive(:readline).with(%Q[> 'other_specs some additional opts' or: ]).and_return("*\n")
+    Readline.should_receive(:readline).with(%Q[> 'other_specs' or: ]).and_return("\n")
+    Spork::RunStrategy::LocalProcess.new(test_framework).run(["some_specs"], STDERR, STDOUT)
+  end
+
+  it "allows to specify '*' as a filter resetting line number" do
+    test_framework = mock_test_framework 3
+    test_framework.should_receive(:run_tests).with(["other_specs"], STDERR, STDOUT)
+    test_framework.should_receive(:run_tests).with(["other_specs:42"], STDERR, STDOUT)
+    test_framework.should_not_receive(:additional_options=)
+
+    Readline.should_receive(:readline).with("> 'some_specs' or: ").and_return(%Q[other_specs:42\n])
+    File.should_receive(:exist?).with("other_specs").and_return(true)
+    Readline.should_receive(:readline).with(%Q[> 'other_specs:42' or: ]).and_return("*\n")
+    Readline.should_receive(:readline).with(%Q[> 'other_specs' or: ]).and_return("\n")
+    Spork::RunStrategy::LocalProcess.new(test_framework).run(["some_specs"], STDERR, STDOUT)
+  end
+
+  it "allows to specify ':\d+' as a filter for line number" do
+    test_framework = mock_test_framework 2
+    test_framework.should_receive(:run_tests).with(["some_specs:42"], STDERR, STDOUT)
+    test_framework.should_not_receive(:additional_options=)
+
+    Readline.should_receive(:readline).with("> 'some_specs' or: ").and_return(%Q[:42\n])
+    Readline.should_receive(:readline).with(%Q[> 'some_specs:42' or: ]).and_return("\n")
+    Spork::RunStrategy::LocalProcess.new(test_framework).run(["some_specs"], STDERR, STDOUT)
+  end
+
+  it "allows to specify ':\d+' as a filter for line number" do
+    test_framework = mock_test_framework 2
+    test_framework.should_receive(:run_tests).with(["some_specs:42"], STDERR, STDOUT)
+    test_framework.should_not_receive(:additional_options=)
+
+    Readline.should_receive(:readline).with("> 'some_specs' or: ").and_return(%Q[:42\n])
+    Readline.should_receive(:readline).with(%Q[> 'some_specs:42' or: ]).and_return("\n")
     Spork::RunStrategy::LocalProcess.new(test_framework).run(["some_specs"], STDERR, STDOUT)
   end
 
@@ -64,10 +109,9 @@ describe Spork::RunStrategy::LocalProcess do
     }.to raise_exception(SystemExit)
   end
 
-  def mock_test_framework new_filter=nil, loop_count=1
+  def mock_test_framework loop_count=1
     test_framework = double('TestFramework')
     test_framework.should_receive(:run_tests).with(["some_specs"], STDERR, STDOUT)
-    test_framework.should_receive(:options_str).with(["some_specs"], nil).and_return("some_specs")
 
     test_framework.should_receive(:preload).exactly(loop_count).times
     test_framework.should_receive(:reset).exactly(loop_count).times

data/spork-local_process.gemspec

@@ -1,18 +1,18 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-
-Gem::Specification.new do |s|
-  s.name        = "spork-local_process"
-  s.version     = "0.0.6"
-  s.authors     = ["Jarmo Pertman"]
-  s.email       = ["jarmo.p@gmail.com"]
-  s.homepage    = "https://github.com/jarmo/spork-local_process"
-  s.summary     = %q{Run your code in a local process with Spork again and again without reloading the whole environment each time.}
-  s.description = %q{Run your code in a local process with Spork again and again without reloading the whole environment each time.}
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_dependency "spork", "~>0.9.0.rc9"
-end
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "spork-local_process"
+  s.version     = "0.0.7"
+  s.authors     = ["Jarmo Pertman"]
+  s.email       = ["jarmo.p@gmail.com"]
+  s.homepage    = "https://github.com/jarmo/spork-local_process"
+  s.summary     = %q{Run your code in a local process with Spork again and again without reloading the whole environment each time.}
+  s.description = %q{Run your code in a local process with Spork again and again without reloading the whole environment each time.}
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency "spork", "~>0.9.0"
+end

metadata

@@ -1,52 +1,43 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spork-local_process
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
 platform: ruby
-authors: 
+authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: spork
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15424151
-        segments: 
-        - 0
-        - 9
-        - 0
-        - rc
-        - 9
-        version: 0.9.0.rc9
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
-  version_requirements: *id001
-description: Run your code in a local process with Spork again and again without reloading the whole environment each time.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+description: Run your code in a local process with Spork again and again without reloading
+  the whole environment each time.
+email:
 - jarmo.p@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGES
 - Gemfile
 - LICENSE
@@ -60,36 +51,33 @@ files:
 - spork-local_process.gemspec
 homepage: https://github.com/jarmo/spork-local_process
 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -694173807
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -694173807
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.4
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Run your code in a local process with Spork again and again without reloading the whole environment each time.
+summary: Run your code in a local process with Spork again and again without reloading
+  the whole environment each time.
 test_files: []
-