respec 0.2.0 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 0.3.0 2012-11-11
+
+ * Don't add progress formatter when user has selected something else.
+ * Remove 's' option. Use "-f s" instead, or an .rspec file instead.
+ * Pass argument to deprecated --formatter option to rspec.
+
 == 0.2.0 2012-10-31
 
  * Support rspec options that require an argument.

data/lib/respec/app.rb

@@ -10,14 +10,13 @@ module Respec
         @args = args
         @raw_args = []
       end
-      @formatter = 'progress'
       @selected_failures = false
       @update_failures = true
       process_args
     end
 
     def command
-      @command ||= bundler_args + ['rspec'] + formatter_args + generated_args + raw_args
+      @command ||= bundler_args + ['rspec'] + formatter_args + default_formatter_args + generated_args + raw_args
     end
 
     def bundler_args
@@ -31,18 +30,31 @@ module Respec
     def formatter_args
       if @update_failures
         formatter_path = File.expand_path('formatter.rb', File.dirname(__FILE__))
-        ['--require', formatter_path, '--format', 'Respec::Formatter', '--out', failures_path, '--format', @formatter]
+        ['--require', formatter_path, '--format', 'Respec::Formatter', '--out', failures_path]
       else
         []
       end
     end
 
+    def default_formatter_args
+      args = @generated_args + @raw_args + dotfile_args
+      if args.include?('-f') || args.include?('--format') || args.include?('--formatter')
+        []
+      else
+        ['--format', 'progress']
+      end
+    end
+
     attr_reader :generated_args, :raw_args
 
     class << self
       attr_accessor :failures_path
+      attr_accessor :local_rspec_config_path
+      attr_accessor :global_rspec_config_path
     end
     self.failures_path = ENV['RESPEC_FAILURES'] || File.expand_path(".respec_failures")
+    self.local_rspec_config_path = '.rspec'
+    self.global_rspec_config_path = File.expand_path('~/.rspec')
 
     def help_only?
       @help_only
@@ -52,19 +64,19 @@ module Respec
       <<-EOS.gsub(/^ *\|/, '')
         |USAGE: respec RESPEC-ARGS ... [ -- RSPEC-ARGS ... ]
         |
-        |Run rspec recording failed examples for easy rerunning later.
+        |Run rspec, recording failed examples for easy rerunning later.
         |
         |RESPEC-ARGS may consist of:
         |
-        |  f            Rerun all failed examples
-        |  <integer>    Rerun only the n-th failure
-        |  <file name>  Run specs in these files
-        |  <other>      Run only examples matching this pattern
-        |  --help       This!  (Also 'help'.)
-        |  -<anything>  Passed directly to rspec.
+        |  f              Rerun all failed examples
+        |  <N>            Rerun only the N-th failure
+        |  <file name>    Run all specs in this file
+        |  <file name:N>  Run specs at line N in this file
+        |  <other>        Run only examples matching this pattern
+        |  -<anything>    Passed directly to rspec.
+        |  --help         This!  (Also 'help'.)
         |
-        |RSPEC-ARGS may follow a '--' argument, and are also passed
-        |directly to rspec.
+        |Any arguments following a '--' argument are passed directly to rspec.
         |
         |More info: http://github.com/oggy/respec
       EOS
@@ -102,8 +114,6 @@ module Respec
           else
             warn "no fail file - ignoring 'f' argument"
           end
-        elsif arg == 's'
-          @formatter = 'specdoc'
         elsif arg =~ /\A\d+\z/
           i = Integer(arg)
           if (failure = failures[i - 1])
@@ -117,12 +127,18 @@ module Respec
           args << '--example' << arg.gsub(/[$]/, '\\\\\\0')
         end
       end
-      # If we selected individual failures to rerun, don't give the
-      # files to rspec, as those files will be run in entirety.
+      # 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.concat(files) unless @selected_failures
     end
 
+    def dotfile_args
+      [self.class.local_rspec_config_path, self.class.global_rspec_config_path].map do |path|
+        File.exist?(path) ? File.read(path) : ''
+      end.join(' ').split
+    end
+
     def failures_path
       self.class.failures_path
     end
@@ -148,7 +164,7 @@ module Respec
       --seed
       --failure-exit-code
       --drb-port
-      -f --format
+      -f --format --formatter
       -o --out
       -P --pattern
       -e --example

