karl-loris 0.0.7 → 0.0.9

data/.gitignore

@@ -1 +1,2 @@
+.gitignore
 .DS_Store

data/README.rdoc

@@ -1 +1,9 @@
-Work in progress...
+== Autotest for Javascript ==
+
+Run your javascript unit tests any time a file in your project changes.
+
+Runs Javascript Lint (if jsl.conf is found)
+Runs JSpec (if spec/spec.rhino.js is found)
+Runs JS Test Driver (if jsTestDriver.conf is found)
+
+Also runs RSpec (if any file ending in _spec.rb is found in the spec directory)

data/Rakefile

@@ -1,21 +1,40 @@
 require 'rubygems'
 require 'rake'
+require 'spec/rake/spectask'
+require 'cucumber'
+require 'cucumber/rake/task'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "loris"
-    gem.summary = %Q{TODO: Automatically run javascript tests}
-    gem.description = %Q{TODO: Automatically run javascript tests}
+    gem.summary = 'Automatically run javascript unit tests'
+    gem.description = 'Automatically run javascript unit tests'
     gem.email = "loris@monket.net"
     gem.homepage = "http://github.com/karl/loris"
     gem.authors = ["Karl O'Keeffe"]
 
-    gem.add_dependency(%q<visionmedia-bind>, [">= 0.2.6"])
-    gem.add_dependency(%q<karl-growl>, [">= 1.0.3"])
+    gem.add_dependency('visionmedia-bind', [">= 0.2.6"])
+    gem.add_dependency('karl-growl', [">= 1.0.3"])
+    gem.add_dependency('extensions', [">= 0.6.0"])
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+end
+
+
+task :default => [:spec, :features]
+
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_files = Dir.glob('spec/**/*_spec.rb')
+  # t.rcov = true
+end
+
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "features --format pretty"
+end
+
+
+

data/TODO

@@ -1,3 +1,4 @@
+* Remove JsTestDriver.jar from lib dir
 * Tidy Windows related if statements
 * Tidy JSL filename removing
 
@@ -16,6 +17,5 @@
 * separate thread (create new and kill old)
 * listen for interrupt
 * detect file deletion
-* rspec task
 * cucumber task
 * Tidy growl windows code

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.9

data/examples/self_test/jsl.conf

@@ -0,0 +1 @@
++process tmp/*.js

data/features/javascript_lint.feature

@@ -0,0 +1,34 @@
+Feature Javascript Lint
+
+	Scenario: Javascript Lint is run
+		Given I run loris --debug
+		When I create a file named "example.js" with:
+"""
+var foo = function() {
+	x = 'moo'
+}
+"""
+		And I wait until loris has finished processing changes
+		Then the Loris output should contain:
+"""
+Javascript Lint
+warning
+"""
+		And I should not see any errors
+
+# 	Scenario: Javascript Lint is run when Loris starts
+# 		When I create a file named "example.js" with:
+# """
+# var foo = function() {
+# 	x = 'moo'
+# }
+# """
+# 		Given I run loris --debug
+# 		And I wait until loris has finished processing changes
+# 		Then the Loris output should contain:
+# """
+# Javascript Lint
+# warning
+# """
+# 		And I should not see any errors
+# 

data/features/run.feature

@@ -33,5 +33,4 @@ Feature: Run Loris
 		When I create a directory named "dir"
 		And I wait until loris has finished processing changes
 		Then I should NOT see "dir" in the Loris output
-		And I should not see any errors
-		
+		And I should not see any errors

data/features/step_definitons/all.rb

@@ -52,6 +52,14 @@ Then /^I should see "([^\"]*)" in the Loris output$/ do |text|
   get_background_output.should include text
 end
 
+Then /^the Loris output should contain:$/ do |text|
+  get_background_output.should include text
+end
+
+Then /^the Loris output should NOT contain:$/ do |text|
+  get_background_output.should_not include text
+end
+
 Then /^I should NOT see "([^\"]*)" in the Loris output$/ do |text|
   get_background_output.should_not include text
 end

data/lib/filters/ends_with_filter.rb

@@ -0,0 +1,17 @@
+require 'rubygems'
+require 'extensions/string'
+
+class EndsWithFilter
+  
+  def initialize(text)
+    @text = text.downcase
+  end
+  
+  def filter(file_name)
+    return file_name.downcase.ends_with? @text
+  end
+  
+  def complete()
+  end
+  
+end

data/lib/loris.rb

@@ -13,10 +13,12 @@ require 'poller'
 require 'sleep_waiter'
 require 'always_continuer'
 require 'file_actioner'
-require 'modified_filter'
-require 'file_filter'
 require 'task_manager'
-require 'extension_filter'
+
+require 'filters/extension_filter'
+require 'filters/modified_filter'
+require 'filters/file_filter'
+require 'filters/ends_with_filter'
 
 require 'outputs/output_collection'
 require 'outputs/shell_output'
@@ -25,12 +27,14 @@ require 'outputs/unix_console_clearing_output'
 require 'outputs/growl_output'
 
 require 'tasks/list_task'
-require 'tasks/jspec_task'
-require 'tasks/jspec_runner'
-require 'tasks/javascript_lint_task'
-require 'tasks/javascript_lint_runner'
-require 'tasks/js_test_driver_task'
-require 'tasks/js_test_driver_runner'
+require 'tasks/jspec/jspec_task'
+require 'tasks/jspec/jspec_runner'
+require 'tasks/javascript_lint/javascript_lint_task'
+require 'tasks/javascript_lint/javascript_lint_runner'
+require 'tasks/js_test_driver/js_test_driver_task'
+require 'tasks/js_test_driver/js_test_driver_runner'
+require 'tasks/rspec/rspec_task'
+require 'tasks/rspec/rspec_runner'
 
 
 include Config
@@ -87,14 +91,15 @@ module Loris
 
           oc = OutputCollection.new()
           oc.add(ShellOutput.new($stdout))
-          oc.add(cco)
+          oc.add(cco) unless debug
           oc.add(GrowlOutput.new(Growl)) unless debug       
           
           tm = TaskManager.new(oc)
           tm.add(ListTask.new()) if debug
-          tm.add(JavascriptLintTask.new(JavascriptLintRunner.new(dir), dir))
-          tm.add(JSpecTask.new(JSpecRunner.new(dir)))
-          tm.add(JsTestDriverTask.new(JsTestDriverRunner.new(dir, jstd_jar)))
+          tm.add(JavascriptLintTask.new(JavascriptLintRunner.new(dir, ExtensionFilter.new(File, 'js')), dir))
+          tm.add(JSpecTask.new(JSpecRunner.new(dir, ExtensionFilter.new(File, 'js'))))
+          tm.add(JsTestDriverTask.new(JsTestDriverRunner.new(dir, jstd_jar, ExtensionFilter.new(File, 'js'))))
+          tm.add(RSpecTask.new(RSpecRunner.new(dir, ExtensionFilter.new(File, 'rb'), EndsWithFilter.new('_spec.rb'))))
 
           a = FileActioner.new(ff, tm)    
           
@@ -102,6 +107,7 @@ module Loris
                 
           p = Poller.new(w, c, debug ? da : a)
           
+          # Start!
           p.start()
 
         end

data/lib/tasks/javascript_lint/javascript_lint_runner.rb

@@ -0,0 +1,21 @@
+class JavascriptLintRunner
+  
+  def initialize(dir, filter)
+    @config = dir + '/jsl.conf'
+    @dir = dir
+    @filter = filter
+  end
+  
+  def execute()
+    return `jsl -conf "#{@config}" -nologo -nofilelisting 2>&1`
+  end
+  
+  def is_configured?(all_files)
+    return all_files.include?(@config)
+  end
+  
+  def should_run?(modified_files)
+    return !(modified_files.detect { |file| @filter.filter(file) }).nil? || modified_files.include?(@config)
+  end
+  
+end

data/lib/tasks/{javascript_lint_task.rb → javascript_lint/javascript_lint_task.rb}

@@ -3,30 +3,31 @@ class JavascriptLintTask
   def initialize(javascript_lint, dir)
     @javascript_lint = javascript_lint
     @dir = dir
-
+ 
     # TODO: Tidy!
     if (RUBY_PLATFORM =~ /mswin32/)
       @dir = @dir.gsub('/', '\\')
     end
-
+ 
   end
   
   def run(files)
     all_files = files[:all]
-    mofified_files = files[:filtered]
+    modified_files = files[:filtered]
     
-    return nil if (!@javascript_lint.is_configured? all_files) 
-
+    return nil if (!@javascript_lint.is_configured? all_files)
+    return nil if (!@javascript_lint.should_run? modified_files)
+ 
     detail = @javascript_lint.execute()
     
     state, summary, first = parse_result(detail)
-
+ 
     # TODO: Tidy!
     # Move to function/class w/ win32 related code
     if (first[0, @dir.length] == @dir)
       first = first[(@dir.length + 1)..-1]
     end
-
+ 
     return {
         :state => state,
         :title => 'Javascript Lint',
@@ -51,7 +52,7 @@ class JavascriptLintTask
       error_info = detail.grep(/\([0-9]+\):([^:]*)Error:/)[0].strip
       return :failure, num_failures + ' Errors', error_info
     end
-
+ 
     if summary_line =~ /([1-9]+)\d*\s+warning/
       num_failures = $1
       error_info = detail.grep(/\([0-9]+\)/)[0].strip

data/lib/tasks/js_test_driver/js_test_driver_runner.rb

@@ -0,0 +1,22 @@
+class JsTestDriverRunner
+    
+  def initialize(dir, jar, filter)
+    @config = dir + '/jsTestDriver.conf'
+    @dir = dir
+    @jar = jar
+    @filter = filter
+  end
+  
+  def execute()
+    return `java -jar "#{@jar}" --config "#{@config}" --tests all --verbose 2>&1`
+  end
+  
+  def is_configured?(all_files)
+    return all_files.include?(@dir + '/jsTestDriver.conf')
+  end
+  
+  def should_run?(modified_files)
+    return !(modified_files.detect { |file| @filter.filter(file)  }).nil? || modified_files.include?(@config)
+  end
+  
+end

data/lib/tasks/{js_test_driver_task.rb → js_test_driver/js_test_driver_task.rb}

@@ -6,9 +6,10 @@ class JsTestDriverTask
   
   def run(files)
     all_files = files[:all]
-    mofified_files = files[:filtered]
+    modified_files = files[:filtered]
     
     return nil if (!@js_test_driver.is_configured? all_files) 
+    return nil if (!@js_test_driver.should_run? modified_files)
 
     detail = @js_test_driver.execute()
     

data/lib/tasks/jspec/jspec_runner.rb

@@ -0,0 +1,21 @@
+class JSpecRunner
+
+  def initialize(dir, filter)
+    @config = dir + '/spec/spec.rhino.js'
+    @dir = dir
+    @filter = filter
+  end
+  
+  def execute
+    return `jspec run --rhino --trace 2>&1`
+  end
+  
+  def is_configured?(all_files)
+    return all_files.include?(@config)
+  end
+  
+  def should_run?(modified_files)
+    return !(modified_files.detect { |file| @filter.filter(file) }).nil?
+  end
+  
+end

data/lib/tasks/{jspec_task.rb → jspec/jspec_task.rb}

@@ -6,9 +6,10 @@ class JSpecTask
   
   def run(files)
     all_files = files[:all]
-    mofified_files = files[:filtered]
+    modified_files = files[:filtered]
     
     return nil if (!@jspec.is_configured? all_files) 
+    return nil if (!@jspec.should_run? modified_files)
 
     detail = @jspec.execute
 

data/lib/tasks/rspec/rspec_runner.rb

@@ -0,0 +1,21 @@
+class RSpecRunner
+    
+  def initialize(dir, ruby_filter, spec_filter)
+    @dir = dir
+    @ruby_filter = ruby_filter
+    @spec_filter = spec_filter
+  end
+  
+  def execute()
+    return `spec . 2>&1`
+  end
+  
+  def is_configured?(all_files)
+    return !(all_files.detect { |file| @spec_filter.filter(file) }).nil?
+  end
+  
+  def should_run?(modified_files)
+    return !(modified_files.detect { |file| @ruby_filter.filter(file) }).nil?
+  end
+  
+end

data/lib/tasks/rspec/rspec_task.rb

@@ -0,0 +1,50 @@
+class RSpecTask
+ 
+  def initialize(rspec)
+    @rspec = rspec
+  end
+  
+  def run(files)
+    all_files = files[:all]
+    modified_files = files[:filtered]
+    
+    return nil if (!@rspec.is_configured? all_files) 
+    return nil if (!@rspec.should_run? modified_files)
+
+    detail = @rspec.execute()
+    
+    state, summary, first = parse_result(detail)
+
+    return {
+        :state => state,
+        :title => 'RSpec',
+        :summary => summary,
+        :first => first,
+        :detail => detail
+      }
+  end
+  
+  # Move to parse class
+  def parse_result(detail)
+    summary_line = detail.grep( /\d+ examples?, \d+ failures?/ )[0]
+    
+    if summary_line.nil?
+      # error
+      error_info = (detail + "\nUnknown Error!").to_a[0].strip
+      return :error, 'Error', error_info
+    end
+    
+    if summary_line =~ /([1-9]+) failures?/
+      num_errors = $1
+      
+      items = detail.split("\n\n")
+      
+      error_info = items[1].split("\n")[1]
+      return :failure, num_errors + ' Errors', error_info
+    end
+
+    return :success, 'All specs pass', ''
+    
+  end
+  
+end