Add some colors to text formatter output

Rakefile

@@ -4,7 +4,7 @@ Bundler.require
 require 'opal/rspec/rake_task'
 Opal::RSpec::RakeTask.new(:default)
 
-desc "Build opal-rspec/rspec.js"
+desc "Build opal/opal/rspec/rspec.js"
 task :build do
   Opal::Processor.dynamic_require_severity = :warning
   Opal.append_path 'app'
@@ -15,7 +15,7 @@ task :build do
   code = Opal.process('rspec-builder')
   min  = uglify code
 
-  puts "\nDev: #{code.size}, min: #{min.size}"
+  puts "\ndevelopment: #{code.size}, minified: #{min.size}"
 
   File.open('opal/opal/rspec/rspec.js', 'w+') do |out|
     out << code
@@ -32,4 +32,3 @@ rescue Errno::ENOENT
   $stderr.puts '"uglifyjs" command not found (install with: "npm install -g uglify-js")'
   nil
 end
-

opal/opal-rspec.rb

@@ -1,2 +1 @@
 require 'opal/rspec'
-

opal/opal/rspec.rb

@@ -2,10 +2,8 @@
 require 'dir'
 require 'thread'
 
-# production
+# vendor a pre-built rspec
 require 'opal/rspec/rspec'
-# development
-# require 'rspec-builder'
 
 require 'opal/rspec/fixes'
 require 'opal/rspec/text_formatter'

opal/opal/rspec/fixes.rb

@@ -21,17 +21,3 @@ def underscore(camel_cased_word)
     word
   end
 end
-
-# These two methods break because of instance_variables(). That method should ignore
-# private variables added by opal. This breaks as we copy ._klass which makes these 
-# collections think they are arrays as we copy the _klass property from an array
-#
-# OR:
-#
-# it breaks because we copy all methods from array, and dont have our real send,
-# __send__ and class methods. This is more likely
-class RSpec::Core::Hooks::HookCollection
-  `def.$send = Opal.Kernel.$send`
-  `def.$__send__ = Opal.Kernel.$__send__`
-  `def.$class = Opal.Kernel.$class`
-end

opal/opal/rspec/runner.rb

@@ -1,50 +1,52 @@
-module Opal; module RSpec
-  class Runner
+module Opal
+  module RSpec
+    class Runner
 
-    class << self
-      def browser?
-        `typeof(document) !== "undefined"`
-      end
+      class << self
+        def browser?
+          `typeof(document) !== "undefined"`
+        end
 
-      def phantom?
-        `typeof(phantom) !== 'undefined' || typeof(OPAL_SPEC_PHANTOM) !== 'undefined'`
-      end
+        def phantom?
+          `typeof(phantom) !== 'undefined' || typeof(OPAL_SPEC_PHANTOM) !== 'undefined'`
+        end
 
-      def default_formatter
-        if phantom?
-          TextFormatter
-        else # browser
-          BrowserFormatter
+        def default_formatter
+          if phantom?
+            TextFormatter
+          else # browser
+            BrowserFormatter
+          end
         end
-      end
 
-      def autorun
-        if browser?
-          `setTimeout(function() { #{Runner.new.run} }, 0)`
-        else # phantom
-          Runner.new.run
+        def autorun
+          if browser?
+            `setTimeout(function() { #{Runner.new.run} }, 0)`
+          else # phantom
+            Runner.new.run
+          end
         end
       end
-    end
 
-    def initialize(options={}, configuration=::RSpec::configuration, world=::RSpec::world)
-      @options = options
-      @configuration = configuration
-      @world = world
-    end
+      def initialize(options={}, configuration=::RSpec::configuration, world=::RSpec::world)
+        @options = options
+        @configuration = configuration
+        @world = world
+      end
 
-    def run(err=$stdout, out=$stdout)
-      @configuration.error_stream = err
-      @configuration.output_stream ||= out
+      def run(err=$stdout, out=$stdout)
+        @configuration.error_stream = err
+        @configuration.output_stream ||= out
 
-      @configuration.reporter.report(@world.example_count) do |reporter|
-        begin
-          @configuration.run_hook(:before, :suite)
-          @world.example_groups.map {|g| g.run(reporter) }.all? ? 0 : @configuration.failure_exit_code
-        ensure
-          @configuration.run_hook(:after, :suite)
+        @configuration.reporter.report(@world.example_count) do |reporter|
+          begin
+            @configuration.run_hook(:before, :suite)
+            @world.example_groups.map {|g| g.run(reporter) }.all? ? 0 : @configuration.failure_exit_code
+          ensure
+            @configuration.run_hook(:after, :suite)
+          end
         end
       end
     end
   end
-end; end
+end

opal/opal/rspec/text_formatter.rb

@@ -3,12 +3,14 @@ module RSpec
     class TextFormatter < ::RSpec::Core::Formatters::BaseFormatter
 
       def dump_failures
-        return if failed_examples.empty?
-        puts "\n"
-        puts "Failures:"
-        failed_examples.each_with_index do |example, index|
-          puts "\n"
-          dump_failure(example, index)
+        if failed_examples.empty?
+          puts "\nFinished"
+        else
+          puts "\nFailures:"
+          failed_examples.each_with_index do |example, index|
+            puts "\n"
+            dump_failure(example, index)
+          end
         end
       end
 
@@ -20,16 +22,8 @@ def dump_failure(example, index)
       def dump_failure_info(example)
         exception = example.execution_result[:exception]
         exception_class_name = exception.class.name.to_s
-        puts "#{long_padding}#{exception_class_name}:"
-        exception.message.to_s.split("\n").each { |line| puts "#{long_padding}  #{line}" }
-      end
-
-      def short_padding
-        '  '
-      end
-
-      def long_padding
-        '     '
+        red "#{long_padding}#{exception_class_name}:"
+        exception.message.to_s.split("\n").each { |line| red "#{long_padding}  #{line}" }
       end
 
       def dump_summary(duration, example_count, failure_count, pending_count)
@@ -38,12 +32,13 @@ def dump_summary(duration, example_count, failure_count, pending_count)
         @failure_count = failure_count
         @pending_count = pending_count
 
-        puts "\nFinished\n"
-        puts "#{example_count} examples, #{failure_count} failures (time taken: #{duration})"
+        msg = "\n\n#{example_count} examples, #{failure_count} failures (time taken: #{duration})"
 
         if failure_count == 0
+          green msg
           finish_with_code(0)
         else
+          red msg
           finish_with_code(1)
         end
       end
@@ -58,6 +53,22 @@ def finish_with_code(code)
           }
         }
       end
+
+      def green(str)
+        `console.log('\\033[32m' + str + '\\033[0m')`
+      end
+
+      def red(str)
+        `console.log('\\033[31m' + str + '\\033[0m')`
+      end
+
+      def short_padding
+        '  '
+      end
+
+      def long_padding
+        '     '
+      end
     end
   end
 end