data/lib/respec/version.rb

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

data/spec/respec/app_spec.rb

@@ -8,6 +8,12 @@ describe Respec::App do
   FAIL_PATH = "#{TMP}/failures.txt"
 
   Respec::App.failures_path = FAIL_PATH
+  Respec::App.local_rspec_config_path = "#{TMP}/local.rspec"
+  Respec::App.global_rspec_config_path = "#{TMP}/global.rspec"
+
+  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|
@@ -47,25 +53,20 @@ describe Respec::App do
   end
 
   describe "#formatter_args" do
-    it "should include the respec and progress formatters by default" do
+    it "should include the respec formatters" do
       app = Respec::App.new
-      app.formatter_args.should == ['--require', FORMATTER_PATH, '--format', 'Respec::Formatter', '--out', FAIL_PATH, '--format', 'progress']
-    end
-
-    it "should include '--format specdoc' if an 's' argument is given" do
-      app = Respec::App.new('s')
-      app.formatter_args.should == ['--require', FORMATTER_PATH, '--format', 'Respec::Formatter', '--out', FAIL_PATH, '--format', 'specdoc']
+      app.formatter_args.should == ['--require', FORMATTER_PATH, '--format', 'Respec::Formatter', '--out', FAIL_PATH]
     end
 
     it "should update the stored failures if no args are given" do
       app = Respec::App.new
-      app.formatter_args.should == ['--require', FORMATTER_PATH, '--format', 'Respec::Formatter', '--out', FAIL_PATH, '--format', 'progress']
+      app.formatter_args.should == ['--require', FORMATTER_PATH, '--format', 'Respec::Formatter', '--out', FAIL_PATH]
     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']
+      app.formatter_args.should == ['--require', FORMATTER_PATH, '--format', 'Respec::Formatter', '--out', FAIL_PATH]
     end
 
     it "should not update the stored failures if a numeric argument is given" do
@@ -75,6 +76,63 @@ describe Respec::App do
     end
   end
 
+  describe "#default_formatter_args" do
+    it "should be empty if a formatter arg was given in the respec args" do
+      app = Respec::App.new('-f', 'specdoc')
+      app.default_formatter_args.should == []
+
+      app = Respec::App.new('--format', 'specdoc')
+      app.default_formatter_args.should == []
+
+      app = Respec::App.new('--formatter', 'specdoc')
+      app.default_formatter_args.should == []
+    end
+
+    it "should be empty if a formatter arg was given in the raw args" do
+      app = Respec::App.new('--', '-f', 'specdoc')
+      app.default_formatter_args.should == []
+
+      app = Respec::App.new('--', '--format', 'specdoc')
+      app.default_formatter_args.should == []
+
+      app = Respec::App.new('--', '--formatter', 'specdoc')
+      app.default_formatter_args.should == []
+    end
+
+    it "should be empty if a formatter arg is in the local .rspec" do
+      write_file "#{TMP}/local.rspec", '-f specdoc'
+      app = Respec::App.new
+      app.default_formatter_args.should == []
+
+      write_file "#{TMP}/local.rspec", '--format specdoc'
+      app = Respec::App.new
+      app.default_formatter_args.should == []
+
+      write_file "#{TMP}/local.rspec", '--formatter specdoc'
+      app = Respec::App.new
+      app.default_formatter_args.should == []
+    end
+
+    it "should be empty if a formatter arg is in the global .rspec" do
+      write_file "#{TMP}/global.rspec", '-f specdoc'
+      app = Respec::App.new
+      app.default_formatter_args.should == []
+
+      write_file "#{TMP}/gloabl.rspec", '--format specdoc'
+      app = Respec::App.new
+      app.default_formatter_args.should == []
+
+      write_file "#{TMP}/gloabl.rspec", '--formatter specdoc'
+      app = Respec::App.new
+      app.default_formatter_args.should == []
+    end
+
+    it "should return the args for the progress formatter otherwise" do
+      app = Respec::App.new
+      app.default_formatter_args.should == ['--format', 'progress']
+    end
+  end
+
   describe "#generated_args" do
     it "should treat all arguments that start with '-' to rspec" do
       app = Respec::App.new('-a', '-b', '-c')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: respec
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2391065629602365369
+      hash: 667712185772310074
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2391065629602365369
+      hash: 667712185772310074
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24