mynyml-redgreen 0.5.2 → 0.6

data/Rakefile

@@ -1,18 +1,10 @@
-load 'test/tests.rake'
-task(:default => "test:all")
-
 # --------------------------------------------------
 # Tests
 # --------------------------------------------------
-namespace(:test) do
+load 'test/tests.rake'
+task(:default => "test:all")
 
-  desc "Run all tests"
-  task(:all) do
-    tests = Dir['test/**/test_*.rb'] - ['test/test_helper.rb']
-    cmd = "ruby -rubygems -I.:lib -e'%w( #{tests.join(' ')} ).each {|file| require file }'"
-    puts(cmd) if ENV['VERBOSE']
-    system(cmd)
-  end
+namespace(:test) do
 
   desc "Run all tests on multiple ruby versions (requires rvm)"
   task(:portability) do

data/lib/redgreen/expectations.rb

@@ -1,19 +1,20 @@
 require 'expectations/suite_results'
-require 'override'
 
 class Expectations::SuiteResults
-  override :print_success
-  def print_success
-    super
+  def new_print_success
+    old_print_success
     out.puts RedGreen.visual
     out.puts
   end
+  alias :old_print_success :print_success
+  alias :print_success :new_print_success
 
-  override :print_fail
-  def print_fail
-    super
+  def new_print_fail
+    old_print_fail
     RedGreen.colour = :red
     out.puts RedGreen.visual
     out.puts
   end
+  alias :old_print_fail :print_fail
+  alias :print_fail :new_print_fail
 end

data/lib/redgreen/minitest.rb

@@ -1,21 +1,22 @@
 require 'minitest/unit'
-require 'override'
 
 class MiniTest::Unit::TestCase
-  override :run
-  def run(runner)
-    result = super
+  def new_run(runner)
+    result = old_run(runner)
     RedGreen.colour = :red unless self.passed?
     result
   end
+  alias :old_run :run
+  alias :run :new_run
 end
 
 class MiniTest::Unit
-  override :run
-  def run(args = [])
-    count = super
+  def new_run(args = [])
+    count = old_run(args)
     @@out.puts RedGreen.visual
     @@out.puts
     count
   end
+  alias :old_run :run
+  alias :run :new_run
 end

data/lib/redgreen/testunit.rb

@@ -1,20 +1,21 @@
 require 'test/unit/testresult'
 require 'test/unit/ui/console/testrunner'
 require 'test/unit/ui/testrunnermediator'
-require 'override'
 
 class Test::Unit::UI::Console::TestRunner
 
-  override :attach_to_mediator
-  def attach_to_mediator
-    super
+  def new_attach_to_mediator
+    old_attach_to_mediator
     @mediator.add_listener(Test::Unit::TestResult::FAULT) { RedGreen.colour = :red }
   end
+  alias :old_attach_to_mediator :attach_to_mediator
+  alias :attach_to_mediator :new_attach_to_mediator
 
-  override :finished
-  def finished(elapsed_time)
-    super
+  def new_finished(elapsed_time)
+    old_finished(elapsed_time)
     output(RedGreen.visual)
     nl
   end
+  alias :old_finished :finished
+  alias :finished :new_finished
 end

data/redgreen.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                = 'mynyml-redgreen'
-  s.version             = '0.5.2'
+  s.version             = '0.6'
   s.summary             = "Standalone redgreen eye candy for test results, ala autotest"
   s.description         = "Standalone redgreen eye candy for test results, ala autotest."
   s.author              = "Martin Aumont"
@@ -11,13 +11,12 @@ Gem::Specification.new do |s|
   s.require_path        = "lib"
   s.files               =  File.read("Manifest").strip.split("\n")
 
-  s.add_dependency 'mynyml-override', '>= 0.5.2' #gemcutter
   s.add_dependency 'term-ansicolor',  '>= 1.0.4'
 
   s.add_development_dependency 'minitest',                '>= 1.3.1'
   s.add_development_dependency 'expectations',            '>= 1.2.1'
-  s.add_development_dependency 'thoughtbot-shoulda',      '>= 2.10.1'
-  s.add_development_dependency 'citrusbyte-contest',      '>= 0.1.1'
+  s.add_development_dependency 'shoulda',                 '>= 2.10.1'
+  s.add_development_dependency 'contest',                 '>= 0.1.1'
   s.add_development_dependency 'jeremymcanally-context',  '>= 0.5.5'
 end
 

data/specs.watchr

@@ -2,26 +2,14 @@
 #
 #   $ watchr specs.watchr
 
-# --------------------------------------------------
-# Helpers
-# --------------------------------------------------
-def run(cmd)
-  puts(cmd)
-  system(cmd)
-end
-
-def run_all_tests
-  # see Rakefile for the definition of the test:all task
-  system( "rake -s test:all VERBOSE=true" )
-end
-
 # --------------------------------------------------
 # Watchr Rules
 # --------------------------------------------------
-watch( '^examples\.rb'         )  { |m| system( "ruby -rubygems -Ilib %s"              % m[0] ) }
-watch( '^test.*/test_.*\.rb'   )  { |m|    run( "ruby -rubygems -Ilib %s"              % m[0] ) }
-watch( '^lib/(.*)\.rb'         )  { |m|    run( "ruby -rubygems -Ilib test/test_%s.rb" % m[1] ) }
-watch( '^test/test_helper\.rb' )  { run_all_tests }
+watch( '^test.*/test_.*\.rb'        )   { |m| system "ruby -rubygems -I.:lib %s" % m[0]                    }
+watch( '^lib/redgreen/(.*)\.rb'     )   { |m| system "rake test:by_fw FW=%s"     % m[1]                    }
+watch( '^lib/redgreen/testunit\.rb' )   { |m| system "rake test:by_fw FW=testunit,shoulda,context,contest" }
+watch( '^lib/redgreen\.rb'          )   { |m| system "rake -s test:all"                                    }
+watch( '^test/test_helper\.rb'      )   { |m| system "rake -s test:all"                                    }
 
 # --------------------------------------------------
 # Signal Handling
@@ -29,7 +17,7 @@ watch( '^test/test_helper\.rb' )  { run_all_tests }
 # Ctrl-\
 Signal.trap('QUIT') do
   puts " --- Running all tests ---\n\n"
-  run_all_tests
+  system "rake -s test:all"
 end
 
 # Ctrl-C

data/test/contest/test_failure.rb

@@ -1,7 +1,5 @@
-require 'pathname'
 require 'contest'
-root  =  Pathname(__FILE__).dirname.parent.parent
-require  root + 'lib/redgreen'
+require 'lib/redgreen'
 
 class TestContestFailure < Test::Unit::TestCase
   def test_failure

data/test/contest/test_success.rb

@@ -1,7 +1,5 @@
-require 'pathname'
 require 'contest'
-root  =  Pathname(__FILE__).dirname.parent.parent
-require  root + 'lib/redgreen'
+require 'lib/redgreen'
 
 class TestContestSuccess < Test::Unit::TestCase
   def test_success

data/test/context/test_failure.rb

@@ -1,7 +1,5 @@
-require 'pathname'
 require 'context'
-root  =  Pathname(__FILE__).dirname.parent.parent
-require  root + 'lib/redgreen'
+require 'lib/redgreen'
 
 class TestContextFailure < Test::Unit::TestCase
   def test_failure

data/test/context/test_success.rb

@@ -1,7 +1,5 @@
-require 'pathname'
 require 'context'
-root  =  Pathname(__FILE__).dirname.parent.parent
-require  root + 'lib/redgreen'
+require 'lib/redgreen'
 
 class TestContextSuccess < Test::Unit::TestCase
   def test_success

data/test/expectations/test_failure.rb

@@ -1,10 +1,12 @@
-require 'pathname'
+unless RUBY_VERSION >= '1.9'
+
 require 'expectations'
-root  =  Pathname(__FILE__).dirname.parent.parent
-require  root + 'lib/redgreen'
+require 'lib/redgreen'
 
 Expectations do
   expect "THIS TEST SHOULD FAIL" do
     true
   end
 end
