disinnovate-greeneggs 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/greeneggs.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{greeneggs}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Fleet"]
-  s.date = %q{2009-06-10}
+  s.date = %q{2009-06-14}
   s.email = %q{disinnovate@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/greeneggs.rb

@@ -9,57 +9,51 @@
 
 module Bacon
 	class << self
-		COLORS = {
-			'F'		=> "\e[1m\e[31m",	# FAILED: red
-			:fail	=> "\e[1m\e[31m",	# FAILED: red
-			'E'		=> "\e[1m\e[35m",	# ERROR: purple
-			'M'		=> "\e[1m\e[33m",	# MISSING: yellow
-			:ok 	=> "\e[1m\e[32m"	# PASSED/OK: green
-		}
+		# ANSI terminal colors
+		COLORS = { 'F' => 31,	'E' => 35, 'M' => 33, :ok => 32	}
 
- 		alias_method :output_handle_requirement, :handle_requirement
-    def handle_requirement(description)
-  			print(colorize_requirement { output_handle_requirement(description) { yield } })
-    end
-
- 		alias_method :output_handle_summary, :handle_summary
- 	  def handle_summary
- 			puts(colorize_summary { output_handle_summary })
- 	  end
+		def colorize_string(text, color); "\e[1m\e[#{COLORS[color]}m#{text}\e[0m"; end
 
-		private
-		def capture_stdout
-			s = StringIO.new
-		  oldstdout = $stdout
-		  $stdout = s
-		  yield
-		  s.string
-		ensure
-		  $stdout = oldstdout
-		end
-
-		def colorize_requirement
-			out = capture_stdout { yield }
+		def colorize_result(out)
+			return out if PLATFORM =~ /win32/ 
 
-			color = case out
+			requirement_color = case out
 			when /(FAILED|ERROR|MISSING)/ then $1[0..0] # SpecDox, Tap, Knock
 			when /\A([FME])\Z/ then $1 # TestUnit
 			else :ok
 			end
 
-			out.sub(/^(.|(ok|not ok|-) .+)$/, colorize('\0', color))
-		end
-
-		def colorize_summary
-			line = capture_stdout { yield }
+			summary_color = out.match(/0 failures, 0 errors/).nil? ? 'F' : :ok
 
-			color = line.match(/0 failures, 0 errors/).nil? ? :fail : :ok
-			line.sub(/^.+\d+ failures, \d+ errors$/, colorize('\0', color))
+			out.sub(/^(.|(ok|not ok|-) .+)$/, 
+				colorize_string('\0', requirement_color)).sub(/^.+\d+ failures, \d+ errors$/, 
+					colorize_string('\0', summary_color))
 		end
 
-		def colorize(text, color)
-			"#{COLORS[color]}#{text}\e[0m"
+		def puts(*args)
+			args.map! { |arg| arg.instance_of?(String) ? colorize_result(arg) : arg }
+			super(args)
 		end
 
+		def print(*args)
+			args.map! { |arg| arg.instance_of?(String) ? colorize_result(arg) : arg }
+			super(args)
+		end
 	end
+
+  module SpecDoxOutput
+    def handle_requirement(description)
+      error = yield
+      puts "- #{description}" << (error.empty? ? "" : " [#{error}]")
+    end
+  end
+
+  module TestUnitOutput
+    def handle_summary
+      puts "\n"
+      puts ErrorLog  if Backtraces
+      puts "%d tests, %d assertions, %d failures, %d errors" %
+        Counter.values_at(:specifications, :requirements, :failed, :errors)
+    end
+  end
 end

data/spec/greeneggs_spec.rb

@@ -1,18 +1,18 @@
-require 'spec_helper'
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
-describe 'Greeneggs' do
-  it 'should display passing specs in green' do
+describe 'GreenEggs terminal output' do
+  it 'should display this passing specs in green' do
     true.should.eql? true
   end
 
-  it 'should display empty specs in yellow' do
+  it 'should display this empty spec in yellow' do
   end
 
-  it 'should display err-raising specs in purple/magenta' do
+  it 'should display this error-raising spec in purple/magenta' do
 		raise 'this is a dummy error'
   end
 
-  it 'should display failed specs in red' do
+  it 'should display this failed spec in red' do
     should.flunk 'this is a dummy failure'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: disinnovate-greeneggs
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Michael Fleet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-10 00:00:00 -07:00
+date: 2009-06-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency