karl-loris 0.0.6 → 0.0.7

data/Rakefile

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'rake'
+
+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.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 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

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/loris.rb

@@ -20,7 +20,8 @@ require 'extension_filter'
 
 require 'outputs/output_collection'
 require 'outputs/shell_output'
-require 'outputs/console_clearing_output' 
+require 'outputs/windows_console_clearing_output' 
+require 'outputs/unix_console_clearing_output' 
 require 'outputs/growl_output'
 
 require 'tasks/list_task'
@@ -28,6 +29,8 @@ 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'
 
 
 include Config
@@ -65,30 +68,33 @@ module Loris
     
       class << self
         def execute(args)
-          puts 'Loris is running!'
-
+          
+          # Get config variables
           debug = args.length > 0
-
+          is_windows = RUBY_PLATFORM =~ /mswin32/
           dir = Dir.pwd
+          sleep_duration = 1
+          jstd_jar = File.join(LIBDIR, 'JsTestDriver-1.0b.jar')
 
-          w = SleepWaiter.new(1)
+          # Create object graph
+          w = SleepWaiter.new(sleep_duration)
           c = AlwaysContinuer.new
           ff = FileFinder.new(Find, dir)
           ff.add_filter(FileFilter.new(File))
           ff.add_filter(ModifiedFilter.new(File))
 
+          cco = is_windows ? WindowsConsoleClearingOutput.new() : UnixConsoleClearingOutput.new()
+
           oc = OutputCollection.new()
           oc.add(ShellOutput.new($stdout))
-          oc.add(ConsoleClearingOutput.new())
-
-          if (!debug)
-            oc.add(GrowlOutput.new(Growl))          
-          end
+          oc.add(cco)
+          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)))
 
           a = FileActioner.new(ff, tm)    
           

data/lib/outputs/unix_console_clearing_output.rb

@@ -0,0 +1,13 @@
+class UnixConsoleClearingOutput
+  
+  def initialize()
+  end
+  
+  def start_run()
+    system 'clear'
+  end
+  
+  def add_result(result)    
+  end
+  
+end

data/lib/outputs/windows_console_clearing_output.rb

@@ -0,0 +1,13 @@
+class WindowsConsoleClearingOutput
+  
+  def initialize()
+  end
+  
+  def start_run()
+    system 'cls'
+  end
+  
+  def add_result(result)    
+  end
+  
+end

data/lib/tasks/javascript_lint_task.rb

@@ -22,6 +22,7 @@ class JavascriptLintTask
     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
@@ -35,24 +36,25 @@ class JavascriptLintTask
       }
   end
   
+  # Move to parse class
   def parse_result(detail)
     summary_line = detail.grep( /\d+\s+error.*,\s+\d+\s+warning.*/ )[0]
     
     if summary_line.nil?
       # error
-      error_info = (detail + "\nUnknown Error!").to_a[0].chomp
+      error_info = (detail + "\nUnknown Error!").to_a[0].strip
       return :error, 'Error', error_info
     end
     
     if summary_line =~ /([1-9]+)\d*\s+error/
       num_failures = $1
-      error_info = detail.grep(/\([0-9]+\):([^:]*)Error:/)[0].chomp
+      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].chomp
+      error_info = detail.grep(/\([0-9]+\)/)[0].strip
       return :warning, num_failures + ' Warnings', error_info
     end
     

data/lib/tasks/js_test_driver_runner.rb

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

data/lib/tasks/js_test_driver_task.rb

@@ -0,0 +1,52 @@
+class JsTestDriverTask
+ 
+  def initialize(js_test_driver)
+    @js_test_driver = js_test_driver
+  end
+  
+  def run(files)
+    all_files = files[:all]
+    mofified_files = files[:filtered]
+    
+    return nil if (!@js_test_driver.is_configured? all_files) 
+
+    detail = @js_test_driver.execute()
+    
+    state, summary, first = parse_result(detail)
+
+    return {
+        :state => state,
+        :title => 'JS Test Driver',
+        :summary => summary,
+        :first => first,
+        :detail => detail
+      }
+  end
+  
+  # Move to parse class
+  def parse_result(detail)
+    summary_line = detail.grep( /Total \d+ tests/ )[0]
+    
+    if summary_line.nil?
+      # error
+      error_info = (detail + "\nUnknown Error!").to_a[0].strip
+      return :error, 'Error', error_info
+    end
+    
+    if summary_line =~ /Errors: ([1-9]+)/
+      num_errors = $1
+      error_info = detail.grep(/error \([0-9]+.[0-9]+ ms\)/)[0].strip
+      return :failure, num_errors + ' Errors', error_info
+    end
+
+    if summary_line =~ /Fails: ([1-9]+)/
+      num_failures = $1
+      error_info = detail.grep(/failed \([0-9]+.[0-9]+ ms\)/)[0].strip
+      return :failure, num_failures + ' Failures', error_info
+    end
+    
+    return :success, 'All tests pass', ''
+    
+  end
+  
+end

data/loris.gemspec

@@ -0,0 +1,109 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{loris}
+  s.version = "0.0.7"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Karl O'Keeffe"]
+  s.date = %q{2009-09-17}
+  s.default_executable = %q{loris}
+  s.description = %q{TODO: Automatically run javascript tests}
+  s.email = %q{loris@monket.net}
+  s.executables = ["loris"]
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".autotest",
+     ".gitignore",
+     "README.rdoc",
+     "Rakefile",
+     "TODO",
+     "VERSION",
+     "autotest/discover.rb",
+     "bin/loris",
+     "cucumber.yml",
+     "examples/self_test/jsl.conf",
+     "examples/self_test/spec/spec.rhino.js",
+     "features/run.feature",
+     "features/step_definitons/all.rb",
+     "features/support/env.rb",
+     "lib/JsTestDriver-1.0b.jar",
+     "lib/always_continuer.rb",
+     "lib/extension_filter.rb",
+     "lib/file_actioner.rb",
+     "lib/file_filter.rb",
+     "lib/file_finder.rb",
+     "lib/icons/error.png",
+     "lib/icons/failure.png",
+     "lib/icons/info.png",
+     "lib/icons/success.png",
+     "lib/icons/warning.png",
+     "lib/loris.rb",
+     "lib/modified_filter.rb",
+     "lib/outputs/growl_output.rb",
+     "lib/outputs/output_collection.rb",
+     "lib/outputs/shell_output.rb",
+     "lib/outputs/unix_console_clearing_output.rb",
+     "lib/outputs/windows_console_clearing_output.rb",
+     "lib/poller.rb",
+     "lib/sleep_waiter.rb",
+     "lib/task_manager.rb",
+     "lib/tasks/javascript_lint_runner.rb",
+     "lib/tasks/javascript_lint_task.rb",
+     "lib/tasks/js_test_driver_runner.rb",
+     "lib/tasks/js_test_driver_task.rb",
+     "lib/tasks/jspec_runner.rb",
+     "lib/tasks/jspec_task.rb",
+     "lib/tasks/list_task.rb",
+     "loris.gemspec",
+     "loris.tmproj",
+     "spec/file_actioner_spec.rb",
+     "spec/file_filter_spec.rb",
+     "spec/file_finder_spec.rb",
+     "spec/growl_output_spec.rb",
+     "spec/jspec_task_spec.rb",
+     "spec/list_task_spec.rb",
+     "spec/modified_filter_spec.rb",
+     "spec/poller_spec.rb",
+     "spec/shell_output_spec.rb",
+     "spec/task_manager_spec.rb"
+  ]
+  s.homepage = %q{http://github.com/karl/loris}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{TODO: Automatically run javascript tests}
+  s.test_files = [
+    "spec/file_actioner_spec.rb",
+     "spec/file_filter_spec.rb",
+     "spec/file_finder_spec.rb",
+     "spec/growl_output_spec.rb",
+     "spec/jspec_task_spec.rb",
+     "spec/list_task_spec.rb",
+     "spec/modified_filter_spec.rb",
+     "spec/poller_spec.rb",
+     "spec/shell_output_spec.rb",
+     "spec/task_manager_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<visionmedia-bind>, [">= 0.2.6"])
+      s.add_runtime_dependency(%q<karl-growl>, [">= 1.0.3"])
+    else
+      s.add_dependency(%q<visionmedia-bind>, [">= 0.2.6"])
+      s.add_dependency(%q<karl-growl>, [">= 1.0.3"])
+    end
+  else
+    s.add_dependency(%q<visionmedia-bind>, [">= 0.2.6"])
+    s.add_dependency(%q<karl-growl>, [">= 1.0.3"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: karl-loris
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Karl O'Keeffe
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 -07:00
+date: 2009-09-17 00:00:00 -07:00
 default_executable: loris
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ files:
 - .autotest
 - .gitignore
 - README.rdoc
+- Rakefile
 - TODO
 - VERSION
 - autotest/discover.rb
@@ -54,6 +55,7 @@ files:
 - features/run.feature
 - features/step_definitons/all.rb
 - features/support/env.rb
+- lib/JsTestDriver-1.0b.jar
 - lib/always_continuer.rb
 - lib/extension_filter.rb
 - lib/file_actioner.rb
@@ -66,18 +68,22 @@ files:
 - lib/icons/warning.png
 - lib/loris.rb
 - lib/modified_filter.rb
-- lib/outputs/console_clearing_output.rb
 - lib/outputs/growl_output.rb
 - lib/outputs/output_collection.rb
 - lib/outputs/shell_output.rb
+- lib/outputs/unix_console_clearing_output.rb
+- lib/outputs/windows_console_clearing_output.rb
 - lib/poller.rb
 - lib/sleep_waiter.rb
 - lib/task_manager.rb
 - lib/tasks/javascript_lint_runner.rb
 - lib/tasks/javascript_lint_task.rb
+- lib/tasks/js_test_driver_runner.rb
+- lib/tasks/js_test_driver_task.rb
 - lib/tasks/jspec_runner.rb
 - lib/tasks/jspec_task.rb
 - lib/tasks/list_task.rb
+- loris.gemspec
 - loris.tmproj
 - spec/file_actioner_spec.rb
 - spec/file_filter_spec.rb

data/lib/outputs/console_clearing_output.rb

@@ -1,14 +0,0 @@
-class ConsoleClearingOutput
-  
-  def initialize()
-  end
-  
-  def start_run()
-    clear = RUBY_PLATFORM =~ /mswin32/ ? 'cls' : 'clear'
-    system clear
-  end
-  
-  def add_result(result)    
-  end
-  
-end