loris 0.1.4 → 0.1.5

data/lib/jasmine-node/specs.js

@@ -0,0 +1,27 @@
+require.paths.push(__dirname + "/lib");
+require.paths.push("./");
+
+var sys = require('sys');
+var jasmine = require('jasmine');
+
+for(var key in jasmine) {
+  global[key] = jasmine[key];
+}
+
+var isVerbose = false;
+var showColors = true;
+var dir = __dirname;
+process.argv.forEach(function(arg){
+  switch(arg) {
+  case '--color': showColors = true; break;
+  case '--noColor': showColors = false; break;
+  case '--verbose': isVerbose = true; break;
+  default: dir = arg; break;
+  }
+});
+
+
+jasmine.executeSpecsInFolder(dir + '/spec', function(runner, log) {
+	// Cannot call process.exit, standard out and standard error do not get flushed
+	// process.exit(runner.results().failedCount);
+}, isVerbose, showColors);

data/lib/loris.rb

@@ -18,10 +18,13 @@ require 'file_actioner'
 require 'task_manager'
 require 'pinger'
 
+require 'directory_finder'
+
 require 'filters/extension_filter'
 require 'filters/modified_filter'
 require 'filters/file_filter'
 require 'filters/ends_with_filter'
+require 'filters/starts_with_filter'
 
 require 'outputs/output_collection'
 require 'outputs/shell_output'
@@ -33,8 +36,12 @@ require 'tasks/list_task'
 require 'tasks/command_line_task'
 require 'tasks/jspec/jspec_runner'
 require 'tasks/jspec/jspec_parser'
+require 'tasks/coffeescript/coffeescript_runner'
+require 'tasks/coffeescript/coffeescript_parser'
 require 'tasks/javascript_lint/javascript_lint_runner'
 require 'tasks/javascript_lint/javascript_lint_parser'
+require 'tasks/jasmine_node/jasmine_node_runner'
+require 'tasks/jasmine_node/jasmine_node_parser'
 require 'tasks/rspec/rspec_runner'
 require 'tasks/rspec/rspec_parser'
 
@@ -98,7 +105,9 @@ module Loris
           
           tm = TaskManager.new(oc)
           tm.add(ListTask.new) if debug
+          tm.add(coffeescript_task(dir))
           tm.add(javascript_lint_task(dir))
+          tm.add(jasmine_node_task(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))
@@ -114,10 +123,37 @@ module Loris
 
         end
         
+        def coffeescript_task(dir)
+          return CommandLineTask.new(
+            CoffeeScriptRunner.new(
+              'coffee',
+              dir,
+              ExtensionFilter.new(File, 'coffee'),
+              DirectoryFinder.new(File, StartsWithFilter.new('coffee-'))
+            ),
+            CoffeeScriptParser.new(dir)
+          )
+        end
+        
+        def jasmine_node_task(dir)
+          node = '/usr/local/bin/node'
+          spec_dir = File.join(LIBDIR, 'jasmine-node')
+          
+          return CommandLineTask.new(
+            JasmineNodeRunner.new(
+              node,
+              spec_dir,
+              dir,
+              ExtensionFilter.new(File, 'js')
+            ),
+            JasmineNodeParser.new(dir)
+          )
+        end
+        
         # Refactor into factory
         def javascript_lint_task(dir)
           is_windows = RUBY_PLATFORM =~ /mswin32/
-          binary = File.join(LIBDIR, 'javascript-lint' , is_windows ? 'jsl.exe' : 'jsl');
+          binary = File.join(LIBDIR, 'javascript-lint' , is_windows ? 'jsl.exe' : 'jsl')
           
           return CommandLineTask.new(
             JavascriptLintRunner.new(

data/lib/task_manager.rb

@@ -3,6 +3,7 @@ class TaskManager
   def initialize(output)
     @output = output
     @tasks = []
+    @fail_index = -1
   end
   
   def add(task)
@@ -12,25 +13,51 @@ class TaskManager
   def run(files)
     @num_tasks_run = 0
     
-    @tasks.each do |task|
+    @tasks.each_index do |index|
+      task = @tasks[index]
+
+      # Don't run if this task is after the last failed task
+      if @fail_index >= 0 && @fail_index < index
+        @output.add_result(@fail_result)
+        break
+      end
       
+      result = nil
       begin
-        break if !run_task(files, task)        
+        result = run_task(files, task)        
       rescue Exception => ex
-        output_exception(ex)
+        result = build_exception_result ex
+        @output.add_result result
+      end
+
+      next if result.nil?
+
+      if [:error, :failure].include? result[:state]
+        # Remember this task as the one that failed
+        # And end this current run of tasks
+        @fail_index = index
+        @fail_result = result
+        
+        @fail_result[:state] = :error
+        @fail_result[:title] = 'Fix ' + @fail_result[:title] + ' to run other tasks'
+        break
+      elsif result[:state] == :success
+        # reset fail index
+        @fail_index = -1 if index == @fail_index
       end
       
     end
+    
   end
   
   def run_task(files, task)
     result = task.run(files)
-    return true if result.nil?
+    return result if result.nil?
 
     task_run
-      
+    
     @output.add_result(result) 
-    return !([:error, :failure].include? result[:state])
+    return result
   end
   
   def task_run
@@ -40,14 +67,18 @@ class TaskManager
     end  
   end
   
-  def output_exception(ex)
-    @output.add_result({
+  def build_exception_result(ex)
+    return {
       :state => :error,
       :title => 'Task',
       :summary => 'Exception',
       :first => ex.message,
       :detail => ex.backtrace
-    })
+    }
+  end
+  
+  def output_exception(ex)
+    @output.add_result build_exception_result ex
   end
   
 end

data/lib/tasks/coffeescript/coffeescript_parser.rb

@@ -0,0 +1,37 @@
+class CoffeeScriptParser
+ 
+  def initialize(dir)
+    @dir = dir
+
+    # TODO: Tidy!
+    if (RUBY_PLATFORM =~ /mswin32/)
+      @dir = @dir.gsub('/', '\\')
+    end 
+  end
+  
+  def parse_result(detail)
+    if (detail.strip == '')
+      return :success, 'All files compiled', ''
+    end
+    
+    summary_line = detail.grep( /^In .*/ )[0]
+
+    if summary_line.nil?
+      # error
+      error_info = (detail + "\nUnknown Error!").to_a[0].strip
+      return :error, 'Error', error_info
+    end
+    
+    return :failure, 'Failed to compile', strip_dir(summary_line[3..-1].strip)
+  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/coffeescript/coffeescript_runner.rb

@@ -0,0 +1,37 @@
+class CoffeeScriptRunner
+  
+  def initialize(binary, dir, filter, dir_finder)
+    @binary = binary
+    @dir = dir
+    @filter = filter
+    @coffeescript_dir_finder = dir_finder
+
+    @js_dir = dir + '/src'
+  end
+  
+  def name
+    return 'CoffeeScript'
+  end
+  
+  def execute
+    output = []
+    
+    @coffee_dirs.each do |coffee_dir|
+      js_dir = coffee_dir.sub '/coffee-', '/'
+      output.push `#{@binary} --compile #{coffee_dir} --output #{js_dir}  2>&1`
+    end
+    
+    return output.join "\n"
+  end
+  
+  # TODO: Only return true if we can find the node binary
+  def is_configured?(all_files)
+    @coffee_dirs = (@coffeescript_dir_finder.find all_files).uniq
+    return @coffee_dirs.length > 0
+  end
+  
+  def should_run?(modified_files)
+    return !(modified_files.detect { |file| @filter.filter(file) }).nil? || modified_files.include?(@config)
+  end
+  
+end

data/lib/tasks/jasmine_node/jasmine_node_parser.rb

@@ -0,0 +1,25 @@
+class JasmineNodeParser
+ 
+  def initialize(dir)
+    @dir = dir
+  end
+  
+  def parse_result(detail)
+    summary_line = detail.grep( /\d+\s+tests?.*,\s+\d+\s+assertions?.*,\s+\d+\s+failures?.*/ )[0]
+
+    if summary_line.nil?
+      # error
+      error_info = detail.grep(/Error: /)[0]  || ["Unknown Error!"]
+      return :error, 'Error', error_info.strip
+    end
+    
+    if summary_line =~ /([1-9]+)\d*\s+failures?/
+      num_failures = $1
+      error_info = detail.grep(/Error: /)[0]  || "Unknown Error!"
+      return :failure, num_failures + ' Errors', error_info.strip
+    end
+ 
+    return :success, 'All tests passed', ''
+  end
+  
+end

data/lib/tasks/jasmine_node/jasmine_node_runner.rb

@@ -0,0 +1,27 @@
+class JasmineNodeRunner
+  
+  def initialize(node, spec_dir, dir, filter)
+    @node = node
+    @spec_dir = spec_dir
+    @dir = dir
+    @filter = filter
+  end
+  
+  def name
+    return 'Jasmine'
+  end
+  
+  def execute
+    return `#{@node} #{@spec_dir}/specs.js --noColor #{@dir}  2>&1`
+  end
+  
+  # TODO: Only return true if we can find the node binary
+  def is_configured?(all_files)
+    return true
+  end
+  
+  def should_run?(modified_files)
+    return !(modified_files.detect { |file| @filter.filter(file) }).nil?
+  end
+  
+end

data/lib/windows_process.rb

@@ -8,7 +8,6 @@ end
 class WindowsProcess
 
   def create(command)
-    puts command
     Process.create({
       :app_name => command
     })

data/loris.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{loris}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karl O'Keeffe"]
-  s.date = %q{2010-07-07}
+  s.date = %q{2010-07-11}
   s.default_executable = %q{loris}
   s.description = %q{Automatically run javascript unit tests}
   s.email = %q{loris@monket.net}
@@ -34,17 +34,23 @@ Gem::Specification.new do |s|
      "features/support/env.rb",
      "lib/always_continuer.rb",
      "lib/browser_finder.rb",
+     "lib/directory_finder.rb",
      "lib/file_actioner.rb",
      "lib/file_finder.rb",
      "lib/filters/ends_with_filter.rb",
      "lib/filters/extension_filter.rb",
      "lib/filters/file_filter.rb",
      "lib/filters/modified_filter.rb",
+     "lib/filters/starts_with_filter.rb",
      "lib/icons/error.png",
      "lib/icons/failure.png",
      "lib/icons/info.png",
      "lib/icons/success.png",
      "lib/icons/warning.png",
+     "lib/jasmine-node/LICENSE",
+     "lib/jasmine-node/lib/jasmine/index.js",
+     "lib/jasmine-node/lib/jasmine/jasmine-0.10.2.js",
+     "lib/jasmine-node/specs.js",
      "lib/javascript-lint/jsl",
      "lib/javascript-lint/jsl.exe",
      "lib/js-test-driver/JsTestDriver-1.2.jar",
@@ -59,7 +65,11 @@ Gem::Specification.new do |s|
      "lib/poller.rb",
      "lib/sleep_waiter.rb",
      "lib/task_manager.rb",
+     "lib/tasks/coffeescript/coffeescript_parser.rb",
+     "lib/tasks/coffeescript/coffeescript_runner.rb",
      "lib/tasks/command_line_task.rb",
+     "lib/tasks/jasmine_node/jasmine_node_parser.rb",
+     "lib/tasks/jasmine_node/jasmine_node_runner.rb",
      "lib/tasks/javascript_lint/javascript_lint_parser.rb",
      "lib/tasks/javascript_lint/javascript_lint_runner.rb",
      "lib/tasks/js_test_driver/js_test_driver_config.rb",
@@ -93,7 +103,7 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{1.3.7}
   s.summary = %q{Automatically run javascript unit tests}
   s.test_files = [
     "spec/file_actioner_spec.rb",
@@ -116,7 +126,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<bind>, [">= 0.2.6"])
       s.add_runtime_dependency(%q<karl-growl>, [">= 1.0.6"])
       s.add_runtime_dependency(%q<extensions>, [">= 0.6.0"])

data/loris.tmproj

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>currentDocument</key>
-	<string>lib/file_actioner.rb</string>
+	<string>lib/directory_finder.rb</string>
 	<key>documents</key>
 	<array>
 		<dict>
@@ -13,8 +13,6 @@
 			<string>loris</string>
 			<key>regexFolderFilter</key>
 			<string>!.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
-			<key>selected</key>
-			<true/>
 			<key>sourceDirectory</key>
 			<string></string>
 		</dict>
@@ -23,26 +21,12 @@
 	<integer>200</integer>
 	<key>metaData</key>
 	<dict>
-		<key>Rakefile</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>47</integer>
-				<key>line</key>
-				<integer>17</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
 		<key>TODO</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>0</integer>
+				<integer>4</integer>
 				<key>line</key>
 				<integer>0</integer>
 			</dict>
@@ -51,14 +35,14 @@
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
-		<key>lib/file_actioner.rb</key>
+		<key>lib/directory_finder.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>44</integer>
+				<integer>16</integer>
 				<key>line</key>
-				<integer>12</integer>
+				<integer>3</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
@@ -70,9 +54,9 @@
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>39</integer>
+				<integer>3</integer>
 				<key>line</key>
-				<integer>16</integer>
+				<integer>35</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
@@ -84,137 +68,109 @@
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>47</integer>
+				<integer>2</integer>
 				<key>line</key>
-				<integer>10</integer>
+				<integer>8</integer>
 			</dict>
+			<key>columnSelection</key>
+			<false/>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
-		</dict>
-		<key>lib/outputs/growl_output.rb</key>
-		<dict>
-			<key>caret</key>
+			<key>selectFrom</key>
 			<dict>
 				<key>column</key>
-				<integer>15</integer>
+				<integer>0</integer>
 				<key>line</key>
-				<integer>6</integer>
+				<integer>0</integer>
 			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>lib/outputs/output_collection.rb</key>
-		<dict>
-			<key>caret</key>
+			<key>selectTo</key>
 			<dict>
 				<key>column</key>
-				<integer>22</integer>
+				<integer>3</integer>
 				<key>line</key>
-				<integer>8</integer>
+				<integer>16</integer>
 			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
 		</dict>
-		<key>lib/task_manager.rb</key>
+		<key>lib/jasmine-node/specs.js</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
 				<integer>0</integer>
 				<key>line</key>
-				<integer>23</integer>
+				<integer>3</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
-		<key>lib/tasks/command_line_task.rb</key>
+		<key>lib/loris.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>28</integer>
+				<integer>26</integer>
 				<key>line</key>
-				<integer>14</integer>
+				<integer>20</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
-		<key>lib/tasks/javascript_lint/javascript_lint_parser.rb</key>
+		<key>lib/outputs/growl_output.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>24</integer>
+				<integer>15</integer>
 				<key>line</key>
-				<integer>32</integer>
+				<integer>6</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
-		<key>lib/tasks/javascript_lint/javascript_lint_runner.rb</key>
+		<key>lib/outputs/output_collection.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>57</integer>
+				<integer>22</integer>
 				<key>line</key>
-				<integer>13</integer>
+				<integer>8</integer>
 			</dict>
-			<key>columnSelection</key>
-			<false/>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
-			<key>selectFrom</key>
-			<dict>
-				<key>column</key>
-				<integer>43</integer>
-				<key>line</key>
-				<integer>13</integer>
-			</dict>
-			<key>selectTo</key>
-			<dict>
-				<key>column</key>
-				<integer>57</integer>
-				<key>line</key>
-				<integer>13</integer>
-			</dict>
 		</dict>
-		<key>lib/tasks/js_test_driver/js_test_driver_parser.rb</key>
+		<key>lib/tasks/coffeescript/coffeescript_runner.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>2</integer>
+				<integer>36</integer>
 				<key>line</key>
-				<integer>30</integer>
+				<integer>18</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
-		<key>lib/tasks/js_test_driver/js_test_driver_runner.rb</key>
+		<key>lib/tasks/jasmine_node/jasmine_node_runner.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>61</integer>
+				<integer>0</integer>
 				<key>line</key>
-				<integer>16</integer>
+				<integer>14</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
@@ -253,19 +209,13 @@
 	<key>openDocuments</key>
 	<array>
 		<string>TODO</string>
-		<string>lib/tasks/javascript_lint/javascript_lint_parser.rb</string>
-		<string>lib/tasks/js_test_driver/js_test_driver_parser.rb</string>
-		<string>lib/tasks/js_test_driver/js_test_driver_runner.rb</string>
-		<string>lib/outputs/growl_output.rb</string>
-		<string>lib/outputs/output_collection.rb</string>
+		<string>lib/loris.rb</string>
 		<string>lib/filters/ends_with_filter.rb</string>
-		<string>lib/tasks/javascript_lint/javascript_lint_runner.rb</string>
-		<string>Rakefile</string>
-		<string>lib/task_manager.rb</string>
+		<string>lib/directory_finder.rb</string>
 		<string>lib/file_finder.rb</string>
-		<string>lib/file_actioner.rb</string>
-		<string>lib/tasks/list_task.rb</string>
-		<string>lib/tasks/command_line_task.rb</string>
+		<string>lib/tasks/coffeescript/coffeescript_runner.rb</string>
+		<string>lib/tasks/jasmine_node/jasmine_node_runner.rb</string>
+		<string>lib/jasmine-node/specs.js</string>
 	</array>
 	<key>showFileHierarchyDrawer</key>
 	<false/>