+
+end

data/test/expectations/test_success.rb

@@ -1,10 +1,12 @@
-require 'pathname'
+unless RUBY_VERSION >= '1.9'
+
 require 'expectations'
-root  =  Pathname(__FILE__).dirname.parent.parent
-require  root + 'lib/redgreen'
+require 'lib/redgreen'
 
 Expectations do
   expect "THIS TEST SHOULD PASS" do
     "THIS TEST SHOULD PASS"
   end
 end
+
+end

data/test/minitest/test_failure.rb

@@ -1,7 +1,5 @@
-require 'pathname'
 require 'minitest/autorun'
-root  =  Pathname(__FILE__).dirname.parent.parent
-require  root + 'lib/redgreen'
+require 'lib/redgreen'
 
 class TestTestUnitFailure < MiniTest::Unit::TestCase
   def test_failure

data/test/minitest/test_success.rb

@@ -1,7 +1,5 @@
-require 'pathname'
 require 'minitest/autorun'
-root  =  Pathname(__FILE__).dirname.parent.parent
-require  root + 'lib/redgreen'
+require 'lib/redgreen'
 
 class TestTestUnitSuccess < MiniTest::Unit::TestCase
   def test_success

data/test/shoulda/test_failure.rb

@@ -1,7 +1,5 @@
-require 'pathname'
 require 'shoulda'
-root  =  Pathname(__FILE__).dirname.parent.parent
-require  root + 'lib/redgreen'
+require 'lib/redgreen'
 
 class TestShouldaFailure < Test::Unit::TestCase
   def test_failure

data/test/shoulda/test_success.rb

@@ -1,7 +1,5 @@
-require 'pathname'
 require 'shoulda'
-root  =  Pathname(__FILE__).dirname.parent.parent
-require  root + 'lib/redgreen'
+require 'lib/redgreen'
 
 class TestShouldaSuccess < Test::Unit::TestCase
   def test_success

data/test/tests.rake

@@ -6,18 +6,18 @@ namespace(:test) do
     test_root = Pathname(__FILE__).dirname
 
     files = %w(
-          testunit/test_success.rb
           testunit/test_failure.rb
-          minitest/test_success.rb
+          testunit/test_success.rb
           minitest/test_failure.rb
-           contest/test_success.rb
+          minitest/test_success.rb
            contest/test_failure.rb
-           context/test_success.rb
+           contest/test_success.rb
            context/test_failure.rb
-           shoulda/test_success.rb
+           context/test_success.rb
            shoulda/test_failure.rb
-      expectations/test_success.rb
+           shoulda/test_success.rb
       expectations/test_failure.rb
+      expectations/test_success.rb
     )
     files.map! {|file| Pathname(file).expand_path(test_root) }
     files.each {|file| system("ruby -rubygems -I.:lib #{file}") }

data/test/testunit/test_failure.rb

@@ -1,7 +1,5 @@
-require 'pathname'
 require 'test/unit'
-root  =  Pathname(__FILE__).dirname.parent.parent
-require  root + 'lib/redgreen'
+require 'lib/redgreen'
 
 class TestTestUnitFailure < Test::Unit::TestCase
   def test_failure

data/test/testunit/test_success.rb

@@ -1,7 +1,5 @@
-require 'pathname'
 require 'test/unit'
-root  =  Pathname(__FILE__).dirname.parent.parent
-require  root + 'lib/redgreen'
+require 'lib/redgreen'
 
 class TestTestUnitSuccess < Test::Unit::TestCase
   def test_success

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mynyml-redgreen
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: "0.6"
 platform: ruby
 authors: 
 - Martin Aumont
@@ -12,16 +12,6 @@ cert_chain: []
 date: 2009-11-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mynyml-override
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.2
-    version: 
 - !ruby/object:Gem::Dependency 
   name: term-ansicolor
   type: :runtime
@@ -53,7 +43,7 @@ dependencies:
         version: 1.2.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -63,7 +53,7 @@ dependencies:
         version: 2.10.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: citrusbyte-contest
+  name: contest
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement