keeptesting 0.3.1 → 0.4.0

data/README.md

@@ -42,7 +42,7 @@ INSTALL:
 TODO:
 =====
 
-
+(See todo.org)
 
 
 LICENSE:

data/bin/keeptesting

@@ -4,21 +4,68 @@ require "keeptesting"
 require "optparse"
 require 'fssm'
 
+
+
+def usage
+  <<USAGE
+
+Usage: keeptesting [options] 'FAILURE-MATCHING-REGEX' 'TEST-COMMAND'
+
+Run tests whenever files change in the current directory or subdirectories.
+
+Spits back indication of test success or failure, based on specified regex
+that detects errors/failures in the output of a test run.
+Starts embedded webserver by default, letting you see test feedback in browser
+window. Can also run in the command line.
+
+Note: Be sure to use quotes around params like the examples!
+
+Examples:
+
+keeptesting 'Error|Failure' 'rake test'                       (Run tests whenever anything changes)
+keeptesting -p 'test' -p 'lib' -c 'Error|Failure' 'rake test' (Test on changes in test/ or lib/)
+
+  -c, --command-line-mode       Commandline mode
+  -p, --watched-path            Path to watch for changes 
+  -h, --help                    Display usage
+  -v, --version                 Display version number
+
+USAGE
+end
+
+
+
 def parse_options
   options = {}
-
-  OptionParser.new do |o|
-    o.banner = "Usage: keeptesting [options] -f 'FAILURE-MATCHING-REGEX' -t 'TEST-COMMAND'\n\n"
     
-    o.on("-f F", "--failure-matching-regex", "A regex that matches failing tests") { |f| options[:failure_regex] = f } 
-    o.on("-t T", "--test-command", "Command to start your test(s)") { |t| options[:test_command] = t }
+  ARGV.each do |arg|
+    if arg == "-v" || arg == "--version"
+      puts Keeptesting::VERSION; exit
+    elsif arg == "-h" || arg == "--help"
+      puts usage; exit
+    end
+  end
+
+  if ARGV.size < 2
+    puts usage; exit
+  end
 
-    o.on("-c", "--command-line-mode", "Get test feedback in terminal") { options[:cli_mode] = true}
+  options[:failure_regex] = ARGV[ARGV.size-2]
+  options[:test_command] = ARGV[ARGV.size-1]
+  
+  ARGV.each_with_index do |arg, i|
+    if arg == "-c" || arg == "--command-line-mode"
+      options[:cli_mode] = true
+    end
     
-    o.on("-h", "--help", "Help page") { puts o; exit }
-    o.on("-v", "--version", "Print version number") { |b| puts Keeptesting::VERSION; exit }
+    if arg == "-p" || arg == "--watched-path"
+      options[:watched_paths] ||= []
+      options[:watched_paths] << ARGV[i+1]
+    end
+  end
 
-    o.parse!
+  if !options[:watched_paths]
+    options[:watched_paths] == ["**/*"]
   end
 
   return options
@@ -27,14 +74,8 @@ end
 
 options = parse_options
 
-if !options[:failure_regex] || !options[:test_command]
-  puts "ERROR: missing args!" # TODO do this in optionsparse step above
-end
-
 if options[:cli_mode]
   Keeptesting::CLI::start_test_loop(options)
 else
   Keeptesting::BrowserConsole.new(options)
 end
-
-

data/lib/keeptesting/browser_console.rb

@@ -47,10 +47,14 @@ module Keeptesting
       Thread.new do
         console = self
         console.testrun(options)
-        FSSM.monitor('.', '**/*') do
-          update {|base, relative| console.testrun(options)}
-          delete {|base, relative| console.testrun(options)}
-          create {|base, relative| console.testrun(options)}
+        FSSM.monitor do
+          options[:watched_paths].each do |watched_path|
+            path watched_path do
+              update {|base, relative| console.testrun(options)}
+              delete {|base, relative| console.testrun(options)}
+              create {|base, relative| console.testrun(options)}
+            end
+          end
         end
       end
     end

data/lib/keeptesting/cli.rb

@@ -28,11 +28,16 @@ module Keeptesting
 
     def self.start_test_loop(options)
       Keeptesting::CLI::testrun(options)
-      FSSM.monitor('.', '**/*') do
-        update {|base, relative| Keeptesting::CLI::testrun(options)}
-        delete {|base, relative| Keeptesting::CLI::testrun(options)}
-        create {|base, relative| Keeptesting::CLI::testrun(options)}
+      FSSM.monitor do
+        options[:watched_paths].each do |watched_path|
+          path watched_path do
+            update {|base, relative| Keeptesting::CLI::testrun(options)}
+            delete {|base, relative| Keeptesting::CLI::testrun(options)}
+            create {|base, relative| Keeptesting::CLI::testrun(options)}
+          end
+        end
       end
     end
+    
   end
 end

data/lib/keeptesting/version.rb

@@ -1,3 +1,3 @@
 module Keeptesting
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/test/test_keeptesting.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-
 class CalculatorTest < Test::Unit::TestCase
   context "a calculator" do
     should "add two numbers for the sum" do

data/todo.org

@@ -1,22 +1,17 @@
-* improve web console
-    handle situation where test fails before have a time to get output?
-        raise error out side method def
-        what happens?
-        blank output in web
-    show error when backend is down
-    prettier html output
-    less chatty communication w. server, use websockets?
 * improve overall interface
-    support simplified usage: keeptesting REGEX TEST_CMD
-    set defaults for common test frameworks
-    add options to constrain/exclude filetypes and paths
-    .keeptesting
-        enable dotfile for standard options
-        can just start with keeptesting w/o options
+** .keeptesting
+***  enable dotfile for standard options
+***  can just start with keeptesting w/o options
+* swap out fssm w/ guard/listen
+** fssm is dead!
+* improve web console
+**  show error when backend is down
+**  prettier html output
+**  less chatty communication w. server, use websockets?
 * test that everything works x-platform
 * create proper documentation
-    website
-    great readme page with screencaptures and workflow examples
-    screencast
-    blog post - release announcement
+** website
+** great readme page with screencaptures and workflow examples
+** screencast
+** blog post - release announcement
 * release 1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keeptesting
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: OptionParser
-  requirement: &17845380 !ruby/object:Gem::Requirement
+  requirement: &24000840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17845380
+  version_requirements: *24000840
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &17844900 !ruby/object:Gem::Requirement
+  requirement: &24000300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17844900
+  version_requirements: *24000300
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &17844460 !ruby/object:Gem::Requirement
+  requirement: &23999780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17844460
+  version_requirements: *23999780
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &17844020 !ruby/object:Gem::Requirement
+  requirement: &23999360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17844020
+  version_requirements: *23999360
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &17843600 !ruby/object:Gem::Requirement
+  requirement: &23998820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17843600
+  version_requirements: *23998820
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &17843160 !ruby/object:Gem::Requirement
+  requirement: &23998240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17843160
+  version_requirements: *23998240
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &17842740 !ruby/object:Gem::Requirement
+  requirement: &23997800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17842740
+  version_requirements: *23997800
 description: ! 'Usage: keeptesting [options] TESTCOMMAND'
 email:
 - thomas@kjeldahlnilsson.net