single_test 0.3.7 → 0.4.0

data/Gemfile

@@ -1,5 +1,7 @@
-source 'http://rubygems.org'
+source :rubygems
 
-gem 'rake'
-gem 'jeweler'
-gem 'rspec'
+group :dev do
+  gem 'rake'
+  gem 'jeweler'
+  gem 'rspec', '~>2'
+end

data/Gemfile.lock

@@ -1,18 +1,21 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    gemcutter (0.5.0)
-      json_pure
+    diff-lcs (1.1.2)
     git (1.2.5)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.3)
+      rake
     rake (0.8.7)
-    rspec (1.3.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
 
 PLATFORMS
   ruby
@@ -20,4 +23,4 @@ PLATFORMS
 DEPENDENCIES
   jeweler
   rake
-  rspec
+  rspec (~> 2)

data/Rakefile

@@ -1,7 +1,7 @@
 task :default do
   options = "--colour"
   files = FileList['spec/**/*_spec.rb'].map{|f| f.sub(%r{^spec/},'') }
-  exit system("cd spec && spec #{options} #{files}") ? 0 : 1
+  exec "cd spec && rspec #{options} #{files}"
 end
 
 begin
@@ -18,4 +18,4 @@ begin
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
-end
+end

data/Readme.md

@@ -14,10 +14,12 @@ As Gem:
 
 
 ###Single test/spec
-    rake spec:user          #run spec/model/user_spec.rb (searches for user*_spec.rb)
+Searchs for test-files matching the given name.
+
+    rake spec:user          #run spec/model/user_spec.rb
     rake test:users_c       #run test/functional/users_controller_test.rb
     rake spec:admin/users_c #run spec/controllers/admin/users_controller_spec.rb
-    rake test:u*hel         #run test/helpers/user_helper_test.rb (searches for u*hel*_test.rb)
+    rake test:u*hel         #run test/helpers/user_helper_test.rb
 
 ###Single test-case/example
     rake spec:user:token    #run the first spec in user_spec.rb that matches /token/
@@ -45,6 +47,6 @@ TODO
 
 AUTHOR
 ======
-[Michael Grosser](http://pragmatig.wordpress.com)  
-grosser.michael@gmail.com  
-Hereby placed under public domain, do what you want, just do not hold me accountable...  
+[Michael Grosser](http://pragmatig.wordpress.com)
+grosser.michael@gmail.com
+Hereby placed under public domain, do what you want, just do not hold me accountable...

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.4.0

data/lib/single_test.rb

@@ -3,10 +3,6 @@ require 'rake'
 module SingleTest
   extend self
   CMD_LINE_MATCHER = /^(spec|test)\:.*(\:.*)?$/
-  SEARCH_ORDER =  {
-    'test'=> %w(unit functional integration *),
-    'spec'=> %w(models controllers views helpers *),
-  }
 
   def load_tasks
     load File.join(File.dirname(__FILE__), 'tasks', 'single_test.rake')
@@ -42,11 +38,6 @@ module SingleTest
     file = find_test_file(type,file)
     return unless file
 
-    #when spec, convert test_name regex to actual test_name
-    if type == 'spec' && test_name
-      test_name = find_example_in_spec(file, test_name) || test_name
-    end
-
     #run the file
     puts "running: #{file}"
     ENV['RAILS_ENV'] = 'test' #current EVN['RAILS_ENV'] is 'development', and will also exist in all called commands
@@ -64,18 +55,15 @@ module SingleTest
     ]
   end
 
+  # find files matching the given name,
+  # prefer lower folders and short names, since deep/long names
+  # can be found via a more precise search string
   def find_test_file(type,file_name)
-    ["","**/"].each do |depth| # find in lower folders first
-      ['','*'].each do |exactness| # find exact matches first
-        SEARCH_ORDER[type].each do |folder|
-          base = "#{type}/#{folder}/#{depth}#{file_name}"
-          # without wildcard no search is performed -> ?rb
-          found = FileList["#{base}#{exactness}_#{type}?rb"].first
-          return found if found
-        end
-      end
-    end
-    nil
+    regex = /#{file_name.gsub('*','.*').gsub('?','.')}/ # support *? syntax for search
+    all_tests(type).grep(regex).sort_by do |path|
+      parts = path.split('/')
+      [parts.size, parts.last.size]
+    end.first
   end
 
   def find_example_in_spec(file, test_name)
@@ -89,11 +77,12 @@ module SingleTest
     case type.to_s
     when 'test' then sh "ruby -Ilib:test #{file} -n /#{test_name}/"
     when 'spec' then
+      executable = spec_executable
       options_file = "spec/spec.opts"
       options_file = (File.exist?(options_file) ? " --options #{options_file}" : "")
-      command = "export RAILS_ENV=test ; #{spec_executable}#{options_file} #{file}"
-      command += (test_name ? %Q( -e "#{test_name.sub('"',"\\\"")}") : '') # just one test ?
-      command += (ENV['X'] ? " -X" : "") # run via drb ?
+      command = "export RAILS_ENV=test ; #{executable}#{options_file} #{file}"
+      command += test_name_matcher(executable, file, test_name)
+      command += " -X" if ENV['X'] # run via drb ?
       sh command
     else raise "Unknown: #{type}"
     end
@@ -118,6 +107,14 @@ module SingleTest
 
   private
 
+  def test_name_matcher(executable, file, test_name)
+    if test_name and not executable.include?('rspec')
+      # rspec 1 only supports full test names -> find a matching test-name
+      test_name = find_example_in_spec(file, test_name) || test_name
+    end
+    test_name ? %Q( -e "#{test_name.sub('"',"\\\"")}") : ''
+  end
+
   # copied from http://github.com/carlhuda/bundler Bundler::SharedHelpers#find_gemfile
   def self.bundler_enabled?
     return true if Object.const_defined?(:Bundler)

data/single_test.gemspec

@@ -1,44 +1,42 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{single_test}
-  s.version = "0.3.7"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-08-21}
+  s.date = %q{2011-04-16}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
     "Gemfile",
-     "Gemfile.lock",
-     "Rakefile",
-     "Readme.md",
-     "VERSION",
-     "lib/single_test.rb",
-     "lib/tasks/single_test.rake",
-     "single_test.gemspec",
-     "spec/example_finder_test.txt",
-     "spec/single_test_spec.rb",
-     "spec/spec_helper.rb"
+    "Gemfile.lock",
+    "Rakefile",
+    "Readme.md",
+    "VERSION",
+    "lib/single_test.rb",
+    "lib/tasks/single_test.rake",
+    "single_test.gemspec",
+    "spec/example_finder_test.txt",
+    "spec/single_test_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/grosser/single_test}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Rake tasks to invoke single tests/specs with rakish syntax}
   s.test_files = [
     "spec/single_test_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/spec/single_test_spec.rb

@@ -60,15 +60,15 @@ describe SingleTest do
       SingleTest.find_test_file('spec','xxx').should == 'spec/mixins/xxx_spec.rb'
     end
 
-    it "finds models before controllers" do
+    it "finds short matches first" do
       make_file 'spec/models/xxx_spec.rb'
       make_file 'spec/controllers/xxx_controller_spec.rb'
       SingleTest.find_test_file('spec','xx').should == 'spec/models/xxx_spec.rb'
     end
 
-    it "finds with paths" do
+    it "finds with wildcards" do
       make_file 'spec/controllers/admin/xxx_controller_spec.rb'
-      SingleTest.find_test_file('spec','ad*/xx').should == 'spec/controllers/admin/xxx_controller_spec.rb'
+      SingleTest.find_test_file('spec','ad*/x?x').should == 'spec/controllers/admin/xxx_controller_spec.rb'
     end
   end
 
@@ -142,18 +142,28 @@ describe SingleTest do
       SingleTest.run_test('spec','xxx')
     end
 
-    it "runs single specs through -e" do
-      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; script/spec xxx -e "yyy"')
+    it "runs all matching specs through -e for rspec 2" do
+      File.should_receive(:file?).with('script/spec').and_return false
+      File.stub!(:readlines).and_return ['it "bla yyy" do']
+      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; bundle exec rspec xxx -e "yyy"')
+      SingleTest.run_test('spec','xxx', 'yyy')
+    end
+
+    it "runs full single specs through -e for rspec 1" do
+      File.stub!(:readlines).and_return ['it "bla yyy" do']
+      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; script/spec xxx -e "bla yyy"')
       SingleTest.run_test('spec','xxx', 'yyy')
     end
 
     it "runs single specs through -e with -X" do
+      File.stub!(:readlines).and_return []
       ENV['X']=''
       SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; script/spec xxx -e "yyy" -X')
       SingleTest.run_test('spec','xxx', 'yyy')
     end
 
     it "runs quoted specs though -e" do
+      File.stub!(:readlines).and_return []
       SingleTest.should_receive(:sh).with(%Q(export RAILS_ENV=test ; script/spec xxx -e "y\\\"yy"))
       SingleTest.run_test('spec','xxx', 'y"yy')
     end
@@ -167,23 +177,24 @@ describe SingleTest do
     it "runs with bundled spec if script/spec is not found" do
       File.stub!(:file?).and_return false
       File.should_receive(:file?).with('script/spec').and_return false
-      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; bundle exec spec xxx')
+      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; bundle exec rspec xxx')
       SingleTest.run_test('spec','xxx')
     end
 
     it "uses bundler if Gemfile is present" do
       File.stub!(:file?).and_return false
       SingleTest.should_receive(:bundler_enabled?).and_return true
-      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; bundle exec spec xxx')
+      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; bundle exec rspec xxx')
       SingleTest.run_test('spec','xxx')
     end
   end
 
   describe :load_tasks do
     it "can load em" do
-      (Rake::Task['spec:one_by_one'] rescue nil).should == nil
+      result = Rake::Task['spec:one_by_one'] rescue nil
+      result.should == nil
       SingleTest.load_tasks
       Rake::Task['spec:one_by_one'].should_not == nil
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ SPEC_ROOT = File.dirname(__FILE__)
 $LOAD_PATH << File.expand_path("../lib", SPEC_ROOT)
 
 # ---- rspec
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before do
     `mkdir -p #{SPEC_ROOT}/script`
     `touch #{SPEC_ROOT}/script/spec`
@@ -13,4 +13,4 @@ Spec::Runner.configure do |config|
     `rm -rf #{SPEC_ROOT}/app`
     `rm -rf #{SPEC_ROOT}/spec`
   end
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: single_test
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 7
-  version: 0.3.7
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-21 00:00:00 +02:00
+date: 2011-04-16 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -43,28 +44,32 @@ homepage: http://github.com/grosser/single_test
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Rake tasks to invoke single tests/specs with rakish syntax