jstdutil 0.1.0 → 0.1.1

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Description goes here.
 
-== Note on Patches/Pull Requests
+== Note on Patches/Merge Requests
  
 * Fork the project.
 * Make your feature addition or bug fix.
@@ -11,7 +11,7 @@ Description goes here.
 * Commit, do not mess with rakefile, version, or history.
   (if you want to have your own version, that is fine but
    bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+* Send me a merge request. Bonus points for topic branches.
 
 == Copyright
 

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/cjohansen/jstdutil"
     gem.authors = ["Christian Johansen"]
     gem.rubyforge_project = "jstdutil"
-    gem.add_development_dependency "thoughtbot-shoulda"
+    gem.add_development_dependency "shoulda"
     gem.add_dependency "watchr"
     gem.add_dependency "rake"
     gem.executables = ["jstestdriver", "jsautotest"]
@@ -21,8 +21,9 @@ begin
   Jeweler::RubyforgeTasks.new do |rubyforge|
     rubyforge.doc_task = "rdoc"
   end
-rescue LoadError
+rescue LoadError => e
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  puts e.message
 end
 
 require 'rake/testtask'

data/TODO.org

@@ -0,0 +1,7 @@
+#+SEQ_TODO: TODO INPR DONE
+
+* TODO Catch exceptions and quit cleanly
+* TODO Print results from jstestdriver in real-time from jsautotest
+* TODO Don't stop the server if the current instance didn't start it
+* TODO Add some tests to autotest and test runner
+* TODO Catch errors caused by JsTestDriver picking up temp files such as #file.js#

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/jsautotest

@@ -7,5 +7,4 @@ begin
 rescue StandardError => err
   puts "An error occurred"
   puts err.message
-  raise err
 end

data/lib/jstdutil/redgreen.rb

@@ -6,7 +6,6 @@ rescue NameError
   # PLATFORM is not defined, not a problem on windows.
   # On other platforms we don't care
 end
-
 module Jstdutil
   class RedGreen
     # Borrowed from the ruby redgreen gem
@@ -29,8 +28,12 @@ module Jstdutil
     # colors. Returns report with encoded colors.
     #
     def self.format(report)
+      return "" if report.nil?
+
       report.split("\n").collect do |line|
-        if line =~ /Passed: \d+; Fails: (\d+); Errors:? (\d+)/
+        if line =~ /Passed: 0; Fails: 0; Errors:? 0/
+          Color.yellow(line)
+        elsif line =~ /Passed: \d+; Fails: (\d+); Errors:? (\d+)/
           Color.send($1.to_i + $2.to_i != 0 ? :red : :green, line)
         elsif line =~ /^[\.EF]+$/
           line.gsub(/\./, Color.green(".")).gsub(/F/, Color.red("F")).gsub("E", Color.yellow("E"))

data/lib/jstdutil/test_runner.rb

@@ -8,9 +8,7 @@ module Jstdutil
   class TestRunner
     def initialize(args = [])
       @args = strip_opt(args.join(" "), "tests")
-      config = @args.scan(/--config\s+([^\s]+)/).flatten
-      config = config.first || File.expand_path("jsTestDriver.conf")
-      config = JsTestDriver::Config.new(config)
+      config = guess_config
 
       if config && config.server
         @server = JsTestDriver::Server.new(config, args({}, ["port"]).join(" "))
@@ -46,6 +44,23 @@ module Jstdutil
     end
 
    private
+    def guess_config
+      config = @args.scan(/--config\s+([^\s]+)/).flatten
+      config = config.first || File.expand_path("jsTestDriver.conf")
+
+      if !File.exists?(config)
+        config = Dir.glob("**/jstestdriver*.conf", File::FNM_CASEFOLD)
+        puts "Using config file #{config[0]}" if config.length > 0
+        config = config.length > 0 ? File.expand_path(config[0]) : nil
+      end
+
+      raise ArgumentError.new("Unable to guess JsTestDriver config file, please name it jstestdriver*.conf or provide the --config option") if config.nil?
+
+      @args.sub!(/(--config\s+[^\s]+)?/, "--config #{config}")
+
+      JsTestDriver::Config.new(config)
+    end
+
     def args(add = {}, remove = [])
       args = @args
       (remove + add.keys).uniq.each { |opt| args = strip_opt(args, opt) }

data/lib/jstdutil.rb

@@ -31,7 +31,6 @@ module Jstdutil
     begin
       `java -jar #{jar} #{args}`
     rescue Exception
-      puts "I N T E R R U P T"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jstdutil
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Christian Johansen
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +01:00
+date: 2009-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -56,6 +56,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- TODO.org
 - VERSION
 - bin/jsautotest
 - bin/jstestdriver