guard-rspec 0.7.1 → 0.7.2

data/lib/guard/rspec/runner.rb

@@ -62,14 +62,16 @@ module Guard
                          end
       end
 
-      def default_formatter
-        @default_formatter ||= unless @options[:cli] =~ formatter_regex
+      def parsed_or_default_formatter
+        @parsed_or_default_formatter ||= begin
           file_name = "#{Dir.pwd}/.rspec"
-          if File.exist?(file_name)
-            s = File.read(file_name)
-            s.scan(formatter_regex).flatten.map{|i| "-f #{i}"}.join(' ')
+          parsed_formatter = if File.exist?(file_name)
+            formatters = File.read(file_name).scan(formatter_regex).flatten
+            formatters.map { |formatter| "-f #{formatter}" }.join(' ')
           end
-        end || '-f progress'
+
+          parsed_formatter.nil? || parsed_formatter.empty? ? '-f progress' : parsed_formatter
+        end
       end
 
     private
@@ -77,8 +79,8 @@ module Guard
       def rspec_arguments(paths, options)
         arg_parts = []
         arg_parts << options[:cli]
+        arg_parts << parsed_or_default_formatter unless options[:cli] =~ formatter_regex
         if @options[:notification]
-          arg_parts << default_formatter unless options[:cli] =~ formatter_regex
           arg_parts << "-r #{File.dirname(__FILE__)}/formatters/notification_#{rspec_class.downcase}.rb"
           arg_parts << "-f Guard::RSpec::Formatter::Notification#{rspec_class}#{rspec_version == 1 ? ":" : " --out "}/dev/null"
         end

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "0.7.1"
+    VERSION = "0.7.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2012-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4256658235828143634
+      hash: -3238188495715962331
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: