jstdutil 0.1.2 → 0.2.0

data/Changelog

@@ -0,0 +1,4 @@
+== 0.2.0 / 2010-06-14
+* HTML output with --html, courtesy of http://github.com/magnars
+* Fix bug where --config option was not automatically added to
+  jsautotest --reset

data/README.rdoc

@@ -15,4 +15,4 @@ Description goes here.
 
 == Copyright
 
-Copyright (c) 2009 Christian Johansen. See LICENSE for details.
+Copyright (c) 2009-2010 Christian Johansen. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/jstdutil/cli.rb

@@ -15,8 +15,9 @@ module Jstdutil
     def self.run(args = [])
       args = args.join(" ")
       jar = (args.match(/--jar\s+([^\s]+)/) || [])[1] || Jstdutil.jar
-
-      Jstdutil::RedGreen.format(Jstdutil.run("#{args.sub(/--jar\s+[^\s]+/, '')}", jar))
+      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
   end
 end

data/lib/jstdutil/colorful_html.rb

@@ -0,0 +1,20 @@
+module Jstdutil
+  class ColorfulHtml
+
+    module Color
+
+      def self.method_missing(color_name, *args)
+        color(color_name) + args.first + "</span>"
+      end
+
+      def self.color(color)
+        "<span class='#{color}'>"
+      end
+    end
+    
+    def self.wrap_report(report)
+      "<style>.red {color: #c00;} .green {color: #0c0;} .yellow {color: #ff0;} </style><pre>#{report}</pre>"
+    end
+  
+  end
+end

data/lib/jstdutil/formatter.rb

@@ -0,0 +1,29 @@
+module Jstdutil
+  class Formatter
+    #
+    # Process report from JsTestDriver and colorize it with beautiful
+    # colors. Returns report with encoded colors.
+    #
+    def self.format(report, type)
+      return "" if report.nil?
+
+      type.wrap_report(report.split("\n").collect do |line|
+        if line =~ /Passed: 0; Fails: 0; Errors:? 0/
+          type::Color.yellow(line)
+        elsif line =~ /Passed: \d+; Fails: (\d+); Errors:? (\d+)/
+          type::Color.send($1.to_i + $2.to_i != 0 ? :red : :green, line)
+        elsif line =~ /^[\.EF]+$/
+          line.gsub(/\./, type::Color.green(".")).gsub(/F/, type::Color.red("F")).gsub("E", type::Color.yellow("E"))
+        elsif line =~ /failed/
+          type::Color.red(line)
+        elsif line =~ /passed/
+          type::Color.green(line)
+        elsif line =~ /error/
+          type::Color.yellow(line)
+        else
+          line
+        end
+      end.join("\n"))
+    end
+  end
+end

data/lib/jstdutil/redgreen.rb

@@ -23,30 +23,9 @@ module Jstdutil
       end
     end
 
-    #
-    # Process report from JsTestDriver and colorize it with beautiful
-    # colors. Returns report with encoded colors.
-    #
-    def self.format(report)
-      return "" if report.nil?
-
-      report.split("\n").collect do |line|
-        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"))
-        elsif line =~ /failed/
-          Color.red(line)
-        elsif line =~ /passed/
-          Color.green(line)
-        elsif line =~ /error/
-          Color.yellow(line)
-        else
-          line
-        end
-      end.join("\n")
+    def self.wrap_report(report)
+      report
     end
+
   end
 end

data/lib/jstdutil/test_runner.rb

@@ -56,7 +56,7 @@ module Jstdutil
 
       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}")
+      @args.sub!(/(--config\s+[^\s]+)?/, "--config #{config} ")
 
       JsTestDriver::Config.new(config)
     end

data/lib/jstdutil.rb

@@ -1,4 +1,6 @@
+require "jstdutil/formatter"
 require "jstdutil/redgreen"
+require "jstdutil/colorful_html"
 #require "jstdutil/autotest"
 
 module Jstdutil

data/test/cli_test.rb

@@ -8,7 +8,7 @@ class JstdutilCliTest < Test::Unit::TestCase
       jar = "path/to.jar"
       result = "REPORT"
       Jstdutil.expects(:run).with("--tests all ", jar).returns(result)
-      Jstdutil::RedGreen.expects(:format).with(result).returns(result * 2)
+      Jstdutil::Formatter.expects(:format).with(result, Jstdutil::RedGreen).returns(result * 2)
 
       assert_equal result * 2, Jstdutil::Cli.run("--tests all --jar #{jar}".split(" "))
     end
@@ -18,9 +18,19 @@ class JstdutilCliTest < Test::Unit::TestCase
       result = "REPORT"
       Jstdutil.expects(:jar).returns(jar)
       Jstdutil.expects(:run).with("--tests all", jar).returns(result)
-      Jstdutil::RedGreen.expects(:format).with(result).returns(result * 2)
+      Jstdutil::Formatter.expects(:format).with(result, Jstdutil::RedGreen).returns(result * 2)
 
       assert_equal result * 2, Jstdutil::Cli.run("--tests all".split(" "))
     end
+    
+    should "run jstestdriver command through JsColorfulHtml with --html" do
+      jar = "path/to.jar"
+      result = "REPORT"
+      Jstdutil.expects(:jar).returns(jar)
+      Jstdutil.expects(:run).with("--tests all ", jar).returns(result)
+      Jstdutil::Formatter.expects(:format).with(result, Jstdutil::ColorfulHtml).returns(result * 2)
+
+      assert_equal result * 2, Jstdutil::Cli.run("--tests all --html".split(" "))
+    end
   end
 end

data/test/colorful_html_test.rb

@@ -0,0 +1,25 @@
+require "test_helper"
+
+class ColorfulHtmlTest < Test::Unit::TestCase
+  context "adding pretty colors" do
+
+    should "wrap in green" do
+      assert_equal "<span class='green'>trees</span>", Jstdutil::ColorfulHtml::Color.green("trees")
+    end
+
+    should "wrap in red" do
+      assert_equal "<span class='red'>dress</span>", Jstdutil::ColorfulHtml::Color.red("dress")
+    end
+
+  end
+  
+  context "wrapping report" do
+    
+    should "add styles and pre" do
+      assert_equal "<style>.red {color: #c00;} .green {color: #0c0;} .yellow {color: #ff0;} </style><pre>present</pre>",
+                   Jstdutil::ColorfulHtml.wrap_report("present")
+    end
+    
+  end
+  
+end

data/test/formatter_test.rb

@@ -0,0 +1,48 @@
+require "test_helper"
+
+class FormatterTest < Test::Unit::TestCase
+  context "formatting report" do
+    setup do
+      @report = <<-REPORT
+.FE
+Total 3 tests (Passed: 1; Fails: 1; Errors: 1) (2.00 ms)
+  Mozilla 1.9.1.2: Run 3 tests (Passed: 1; Fails: 1; Errors 1) (2.00 ms)
+    GreeterTest.testSomethingElse failed (1.00 ms): expected "1" but was "2"
+    ()@http://localhost:4224/test/test/greeter_test.js:10
+      [LOG] UH!
+    GreeterTest.testSomethingElseFails error (1.00 ms): assertEqual is not defined
+    ()@http://localhost:4224/test/test/greeter_test.js:14
+      REPORT
+    end
+
+    should "add pretty colors for both RedGreen and ColorfulHtml" do
+      verify_pretty_colors(Jstdutil::RedGreen)
+      verify_pretty_colors(Jstdutil::ColorfulHtml)
+    end
+
+  end
+
+  def verify_pretty_colors(type)
+    report = Jstdutil::Formatter.format(@report, type)
+
+    lines = @report.split("\n")
+
+    expected = type::Color.green(".") +
+      type::Color.red("F") +
+      type::Color.yellow("E") + "\n"
+    expected << type::Color.red(lines[1]) + "\n"
+    expected << type::Color.red(lines[2]) + "\n"
+    expected << type::Color.red(lines[3]) + "\n"
+    expected << lines[4] + "\n"
+    expected << lines[5] + "\n"
+    expected << type::Color.yellow(lines[6]) + "\n"
+    expected << lines[7]
+
+    expected = type.wrap_report(expected)
+
+    expected.split("\n").size.times {|i|
+      assert_equal expected.split("\n")[i], report.split("\n")[i]
+    }
+    assert_equal expected, report
+  end
+end

data/test/redgreen_test.rb

@@ -1,45 +1,23 @@
 require "test_helper"
 
 class RedGreenTest < Test::Unit::TestCase
-  context "formatting report" do
-    setup do
-      @report = <<-REPORT
-.FE
-Total 3 tests (Passed: 1; Fails: 1; Errors: 1) (2.00 ms)
-  Mozilla 1.9.1.2: Run 3 tests (Passed: 1; Fails: 1; Errors 1) (2.00 ms)
-    GreeterTest.testSomethingElse failed (1.00 ms): expected "1" but was "2"
-    ()@http://localhost:4224/test/test/greeter_test.js:10
-      [LOG] UH!
-    GreeterTest.testSomethingElseFails error (1.00 ms): assertEqual is not defined
-    ()@http://localhost:4224/test/test/greeter_test.js:14
-      REPORT
-    end
+  context "adding pretty colors" do
 
-    should "add pretty colors" do
-      report = Jstdutil::RedGreen.format(@report)
+    should "wrap in green" do
+      assert_equal "\e[32mtrees\e[0m", Jstdutil::RedGreen::Color.green("trees")
+    end
 
-      lines = @report.split("\n")
+    should "wrap in red" do
+      assert_equal "\e[31mdress\e[0m", Jstdutil::RedGreen::Color.red("dress")
+    end
 
-      expected = Jstdutil::RedGreen::Color.green(".") +
-        Jstdutil::RedGreen::Color.red("F") +
-        Jstdutil::RedGreen::Color.yellow("E") + "\n"
-      expected << Jstdutil::RedGreen::Color.red(lines[1]) + "\n"
-      expected << Jstdutil::RedGreen::Color.red(lines[2]) + "\n"
-      expected << Jstdutil::RedGreen::Color.red(lines[3]) + "\n"
-      expected << lines[4] + "\n"
-      expected << lines[5] + "\n"
-      expected << Jstdutil::RedGreen::Color.yellow(lines[6]) + "\n"
-      expected << lines[7]
+  end
+  
+  context "wrapping report" do
 
-      assert_equal expected.split("\n")[0], report.split("\n")[0]
-      assert_equal expected.split("\n")[1], report.split("\n")[1]
-      assert_equal expected.split("\n")[2], report.split("\n")[2]
-      assert_equal expected.split("\n")[3], report.split("\n")[3]
-      assert_equal expected.split("\n")[4], report.split("\n")[4]
-      assert_equal expected.split("\n")[5], report.split("\n")[5]
-      assert_equal expected.split("\n")[6], report.split("\n")[6]
-      assert_equal expected.split("\n")[7], report.split("\n")[7]
-      assert_equal expected, report
+    should "add nothing" do
+      assert_equal "bare", Jstdutil::RedGreen.wrap_report("bare")
     end
+
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Christian Johansen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +02:00
+date: 2010-06-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- Changelog
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -74,6 +75,8 @@ files:
 - lib/jstdutil.rb
 - lib/jstdutil/autotest.rb
 - lib/jstdutil/cli.rb
+- lib/jstdutil/colorful_html.rb
+- lib/jstdutil/formatter.rb
 - lib/jstdutil/hooks.rb
 - lib/jstdutil/jstestdriver/config.rb
 - lib/jstdutil/jstestdriver/server.rb
@@ -82,6 +85,8 @@ files:
 - lib/jstdutil/test_runner.rb
 - lib/watchr_script
 - test/cli_test.rb
+- test/colorful_html_test.rb
+- test/formatter_test.rb
 - test/jstdutil_test.rb
 - test/jstestdriver_config_test.rb
 - test/jstestdriver_test.rb
@@ -119,6 +124,7 @@ signing_key:
 specification_version: 3
 summary: Thin wrapper over Google's JsTestDriver that adds colors and autotest
 test_files: 
+- test/formatter_test.rb
 - test/jstestdriver_test.rb
 - test/cli_test.rb
 - test/test_file_test.rb
@@ -126,3 +132,4 @@ test_files:
 - test/test_helper.rb
 - test/jstdutil_test.rb
 - test/jstestdriver_config_test.rb
+- test/colorful_html_test.rb