respec 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.0.2 2012-05-23
+
+ * Run through bundler if Gemfile is present.
+ * Don't run whole files specified when rerunning failures.
+
 == 0.0.1 2012-05-17
 
  * Hi.

data/lib/respec/app.rb

@@ -9,16 +9,25 @@ module Respec
         @raw_args = []
       end
       @formatter = 'progress'
-      @output_failures = true
+      @selected_failures = false
+      @update_failures = true
       process_args
     end
 
     def command
-      @command ||= ['rspec'] + formatter_args + generated_args + raw_args
+      @command ||= bundler_args + ['rspec'] + formatter_args + generated_args + raw_args
+    end
+
+    def bundler_args
+      if File.exist?(ENV['BUNDLE_GEMFILE'] || 'Gemfile')
+        ['bundle', 'exec']
+      else
+        []
+      end
     end
 
     def formatter_args
-      if @output_failures
+      if @update_failures
         formatter_path = File.expand_path('formatter.rb', File.dirname(__FILE__))
         ['--require', formatter_path, '--format', 'Respec::Formatter', '--out', failures_path, '--format', @formatter]
       else
@@ -78,6 +87,7 @@ module Respec
               failures.each do |line|
                 args << line.strip
               end
+              @selected_failures = true
             end
           else
             warn "no fail file - ignoring 'f' argument"
@@ -90,7 +100,8 @@ module Respec
           i = Integer(arg)
           if (failure = failures[i - 1])
             args << failure
-            @output_failures = false
+            @selected_failures = true
+            @update_failures = false
           else
             warn "invalid failure: #{i} for (1..#{failures.size})"
           end
@@ -98,7 +109,10 @@ module Respec
           args << '--example' << arg.gsub(/[$]/, '\\\\\\0')
         end
       end
-      @generated_args = args + files
+      # If we selected individual failures to rerun, don't give the
+      # files to rspec, as those files will be run in entirety.
+      @generated_args = args
+      @generated_args.concat(files) unless @selected_failures
     end
 
     def failures_path

data/lib/respec/version.rb

@@ -1,5 +1,5 @@
 module Respec
-  VERSION = [0, 0, 1]
+  VERSION = [0, 0, 2]
 
   class << VERSION
     include Comparable

data/respec.gemspec

@@ -13,5 +13,7 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
+  gem.add_runtime_dependency 'rspec', '>= 2.0.0'
   gem.add_development_dependency 'ritual', '~> 0.4.0'
+  gem.add_development_dependency 'temporaries', '~> 0.0.3'
 end

data/spec/integration_spec.rb

@@ -2,6 +2,8 @@ require_relative 'spec_helper'
 require 'rbconfig'
 
 describe Respec do
+  use_temporary_directory TMP
+
   CONFIG = (Object.const_defined?(:RbConfig) ? RbConfig : Config)::CONFIG
   def respec(args)
     ruby = File.join(CONFIG['bindir'], CONFIG['ruby_install_name'])
@@ -31,19 +33,21 @@ describe Respec do
   end
 
   it "should let you rerun failing specs until they all pass" do
-    make_spec(num_failures: 2)
-    status, output = respec(spec_path)
-    status.should_not be_success
-    output.should include('2 examples, 2 failures')
-
-    make_spec(num_failures: 1)
-    status, output = respec("#{spec_path} f")
-    status.should_not be_success
-    output.should include('2 examples, 1 failure')
-
-    make_spec(num_failures: 0)
-    status, output = respec("#{spec_path} f")
-    status.should be_success
-    output.should include('1 example, 0 failures')
+    Dir.chdir tmp do
+      make_spec(num_failures: 2)
+      status, output = respec(spec_path)
+      status.should_not be_success
+      output.should include('2 examples, 2 failures')
+
+      make_spec(num_failures: 1)
+      status, output = respec("#{spec_path} f")
+      status.should_not be_success
+      output.should include('2 examples, 1 failure')
+
+      make_spec(num_failures: 0)
+      status, output = respec("#{spec_path} f")
+      status.should be_success
+      output.should include('1 example, 0 failures')
+    end
   end
 end

data/spec/respec/app_spec.rb

@@ -3,6 +3,8 @@ require_relative '../spec_helper'
 require 'fileutils'
 
 describe Respec::App do
+  use_temporary_directory TMP
+
   FORMATTER_PATH = File.expand_path("#{ROOT}/lib/respec/formatter.rb", File.dirname(__FILE__))
   FAIL_PATH = "#{TMP}/failures.txt"
 
@@ -16,34 +18,34 @@ describe Respec::App do
     end
   end
 
-  describe "#generated_args" do
-    it "should run with --context if 'c' is given" do
-      app = Respec::App.new('c')
-      app.generated_args.should == ['--diff', 'context']
-    end
-
-    it "should run all failures if 'f' is given" do
-      make_failures_file 'a.rb:1', 'b.rb:2'
-      app = Respec::App.new('f')
-      app.generated_args.should == ['a.rb:1', 'b.rb:2']
-    end
-
-    it "should run the n-th failure if a numeric argument 'n' is given" do
-      make_failures_file 'a.rb:1', 'b.rb:2'
-      app = Respec::App.new('2')
-      app.generated_args.should == ['b.rb:2']
+  describe "#bundler_args" do
+    it "should run through bundler if a Gemfile is present" do
+      FileUtils.touch "#{tmp}/Gemfile"
+      Dir.chdir tmp do
+        app = Respec::App.new
+        app.bundler_args.should == ['bundle', 'exec']
+      end
     end
 
-    it "should interpret existing file names as file name arguments" do
-      FileUtils.touch "#{TMP}/existing.rb"
-      app = Respec::App.new("#{TMP}/existing.rb")
-      app.generated_args.should == ["#{TMP}/existing.rb"]
+    it "should check the BUNDLE_GEMFILE environment variable if set" do
+      original_bundle_gemfile = ENV['BUNDLE_GEMFILE']
+      ENV['BUNDLE_GEMFILE'] = "#{tmp}/custom_gemfile"
+      begin
+        FileUtils.touch "#{tmp}/custom_gemfile"
+        Dir.chdir tmp do
+          app = Respec::App.new
+          app.bundler_args.should == ['bundle', 'exec']
+        end
+      ensure
+        ENV['BUNDLE_GEMFILE'] = original_bundle_gemfile
+      end
     end
 
-    it "should treat other arguments as example names" do
-      FileUtils.touch "#{TMP}/FILE"
-      app = Respec::App.new("#{TMP}/FILE")
-      app.generated_args.should == ["#{TMP}/FILE"]
+    it "should not run through bundler if no Gemfile is present" do
+      Dir.chdir tmp do
+        app = Respec::App.new
+        app.bundler_args.should == []
+      end
     end
   end
 
@@ -64,16 +66,63 @@ describe Respec::App do
     end
 
     it "should update the stored failures if 'f' is used" do
+      make_failures_file 'a.rb:1'
       app = Respec::App.new('f')
       app.formatter_args.should == ['--require', FORMATTER_PATH, '--format', 'Respec::Formatter', '--out', FAIL_PATH, '--format', 'progress']
     end
 
     it "should not update the stored failures if a numeric argument is given" do
+      make_failures_file 'a.rb:1'
       app = Respec::App.new('1')
       app.formatter_args.should == []
     end
   end
 
+  describe "#generated_args" do
+    it "should run with --context if 'c' is given" do
+      app = Respec::App.new('c')
+      app.generated_args.should == ['--diff', 'context']
+    end
+
+    it "should run all failures if 'f' is given" do
+      make_failures_file 'a.rb:1', 'b.rb:2'
+      app = Respec::App.new('f')
+      app.generated_args.should == ['a.rb:1', 'b.rb:2']
+    end
+
+    it "should run the n-th failure if a numeric argument 'n' is given" do
+      make_failures_file 'a.rb:1', 'b.rb:2'
+      app = Respec::App.new('2')
+      app.generated_args.should == ['b.rb:2']
+    end
+
+    it "should interpret existing file names as file name arguments" do
+      FileUtils.touch "#{tmp}/existing.rb"
+      app = Respec::App.new("#{tmp}/existing.rb")
+      app.generated_args.should == ["#{tmp}/existing.rb"]
+    end
+
+    it "should treat other arguments as example names" do
+      FileUtils.touch "#{tmp}/FILE"
+      app = Respec::App.new("#{tmp}/FILE")
+      app.generated_args.should == ["#{tmp}/FILE"]
+    end
+
+    it "should not include named files if a numeric argument is given" do
+      FileUtils.touch "#{tmp}/FILE"
+      make_failures_file 'a.rb:1'
+      app = Respec::App.new("#{tmp}/FILE", '1')
+      app.generated_args.should == ['a.rb:1']
+    end
+
+    it "should not include named files if an 'f' argument is given" do
+      FileUtils.touch "#{tmp}/FILE"
+      make_failures_file 'a.rb:1'
+      app = Respec::App.new("#{tmp}/FILE", 'f')
+      app.generated_args.should == ['a.rb:1']
+    end
+  end
+
   describe "#raw_args" do
     it "should pass arguments after '--' directly to rspec" do
       app = Respec::App.new('--', '--blah')
@@ -83,9 +132,11 @@ describe Respec::App do
 
   describe "#command" do
     it "should combine all the args" do
-      make_failures_file 'a.rb:1'
-      app = Respec::App.new('f', '--', '-t', 'TAG')
-      app.command.should == ['rspec', '--require', FORMATTER_PATH, '--format', 'Respec::Formatter', '--out', FAIL_PATH, '--format', 'progress', 'a.rb:1', '-t', 'TAG']
+      Dir.chdir tmp do
+        FileUtils.touch 'Gemfile'
+        app = Respec::App.new('c', '--', '-t', 'TAG')
+        app.command.should == ['bundle', 'exec', 'rspec', '--require', FORMATTER_PATH, '--format', 'Respec::Formatter', '--out', FAIL_PATH, '--format', 'progress', '--diff', 'context', '-t', 'TAG']
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 $:.unshift File.expand_path('../lib', File.dirname(__FILE__))
 require 'respec'
-require 'tmpdir'
+require 'temporaries'
 
 ROOT = File.expand_path('..', File.dirname(__FILE__))
-TMP = Dir.tmpdir
+TMP = "#{ROOT}/spec/tmp"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: respec
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: ritual
-  requirement: &70131397136780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: temporaries
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
   type: :development
   prerelease: false
-  version_requirements: *70131397136780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: 
 email:
 - george.ogata@gmail.com
@@ -57,15 +94,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3838848027574177683
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3838848027574177683
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rerun failing RSpec examples easily.
@@ -73,4 +116,3 @@ test_files:
 - spec/integration_spec.rb
 - spec/respec/app_spec.rb
 - spec/spec_helper.rb
-has_rdoc: