jbarnette-lather 1.2.0 → 1.2.1

data/README.markdown

@@ -71,12 +71,12 @@ optional. See Lather's `Rakefile` for a working example.
 
 ## Hacking
 
-`rake lather` will watch `lib` and `test` and re-run the tests when
+`rake test:lather` will watch `lib` and `test` and re-run the tests when
 something changes. If you're looking for something to work on, chew on
 these:
 
   * A way to get at the list of changed files in a `-r` command and
-    the Rake task.
+    the Rake tasks.
 
   * Some default exclude (like backup/editor files, `.svn`, `.git`)
   patterns, and an easy way to add new ones.

data/lib/lather/version.rb

@@ -1,3 +1,3 @@
 module Lather
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/rake/lathertesttask.rb

@@ -63,10 +63,25 @@ module Rake
       yield self if block_given?
 
       desc "Run the tests"
-      task(:test) { testify FileList[@tests] }
+      task :test, [:tests] do |task, args|
 
-      namespace :test do
+        tests = if args.tests.nil? || args.tests.empty?
+                  FileList[@tests]
+                else
+                  args.tests
+                end
+
+        cmd = @flags.dup
+        cmd << "-I#{@libs.join(':')}"
+        cmd << "-e 'ARGV.each { |f| load f }'"
 
+        cmd.concat tests.collect { |f| "'#{f}'" }.sort_by { rand }
+        cmd.concat @extras
+
+        RakeFileUtils.verbose(@verbose) { ruby cmd.join(" ") }
+      end
+
+      namespace :test do
         desc "Test, rinse, repeat"
         task :lather do
           watcher = Lather::Watcher.new @files, @tests, @options do |changed|
@@ -80,10 +95,18 @@ module Rake
             tests.concat all_tests.
               select { |t| basenames.any? { |b| t =~ /#{b}/ } }
 
+            task = Rake::Task[:test]
+
             begin
-              testify tests.empty? ? all_tests : tests.uniq
+              task.invoke tests.uniq
             rescue StandardError => e
               raise e unless e.to_s =~ /^Command failed/
+            ensure
+
+              # FIXME: walk the whole tree
+
+              task.reenable
+              task.prerequisites.each { |p| Rake::Task[p].reenable }
             end
           end
 
@@ -91,18 +114,5 @@ module Rake
         end
       end
     end
-
-    private
-
-    def testify tests
-      cmd = @flags.dup
-      cmd << "-I#{@libs.join(':')}"
-      cmd << "-e 'ARGV.each { |f| load f }'"
-      
-      cmd.concat tests.collect { |f| "'#{f}'" }.sort_by { rand }
-      cmd.concat @extras
-
-      RakeFileUtils.verbose(@verbose) { ruby cmd.join(" ") }
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jbarnette-lather
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - John Barnette