autowatchr 0.1.3 → 0.1.4

data/README.rdoc

@@ -16,6 +16,7 @@ Provides some autotest-like behavior for watchr (http://github.com/mynyml/watchr
 
 * Cucumber support
 * Expose algorithm to map test classes to test files
+* Add INT signal trapping
 
 == Example use
 
@@ -31,13 +32,17 @@ test.watchr
 === Configuration options
 * command
   * An ERB template for the command
-  * Default: <tt>"<%= ruby %> -I<%= include %> <%= predicate %>"</tt>
+  * Default: <tt>"<%= ruby %> -I<%= include %> <% list_of_requires.each { |lib| %>-r<%= lib %> <% } %><%= predicate %>"</tt>
 * ruby
   * The ruby executable to use
   * Default: <tt>"ruby"</tt>
 * include
   * Paths to include (with -I)
   * Default: <tt>".:#{self.lib_dir}:#{self.test_dir}"</tt>
+* require
+  * Libraries to include (with -r)
+  * Can either be a string or an array (Ex: <tt>config.require = %w{rubygems active_support}</tt>)
+  * Default: <tt>nil</tt>
 * lib_dir
   * The lib path, where your library lives
   * Default: <tt>"lib"</tt>

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/autowatchr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autowatchr}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Stephens"]
-  s.date = %q{2009-10-14}
+  s.date = %q{2009-10-28}
   s.description = %q{Provides some autotest-like behavior for watchr (http://github.com/mynyml/watchr).}
   s.email = %q{viking415@gmail.com}
   s.extra_rdoc_files = [

data/lib/autowatchr.rb

@@ -2,8 +2,9 @@ require 'erb'
 
 class Autowatchr
   class Config
-    attr_writer :command, :ruby, :include, :lib_dir, :test_dir, :lib_re,
-      :test_re, :failed_results_re, :completed_re, :failing_only, :run_suite
+    attr_writer :command, :ruby, :include, :require, :lib_dir, :test_dir,
+      :lib_re, :test_re, :failed_results_re, :completed_re, :failing_only,
+      :run_suite
 
     def initialize(options = {})
       @failing_only = @run_suite = true
@@ -17,7 +18,7 @@ class Autowatchr
     end
 
     def command
-      @command ||= "<%= ruby %> -I<%= include %> <%= predicate %>"
+      @command ||= "<%= ruby %> -I<%= include %> <% list_of_requires.each { |lib| %>-r<%= lib %> <% } %><%= predicate %>"
     end
 
     def ruby
@@ -28,6 +29,20 @@ class Autowatchr
       @include ||= ".:#{self.lib_dir}:#{self.test_dir}"
     end
 
+    def require
+      @require
+    end
+
+    def list_of_requires
+      if @require.nil? || @require.empty?
+        []
+      elsif @require.is_a?(Array)
+        @require
+      else
+        [@require]
+      end
+    end
+
     def lib_dir
       @lib_dir ||= "lib"
     end

data/test/helper.rb

@@ -1,8 +1,6 @@
-require 'rubygems'
 require 'test/unit'
 require 'mocha'
 require 'pp'
-require 'ruby-debug'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_autowatchr.rb

@@ -63,6 +63,7 @@ class TestAutowatchr < Test::Unit::TestCase
     end
     assert_equal "ruby", aw.config.ruby
     assert_equal ".:lib:test", aw.config.include
+    assert_equal nil, aw.config.require
     assert_equal "lib", aw.config.lib_dir
     assert_equal "test", aw.config.test_dir
     assert_equal '^lib.*/.*\.rb$', aw.config.lib_re
@@ -95,6 +96,26 @@ class TestAutowatchr < Test::Unit::TestCase
     end
   end
 
+  def test_run_lib_file_with_require
+    expected_cmd = "/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} -rrubygems #{@test_dir}/test_foo.rb"
+    Autowatchr.any_instance.expects_system_call(expected_cmd, "foo")
+
+    silence_stream(STDOUT) do
+      aw = new_autowatchr(:require => 'rubygems')
+      aw.run_lib_file("#{@lib_dir}/foo.rb")
+    end
+  end
+
+  def test_run_lib_file_with_mulitple_requires
+    expected_cmd = "/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} -rrubygems -rblah #{@test_dir}/test_foo.rb"
+    Autowatchr.any_instance.expects_system_call(expected_cmd, "foo")
+
+    silence_stream(STDOUT) do
+      aw = new_autowatchr(:require => %w{rubygems blah})
+      aw.run_lib_file("#{@lib_dir}/foo.rb")
+    end
+  end
+
   def test_running_multiple_test_files
     expected_cmd = "/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} -e \"%w[#{@test_dir}/test_bar.rb #{@test_dir}/test_foo.rb].each do |f| require f end\""
     Autowatchr.any_instance.expects_system_call(expected_cmd, "all")

data/test.watchr

@@ -2,4 +2,5 @@ require 'lib/autowatchr'
 
 Autowatchr.new(self) do |config|
   config.test_re = "^#{config.test_dir}/test_\\w+.rb"
+  config.require = "rubygems"   if Object.const_defined?(:Gem)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autowatchr
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jeremy Stephens
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 -05:00
+date: 2009-10-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency