guard-rspec 0.1.9 → 0.2.0

data/lib/guard/rspec/runner.rb

@@ -3,46 +3,38 @@ module Guard
     module Runner
       class << self
         attr_reader :rspec_version
-        
-        def run(paths, options = {})
+
+        def run(paths, options={})
           message = options[:message] || "Running: #{paths.join(' ')}"
-          UI.info message, :reset => true
+          UI.info(message, :reset => true)
           system(rspec_command(paths, options))
         end
-        
-        def set_rspec_version(options = {})
+
+        def set_rspec_version(options={})
           @rspec_version = options[:version] || determine_rspec_version
         end
-        
+
       private
-        
-        def rspec_command(paths, options = {})
+
+        def rspec_command(paths, options={})
+          warn_deprectation(options)
+
           cmd_parts = []
           cmd_parts << "rvm #{options[:rvm].join(',')} exec" if options[:rvm].is_a?(Array)
           cmd_parts << "bundle exec" if bundler? && options[:bundler] != false
-          
-          formatter = options[:formatter] || "default"
-          case rspec_version
-          when 1
-            cmd_parts << "spec"
-            cmd_parts << "--require #{File.dirname(__FILE__)}/formatters/#{formatter}_spec.rb --format #{formatter.capitalize}Spec"
-          when 2
-            cmd_parts << "rspec"
-            cmd_parts << "--require #{File.dirname(__FILE__)}/formatters/#{formatter}_rspec.rb --format #{formatter.capitalize}RSpec"
-          end
-          
-          cmd_parts << "--drb" if options[:drb] == true
-          cmd_parts << "--color" if options[:color] != false
-          cmd_parts << "--fail-fast" if options[:fail_fast] == true
-          
+          cmd_parts << rspec_exec.downcase
+          cmd_parts << options[:cli] if options[:cli]
+          cmd_parts << "-f progress" unless options[:cli] && options[:cli].split(' ').any? { |w| %w[-f --format].include?(w) }
+          cmd_parts << "-r #{File.dirname(__FILE__)}/formatters/notification_#{rspec_exec.downcase}.rb -f Notification#{rspec_exec}#{rspec_version == 1 ? ":" : " --out "}/dev/null" if options[:notification] != false
           cmd_parts << paths.join(' ')
-          cmd_parts.join(" ")
+
+          cmd_parts.join(' ')
         end
-        
+
         def bundler?
           @bundler ||= File.exist?("#{Dir.pwd}/Gemfile")
         end
-        
+
         def determine_rspec_version
           UI.info "Determine rspec_version... (can be forced with Guard::RSpec version option)"
           if File.exist?("#{Dir.pwd}/spec/spec_helper.rb")
@@ -55,7 +47,25 @@ module Guard
             2
           end
         end
-        
+
+        def rspec_exec
+          case rspec_version
+          when 1
+            "Spec"
+          when 2
+            "RSpec"
+          end
+        end
+
+        def warn_deprectation(options={})
+          [:color, :drb, :fail_fast, [:formatter, "format"]].each do |option|
+            key, value = option.is_a?(Array) ? option : [option, option.to_s.gsub('_', '-')]
+            if options.key?(key)
+              UI.info %{DEPRECATION WARNING: The :#{key} option is deprecated. Pass standard command line argument "--#{value}" to RSpec with the :cli option.}
+            end
+          end
+        end
+
       end
     end
   end

data/lib/guard/rspec/runner.rbc

@@ -0,0 +1,2095 @@
+!RBIX
+10937318184790222022
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+28
+99
+7
+0
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+5
+Guard
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+5
+Guard
+i
+29
+5
+66
+99
+7
+0
+1
+65
+49
+1
+3
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+5
+RSpec
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+5
+RSpec
+i
+28
+5
+66
+99
+7
+0
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+6
+Runner
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+6
+Runner
+i
+28
+5
+66
+5
+99
+12
+49
+0
+1
+13
+99
+12
+7
+1
+12
+7
+2
+12
+65
+12
+49
+3
+4
+15
+54
+50
+1
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+4
+x
+16
+object_metaclass
+x
+18
+__metaclass_init__
+M
+1
+n
+n
+x
+18
+__metaclass_init__
+i
+112
+5
+66
+5
+7
+0
+47
+49
+1
+1
+15
+99
+7
+2
+7
+3
+65
+67
+49
+4
+0
+49
+5
+4
+15
+99
+7
+6
+7
+7
+65
+67
+49
+4
+0
+49
+5
+4
+15
+5
+48
+8
+15
+99
+7
+9
+7
+10
+65
+67
+49
+4
+0
+49
+5
+4
+15
+99
+7
+11
+7
+12
+65
+67
+49
+4
+0
+49
+5
+4
+15
+99
+7
+13
+7
+14
+65
+67
+49
+4
+0
+49
+5
+4
+15
+99
+7
+15
+7
+16
+65
+67
+49
+4
+0
+49
+5
+4
+15
+99
+7
+17
+7
+18
+65
+67
+49
+4
+0
+49
+5
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+19
+x
+13
+rspec_version
+x
+11
+attr_reader
+x
+3
+run
+M
+1
+n
+n
+x
+3
+run
+i
+82
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+20
+1
+7
+2
+49
+3
+1
+13
+10
+40
+15
+7
+4
+20
+0
+7
+5
+64
+49
+6
+1
+47
+101
+7
+63
+2
+19
+2
+15
+45
+8
+9
+20
+2
+44
+43
+0
+79
+49
+1
+1
+13
+7
+10
+2
+49
+11
+2
+15
+49
+12
+2
+15
+5
+5
+20
+0
+20
+1
+47
+49
+13
+2
+47
+49
+14
+1
+11
+I
+9
+I
+3
+I
+1
+I
+2
+n
+p
+15
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+7
+message
+x
+2
+[]
+s
+9
+Running: 
+s
+1
+ 
+x
+4
+join
+x
+4
+to_s
+x
+2
+UI
+n
+x
+5
+reset
+x
+3
+[]=
+x
+4
+info
+x
+13
+rspec_command
+x
+6
+system
+p
+9
+I
+-1
+I
+7
+I
+e
+I
+8
+I
+2b
+I
+9
+I
+43
+I
+a
+I
+52
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+3
+x
+5
+paths
+x
+7
+options
+x
+7
+message
+x
+17
+method_visibility
+x
+15
+add_defn_method
+x
+17
+set_rspec_version
+M
+1
+n
+n
+x
+17
+set_rspec_version
+i
+31
+23
+0
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+0
+15
+20
+0
+7
+2
+49
+3
+1
+13
+10
+28
+15
+5
+48
+4
+38
+5
+11
+I
+3
+I
+1
+I
+0
+I
+1
+n
+p
+6
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+7
+version
+x
+2
+[]
+x
+23
+determine_rspec_version
+x
+14
+@rspec_version
+p
+5
+I
+-1
+I
+d
+I
+e
+I
+e
+I
+1f
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+1
+x
+7
+options
+x
+7
+private
+x
+13
+rspec_command
+M
+1
+n
+n
+x
+13
+rspec_command
+i
+293
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+5
+20
+1
+47
+49
+2
+1
+15
+35
+0
+19
+2
+15
+20
+1
+7
+3
+49
+4
+1
+45
+5
+6
+49
+7
+1
+9
+71
+20
+2
+7
+8
+20
+1
+7
+3
+49
+4
+1
+7
+9
+64
+49
+10
+1
+47
+101
+11
+7
+12
+63
+3
+49
+13
+1
+8
+72
+1
+15
+5
+47
+49
+14
+0
+13
+9
+98
+15
+20
+1
+7
+15
+49
+4
+1
+3
+83
+16
+10
+97
+2
+8
+98
+3
+9
+110
+20
+2
+7
+17
+64
+49
+13
+1
+8
+111
+1
+15
+20
+2
+5
+48
+18
+49
+19
+0
+49
+13
+1
+15
+20
+1
+7
+20
+49
+4
+1
+9
+147
+20
+2
+20
+1
+7
+20
+49
+4
+1
+49
+13
+1
+8
+148
+1
+15
+20
+1
+7
+20
+49
+4
+1
+13
+9
+178
+15
+20
+1
+7
+20
+49
+4
+1
+7
+21
+64
+49
+22
+1
+56
+23
+50
+24
+0
+9
+183
+1
+8
+191
+20
+2
+7
+25
+64
+49
+13
+1
+15
+20
+1
+7
+26
+49
+4
+1
+3
+83
+16
+9
+207
+1
+8
+269
+20
+2
+7
+27
+45
+28
+29
+65
+49
+30
+0
+49
+31
+1
+47
+101
+11
+7
+32
+5
+48
+18
+49
+19
+0
+47
+101
+11
+7
+33
+5
+48
+18
+47
+101
+11
+5
+48
+34
+79
+83
+16
+9
+256
+7
+35
+64
+8
+259
+7
+36
+64
+47
+101
+11
+7
+37
+63
+8
+49
+13
+1
+15
+20
+2
+20
+0
+7
+21
+64
+49
+10
+1
+49
+13
+1
+15
+20
+2
+7
+21
+64
+49
+10
+1
+11
+I
+c
+I
+3
+I
+1
+I
+2
+n
+p
+38
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+17
+warn_deprectation
+x
+3
+rvm
+x
+2
+[]
+x
+5
+Array
+n
+x
+5
+is_a?
+s
+4
+rvm 
+s
+1
+,
+x
+4
+join
+x
+4
+to_s
+s
+5
+ exec
+x
+2
+<<
+x
+8
+bundler?
+x
+7
+bundler
+x
+2
+==
+s
+11
+bundle exec
+x
+10
+rspec_exec
+x
+8
+downcase
+x
+3
+cli
+s
+1
+ 
+x
+5
+split
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+13
+rspec_command
+i
+18
+57
+19
+0
+15
+7
+0
+64
+7
+1
+64
+35
+2
+20
+0
+49
+2
+1
+11
+I
+4
+I
+1
+I
+1
+I
+1
+n
+p
+3
+s
+2
+-f
+s
+8
+--format
+x
+8
+include?
+p
+3
+I
+0
+I
+1b
+I
+12
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+1
+x
+1
+w
+x
+4
+any?
+s
+11
+-f progress
+x
+12
+notification
+s
+3
+-r 
+x
+4
+File
+n
+x
+11
+active_path
+x
+7
+dirname
+s
+25
+/formatters/notification_
+s
+19
+.rb -f Notification
+x
+13
+rspec_version
+s
+1
+:
+s
+7
+ --out 
+s
+9
+/dev/null
+p
+23
+I
+-1
+I
+13
+I
+e
+I
+14
+I
+16
+I
+16
+I
+1b
+I
+17
+I
+49
+I
+18
+I
+70
+I
+19
+I
+7c
+I
+1a
+I
+95
+I
+1b
+I
+c0
+I
+1c
+I
+10e
+I
+1d
+I
+11c
+I
+1f
+I
+125
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+3
+x
+5
+paths
+x
+7
+options
+x
+9
+cmd_parts
+x
+8
+bundler?
+M
+1
+n
+n
+x
+8
+bundler?
+i
+28
+39
+0
+13
+10
+27
+15
+45
+1
+2
+45
+3
+4
+49
+5
+0
+47
+101
+6
+7
+7
+63
+2
+49
+8
+1
+38
+0
+11
+I
+3
+I
+0
+I
+0
+I
+0
+n
+p
+9
+x
+8
+@bundler
+x
+4
+File
+n
+x
+3
+Dir
+n
+x
+3
+pwd
+x
+4
+to_s
+s
+8
+/Gemfile
+x
+6
+exist?
+p
+5
+I
+-1
+I
+22
+I
+0
+I
+23
+I
+1c
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+0
+x
+23
+determine_rspec_version
+M
+1
+n
+n
+x
+23
+determine_rspec_version
+i
+156
+45
+0
+1
+7
+2
+64
+49
+3
+1
+15
+45
+4
+5
+45
+6
+7
+49
+8
+0
+47
+101
+9
+7
+10
+63
+2
+49
+11
+1
+9
+98
+45
+4
+12
+13
+71
+13
+47
+9
+65
+47
+49
+14
+0
+13
+45
+6
+15
+49
+8
+0
+47
+101
+9
+7
+10
+63
+2
+47
+49
+16
+1
+15
+8
+81
+45
+6
+17
+49
+8
+0
+47
+101
+9
+7
+10
+63
+2
+49
+13
+1
+49
+18
+0
+7
+19
+64
+49
+20
+1
+9
+95
+79
+8
+96
+80
+8
+155
+5
+47
+49
+21
+0
+9
+154
+45
+22
+23
+7
+24
+64
+45
+6
+25
+49
+8
+0
+47
+101
+9
+7
+26
+63
+2
+13
+18
+3
+49
+27
+2
+15
+15
+5
+7
+28
+64
+47
+49
+29
+1
+7
+30
+64
+49
+20
+1
+9
+151
+79
+8
+152
+80
+8
+155
+80
+11
+I
+4
+I
+0
+I
+0
+I
+0
+n
+p
+31
+x
+2
+UI
+n
+s
+75
+Determine rspec_version... (can be forced with Guard::RSpec version option)
+x
+4
+info
+x
+4
+File
+n
+x
+3
+Dir
+n
+x
+3
+pwd
+x
+4
+to_s
+s
+20
+/spec/spec_helper.rb
+x
+6
+exist?
+n
+x
+3
+new
+x
+8
+allocate
+n
+x
+10
+initialize
+n
+x
+4
+read
+s
+12
+Spec::Runner
+x
+8
+include?
+x
+8
+bundler?
+x
+3
+ENV
+n
+s
+14
+BUNDLE_GEMFILE
+n
+s
+8
+/Gemfile
+x
+3
+[]=
+s
+17
+bundle show rspec
+x
+1
+`
+s
+9
+/rspec-1.
+p
+17
+I
+-1
+I
+26
+I
+0
+I
+27
+I
+a
+I
+28
+I
+1f
+I
+29
+I
+62
+I
+2a
+I
+69
+I
+2c
+I
+84
+I
+2d
+I
+9a
+I
+2f
+I
+9c
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+0
+x
+10
+rspec_exec
+M
+1
+n
+n
+x
+10
+rspec_exec
+i
+34
+5
+48
+0
+13
+79
+12
+49
+1
+1
+9
+17
+15
+7
+2
+64
+8
+33
+13
+80
+12
+49
+1
+1
+9
+31
+15
+7
+3
+64
+8
+33
+15
+1
+11
+I
+3
+I
+0
+I
+0
+I
+0
+n
+p
+4
+x
+13
+rspec_version
+x
+3
+===
+s
+4
+Spec
+s
+5
+RSpec
+p
+15
+I
+-1
+I
+33
+I
+0
+I
+34
+I
+3
+I
+35
+I
+c
+I
+36
+I
+11
+I
+37
+I
+1a
+I
+38
+I
+20
+I
+34
+I
+22
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+0
+x
+17
+warn_deprectation
+M
+1
+n
+n
+x
+17
+warn_deprectation
+i
+35
+23
+0
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+0
+15
+7
+2
+7
+3
+7
+4
+7
+5
+7
+6
+64
+35
+2
+35
+4
+56
+7
+50
+8
+0
+11
+I
+6
+I
+1
+I
+0
+I
+1
+n
+p
+9
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+5
+color
+x
+3
+drb
+x
+9
+fail_fast
+x
+9
+formatter
+s
+6
+format
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+17
+warn_deprectation
+i
+86
+57
+19
+0
+15
+20
+0
+45
+0
+1
+49
+2
+1
+9
+18
+20
+0
+8
+36
+20
+0
+20
+0
+49
+3
+0
+7
+4
+64
+7
+5
+64
+49
+6
+2
+35
+2
+97
+37
+19
+1
+15
+37
+19
+2
+15
+15
+2
+15
+21
+1
+0
+20
+1
+49
+7
+1
+9
+84
+45
+8
+9
+7
+10
+20
+1
+47
+101
+3
+7
+11
+20
+2
+47
+101
+3
+7
+12
+63
+5
+49
+13
+1
+8
+85
+1
+11
+I
+a
+I
+3
+I
+1
+I
+1
+n
+p
+14
+x
+5
+Array
+n
+x
+5
+is_a?
+x
+4
+to_s
+s
+1
+_
+s
+1
+-
+x
+4
+gsub
+x
+4
+key?
+x
+2
+UI
+n
+s
+26
+DEPRECATION WARNING: The :
+s
+62
+ option is deprecated. Pass standard command line argument "--
+s
+32
+" to RSpec with the :cli option.
+x
+4
+info
+p
+11
+I
+0
+I
+3d
+I
+4
+I
+3e
+I
+30
+I
+3f
+I
+3a
+I
+40
+I
+54
+I
+3f
+I
+56
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+3
+x
+6
+option
+x
+3
+key
+x
+5
+value
+x
+4
+each
+p
+5
+I
+-1
+I
+3c
+I
+e
+I
+3d
+I
+23
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+1
+x
+7
+options
+p
+19
+I
+2
+I
+5
+I
+a
+I
+7
+I
+18
+I
+d
+I
+26
+I
+11
+I
+2a
+I
+13
+I
+38
+I
+22
+I
+46
+I
+26
+I
+54
+I
+33
+I
+62
+I
+3c
+I
+70
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+4
+I
+1c
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+3
+I
+1c
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+2
+I
+1d
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+1c
+x
+69
+/Users/Thibaud/Development/Code/guard-rspec/lib/guard/rspec/runner.rb
+p
+0