jstdutil 0.0.2 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/bin/jsautotest

@@ -2,4 +2,10 @@
 require "jstdutil"
 require "jstdutil/autotest"
 
-Jstdutil::Autotest.new($*).run
+begin
+  Jstdutil::Autotest.new($*).run
+rescue StandardError => err
+  puts "An error occurred"
+  puts err.message
+  raise err
+end

data/lib/jstdutil/autotest.rb

@@ -15,6 +15,8 @@ module Jstdutil
       @runner = Jstdutil::TestRunner.new(args)
       $jstestdriver_test_runner = @runner
       @interrupted_at = nil
+    rescue StandardError => err
+      raise err
     end
 
     def run

data/lib/jstdutil/jstestdriver/config.rb

@@ -24,12 +24,17 @@ module Jstdutil
         super
       end
 
+      def respond_to?(name)
+        return true if @contents.key?(name.to_s)
+        super
+      end
+
      private
       def load_config(contents)
         @contents = YAML.load(contents)
 
         if !@contents.respond_to?(:key?) || !@contents.key?("server")
-          raise ArgumentError.new("Error: Missing 'server' setting")
+          raise ArgumentError.new("Error: Unable to locate 'server' configuration setting. Did you provide a --config?")
         end
 
         @contents

data/lib/jstdutil/jstestdriver/server.rb

@@ -4,11 +4,15 @@ require "uri"
 module Jstdutil
   module JsTestDriver
     class Server
+      attr_reader :uri
+
       def initialize(config, args = nil)
-        @uri = URI.parse(config.respond_to?(:server) ? config.server : config)
+        uri = config.respond_to?(:server) ? config.server : config
+        @uri = URI.parse(uri)
         @args = args
-        # @server = nil
         @pid = nil
+      rescue URI::InvalidURIError => err
+        raise StandardError.new("Invalid test driver server URL #{uri}")
       end
 
       def running?

data/lib/jstdutil/redgreen.rb

@@ -2,6 +2,9 @@ begin
   require 'Win32/Console/ANSI' if PLATFORM =~ /win32/
 rescue LoadError
   raise 'You must gem install win32console to use color on Windows'
+rescue NameError
+  # PLATFORM is not defined, not a problem on windows.
+  # On other platforms we don't care
 end
 
 module Jstdutil

data/lib/jstdutil/test_runner.rb

@@ -15,6 +15,8 @@ module Jstdutil
       if config && config.server
         @server = JsTestDriver::Server.new(config, args({}, ["port"]).join(" "))
       end
+    rescue StandardError => err
+      raise err
     end
 
     def test_cases(files)
@@ -25,10 +27,14 @@ module Jstdutil
     end
 
     def run(tests = "all")
-      begin
-        @server.start unless @server.running?
-      rescue StandardError => err
-        puts err.message
+      #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}"))

data/test/jstestdriver_config_test.rb

@@ -1,5 +1,5 @@
 require "test_helper"
-require "jstdutil/jstestdriver_config"
+require "jstdutil/jstestdriver/config"
 
 class JsTestDriverConfigTest < Test::Unit::TestCase
   context "creating JsTestDriverConfig instances" do
@@ -17,7 +17,7 @@ class JsTestDriverConfigTest < Test::Unit::TestCase
       config = nil
 
       assert_nothing_raised do
-        config = Jstdutil::JsTestDriverConfig.new @file
+        config = Jstdutil::JsTestDriver::Config.new @file
       end
 
       assert_equal @server, config.server
@@ -27,7 +27,7 @@ class JsTestDriverConfigTest < Test::Unit::TestCase
       config = nil
 
       assert_nothing_raised do
-        config = Jstdutil::JsTestDriverConfig.new "server: #{@server}"
+        config = Jstdutil::JsTestDriver::Config.new "server: #{@server}"
       end
 
       assert_equal @server, config.server
@@ -35,7 +35,7 @@ class JsTestDriverConfigTest < Test::Unit::TestCase
 
     should "raise error if no valid configuration is provided" do
       assert_raise ArgumentError do
-        Jstdutil::JsTestDriverConfig.new "bogus"
+        Jstdutil::JsTestDriver::Config.new "bogus"
       end
     end
   end

data/test/test_helper.rb

@@ -3,7 +3,7 @@ require 'test/unit'
 require 'shoulda'
 require 'mocha'
 require 'fileutils'
-require 'redgreen'
+require 'redgreen' if RUBY_VERSION < "1.9"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jstdutil
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Christian Johansen