guard-jruby-rspec 0.1.0 → 0.1.1

data/README.md

@@ -2,7 +2,7 @@
 
 This guard extention allows you to run all of your specs on JRuby without the initial start up cost.  *It does not run a subset of your specs like guard-rspec* and it does not trigger a run when a file changes.
 
-Instead, this extension loads all of your application files in advance, and reloads any that change.  That way, when you run RSpec, the JVM is already running, and your file have already been required.
+Instead, this extension loads all of your application files in advance, and reloads any that change.  That way, when you run RSpec, the JVM is already running, and your files have already been required.
 
 ## How to Use
 

data/lib/guard/jruby-rspec.rb

@@ -1,61 +1,83 @@
 require 'guard'
 require 'guard/guard'
-# require 'guard/jruby-rspec/runner'
+require 'guard/rspec'
 
 module Guard
-  class JRubyRSpec < Guard
-    autoload :Runner,    'guard/jruby-rspec/runner'
+  class JRubyRSpec < ::Guard::RSpec
+    autoload :Runner,       'guard/jruby-rspec/runner'
+    autoload :Inspector,    'guard/jruby-rspec/inspector'
 
     def initialize(watchers = [], options = {})
-      @monitor = options[:monitor_file]
-      @monitor ||= ".guard-jruby-rspec"
-
-      @spec_paths = options[:spec_dir]
-      @spec_paths ||= ["spec"]
-
-      all_watchers = watchers + [
-        Watcher.new(@monitor), 
-        Watcher.new(%r{^(.+)\.rb$}),
-        Watcher.new(%r{^(.+)\.(erb|haml)$})
-      ]
-      
+      @options = {
+        :all_after_pass => true,
+        :all_on_start   => true,
+        :keep_failed    => true,
+        :spec_paths     => ["spec"],
+        :run_all        => {},
+        :monitor_file   => ".guard-jruby-rspec"
+      }.merge(options)
+      @last_failed  = false
+      @failed_paths = []
+
+      default_watchers = [Watcher.new(@monitor)]
+      if @custom_watchers.nil? or @custom_watchers.empty?
+        default_watchers <<
+            Watcher.new(%r{^(.+)\.rb$}) <<
+            Watcher.new(%r{^(.+)\.(erb|haml)$})
+      else
+        watchers.each do |w|
+          default_watchers << Watcher.new(w.pattern)
+        end
+      end
+
+      @custom_watchers = watchers
+
       # touch the monitor file (lets the gjrspec know we're here)
       #File.open(@monitor, "w") {}
 
-      super(all_watchers, options)
+      # ideally we would bypass the Guard::RSpec initializer
+      super(default_watchers, @options)
 
-      @runner = Runner.new(options)
+      @inspector = Inspector.new(@options)
+      @runner = Runner.new(@options)
 
     end
 
     # Call once when guard starts
     def start
       UI.info "Guard::JRuby::RSpec is running, with RSpec!"
-      run_all #if @options[:all_on_start]
+      run_all if @options[:all_on_start]
     end
 
-    def run_all      
-      @runner.run(@spec_paths) # options should be configurable
-    end
+    def run_on_change(raw_paths)
+      reload_paths(raw_paths)
 
-    def reload
-      #UI.info "reload!"
+      unless @custom_watchers.nil? or @custom_watchers.empty?
+        paths = []
+
+        raw_paths.each do |p|
+          @custom_watchers.each do |w|
+            paths << w.call_action(w.match(p))
+          end
+        end
+        super(paths)
+      end
     end
 
-    def run_on_change(paths)
+    def reload_paths(paths)
       paths.each do |p| 
-        if File.exists?(p)
-          if p == @monitor
-            begin
-              pidfile = open(@monitor, "r+")
-              pid = pidfile.read
-
-              run_all
-
-              system("kill #{pid}") if (pid and !pid.empty?)
-            ensure
-              @runner.cleanup
-            end
+        if File.exists?(p) 
+          if p == @options[:monitor_file]
+            # begin
+            #   pidfile = open(@options[:monitor_file], "r+")
+            #   pid = pidfile.read
+
+            #   run_all
+
+            #   system("kill #{pid}") if (pid and !pid.empty?)
+            # ensure
+            #   @runner.cleanup
+            # end
           else
             # reload the file
             load p 

data/lib/guard/jruby-rspec/formatters/notification_rspec.rb

@@ -0,0 +1,13 @@
+require "guard/rspec/formatter"
+require "rspec/core/formatters/base_formatter"
+
+class Guard::JRubyRSpec::Formatter::NotificationRSpec < RSpec::Core::Formatters::BaseFormatter
+  include Guard::RSpec::Formatter
+
+  def dump_summary(duration, total, failures, pending)
+    message = guard_message(total, failures, pending, duration)
+    image   = guard_image(failures, pending)
+    notify(message, image)
+  end
+
+end

data/lib/guard/jruby-rspec/inspector.rb

@@ -0,0 +1,9 @@
+require 'guard/rspec/inspector'
+
+module Guard
+  class JRubyRSpec
+    class Inspector < ::Guard::RSpec::Inspector
+
+    end
+  end
+end

data/lib/guard/jruby-rspec/runner.rb

@@ -1,10 +1,17 @@
 require 'rspec'
+require 'guard/jruby-rspec/formatters/notification_rspec'
+#require 'guard/rspec/runner'
 
 module Guard
   class JRubyRSpec
-    class Runner
+    class Runner #< ::Guard::RSpec::Runner
      
       def initialize(options = {})
+        @options = {
+          :cli          => nil,
+          :notification => true
+        }.merge(options)
+
         @pipefile = options[:pipefile]
         @pipefile ||= ".guard-jruby-rspec-pipe"
         cleanup
@@ -15,26 +22,62 @@ module Guard
       end
 
       def run(paths, options = {})
+        return false if paths.empty?
+
+        message = options[:message] || "Running: #{paths.join(' ')}"
+        UI.info(message, :reset => true)
+
         # it might be a problem to run Rspec within this runtime.  Might have to create an
-        # auxillary java process and run it over there.  That would just make this one a
-        # controller for the other one. 
+        # embedded jruby.  
         if File.exists?(@pipefile)
-
+          raise "not supported yet"
           # instead of writing to the pipefile, we should probably use a 
           # formatter and write to /dev/null
-          orig_stdout = $stdout.clone
-          orig_stderr = $stderr.clone
-          begin
-            $stdout.reopen(@pipefile, "w")
-            $stderr.reopen(@pipefile, "w")
-            RSpec::Core::Runner.run(paths)
-          ensure
-            $stdout.reopen(orig_stdout)
-            $stderr.reopen(orig_stderr)
-          end
+          # orig_stdout = $stdout.clone
+          # orig_stderr = $stderr.clone
+          # begin
+          #   $stdout.reopen(@pipefile, "w")
+          #   $stderr.reopen(@pipefile, "w")
+          #   ::RSpec::Core::Runner.run(paths)
+          # ensure
+          #   $stdout.reopen(orig_stdout)
+          #   $stderr.reopen(orig_stderr)
+          # end
         else
-          RSpec::Core::Runner.run(paths)
+          ::RSpec::Core::Runner.run(rspec_arguments(paths, @options))
+        end
+      end
+
+      def parsed_or_default_formatter
+        @parsed_or_default_formatter ||= begin
+          file_name = "#{Dir.pwd}/.rspec"
+          parsed_formatter = if File.exist?(file_name)
+            formatters = File.read(file_name).scan(formatter_regex).flatten
+            formatters.map { |formatter| "-f #{formatter}" }.join(' ')
+          end
+
+          parsed_formatter.nil? || parsed_formatter.empty? ? '-fprogress' : parsed_formatter
+        end
+      end
+
+      private
+
+      def rspec_arguments(paths, options)
+        arg_parts = []
+        # arg_parts << options[:cli]
+        if @options[:notification]
+          arg_parts << parsed_or_default_formatter unless options[:cli] =~ formatter_regex
+          # arg_parts << "-r #{File.dirname(__FILE__)}/formatters/notification_rspec.rb"
+          arg_parts << "-fGuard::JRubyRSpec::Formatter::NotificationRSpec"
+          arg_parts << "-o/dev/null"
+          arg_parts << "-c"
         end
+        #arg_parts << "--failure-exit-code #{FAILURE_EXIT_CODE}" if failure_exit_code_supported?
+        arg_parts.concat(paths)
+      end
+
+      def formatter_regex
+        @formatter_regex ||= /(?:^|\s)(?:-f\s*|--format(?:=|\s+))([\w:]+)/
       end
 
     end

data/lib/guard/jruby-rspec/templates/Guardfile

@@ -1,2 +1,20 @@
-guard 'jruby-rspec', :spec_paths => ["spec"]
+guard 'jruby-rspec', :spec_paths => ["spec"] do
+  # You can leave this empty and jruby-rspec will not autorun,
+  # but it will run all specs in :spec_paths on demand
+
+  # or you can configure it just like guard-rspec
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+end
 

data/lib/guard/jruby-rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module JRubyRSpecVersion
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: guard-jruby-rspec
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
   - Joe Kutner
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-29 00:00:00 Z
+date: 2012-05-30 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: guard
@@ -24,16 +24,27 @@ dependencies:
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: guard-rspec
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.7.3
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "2.7"
     type: :development
-    version_requirements: *id002
+    version_requirements: *id003
 description: Guard::JRuby::RSpec keeps a warmed up JVM ready to run your specs.
 email: 
   - jpkutner@gmail.com
@@ -46,8 +57,10 @@ extra_rdoc_files: []
 files: 
   - lib/guard-jruby-rspec.rb
   - lib/guard/jruby-rspec.rb
+  - lib/guard/jruby-rspec/inspector.rb
   - lib/guard/jruby-rspec/runner.rb
   - lib/guard/jruby-rspec/version.rb
+  - lib/guard/jruby-rspec/formatters/notification_rspec.rb
   - lib/guard/jruby-rspec/templates/Guardfile
   - LICENSE
   - README.md