respec 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8e7b7909c9c2f972ba87f26dc8442075b448c19
-  data.tar.gz: 8bf9c7ccb004cdbb8428ef45795aa2ba66299af2
+  metadata.gz: d53d945527eec47f8756eb05b37d6d4728b79814
+  data.tar.gz: 20d763a3e804d9d1562b3dfa7589cda2eb0238ea
 SHA512:
-  metadata.gz: 611e4c52b16c9e203b3be7eb89baf0e35fdb73378a4236c9b3e9c52b1fbdaaa967c9d11955154879923c40ff52a4929d830e541b8895366ab8d036b5ac506330
-  data.tar.gz: 4fd3271dde886c2fd84324a472fc3cded2c9a1da5c6b4c0cc572cc77f26982c837e3562cad9f6fba9ddfaec16addbad48dfce9291d218f4bce21b3502ed86df6
+  metadata.gz: c10f7f2a4e072f67d0e692183c4f39678182cab17f97b823320335a70b58b64ccab93399d836a91abfe362d11332cc358c271c836f792e74d1bd4503064c5091
+  data.tar.gz: d5faf4f588bf784f1aad11cce08a743f7d8a1cadb77b0cb121bcaec5239be5a04e3bfc001c878e06b127dc8f5933e9b4298e0c5f364646e03757305e25169806

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.7.0 2014-04-16
+
+ * Allow setting failure file via argument. Useful under CI with parallel_tests.
+
 == 0.6.0 2014-04-09
 
  * Exit with status 0 if there are no failures left to retry. Useful under CI.

data/README.markdown

@@ -52,6 +52,17 @@ It'll even `bundle exec` for you automatically.
 
 There are a few other shortcuts. `respec --help` to see them all.
 
+If you're using this on CI, you may want to control where the failure file is
+written. You can do this in one of 2 ways:
+
+Either pass a FAILURES argument:
+
+    respec FAILURES=/path/to/file ...
+
+Or use the `RESPEC_FAILURES` environment variable.
+
+    RESPEC_FAILURES=/path/to/file respec ...
+
 ## Contributing
 
  * [Bug reports](https://github.com/oggy/respec/issues)

data/lib/respec/app.rb

@@ -10,11 +10,14 @@ module Respec
         @args = args
         @raw_args = []
       end
+      @failures_path = self.class.default_failures_path
       @selected_failures = false
       @update_failures = true
       process_args
     end
 
+    attr_accessor :failures_path
+
     def command
       @command ||= bundler_args + ['rspec'] + generated_args + raw_args + formatter_args
     end
@@ -38,9 +41,9 @@ module Respec
     end
 
     class << self
-      attr_accessor :failures_path
+      attr_accessor :default_failures_path
     end
-    self.failures_path = ENV['RESPEC_FAILURES'] || File.expand_path(".respec_failures")
+    self.default_failures_path = ENV['RESPEC_FAILURES'] || File.expand_path(".respec_failures")
 
     def help_only?
       @help_only
@@ -87,18 +90,23 @@ module Respec
           @help_only = true
         elsif arg =~ /\A-/
           args << arg
+        elsif arg =~ /\AFAILURES=(.*)\z/
+          self.failures_path = $1
         elsif arg == 'f'
-          if File.exist?(failures_path)
-            if failures.empty?
-              STDERR.puts "No specs failed!"
-            else
-              failures.each do |line|
-                args << line.strip
+          # failures_path could still be overridden -- delay evaluation of this.
+          args << lambda do
+            if File.exist?(failures_path)
+              if failures.empty?
+                STDERR.puts "No specs failed!"
+                []
+              else
+                @selected_failures = true
+                failures
               end
-              @selected_failures = true
+            else
+              warn "no fail file - ignoring 'f' argument"
+              []
             end
-          else
-            warn "no fail file - ignoring 'f' argument"
           end
         elsif arg =~ /\A\d+\z/
           i = Integer(arg)
@@ -114,20 +122,25 @@ module Respec
         end
       end
 
+      expanded = []
+      args.each do |arg|
+        if arg.respond_to?(:call)
+          expanded.concat(arg.call)
+        else
+          expanded << arg
+        end
+      end
+
       # Since we append our formatter as a file to run, rspec won't fall back to
       # using 'spec' by default. Add it explicitly here.
       files << 'spec' if files.empty?
 
       # If we selected individual failures to rerun, don't give the files to
       # rspec, as those files will be run in their entirety.
-      @generated_args = args
+      @generated_args = expanded
       @generated_args.concat(files) unless @selected_failures
     end
 
-    def failures_path
-      self.class.failures_path
-    end
-
     def failures
       @failures ||=
         if File.exist?(failures_path)

data/lib/respec/version.rb

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

data/spec/respec/app_spec.rb

@@ -7,20 +7,34 @@ describe Respec::App do
   FORMATTER_PATH = File.expand_path("#{ROOT}/lib/respec/formatter.rb", File.dirname(__FILE__))
   FAIL_PATH = "#{TMP}/failures.txt"
 
-  Respec::App.failures_path = FAIL_PATH
+  Respec::App.default_failures_path = FAIL_PATH
 
   def write_file(path, content)
     open(path, 'w') { |f| f.print content }
   end
 
   def make_failures_file(*examples)
-    open Respec::App.failures_path, 'w' do |file|
+    options = examples.last.is_a?(Hash) ? examples.pop : {}
+    path = options[:path] || Respec::App.default_failures_path
+    open path, 'w' do |file|
       examples.each do |example|
         file.puts example
       end
     end
   end
 
+  describe "#failures_path" do
+    it "defaults to the global default" do
+      app = Respec::App.new
+      expect(app.failures_path).to eq FAIL_PATH
+    end
+
+    it "can be overridden with a FAILURES= argument" do
+      app = Respec::App.new('FAILURES=overridden.txt')
+      expect(app.failures_path).to eq 'overridden.txt'
+    end
+  end
+
   describe "#bundler_args" do
     it "should run through bundler if a Gemfile is present" do
       FileUtils.touch "#{tmp}/Gemfile"
@@ -87,6 +101,12 @@ describe Respec::App do
       expect(app.generated_args).to eq ['a.rb:1', 'b.rb:2']
     end
 
+    it "should find the right failures if the failures file is overridden after the 'f'" do
+      make_failures_file 'a.rb:1', 'b.rb:2', path: "#{FAIL_PATH}-overridden"
+      app = Respec::App.new('f', "FAILURES=#{FAIL_PATH}-overridden")
+      expect(app.generated_args).to eq ['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')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: respec
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - George Ogata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec