karl-loris 0.0.9 → 0.0.10

data/Rakefile

@@ -25,7 +25,7 @@ rescue LoadError
 end
 
 
-task :default => [:spec, :features]
+task :default => :spec
 
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_files = Dir.glob('spec/**/*_spec.rb')

data/TODO

@@ -1,21 +1,21 @@
+* Work out what is going on with fork in windows (running second copy of Loris?)
+
 * Remove JsTestDriver.jar from lib dir
 * Tidy Windows related if statements
 * Tidy JSL filename removing
 
 * javascript lint not installed? (package if not already installed?)
-
 * JSpec not installed? (can require as gem)
 
-* Add JS Test Driver support
-
+* Detect file rename
 * Detect file deletion/directory rename
 
+* Factories to create tasks
+
 * Deal with filesystem exceptions
-* Deal with task exceptions
 * jspec task (just modified files?)
 * javascript lint task (just modified files?)
 * separate thread (create new and kill old)
 * listen for interrupt
-* detect file deletion
 * cucumber task
 * Tidy growl windows code

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/features/step_definitons/all.rb

@@ -65,5 +65,5 @@ Then /^I should NOT see "([^\"]*)" in the Loris output$/ do |text|
 end
 
 Then /^I should not see any errors$/ do
-  get_background_error.strip().should == ""
+  get_background_error.strip.should == ""
 end

data/lib/filters/ends_with_filter.rb

@@ -11,7 +11,7 @@ class EndsWithFilter
     return file_name.downcase.ends_with? @text
   end
   
-  def complete()
+  def complete
   end
   
 end

data/lib/filters/extension_filter.rb

@@ -14,7 +14,7 @@ class ExtensionFilter
     @file_class.extname(file_name).gsub( /^\./, '' ).downcase 
   end
   
-  def complete()
+  def complete
   end
   
 end

data/lib/filters/file_filter.rb

@@ -8,7 +8,7 @@ class FileFilter
     return @file_class.file?(path)
   end
   
-  def complete()
+  def complete
   end
   
 end

data/lib/filters/modified_filter.rb

@@ -13,7 +13,7 @@ class ModifiedFilter
     return @last_modified.nil? || modified > @last_modified
   end
   
-  def complete()
+  def complete
     @last_modified = @modifieds.max
     @modifieds = []
   end

data/lib/loris.rb

@@ -6,6 +6,8 @@ require 'bind'
 require 'rbconfig'
 require 'find'
 require 'Growl'
+require 'yaml'
+require 'uri'
 
 
 require 'file_finder'
@@ -14,6 +16,7 @@ require 'sleep_waiter'
 require 'always_continuer'
 require 'file_actioner'
 require 'task_manager'
+require 'pinger'
 
 require 'filters/extension_filter'
 require 'filters/modified_filter'
@@ -27,14 +30,13 @@ require 'outputs/unix_console_clearing_output'
 require 'outputs/growl_output'
 
 require 'tasks/list_task'
-require 'tasks/jspec/jspec_task'
+require 'tasks/command_line_task'
 require 'tasks/jspec/jspec_runner'
-require 'tasks/javascript_lint/javascript_lint_task'
+require 'tasks/jspec/jspec_parser'
 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/javascript_lint/javascript_lint_parser'
 require 'tasks/rspec/rspec_runner'
+require 'tasks/rspec/rspec_parser'
 
 
 include Config
@@ -62,8 +64,8 @@ module Loris
           @stream = stream
         end
         
-        def run()
-            @actioner.run()
+        def run
+            @actioner.run
             @stream.puts '[Poll complete]'
             @stream.flush
         end
@@ -78,7 +80,7 @@ module Loris
           is_windows = RUBY_PLATFORM =~ /mswin32/
           dir = Dir.pwd
           sleep_duration = 1
-          jstd_jar = File.join(LIBDIR, 'JsTestDriver-1.0b.jar')
+          browser = is_windows ? 'C:/Program Files/Internet Explorer/iexplore.exe' : 'open'
 
           # Create object graph
           w = SleepWaiter.new(sleep_duration)
@@ -87,19 +89,19 @@ module Loris
           ff.add_filter(FileFilter.new(File))
           ff.add_filter(ModifiedFilter.new(File))
 
