jstdutil 0.2.2 → 0.3.0

data/Changelog

@@ -1,3 +1,8 @@
+== 0.3.0 / 2010-09-17
+* Add --reset when changing source files
+* No --reset when changing test files
+* No server sniffing - much faster
+
 == 0.2.2 / 2010-09-17
 * Escape config path to avoid trouble with paths with spaces
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/bin/jstestdriver

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
 begin
   require "jstdutil"
-  require "jstdutil/cli"
+  require "jstdutil/test_runner"
 rescue LoadError => err
   exit
 end
 
 begin
-  $stdout.puts Jstdutil::Cli.run($*)
+  $stdout.puts Jstdutil::TestRunner.new($*).run()
 rescue StandardError => err
+  puts err.message
   # Swallow...
 end

data/lib/jstdutil/cli.rb

@@ -1,3 +1,5 @@
+require "jstdutil"
+
 module Jstdutil
   #
   # <tt>Jstdutil::Cli</tt> is a tiny wrapper to the JsTestDriver
@@ -15,7 +17,7 @@ module Jstdutil
     def self.run(args = [])
       args = args.join(" ")
       jar = (args.match(/--jar\s+([^\s]+)/) || [])[1] || Jstdutil.jar
-      format_type = args.match(/--html/) ? Jstdutil::ColorfulHtml : Jstdutil::RedGreen;
+      format_type = args.match(/--html/) ? Jstdutil::ColorfulHtml : Jstdutil::RedGreen
       report = Jstdutil.run("#{args.gsub(/(--jar\s+[^\s]+|--html)/, '')}", jar)
       Jstdutil::Formatter.format(report, format_type)
     end

data/lib/jstdutil/test_runner.rb

@@ -19,22 +19,17 @@ module Jstdutil
 
     def test_cases(files)
       files = files.respond_to?(:captures) ? files.captures : files
-      cases = files.collect { |file| TestFile.new(file).test_cases }.flatten.join(",")
+      @args = @args.sub(/--reset\s*/, "")
 
+      cases = files.collect do |file|
+        @args = @args.sub(/(\s*--reset)?$/, " --reset") if file !~ /_test\.js$/
+        TestFile.new(file).test_cases
+      end.flatten.join(",")
+      
       cases == "" && "all" || cases
     end
 
     def run(tests = "all")
-      #begin
-      #  @server.start unless @server.running?
-      #rescue StandardError => err
-      #  puts err.message
-      #end
-      if !@server.running?
-        puts "Server not running, you want to start it with jstestdriver --port #{@server.uri.port}"
-        exit
-      end
-
       puts(Time.now.strftime("%F %H:%M:%S Running #{tests}"))
       puts(Jstdutil::Cli.run(args("tests" => tests)))
     end

data/lib/jstdutil.rb

@@ -32,7 +32,7 @@ module Jstdutil
   def self.run(args, jar)
     begin
       `java -jar #{jar} #{args}`
-    rescue Exception
+    rescue Exception => err
     end
   end
 end

data/test/jstestdriver_test.rb

@@ -18,7 +18,7 @@ class JstdutilCliTest < Test::Unit::TestCase
         end
       end
 
-      assert_equal "\n", stdout
+      assert_equal "", stdout
     end
   end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Christian Johansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 +02:00
+date: 2010-09-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,7 +86,6 @@ files:
 - lib/jstdutil/formatter.rb
 - lib/jstdutil/hooks.rb
 - lib/jstdutil/jstestdriver/config.rb
-- lib/jstdutil/jstestdriver/server.rb
 - lib/jstdutil/redgreen.rb
 - lib/jstdutil/test_file.rb
 - lib/jstdutil/test_runner.rb

data/lib/jstdutil/jstestdriver/server.rb

@@ -1,62 +0,0 @@
-# require 'open3'
-require "uri"
-
-module Jstdutil
-  module JsTestDriver
-    class Server
-      attr_reader :uri
-
-      def initialize(config, args = nil)
-        uri = config.respond_to?(:server) ? config.server : config
-        @uri = URI.parse(uri)
-        @args = args
-        @pid = nil
-      rescue URI::InvalidURIError => err
-        raise StandardError.new("Invalid test driver server URL #{uri}")
-      end
-
-      def running?
-        response = nil
-
-        begin
-          Net::HTTP.start(@uri.host, @uri.port) { |http| response = http.head("/") }
-        rescue Errno::ECONNREFUSED => err
-          return false
-        end
-
-        response.code == "200"
-      end
-
-      def start
-        if !["localhost", "127.0.0.1", "0.0.0.0"].include?(@uri.host)
-          raise "Unable to start remote server on #{@uri.host}"
-        end
-
-        puts "Starting server on http://#{@uri.host}:#{@uri.port}"
-        # @server = IO.popen("jstestdriver #{@args} --port #{@uri.port}")
-        # [stdin, stdout, stderr] = Open3.popen3("jstestdriver #{@args} --port #{@uri.port}")
-        # @server = stderr
-
-        @pid = Process.fork do
-          io = `jstestdriver --port #{@uri.port}`
-
-          Signal.trap("HUP") do
-            puts "JsTestDriver at port #@port going down"
-            !io.closed? && io.close!
-            exit
-          end
-        end
-
-        # sleep 0.5
-      end
-
-      def stop
-        # @server && !@server.closed? && @server.close
-        if @pid
-          Process.kill("HUP", @pid)
-          Process.wait
-        end
-      end
-    end
-  end
-end