guard-jruby-rspec 0.1.8 → 0.2.0

data/lib/guard/jruby-rspec.rb

@@ -1,6 +1,7 @@
 require 'guard'
 require 'guard/guard'
 require 'guard/rspec'
+require 'guard/jruby-rspec/reloaders'
 
 module Guard
   class JRubyRSpec < ::Guard::RSpec
@@ -15,7 +16,8 @@ module Guard
         :spec_paths       => ["spec"],        
         :spec_file_suffix => "_spec.rb",
         :run_all          => {},
-        :monitor_file     => ".guard-jruby-rspec"
+        :monitor_file     => ".guard-jruby-rspec",
+        :custom_reloaders => []
       }.merge(options)
       @last_failed  = false
       @failed_paths = []
@@ -41,7 +43,7 @@ module Guard
 
       @inspector = Inspector.new(@options)
       @runner = Runner.new(@options)
-
+      @reloaders = set_up_reloaders(@options)
     end
 
     # Call once when guard starts
@@ -50,8 +52,14 @@ module Guard
       run_all if @options[:all_on_start]
     end
 
+    def run_all
+      unload_previous_examples
+      super
+    end
+
     def run_on_changes(raw_paths)
-      reload_paths(raw_paths)
+      unload_previous_examples
+      @reloaders.reload(raw_paths)
 
       unless @custom_watchers.nil? or @custom_watchers.empty?
         paths = []
@@ -69,6 +77,13 @@ module Guard
     # Guard 1.1 renamed run_on_change to run_on_changes
     alias_method :run_on_change, :run_on_changes
 
+    def reload_rails(*)
+      if defined? ::ActionDispatch::Reloader
+        ActionDispatch::Reloader.cleanup!
+        ActionDispatch::Reloader.prepare!
+      end
+    end
+
     def reload_paths(paths)
       paths.reject {|p| p.end_with?(@options[:spec_file_suffix])}.each do |p| 
         if File.exists?(p) 
@@ -85,18 +100,30 @@ module Guard
             # end
           else
             # reload the file
-            begin
+            Containment.new.protect do
               load p
-            rescue
-              UI.error $!.message
-              UI.error $!.backtrace.join "\n"
-              throw :task_has_failed
             end
           end
         end
       end
     end
 
+    private
+
+    def set_up_reloaders(options)
+      reloaders = Reloaders.new
+      reloader_methods = [:reload_rails, :reload_paths]
+      reloader_procs = reloader_methods.map { |name| method(name) }
+      reloader_procs += options[:custom_reloaders]
+      reloader_procs.each { |reloader| reloaders.register &reloader }
+
+      reloaders
+    end
+
+    def unload_previous_examples
+      ::RSpec.configuration.reset
+      ::RSpec.world.reset
+    end
   end
 end
 

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

@@ -0,0 +1,25 @@
+module Guard
+  class JRubyRSpec
+    class Containment
+      def initialize(options = {})
+        @error_handler = options.fetch(:error_handler, method(:output_as_guard_error))
+      end
+
+      def protect
+        yield
+      rescue Exception => e
+        error_handler.call e
+        throw :task_has_failed
+      end
+
+      private
+
+      attr_reader :error_handler
+
+      def output_as_guard_error(exception)
+        UI.error $!.message
+        UI.error $!.backtrace.join "\n"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+class Reloaders
+  def initialize
+    @reloaders = []
+  end
+
+  # Add a reloader to be called on reload
+  def register(options = {}, &block)
+    if options[:prepend]
+      @reloaders.unshift block
+    else
+      @reloaders << block
+    end
+  end
+
+  def reload(paths = [])
+    @reloaders.each do |reloader|
+      reloader.call(paths)
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'guard/jruby-rspec/containment'
 require 'guard/jruby-rspec/formatters/notification_rspec'
 
 module Guard
@@ -44,13 +45,10 @@ module Guard
           # end
         else
           orig_configuration = ::RSpec.configuration
-          begin
+          Containment.new.protect do
             ::RSpec::Core::Runner.run(rspec_arguments(paths, @options))
-          rescue SyntaxError => e
-            UI.error e.message
-          ensure
-            ::RSpec.instance_variable_set(:@configuration, orig_configuration)
           end
+          ::RSpec.instance_variable_set(:@configuration, orig_configuration)
         end
       end
 
@@ -83,7 +81,6 @@ module Guard
       def formatter_regex
         @formatter_regex ||= /(?:^|\s)(?:-f\s*|--format(?:=|\s+))([\w:]+)/
       end
-
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Guard
   module JRubyRSpecVersion
-    VERSION = "0.1.8"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jruby-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -68,7 +68,9 @@ extra_rdoc_files: []
 files:
 - lib/guard-jruby-rspec.rb
 - lib/guard/jruby-rspec.rb
+- lib/guard/jruby-rspec/containment.rb
 - lib/guard/jruby-rspec/inspector.rb
+- lib/guard/jruby-rspec/reloaders.rb
 - lib/guard/jruby-rspec/runner.rb
 - lib/guard/jruby-rspec/version.rb
 - lib/guard/jruby-rspec/formatters/notification_rspec.rb