guard-jstd 0.1.0 → 0.1.1

data/Changelog.md

@@ -0,0 +1,13 @@
+### 0.1.1 / 2011-04-09
+
+* Enhancements
+  * Formatter - improved colorization
+  * Jstd - #reload runs all tests
+* Bug fixes
+  * Jstd - disable #run_all when Guard::CoffeeScript is installed. Use #reload instead
+  * CaseFinder - removes duplicate TestCases
+
+## 0.1.0 / 2011-04-08
+
+* Enhancements
+  * Added configuration options

data/README.md

@@ -22,7 +22,9 @@ Generate the suggested Guardfile with:
 
 See the [Guard](http://github.com/guard/guard) gem README for more information about using Guard.
 
-If you want to use CoffeeScript in your development, add the [guard-coffeescript gem.](https://github.com/guard/guard-coffeescript)
+By default, Guard::Jstd will attempt to start the JsTestDriver server. This is done as a forked process, so when you stop Guard with <tt>Ctrl-C</tt>, the Jstd server will also stop.
+
+<tt>Ctrl-\</tt> or <tt>Ctrl-Z</tt> will run all of your tests.
 
 ## Configuration
 
@@ -53,3 +55,7 @@ The default JsTestDriver configuration file name is 'jsTestDriver.conf'. If you
 ## JsTestDriver
 
 Information about setting up JsTestDriver on your system can be [found here](http://www.arailsdemo.com/posts/46) or on the JsTestDriver [homepage.](http://code.google.com/p/js-test-driver/)
+
+## Guard::CoffeeScript
+
+If you want to use CoffeeScript in your development, add the [guard-coffeescript gem.](https://github.com/guard/guard-coffeescript) To avoid conflict with Guard::CoffeeScript, <tt>Ctrl-\</tt> is disabled for Guard::Jstd. Use <tt>Ctrl-Z</tt> instead to run all tests.

data/lib/guard/jstd/case_finder.rb

@@ -5,7 +5,7 @@ module Guard
         paths.collect do |path|
           contents = File.read(path)
           contents.scan(/TestCase\s*\(\s*["']([^"']+)/)
-        end.flatten.join(',')
+        end.flatten.uniq.join(',')
       end
     end
   end

data/lib/guard/jstd/formatter.rb

@@ -4,7 +4,8 @@ module Guard
       TITLES =
         {
           :failed => 'You have failing tests.',
-          :success => "All of your tests passed."
+          :success => "All of your tests passed.",
+          :error => "You had some errors."
         }
 
       COLORS =
@@ -30,21 +31,47 @@ module Guard
         @failed ||= results.match(/failed/)
       end
 
+      def errors_present?
+        lines[0].match(/error/)
+      end
+
       def notify
-        status = any_failed? ? :failed : :success
-        ::Guard::Notifier.notify( lines[1].lstrip,
-          { :title => TITLES[status], :image => status }
+        if errors_present?
+          status = :error
+          image = { :image => :failed }
+          message = lines[0]
+        else
+          status = any_failed? ? :failed : :success
+          image = { :image => status }
+          message = lines[1]
+        end
+
+        ::Guard::Notifier.notify( message.lstrip,
+          { :title => TITLES[status] }.merge(image)
         )
       end
 
       def colorize_results
        lines.collect do |line|
-          if line =~ /failed/
-            colorize(line, :failed)
-          elsif line =~ /Fails: (\d+);/
-            status = $1.to_i == 0 ? :success : :failed
-            colorize(line, status)
+          if line =~ /failed|error/
+            colorize(line, line, :failed)
           else
+            if line =~ /((Passed: (\d+)); (Fails: (\d+)); (Errors:? (\d+)))/
+              if $5 == "0" && $7 == "0"
+                colorize(line, line, :success)
+              else
+#               if $3 != "0"
+#                 colorize(line, $2, :success)
+#               end
+                [3, 5, 7].each do |tally|
+                  if eval("$#{tally}") != "0"
+                    status = tally == 3 ? :success : :failed
+                    colorize(line, eval("$#{tally - 1}"), status)
+                  end
+                end
+              end
+            end
+
             line
           end
         end.join("\n")
@@ -56,8 +83,8 @@ module Guard
 
       private
 
-      def colorize(text, status)
-        "#{COLORS[status]}#{text}\e[0m"
+      def colorize(text, part, status)
+        text.gsub!(part, "#{COLORS[status]}#{part}\e[0m")
       end
     end
   end

data/lib/guard/jstd/runner.rb

@@ -23,6 +23,7 @@ module Guard
                           " --browser #{browser_paths}" : ""
             pid = fork {
               trap('QUIT', 'IGNORE')
+              trap('TSTP', 'IGNORE')
               `#{java_command} --port #{server_port}#{browser_opt}`
             }
             Process.detach(pid)

data/lib/guard/jstd/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module JstdVersion
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/guard/jstd.rb

@@ -14,6 +14,11 @@ module Guard
     end
 
     def run_all
+      Runner.run unless defined?(::Guard::CoffeeScript) &&
+            ::Guard.guards.any? { |guard| guard.class == ::Guard::CoffeeScript }
+    end
+
+    def reload
       Runner.run
     end
 

data/spec/guard/jstd/case_finder_spec.rb

@@ -10,6 +10,7 @@ describe Guard::Jstd::CaseFinder do
 
   def file2
     <<-CASES
+       TestCase('Second'    , {})
        TestCase('Third'    , {})
        TestCase("Fourth", {
          "test": function () {

data/spec/guard/jstd/formatter_spec.rb

@@ -1,6 +1,8 @@
 require "spec_helper"
 
 describe Guard::Jstd::Formatter do
+  let(:klass) { ::Guard::Jstd::Formatter }
+
   let(:failed) do
     <<-FAILED
     ..
@@ -12,16 +14,6 @@ describe Guard::Jstd::Formatter do
     FAILED
   end
 
-  let(:passed) do
-    <<-PASSED
-    ....
-    Total 4 tests (Passed: 4; Fails: 0; Errors: 0) (4.00 ms)
-      Chrome 10.0.648.204 Mac OS: Run 4 tests (Passed: 4; Fails: 0; Errors 0) (4.00 ms)
-    PASSED
-  end
-
-  let(:klass) { ::Guard::Jstd::Formatter }
-
   context "--failed test--" do
     subject { klass.new(failed) }
 
@@ -36,12 +28,16 @@ describe Guard::Jstd::Formatter do
     end
 
     describe "#colorized_results" do
-      it "adds color to the failed test" do
+      it "adds color to the failure message" do
         subject.colorize_results.should match /\[31m\s+Sneaky3.test/
       end
 
-      it "adds color to the failed overview line" do
-        subject.colorize_results.should match /\[31m\s+Chrome/
+      it "adds color to the failure tally" do
+        subject.colorize_results.should match /\[31mFails: 1/
+      end
+
+      it "adds color to the passed tally" do
+          subject.colorize_results.should match /\[32mPassed: 1/
       end
     end
 
@@ -55,6 +51,14 @@ describe Guard::Jstd::Formatter do
   end
 
   context "--all tests passed--" do
+    let(:passed) do
+      <<-PASSED
+      ....
+      Total 4 tests (Passed: 4; Fails: 0; Errors: 0) (4.00 ms)
+        Chrome 10.0.648.204 Mac OS: Run 4 tests (Passed: 4; Fails: 0; Errors 0) (4.00 ms)
+      PASSED
+    end
+
     subject { klass.new(passed) }
 
     its(:any_failed?) { should be_false }
@@ -68,7 +72,51 @@ describe Guard::Jstd::Formatter do
     end
 
     it "#colorized_results adds color to the successful overview line" do
-      subject.colorize_results.should match /\[32m\s+Total/
+      colorized = subject.colorize_results
+      colorized.should match /\[32m\s*Total/
+    end
+  end
+
+  context "--errors present--" do
+    context "-Java error-" do
+      let(:java_error) do
+        <<-ERROR
+        java.lang.RuntimeException: Connection error on: sun.net.www.protocol.
+                at com.google.jstestdriver.HttpServer.postJson(HttpServer.java:124)
+        ERROR
+      end
+
+      subject { klass.new(java_error) }
+
+      it "#notify should send :error arguments to Nofitier" do
+        message = "java.lang.RuntimeException: Connection error on: sun.net.www.protocol."
+        ::Guard::Notifier.should_receive(:notify).with(
+          message, { :title => klass::TITLES[:error], :image => :failed }
+        )
+        subject.notify
+      end
+
+      it "#colorized_results adds color to the error description line" do
+        subject.colorize_results.should match /\[31m\s+java.lang./
+      end
+    end
+
+    context "-JavaScript error-" do
+      let(:javascript_error) do
+        <<-ERROR
+
+        Total 0 tests (Passed: 0; Fails: 0; Errors: 0) (0.00 ms)
+          Chrome 10.0.648.204 Mac OS: Run 1 tests (Passed: 0; Fails: 0; Errors 1) (0.00 ms)
+            error loading file: /test/javascripts/test/hello_test.js:33: Uncaught SyntaxError: Unexpected token ;
+        Tests failed: Tests failed. See log for details.
+        ERROR
+      end
+
+      subject { klass.new(javascript_error) }
+
+      it "#colorized_results add color to the summary line" do
+        subject.colorize_results.should match /\[31mErrors 1/
+      end
     end
   end
 

data/spec/guard/jstd/runner_spec.rb

@@ -106,9 +106,10 @@ describe Guard::Jstd::Runner do
           subject.start_server
         end
 
-        it "traps the 'QUIT' signal before sending it to the child process" do
+        it "traps the 'QUIT' and 'TSTP' signals before sending it to the child process" do
           subject.should_receive("`").with('hooha --port 1234') { 'hooha' }
           subject.should_receive(:trap).with('QUIT', 'IGNORE')
+          subject.should_receive(:trap).with('TSTP', 'IGNORE')
           subject.should_receive(:fork) { |&block| block.call }
           subject.start_server
         end

data/spec/guard/jstd_spec.rb

@@ -22,11 +22,30 @@ describe Guard::Jstd do
     end
   end
 
-  it " #run_all runs all tests" do
-    klass::Runner.should_receive(:run)
-    subject.run_all
+  describe "#run_all" do
+    it "runs all tests" do
+      klass::Runner.should_receive(:run)
+      subject.run_all
+    end
+
+# TODO remove ::Guard::CoffeeScript when test is done
+    it "does not run tests if Guard::CoffeeScript is present" do
+      ::Guard::CoffeeScript = Class.new
+      Guard.stub(:guards) { [::Guard::CoffeeScript.new, ::Guard::Jstd.new] }
+      klass::Runner.should_not_receive(:run)
+#      Object.send :remove_const, "::Guard::CoffeeScript"
+      subject.run_all
+    end
   end
 
+  describe "#reload" do
+    it "runs all without checking for CoffeeScript" do
+      klass::Runner.should_receive :run
+      subject.reload
+    end
+  end
+
+
   describe "#run_on_change" do
     it "starts the Runner with the corresponding TestCases" do
       paths = ['foo/bar.js', 'hand/foot.js']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-jstd
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - aRailsDemo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 Z
+date: 2011-04-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: guard
@@ -60,6 +60,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Changelog.md
 - Gemfile
 - Guardfile
 - LICENSE