respec 0.3.0 → 0.4.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.4.0 2012-11-11
+
+ * Fix further issues with custom formatter being overridden by respec.
+
 == 0.3.0 2012-11-11
 
  * Don't add progress formatter when user has selected something else.

data/lib/respec/app.rb

@@ -16,7 +16,7 @@ module Respec
     end
 
     def command
-      @command ||= bundler_args + ['rspec'] + formatter_args + default_formatter_args + generated_args + raw_args
+      @command ||= bundler_args + ['rspec'] + generated_args + raw_args + formatter_args
     end
 
     def bundler_args
@@ -27,34 +27,20 @@ module Respec
       end
     end
 
+    attr_reader :generated_args, :raw_args
+
     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]
+        [File.expand_path('formatter.rb', File.dirname(__FILE__))]
       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
@@ -133,12 +119,6 @@ module Respec
       @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

data/lib/respec/formatter.rb

@@ -9,3 +9,11 @@ module Respec
     end
   end
 end
+
+# We inject this here rather than on the command line, as the logic to assemble
+# the list of formatters is complex, and easily broken by adding a --format
+# option.
+RSpec.configure do |config|
+  config.add_formatter 'progress' if config.formatters.empty?
+  config.add_formatter Respec::Formatter, ENV['RESPEC_FAILURES'] || File.expand_path(".respec_failures")
+end

data/lib/respec/version.rb

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

data/spec/respec/app_spec.rb

@@ -8,8 +8,6 @@ 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 }
@@ -53,20 +51,15 @@ describe Respec::App do
   end
 
   describe "#formatter_args" 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]
-    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]
+      app.formatter_args.should == [FORMATTER_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]
+      app.formatter_args.should == [FORMATTER_PATH]
     end
 
     it "should not update the stored failures if a numeric argument is given" do
@@ -76,63 +69,6 @@ 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')
@@ -200,7 +136,7 @@ describe Respec::App do
       Dir.chdir tmp do
         FileUtils.touch 'Gemfile'
         app = Respec::App.new('--', '-t', 'TAG')
-        app.command.should == ['bundle', 'exec', 'rspec', '--require', FORMATTER_PATH, '--format', 'Respec::Formatter', '--out', FAIL_PATH, '--format', 'progress', '-t', 'TAG']
+        app.command.should == ['bundle', 'exec', 'rspec', '-t', 'TAG', FORMATTER_PATH]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: respec
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 667712185772310074
+      hash: 2310279171202373770
 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: 667712185772310074
+      hash: 2310279171202373770
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24