guard-rspec 0.7.0 → 0.7.1

data/lib/guard/rspec/runner.rb

@@ -62,13 +62,23 @@ module Guard
                          end
       end
 
+      def default_formatter
+        @default_formatter ||= unless @options[:cli] =~ formatter_regex
+          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(' ')
+          end
+        end || '-f progress'
+      end
+
     private
 
       def rspec_arguments(paths, options)
         arg_parts = []
         arg_parts << options[:cli]
-        arg_parts << "-f progress" if !options[:cli] || options[:cli].split(/[\s=]/).none? { |w| %w[-f --format].include?(w) }
         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
@@ -84,7 +94,6 @@ module Guard
         cmd_parts << "bundle exec" if bundler?
         cmd_parts << rspec_executable
         cmd_parts << rspec_arguments(paths, options)
-
         cmd_parts.compact.join(' ')
       end
 
@@ -199,6 +208,10 @@ module Guard
         end
       end
 
+      def formatter_regex
+        @formatter_regex ||= /(?:^|\s)(?:-f\s*|--format(?:=|\s+))(\w+)/
+      end
+
     end
   end
 end

data/lib/guard/rspec/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70179267450520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70179267450520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70179267449820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70179267449820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70179267449300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +53,12 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70179267449300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
 description: Guard::RSpec automatically run your specs (much like autotest).
 email:
 - thibaud@thibaud.me
@@ -73,6 +88,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4256658235828143634
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -81,9 +99,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-rspec
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Guard gem for RSpec
 test_files: []
-has_rdoc: