respec 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dd8596c058fbfcdb4a97721345b2b740dff445d
-  data.tar.gz: 22b1e40d8109cb9ddb088c0bc7450dcdda94c269
+  metadata.gz: 396cc6c0d51083e279d493000adb0adb7fc79cca
+  data.tar.gz: c426e519c224bbd542f3889332e597726c3542b2
 SHA512:
-  metadata.gz: dcaef4a1fc8f02cffea1b960399a790299e3f677f88cdde6e6c175de88d9dcaf8716bfd5e9c86f1f785550b5cd4b21de6b5315cd79e6ceda3fa1a78477c70525
-  data.tar.gz: 607fd40e658daf575bde72444b76b337ecc6632b26c181b6fa5032ea08269ec5ee83b7d7eeca7df912e68d4b544b4070d125a4f998c2e62276d744dae7b58adc
+  metadata.gz: baaa1afe7a1c8d61d079450347e5168ae95b6c2f22f9676d9237d27d1d38674f30c066a5889ddd9925c558a8719083a63eabe631dcd25de8df6f7a8f9dd11e52
+  data.tar.gz: 570fe25028bd088b82e5d5f2a7c5f62c9bdca953c33e91689233fe69c8c3478092dab9af3d25626844e2b7bee0f1af15ec93a827f8193f153a61e1f400fa3978

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.9.0 2015-10-10
+
+ * Fail with error if an invalid number is given, so we don't run everything.
+
 == 0.8.3 2015-06-12
 
  * Write .respec_failures to the right path when a test messes up the pwd.

data/README.markdown

@@ -13,7 +13,7 @@ Run your specs:
 
     respec f
 
-Need to debug failure #1? Pop a `debugger` in your code, and rerun it
+Need to debug failure #1? Pop a `debugger` (or `pry`) in your code, and rerun it
 like this:
 
     respec 1
@@ -50,12 +50,18 @@ example name.
 
 It'll even `bundle exec` for you automatically, or use a binstub if present.
 
+If you use git, run all specs modified since the last commit with:
+
+    respec d
+
+(**d** for "git **d**iff", which this uses.)
+
 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:
+If you're using this on CI to [rerun your failures][junit-merge], 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:
+Either pass a `FAILURES=...` argument:
 
     respec FAILURES=/path/to/file ...
 
@@ -63,6 +69,8 @@ Or use the `RESPEC_FAILURES` environment variable.
 
     RESPEC_FAILURES=/path/to/file respec ...
 
+[junit-merge]: https://github.com/oggy/junit_merge
+
 ## Contributing
 
  * [Bug reports](https://github.com/oggy/respec/issues)

data/bin/respec

@@ -8,6 +8,9 @@ require 'shellwords'
 app = Respec::App.new(*ARGV)
 if app.help_only?
   STDERR.puts app.help
+elsif app.error
+  STDERR.puts app.error
+  exit 1
 else
   STDERR.puts "++ #{app.command.shelljoin}"
   exec *app.command

data/lib/respec/app.rb

@@ -12,11 +12,17 @@ module Respec
       end
       @failures_path = self.class.default_failures_path
       @update_failures = true
+      @error = nil
       process_args
     end
 
     attr_accessor :failures_path
 
+    def error
+      command
+      @error
+    end
+
     def command
       @command ||= program_args + generated_args + raw_args + formatter_args
     end
@@ -58,6 +64,7 @@ module Respec
         |
         |RESPEC-ARGS may consist of:
         |
+        |  d              Run all spec files changed since the last git commit
         |  f              Rerun all failed examples
         |  <N>            Rerun only the N-th failure
         |  <file name>    Run all specs in this file
@@ -79,6 +86,7 @@ module Respec
       files = []
       pass_next_arg = false
       using_filters = false
+      changed_only = false
       @args.each do |arg|
         if pass_next_arg
           args << arg
@@ -94,6 +102,8 @@ module Respec
           args << arg
         elsif arg =~ /\AFAILURES=(.*)\z/
           self.failures_path = $1
+        elsif arg == 'd'
+          changed_only = true
         elsif arg == 'f'
           # failures_path could still be overridden -- delay evaluation of this.
           args << lambda do
@@ -117,7 +127,7 @@ module Respec
             @update_failures = false
             using_filters = true
           else
-            warn "invalid failure: #{i} for (1..#{failures.size})"
+            @error = "invalid failure: #{i} for (1..#{failures.size})"
           end
         else
           args << '-e' << arg.gsub(/[$]/, '\\\\\\0')
@@ -143,12 +153,25 @@ module Respec
       # using 'spec' by default. Add it explicitly here.
       files << 'spec' if files.empty?
 
+      # Filter files only to those changed if 'd' is present.
+      if changed_only
+        files = changed_paths(files)
+      end
+
       # 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 = expanded
       @generated_args.concat(files)
     end
 
+    def changed_paths(paths)
+      changes = `git status --short --untracked-files=all #{paths.shelljoin}`
+      changes.lines.map do |line|
+        path = line[3..-1].chomp
+        path if File.exist?(path) && path =~ /\.rb\z/i
+      end.compact.uniq
+    end
+
     def failures
       @failures ||=
         if File.exist?(failures_path)

data/lib/respec/version.rb

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

data/spec/respec/app_spec.rb

@@ -89,6 +89,47 @@ describe Respec::App do
   end
 
   describe "#generated_args" do
+    def in_git_repo
+      dir = "#{tmp}/repo"
+      FileUtils.mkdir_p dir
+      Dir.chdir(dir) do
+        system 'git init --quiet .'
+        yield
+      end
+    end
+
+    def make_git_file(path, index_status, status)
+      FileUtils.mkdir_p File.dirname(path)
+
+      unless index_status == nil || index_status == :new
+        open(path, 'w') { |f| f.print 1 }
+        system "git add #{path.shellescape}"
+        system "git commit --quiet --message . #{path.shellescape}"
+      end
+
+      case index_status
+      when :new, :updated
+        open(path, 'w') { |f| f.print 2 }
+      when :up_to_date, nil
+      when :removed
+        File.delete path
+      else
+        raise ArgumentError, "invalid index_status: #{index_status}"
+      end
+
+      system "git add -- #{path.shellescape}" unless index_status.nil?
+
+      case status
+      when :new, :updated
+        open(path, 'w') { |f| f.print 3 }
+      when :up_to_date
+      when :removed
+        File.delete path
+      else
+        raise ArgumentError, "invalid status: #{status}"
+      end
+    end
+
     it "should pass all arguments that start with '-' to rspec" do
       FileUtils.touch "#{tmp}/file"
       app = Respec::App.new('-a', '-b', '-c', "#{tmp}/file")
@@ -106,6 +147,62 @@ describe Respec::App do
       expect(app.generated_args).to eq ['-e', 'a', '-e', 'b', 'spec']
     end
 
+    it "should run all new and updated files if 'd' is given" do
+      in_git_repo do
+        make_git_file 'a/01.rb', nil, :new
+
+        make_git_file 'a/02.rb', :new, :up_to_date
+        make_git_file 'a/03.rb', :new, :updated
+        make_git_file 'a/04.rb', :new, :removed
+
+        make_git_file 'a/05.rb', :up_to_date, :up_to_date
+        make_git_file 'a/06.rb', :up_to_date, :updated
+        make_git_file 'a/07.rb', :up_to_date, :removed
+
+        make_git_file 'a/08.rb', :updated, :up_to_date
+        make_git_file 'a/09.rb', :updated, :updated
+        make_git_file 'a/10.rb', :updated, :removed
+
+        make_git_file 'a/11.rb', :removed, :up_to_date
+        make_git_file 'a/12.rb', :removed, :new
+
+        app = Respec::App.new('d', 'a')
+        expect(app.generated_args).to \
+          contain_exactly(*[1, 2, 3, 6, 8, 9, 12].map { |i| 'a/%02d.rb' % i})
+      end
+    end
+
+    it "should only include .rb files for 'd'" do
+      in_git_repo do
+        make_git_file 'a/1.rb', :new, :up_to_date
+        make_git_file 'a/1.br', :new, :up_to_date
+
+        app = Respec::App.new('d', 'a')
+        expect(app.generated_args).to eq %w[a/1.rb]
+      end
+    end
+
+    it "should not include files outside the given spec directories for 'd'" do
+      in_git_repo do
+        make_git_file 'a/1.rb', :new, :up_to_date
+        make_git_file 'b/1.rb', :new, :up_to_date
+        make_git_file 'c/1.rb', :new, :up_to_date
+
+        app = Respec::App.new('d', 'a', 'b')
+        expect(app.generated_args).to eq %w[a/1.rb b/1.rb]
+      end
+    end
+
+    it "should filter files from the default spec directory for 'd'" do
+      in_git_repo do
+        make_git_file 'spec/1.rb', :new, :up_to_date
+        make_git_file 'other/1.rb', :new, :up_to_date
+
+        app = Respec::App.new('d')
+        expect(app.generated_args).to eq %w[spec/1.rb]
+      end
+    end
+
     it "should pass failures with spaces in them as a single argument" do
       make_failures_file 'a a'
       app = Respec::App.new('f')
@@ -209,4 +306,18 @@ describe Respec::App do
       end
     end
   end
+
+  describe "#error" do
+    it "should not be set if the arguments are valid" do
+      make_failures_file 'a'
+      app = Respec::App.new('1')
+      expect(app.error).to be_nil
+    end
+
+    it "should be set if an invalid failure is given" do
+      make_failures_file 'a', 'b'
+      app = Respec::App.new('3')
+      expect(app.error).to include 'invalid failure: 3 for (1..2)'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: respec
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - George Ogata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rerun failing RSpec examples easily.