jbarnette-lather 1.1.0 → 1.2.0

data/README.markdown

@@ -20,7 +20,6 @@ You can also run a command every time something changes:
 
 ## From Code
 
-    require "rubygems"
     require "lather"
     
     watcher = Lather::Watcher.new "**/*.rb" do |changed|
@@ -39,12 +38,32 @@ If you want to mess with the polling interval:
     require "rake/lathertask"
 
     Rake::LatherTask.new "lib/**/*.rb" do |task|
-      task.target = :test # the default
+      task.target = :test # default
       task.globs << "test/**/*_test.rb"
     end
 
-This will call the `target` task any time the `globs` change. The
-block is optional.
+This creates a `lather` task, which will call the `target` task any
+time the `globs` change. The block is optional.
+
+You can also use Lather's replacement for Rake's `TestTask` for even
+nicer integration:
+
+    require "rake/lathertesttask"
+
+    Rake::LatherTestTask.new do |test|
+
+      # These are the defaults, you don't need to specify 'em.
+
+      test.files   = %w(lib/**/*.rb)
+      test.flags   = %w(-w)
+      test.libs    = %w(lib test)
+      test.options = { :force => true }
+      test.tests   = %w(test/**/*_test.rb)
+      test.verbose = false
+    end
+
+This creates `test` and `test:lather` tasks. The block is
+optional. See Lather's `Rakefile` for a working example.
 
 ## Installing
 
@@ -56,10 +75,8 @@ block is optional.
 something changes. If you're looking for something to work on, chew on
 these:
 
-  * A `:force => true` option for `Lather::Watcher` so it'll call the
-  change proc with all matched files when it first starts.
-  
-  * A way to get at the list of changed files in a `-r` command.
+  * A way to get at the list of changed files in a `-r` command and
+    the Rake task.
 
   * Some default exclude (like backup/editor files, `.svn`, `.git`)
   patterns, and an easy way to add new ones.
@@ -71,7 +88,7 @@ these:
 
 Lather owes a huge debt to Ryan Davis' ZenTest library, specifically
 `autotest`. Use it. It'll change your life. See also Mike Clark and
-Geoff Grossenbach's `rstakeout`.
+Geoffrey Grosenbach's `rstakeout`.
 
 ## License
 

data/Rakefile

@@ -1,9 +1,8 @@
-require "rubygems"
 require "rubygems/specification"
 require "rake/testtask"
 
 require "./lib/lather"
-require "./lib/rake/lathertask"
+require "./lib/rake/lathertesttask"
 
 namespace :gem do
   LATHER = Gem::Specification.new do |s|
@@ -39,13 +38,8 @@ namespace :gem do
   end
 end
 
-Rake::TestTask.new do |test|
-  test.libs << "test"
-  test.ruby_opts << "-rhelper"
-  test.test_files = FileList["test/**/*_test.rb"]
-  test.verbose = false
+Rake::LatherTestTask.new do |test|
+  test.flags << "-rhelper"
 end
 
 task :default => :test
-
-Rake::LatherTask.new "{lib,test}/**/*.rb"

data/lib/lather/version.rb

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

data/lib/lather/watcher.rb

@@ -1,12 +1,13 @@
 module Lather
   class Watcher
     attr_reader :files
+    attr_reader :options
 
     def initialize *globs, &callback
       raise ArgumentError, "need a callback" unless block_given?
       @callback = callback
 
-      @options = { :sleep => 1 }
+      @options = { :force => false, :sleep => 1 }
       @options.merge!(globs.pop) if globs.last.is_a? Hash
 
       @globs = globs.flatten
@@ -16,6 +17,8 @@ module Lather
     def go!
       @timestamp = Time.now
 
+      @callback[@files.keys] if @options[:force]
+
       loop do
         unless (changed = update_files_and_timestamp).empty?
           @callback[changed]

data/lib/rake/lathertask.rb

@@ -3,8 +3,19 @@ require "rake/tasklib"
 require "lather/watcher"
 
 module Rake
+
+  # Runs the <tt>target</tt> task any time a file matching one of the
+  # <tt>globs</tt> changes.
+
   class LatherTask < TaskLib
-    attr_accessor :globs, :target
+
+    # An array of globs to watch.
+
+    attr_accessor :globs
+
+    # The task to run when things change. Default is <tt>:test</tt>.
+
+    attr_accessor :target
 
     def initialize *globs, &block
       @target = :test

data/lib/rake/lathertesttask.rb

@@ -0,0 +1,108 @@
+require "rake"
+require "rake/tasklib"
+require "lather/watcher"
+
+module Rake
+
+  # A simplified version of <tt>Rake::TestTask</tt> with support for
+  # Lather. It creates <tt>test</tt> and <tt>test:lather</tt>
+  # tasks. It's more opinionated and less configurable than
+  # <tt>Rake::TestTask</tt>: Test file load order is random.
+  #
+  # When lathering, a very stupid heuristic is used to decide which
+  # test files to run: Any test file whose path contains the basename
+  # (without extension) of the file that changed. If no test files
+  # match, everything gets run. No tracking of failures, no specific
+  # tests. If you want more than this, you should be using Autotest.
+
+  class LatherTestTask < TaskLib
+
+    # An optional array of stuff to tack on to the end of the Ruby
+    # command-line. Default is <tt>[]</tt>.
+
+    attr_accessor :extras
+
+    # An array of glob patterns to match implementation files. Default
+    # is <tt>%w(lib/**/*.rb)</tt>.
+
+    attr_accessor :files
+
+    # An array of command-line flags to pass on to Ruby. Default is
+    # <tt>%w(-w)</tt>.
+
+    attr_accessor :flags
+
+    # An array of directories to add to the load path. Default is
+    # <tt>%w(lib test)</tt>.
+
+    attr_accessor :libs
+
+    # A hash of options to pass on to <tt>Lather::Watcher.new</tt>.
+    # Default is <tt>{ :force => true }</tt>.
+
+    attr_accessor :options
+
+    # An array of glob patterns to match test files. Default is
+    # <tt>%w(test/**/*_test.rb)</tt>.
+
+    attr_accessor :tests
+
+    # Be chatty? Default is <tt>false</tt>.
+
+    attr_accessor :verbose
+
+    def initialize
+      @extras  = []
+      @files   = %w(lib/**/*.rb)
+      @flags   = %w(-w)
+      @libs    = %w(lib test)
+      @options = { :force => true }
+      @tests   = %w(test/**/*_test.rb)
+      @verbose = false
+
+      yield self if block_given?
+
+      desc "Run the tests"
+      task(:test) { testify FileList[@tests] }
+
+      namespace :test do
+
+        desc "Test, rinse, repeat"
+        task :lather do
+          watcher = Lather::Watcher.new @files, @tests, @options do |changed|
+            all_tests = FileList[@tests]
+            tests = all_tests & changed
+
+            basenames = (changed - tests).collect do |f|
+              File.basename(f).split(".").first
+            end
+            
+            tests.concat all_tests.
+              select { |t| basenames.any? { |b| t =~ /#{b}/ } }
+
+            begin
+              testify tests.empty? ? all_tests : tests.uniq
+            rescue StandardError => e
+              raise e unless e.to_s =~ /^Command failed/
+            end
+          end
+
+          watcher.go!
+        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

data/test/lather/cli_test.rb

@@ -15,7 +15,7 @@ module Lather
 
     def test_empty_invocation_prints_help
       out, err = parse!
-      assert_match /Shows help/, out
+      assert_match(/Shows help/, out)
     end
 
     def test_V_option_prints_version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jbarnette-lather
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - John Barnette
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 00:00:00 -08:00
+date: 2009-02-06 00:00:00 -08:00
 default_executable: lather
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - lib/lather.rb
 - lib/rake
 - lib/rake/lathertask.rb
+- lib/rake/lathertesttask.rb
 - test/helper.rb
 - test/lather
 - test/lather/cli_test.rb