-          cco = is_windows ? WindowsConsoleClearingOutput.new() : UnixConsoleClearingOutput.new()
+          cco = is_windows ? WindowsConsoleClearingOutput.new : UnixConsoleClearingOutput.new
 
-          oc = OutputCollection.new()
+          oc = OutputCollection.new
           oc.add(ShellOutput.new($stdout))
           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, 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'))))
+          tm.add(ListTask.new) if debug
+          tm.add(CommandLineTask.new(JavascriptLintRunner.new(dir, ExtensionFilter.new(File, 'js')), JavascriptLintParser.new(dir)))
+          tm.add(CommandLineTask.new(JSpecRunner.new(dir, ExtensionFilter.new(File, 'js')), JSpecParser.new)) unless is_windows
+          tm.add(jsTestDriverTask(dir))
+          tm.add(CommandLineTask.new(RSpecRunner.new(dir, ExtensionFilter.new(File, 'rb'), EndsWithFilter.new('_spec.rb')), RSpecParser.new))
 
           a = FileActioner.new(ff, tm)    
           
@@ -108,9 +110,50 @@ module Loris
           p = Poller.new(w, c, debug ? da : a)
           
           # Start!
-          p.start()
+          p.start
 
         end
+        
+        # Will need to be refactored into a factory
+        def jsTestDriverTask(dir)
+          require 'tasks/js_test_driver/js_test_driver_runner'
+          require 'tasks/js_test_driver/js_test_driver_parser'
+          require 'tasks/js_test_driver/js_test_driver_config'
+          require 'tasks/js_test_driver/js_test_driver_server'          
+          
+          jar = File.join(LIBDIR, 'JsTestDriver-1.0b.jar')
+          is_windows = RUBY_PLATFORM =~ /mswin32/
+          browser = is_windows ? 'C:/Program Files/Internet Explorer/iexplore.exe' : 'open'
+          sleep_time = is_windows ? 10 : 5
+          
+          if is_windows
+            require 'windows_process'
+          else
+            require 'unix_process'
+          end
+          
+          return CommandLineTask.new(
+            JsTestDriverRunner.new(
+              dir, 
+              jar, 
+              ExtensionFilter.new(File, 'js'),
+              JsTestDriverServer.new(
+                JsTestDriverConfig.new(
+                  dir, 
+                  YAML, 
+                  URI
+                ), 
+                Pinger.new, 
+                is_windows ? WindowsProcess.new : UnixProcess.new,
+                jar, 
+                browser,
+                sleep_time
+              )
+            ), 
+            JsTestDriverParser.new
+          )          
+        end
+        
       end    
 
     end

data/lib/outputs/growl_output.rb

@@ -4,7 +4,7 @@ class GrowlOutput
     @growler = growler
   end
   
-  def start_run()
+  def start_run
   end
 
   def add_result(result)

data/lib/outputs/output_collection.rb

@@ -1,12 +1,12 @@
 class OutputCollection
  
-  def initialize()
+  def initialize
     @outputs = []
   end
 
-  def start_run()
+  def start_run
     @outputs.each do |output|
-      output.start_run()
+      output.start_run
     end
   end
   

data/lib/outputs/shell_output.rb

@@ -4,7 +4,7 @@ class ShellOutput
     @output = output
   end
   
-  def start_run()
+  def start_run
   end
   
   def add_result(result)    

data/lib/outputs/unix_console_clearing_output.rb

@@ -1,9 +1,9 @@
 class UnixConsoleClearingOutput
   
-  def initialize()
+  def initialize
   end
   
-  def start_run()
+  def start_run
     system 'clear'
   end
   

data/lib/outputs/windows_console_clearing_output.rb

@@ -1,9 +1,9 @@
 class WindowsConsoleClearingOutput
   
-  def initialize()
+  def initialize
   end
   
-  def start_run()
+  def start_run
     system 'cls'
   end
   

data/lib/pinger.rb

@@ -0,0 +1,23 @@
+require 'socket'
+require 'timeout'
+
+class Pinger
+
+  def is_port_open?(ip, port)
+    begin
+      Timeout::timeout(1) do
+        begin
+          s = TCPSocket.new(ip, port)
+          s.close
+          return true
+        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+          return false
+        end
+      end
+    rescue Timeout::Error
+    end
+
+    return false
+  end
+  
+end

data/lib/task_manager.rb

@@ -10,18 +10,36 @@ class TaskManager
   end
   
   def run(files)
-    @output.start_run();
+    @output.start_run;
 
     @tasks.each do |task|
       
-      result = task.run(files)
-      if !result.nil?
-        @output.add_result(result) 
-        break if [:error, :failure].include? result[:state]
+      begin
+        break if !run_task(files, task)        
+      rescue Exception => ex
+        output_exception(ex)
       end
       
     end
 
   end
   
+  def run_task(files, task)
+    result = task.run(files)
+    return true if result.nil?
+      
+    @output.add_result(result) 
+    return !([:error, :failure].include? result[:state])
+  end
+  
+  def output_exception(ex)
+    @output.add_result({
+      :state => :error,
+      :title => 'Task',
+      :summary => 'Exception',
+      :first => ex.message,
+      :detail => ex.backtrace
+    })
+  end
+  
 end

data/lib/tasks/command_line_task.rb

@@ -0,0 +1,28 @@
+class CommandLineTask
+ 
+  def initialize(runner, parser)
+    @runner = runner
+    @parser = parser
+  end
+  
+  def run(files)
+    all_files = files[:all]
+    modified_files = files[:filtered]
+    
+    return nil if (!@runner.is_configured? all_files)
+    return nil if (!@runner.should_run? modified_files)
+ 
+    detail = @runner.execute
+    
+    state, summary, first = @parser.parse_result(detail)
+ 
+    return {
+        :state => state,
+        :title => @runner.name,
+        :summary => summary,
+        :first => first,
+        :detail => detail
+      }
+  end
+    
+end

data/lib/tasks/javascript_lint/javascript_lint_parser.rb

@@ -0,0 +1,45 @@
+class JavascriptLintParser
+ 
+  def initialize(dir)
+    @dir = dir
+ 
+    # TODO: Tidy!
+    if (RUBY_PLATFORM =~ /mswin32/)
+      @dir = @dir.gsub('/', '\\')
+    end 
+  end
+  
+  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].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].strip
+      return :failure, num_failures + ' Errors', strip_dir(error_info)
+    end
+ 
+    if summary_line =~ /([1-9]+)\d*\s+warning/
+      num_failures = $1
+      error_info = detail.grep(/\([0-9]+\)/)[0].strip
+      return :warning, num_failures + ' Warnings', strip_dir(error_info)
+    end
+    
+    return :success, 'All files are clean', ''
+  end
+  
+  def strip_dir(text)
+
+    # Move to function/class w/ win32 related code
+    if (text[0, @dir.length] == @dir)
+      text = text[(@dir.length + 1)..-1]
+    end    
+    
+  end
+  
+end

data/lib/tasks/javascript_lint/javascript_lint_runner.rb

@@ -6,7 +6,11 @@ class JavascriptLintRunner
     @filter = filter
   end
   
-  def execute()
+  def name
+    return 'Javascript Lint'
+  end
+  
+  def execute
     return `jsl -conf "#{@config}" -nologo -nofilelisting 2>&1`
   end
   

data/lib/tasks/js_test_driver/js_test_driver_config.rb

@@ -0,0 +1,22 @@
+class JsTestDriverConfig
+  
+  def initialize(dir, yaml, uri)
+    @config_file = dir + '/jsTestDriver.conf'
+    @yaml = yaml
+    @uri = uri
+  end
+  
+  def reload
+    @conf = @yaml.load_file(@config_file)
+    @server = @uri.parse(@conf['server'])
+  end
+  
+  def host
+    return @server.host
+  end
+  
+  def port
+    return @server.port
+  end
+  
+end

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

@@ -1,30 +1,5 @@
-class JsTestDriverTask
- 
-  def initialize(js_test_driver)
-    @js_test_driver = js_test_driver
-  end
-  
-  def run(files)
-    all_files = files[:all]
-    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()
-    
-    state, summary, first = parse_result(detail)
-
-    return {
-        :state => state,
-        :title => 'JS Test Driver',
-        :summary => summary,
-        :first => first,
-        :detail => detail
-      }
-  end
+class JsTestDriverParser
   
-  # Move to parse class
   def parse_result(detail)
     summary_line = detail.grep( /Total \d+ tests/ )[0]
     

data/lib/tasks/js_test_driver/js_test_driver_runner.rb

@@ -1,13 +1,19 @@
 class JsTestDriverRunner
     
-  def initialize(dir, jar, filter)
+  def initialize(dir, jar, filter, server)
     @config = dir + '/jsTestDriver.conf'
     @dir = dir
     @jar = jar
     @filter = filter
+    @server = server
   end
   
-  def execute()
+  def name
+    return 'JS Test Driver'
+  end
+  
+  def execute
+    @server.start_if_required
     return `java -jar "#{@jar}" --config "#{@config}" --tests all --verbose 2>&1`
   end
   

data/lib/tasks/js_test_driver/js_test_driver_server.rb

@@ -0,0 +1,30 @@
+class JsTestDriverServer
+  
+  def initialize(config, pinger, process, jar, browser, sleep_time)
+    @config = config
+    @pinger = pinger
+    @process = process
+    @jar = jar
+    @browser = browser
+    @sleep_time = sleep_time
+  end
+  
+  def start_if_required
+    @config.reload
+    
+    if @config.host == 'localhost' && server_not_running
+      start_server(@config.port)
+    end
+  end
+  
+  def server_not_running
+    return !@pinger.is_port_open?('127.0.0.1', @config.port)
+  end
+  
+  def start_server(port)
+    command = "java -jar \"#{@jar}\" --port #{port} --browser \"#{@browser}\" "
+    @process.create(command)
+    sleep @sleep_time
+  end
+  
+end

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

@@ -1,30 +1,6 @@
-class JSpecTask
+class JSpecParser
  
-  def initialize(jspec)
-    @jspec = jspec
-  end
-  
-  def run(files)
-    all_files = files[:all]
-    modified_files = files[:filtered]
-    
-    return nil if (!@jspec.is_configured? all_files) 
-    return nil if (!@jspec.should_run? modified_files)
-
-    detail = @jspec.execute
-
-    state, summary, first = parse_results(detail)
-
-    return {
-        :state => state,
-        :title => 'JSpec',
-        :summary => summary,
-        :first => first,
-        :detail => detail
-      }
-  end
-  
-  def parse_results(detail)
+  def parse_result(detail)
     summary_line = detail.grep( /Passes:/ )[0]
     
     if summary_line.nil?

data/lib/tasks/jspec/jspec_runner.rb

@@ -6,6 +6,10 @@ class JSpecRunner
     @filter = filter
   end
   
+  def name
+    return 'JSpec'
+  end
+  
   def execute
     return `jspec run --rhino --trace 2>&1`
   end

data/lib/tasks/rspec/rspec_parser.rb

@@ -0,0 +1,25 @@
+class RSpecParser
+ 
+  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

data/lib/tasks/rspec/rspec_runner.rb

@@ -6,7 +6,11 @@ class RSpecRunner
     @spec_filter = spec_filter
   end
   
-  def execute()
+  def name
+    return 'RSpec'
+  end
+  
+  def execute
     return `spec . 2>&1`
   end
   

data/lib/unix_process.rb

@@ -0,0 +1,7 @@
+class UnixProcess
+
+  def create(command)
+    exec(command) if fork.nil?
+  end
+  
+end

data/lib/windows_process.rb

@@ -0,0 +1,9 @@
+require 'win32/process'
+
+class WindowsProcess
+
+  def create(command)
+    exec(command) if Process.fork.nil?
+  end
+  
+end

data/loris.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{loris}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   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-18}
+  s.date = %q{2009-09-21}
   s.default_executable = %q{loris}
   s.description = %q{Automatically run javascript unit tests}
   s.email = %q{loris@monket.net}
@@ -50,18 +50,24 @@ Gem::Specification.new do |s|
      "lib/outputs/shell_output.rb",
      "lib/outputs/unix_console_clearing_output.rb",
      "lib/outputs/windows_console_clearing_output.rb",
+     "lib/pinger.rb",
      "lib/poller.rb",
      "lib/sleep_waiter.rb",
      "lib/task_manager.rb",
+     "lib/tasks/command_line_task.rb",
+     "lib/tasks/javascript_lint/javascript_lint_parser.rb",
      "lib/tasks/javascript_lint/javascript_lint_runner.rb",
-     "lib/tasks/javascript_lint/javascript_lint_task.rb",
+     "lib/tasks/js_test_driver/js_test_driver_config.rb",
+     "lib/tasks/js_test_driver/js_test_driver_parser.rb",
      "lib/tasks/js_test_driver/js_test_driver_runner.rb",
-     "lib/tasks/js_test_driver/js_test_driver_task.rb",
+     "lib/tasks/js_test_driver/js_test_driver_server.rb",
+     "lib/tasks/jspec/jspec_parser.rb",
      "lib/tasks/jspec/jspec_runner.rb",
-     "lib/tasks/jspec/jspec_task.rb",
      "lib/tasks/list_task.rb",
+     "lib/tasks/rspec/rspec_parser.rb",
      "lib/tasks/rspec/rspec_runner.rb",
-     "lib/tasks/rspec/rspec_task.rb",
+     "lib/unix_process.rb",
+     "lib/windows_process.rb",
      "loris.gemspec",
      "loris.tmproj",
      "spec/file_actioner_spec.rb",
@@ -76,8 +82,8 @@ Gem::Specification.new do |s|
      "spec/task_manager_spec.rb",
      "spec/tasks/javascript_lint/javascript_lint_runner_spec.rb",
      "spec/tasks/js_test_driver/js_test_driver_runner_spec.rb",
-     "spec/tasks/jspec/jspec_runner_spec.rb",
-     "spec/tasks/jspec/jspec_task_spec.rb"
+     "spec/tasks/jspec/jspec_parser_spec.rb",
+     "spec/tasks/jspec/jspec_runner_spec.rb"
   ]
   s.homepage = %q{http://github.com/karl/loris}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -97,8 +103,8 @@ Gem::Specification.new do |s|
      "spec/task_manager_spec.rb",
      "spec/tasks/javascript_lint/javascript_lint_runner_spec.rb",
      "spec/tasks/js_test_driver/js_test_driver_runner_spec.rb",
-     "spec/tasks/jspec/jspec_runner_spec.rb",
-     "spec/tasks/jspec/jspec_task_spec.rb"
+     "spec/tasks/jspec/jspec_parser_spec.rb",
+     "spec/tasks/jspec/jspec_runner_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/file_actioner_spec.rb

@@ -15,7 +15,7 @@ describe FileActioner do
     tm.should_receive(:run).with(files)
 
     fa = FileActioner.new(ff, tm)
-    fa.run()
+    fa.run
 
   end
   
@@ -32,7 +32,7 @@ describe FileActioner do
     tm.should_not_receive(:run)
 
     fa = FileActioner.new(ff, tm)
-    fa.run()
+    fa.run
     
   end
 

data/spec/list_task_spec.rb

@@ -10,7 +10,7 @@ describe ListTask do
   end
 
   it "should output the given paths" do
-    oa = ListTask.new()
+    oa = ListTask.new
     result = oa.run(@files)
 
     result[:detail].should eql "/path/to.file\n"
@@ -26,28 +26,28 @@ describe ListTask do
   end
 
   it "should return a title" do
-    oa = ListTask.new()
+    oa = ListTask.new
     result = oa.run(@files)
 
     result[:title].should eql "List"
   end
 
   it "should return success always" do
-    oa = ListTask.new()
+    oa = ListTask.new
     result = oa.run(@files)
 
     result[:state].should eql :success
   end
 
   it "should return summary for 1 file" do
-    oa = ListTask.new()
+    oa = ListTask.new
     result = oa.run(@files)
 
     result[:first].should eql @files[:filtered][0]
   end
 
   it "should return summary for 3 files" do
-    oa = ListTask.new()
+    oa = ListTask.new
     result = oa.run({ :filtered => ['first.file','second.file','third.file'] })
 
     result[:first].should eql "3 files."

data/spec/poller_spec.rb

@@ -20,7 +20,7 @@ describe Poller do
 
   it "should wait and call action while contunuer returns true" do
     p = Poller.new(@waiter, @continuer, @action)
-    p.start()
+    p.start
   end
 
 end

data/spec/tasks/js_test_driver/js_test_driver_runner_spec.rb

@@ -5,6 +5,7 @@ describe JsTestDriverRunner do
   before do
     @jar = '/path/to/jsTestDriver.jar'
     @filter = mock('JS Extension Filter')
+    @server = mock('JS Test Driver Server')
   end
 
   describe "is_configured?" do
@@ -14,7 +15,7 @@ describe JsTestDriverRunner do
       dir = '/a/dir/structure'
       all_files = ['/a/dir/structure/jsTestDriver.conf']
       
-      runner = JsTestDriverRunner.new(dir, @jar, @filter)
+      runner = JsTestDriverRunner.new(dir, @jar, @filter, @server)
     
       runner.is_configured?(all_files).should be_true
       
@@ -25,7 +26,7 @@ describe JsTestDriverRunner do
       dir = '/a/dir/structure'
       all_files = ['/a/dir/structure/other.conf']
       
-      runner = JsTestDriverRunner.new(dir, @jar, @filter)
+      runner = JsTestDriverRunner.new(dir, @jar, @filter, @server)
       
       runner.is_configured?(all_files).should be_false
       
@@ -41,7 +42,7 @@ describe JsTestDriverRunner do
       modified_files = ['/a/dir/structure/another_dir/example.js']
       @filter.should_receive(:filter).and_return(true)
       
-      runner = JsTestDriverRunner.new(dir, @jar, @filter)
+      runner = JsTestDriverRunner.new(dir, @jar, @filter, @server)
       
       runner.should_run?(modified_files).should be_true
       
@@ -54,7 +55,7 @@ describe JsTestDriverRunner do
       @filter.should_receive(:filter).ordered.and_return(false)
       @filter.should_receive(:filter).ordered.and_return(true)
       
-      runner = JsTestDriverRunner.new(dir, @jar, @filter)
+      runner = JsTestDriverRunner.new(dir, @jar, @filter, @server)
       
       runner.should_run?(modified_files).should be_true
       
@@ -66,7 +67,7 @@ describe JsTestDriverRunner do
       modified_files = ['/a/dir/structure/nonjs.file']
       @filter.should_receive(:filter).ordered.and_return(false)
       
-      runner = JsTestDriverRunner.new(dir, @jar, @filter)
+      runner = JsTestDriverRunner.new(dir, @jar, @filter, @server)
       
       runner.should_run?(modified_files).should be_false
       
@@ -78,7 +79,7 @@ describe JsTestDriverRunner do
       modified_files = ['/a/dir/structure/jsTestDriver.conf']
       @filter.should_receive(:filter).ordered.and_return(false)
       
-      runner = JsTestDriverRunner.new(dir, @jar, @filter)
+      runner = JsTestDriverRunner.new(dir, @jar, @filter, @server)
       
       runner.should_run?(modified_files).should be_true
       

data/spec/tasks/jspec/jspec_parser_spec.rb

@@ -0,0 +1,28 @@
+require 'lib/tasks/jspec/jspec_parser.rb'
+
+describe JSpecParser do
+
+  it "should return error if unable to parse jspec output" do
+    jspec_parser = JSpecParser.new
+    state, summary, first = jspec_parser.parse_result('A JSpec error message here...')
+    
+    state.should eql :error
+  end
+
+  it "should return success if all tests pass" do
+    jspec_parser = JSpecParser.new
+    state, summary, first = jspec_parser.parse_result('Passes: 3 Failures: 0')
+    
+    state.should eql :success
+  end
+
+  it "should return failure if any test fails" do
+    jspec_parser = JSpecParser.new
+    state, summary, first = jspec_parser.parse_result('Passes: 2 Failures: 1')
+    
+    state.should eql :failure
+  end
+
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: karl-loris
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Karl O'Keeffe
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -07:00
+date: 2009-09-21 00:00:00 -07:00
 default_executable: loris
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,18 +83,24 @@ files:
 - lib/outputs/shell_output.rb
 - lib/outputs/unix_console_clearing_output.rb
 - lib/outputs/windows_console_clearing_output.rb
+- lib/pinger.rb
 - lib/poller.rb
 - lib/sleep_waiter.rb
 - lib/task_manager.rb
+- lib/tasks/command_line_task.rb
+- lib/tasks/javascript_lint/javascript_lint_parser.rb
 - lib/tasks/javascript_lint/javascript_lint_runner.rb
-- lib/tasks/javascript_lint/javascript_lint_task.rb
+- lib/tasks/js_test_driver/js_test_driver_config.rb
+- lib/tasks/js_test_driver/js_test_driver_parser.rb
 - lib/tasks/js_test_driver/js_test_driver_runner.rb
-- lib/tasks/js_test_driver/js_test_driver_task.rb
+- lib/tasks/js_test_driver/js_test_driver_server.rb
+- lib/tasks/jspec/jspec_parser.rb
 - lib/tasks/jspec/jspec_runner.rb
-- lib/tasks/jspec/jspec_task.rb
 - lib/tasks/list_task.rb
+- lib/tasks/rspec/rspec_parser.rb
 - lib/tasks/rspec/rspec_runner.rb
-- lib/tasks/rspec/rspec_task.rb
+- lib/unix_process.rb
+- lib/windows_process.rb
 - loris.gemspec
 - loris.tmproj
 - spec/file_actioner_spec.rb
@@ -109,8 +115,8 @@ files:
 - spec/task_manager_spec.rb
 - spec/tasks/javascript_lint/javascript_lint_runner_spec.rb
 - spec/tasks/js_test_driver/js_test_driver_runner_spec.rb
+- spec/tasks/jspec/jspec_parser_spec.rb
 - spec/tasks/jspec/jspec_runner_spec.rb
-- spec/tasks/jspec/jspec_task_spec.rb
 has_rdoc: false
 homepage: http://github.com/karl/loris
 licenses: 
@@ -151,5 +157,5 @@ test_files:
 - spec/task_manager_spec.rb
 - spec/tasks/javascript_lint/javascript_lint_runner_spec.rb
 - spec/tasks/js_test_driver/js_test_driver_runner_spec.rb
+- spec/tasks/jspec/jspec_parser_spec.rb
 - spec/tasks/jspec/jspec_runner_spec.rb
-- spec/tasks/jspec/jspec_task_spec.rb

data/lib/tasks/javascript_lint/javascript_lint_task.rb

@@ -1,66 +0,0 @@
-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]
-    modified_files = files[:filtered]
-    
-    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',
-        :summary => summary,
-        :first => first,
-        :detail => detail
-      }
-  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].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].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
-      return :warning, num_failures + ' Warnings', error_info
-    end
-    
-    return :success, 'All files are clean', ''
-    
-  end
-  
-end

data/lib/tasks/rspec/rspec_task.rb

@@ -1,50 +0,0 @@
-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

data/spec/tasks/jspec/jspec_task_spec.rb

@@ -1,45 +0,0 @@
-require 'lib/tasks/jspec/jspec_task.rb'
-
-describe JSpecTask do
-
-  before do
-    @files = {
-      :all => [], 
-      :filtered => [] 
-    }
-
-    @jspec = mock('JSpec Runner')
-    @jspec.should_receive(:is_configured?).and_return(true)
-    @jspec.should_receive(:should_run?).and_return(true)
-  end
-
-  it "should return error if unable to parse jspec output" do
-    @jspec.should_receive(:execute).and_return('A JSpec error message here...')
-    
-    jspec_task = JSpecTask.new(@jspec)
-    result = jspec_task.run(@files)
-    
-    result[:state].should eql :error
-  end
-
-  it "should return success if all tests pass" do
-    @jspec.should_receive(:execute).and_return('Passes: 3 Failures: 0')
-    
-    jspec_task = JSpecTask.new(@jspec)
-    result = jspec_task.run(@files)
-    
-    result[:state].should eql :success
-  end
-
-  it "should return failure if any test fails" do
-    @jspec.should_receive(:execute).and_return('Passes: 2 Failures: 1')
-    
-    jspec_task = JSpecTask.new(@jspec)
-    result = jspec_task.run(@files)
-    
-    result[:state].should eql :failure
-  end
-
-end
-
-