autowatchr 0.1.4 → 0.1.5

data/README.rdoc

@@ -11,16 +11,18 @@ Provides some autotest-like behavior for watchr (http://github.com/mynyml/watchr
 * Auto-watches test and lib files using the autotest layout
 * Optionally run only failing-tests
 * Optionally run entire suite after all tests pass
+* Traps INT signal (Control-C) and re-runs all tests.
 
 == Todo
 
 * Cucumber support
 * Expose algorithm to map test classes to test files
-* Add INT signal trapping
 
 == Example use
 
-test.watchr
+Create a <tt>.watchr</tt> file for your project and simply declare an Autowatchr block within it:
+
+  # test/test.watchr
   require 'autowatchr'
 
   Autowatchr.new(self) do |config|
@@ -29,6 +31,9 @@ test.watchr
     config.test_dir = 'leet_test'
   end
 
+Your tests can then be run with:
+    $ watchr test/test.watchr
+    
 === Configuration options
 * command
   * An ERB template for the command
@@ -53,8 +58,11 @@ test.watchr
   * The regexp to use for discovering library files
   * Default: <tt>'^%s.*/.*\.rb$' % self.lib_dir</tt>
 * test_re
-  * The regexp to use for discovering library files
+  * The regexp to use for discovering test files
   * Default: <tt>'^%s.*/test_.*\.rb$' % self.test_dir</tt>
+* test_file
+  * The filename pattern for correlating test files with lib files.  The %s will be substituted for the basename of the lib file.
+  * Default: <tt>'test_%s.rb'</tt>
 * failing_only
   * Run only failing tests the next time a test file is run
   * Default: <tt>true</tt>
@@ -64,8 +72,32 @@ test.watchr
 
 All of the config options are optional.  You can also pass in a hash instead of a block. Also see: test.watchr[http://github.com/viking/autowatchr/blob/master/test.watchr].
 
+== Using with RSpec
+
+Autowatchr can easily be configured to work with the standard RSpec file hierarchy:
+
+    # spec/spec.watchr
+    require 'autowatchr'
+    
+    Autowatchr.new(self) do |config|
+      config.test_dir = 'spec'
+      config.test_re = "^#{config.test_dir}/(.*)_spec\.rb$"
+      config.test_file = '%s_spec.rb'
+    end
+
+Be sure you have <tt>spec_helper.rb</tt> required in every spec file, or else put it in your <tt>.watchr</tt> file.
+
+== Prettier Results
+
+Autowatchr is compatible with the Watchr redgreen gem.  Install 'mynyml-redgreen' and simply require it in your <tt>.watchr</tt> file.
+
 == Copyright
 
 Copyright (c) 2009 Jeremy Stephens. See LICENSE for details.
 
 Many snippets were taken from ZenTest[http://github.com/seattlerb/ZenTest].
+
+== Contributors
+
+* Stephen Eley (SFEley)
+* Adam Grant (harmon)

data/Rakefile

@@ -24,6 +24,7 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/test_*.rb'
   test.verbose = true
+  test.ruby_opts = %w{-rubygems}
 end
 
 begin

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/autowatchr.rb

@@ -1,10 +1,11 @@
 require 'erb'
+require 'stringio'
 
 class Autowatchr
   class Config
     attr_writer :command, :ruby, :include, :require, :lib_dir, :test_dir,
-      :lib_re, :test_re, :failed_results_re, :completed_re, :failing_only,
-      :run_suite
+      :lib_re, :test_re, :test_file, :failed_results_re, :completed_re, 
+      :failing_only, :run_suite
 
     def initialize(options = {})
       @failing_only = @run_suite = true
@@ -58,6 +59,10 @@ class Autowatchr
     def test_re
       @test_re ||= '^%s.*/test_.*\.rb$' % self.test_dir
     end
+    
+    def test_file
+      @test_file ||= 'test_%s.rb'
+    end
 
     def failed_results_re
       @failed_results_re ||= /^\s+\d+\) (?:Failure|Error):\n(.*?)\((.*?)\)/
@@ -94,6 +99,7 @@ class Autowatchr
   end
 
   attr_reader :config
+  attr_accessor :interrupt_received
 
   def initialize(script, options = {})
     @config = Config.new(options)
@@ -105,12 +111,31 @@ class Autowatchr
     discover_files
     run_all_tests
     start_watching_files
+    start_sigint_handler
+  end
+
+  # Traps any INT signals (like Control-C) and re-runs all
+  # the tests, unless the user sends the INT signal again within
+  # 2 seconds.
+  def start_sigint_handler
+    Signal.trap 'INT' do
+      if self.interrupt_received
+        exit 0
+      else
+        self.interrupt_received = true
+        puts "\nInterrupt a second time to quit"
+        Kernel.sleep 2
+        self.interrupt_received = false
+        puts "Running all tests..."
+        run_all_tests
+      end
+    end
   end
 
   def run_lib_file(file)
     md = file.match(%r{^#{@config.lib_dir}#{File::SEPARATOR}?(.+)$})
     parts = md[1].split(File::SEPARATOR)
-    parts[-1] = "test_#{parts[-1]}"
+    parts[-1] = config.test_file % File.basename(parts[-1],'.rb')
     file = "#{@config.test_dir}/" + File.join(parts)
     run_test_file(file)
   end
@@ -214,4 +239,5 @@ class Autowatchr
         tr("-", "_").
         downcase
     end
+    
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: autowatchr
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jeremy Stephens
@@ -9,29 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -05:00
+date: 2011-02-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: watchr
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: Provides some autotest-like behavior for watchr (http://github.com/mynyml/watchr).
 email: viking415@gmail.com
 executables: []
@@ -43,7 +54,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -70,34 +80,38 @@ homepage: http://github.com/viking/autowatchr
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Provides some autotest-like behavior for watchr
 test_files: 
-- test/fixtures/test/test_foo.rb
-- test/fixtures/test/test_bar.rb
-- test/fixtures/test/helper.rb
 - test/fixtures/lib/bar.rb
 - test/fixtures/lib/foo.rb
-- test/test_autowatchr.rb
+- test/fixtures/test/helper.rb
+- test/fixtures/test/test_bar.rb
+- test/fixtures/test/test_foo.rb
 - test/helper.rb
+- test/test_autowatchr.rb

data/.gitignore

@@ -1,5 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg