echoe 2.7.3 → 2.7.4

data/CHANGELOG

@@ -1,6 +1,8 @@
 
 vSVN. support compiling without extension registration for win32 and java targets.
 
+v2.7.4. Ensured teardown.rb just like setup.rb. Load multi_rails automatically if its available. ENV['VERBOSE'] obeyed for Echoe.silence.
+
 v2.7.3. Put some handy things in lib/echoe/extensions.rb; use Rake::TestTask instead of screwing around in the shell. Automatically run test/setup.rb before the test task, if it exists.
 
 v2.7.2. Don't try to verify the existence of the RDoc template. Fixes for the RCov task.

data/lib/echoe.rb

@@ -15,6 +15,11 @@ begin
 rescue LoadError
 end
 
+begin
+  require 'load_multi_rails_rake_tasks'
+rescue LoadError
+end
+
 gem 'rubyforge', '>=0.4.0'
 require 'rubyforge'
 
@@ -612,21 +617,33 @@ class Echoe
   
     ### Testing
   
-    Rake::TestTask.new do |t|
+    Rake::TestTask.new(:test_inner) do |t|
       t.libs += ['lib', 'ext', 'bin', 'test']
       t.test_files = test_pattern
       t.verbose = true
     end
   
-    task :default => :test
-            
-    if File.exist? 'test/setup.rb'
-      task :setup_test_environment do
-        Echoe.silence { system("ruby test/setup.rb") }
+    task :test do
+      if File.exist? 'test/setup.rb'  
+        Echoe.silence do
+          puts "Setting up test environment"
+          system("ruby test/setup.rb")
+        end
       end
-      task :test => :setup_test_environment 
+      begin
+        Rake::Task[:test_inner].already_invoked = false
+        Rake::Task[:test_inner].invoke
+      ensure        
+        if File.exist? 'test/teardown.rb'        
+          Echoe.silence do 
+            puts "Tearing down test environment"
+            system("ruby test/teardown.rb")
+          end
+        end
+      end      
     end
-    
+  
+    task :default => :test
     
     if defined? Rcov      
       Rcov::RcovTask.new(:coverage) do |t|

data/lib/echoe/extensions.rb

@@ -11,16 +11,19 @@ end
 
 class Echoe
 
-  # http://pastie.caboo.se/127840
-  
   def self.silence
-    stdout, stderr = $stdout.clone, $stderr.clone
-    $stdout.reopen(File.new('/tmp/stdout.echoe', 'w'))
-    $stderr.reopen(File.new('/tmp/stderr.echoe', 'w'))
-    yield
-    $stdout.reopen(stdout)
-    $stderr.reopen(stderr)
+    if !ENV['VERBOSE']      
+      stdout, stderr = $stdout.clone, $stderr.clone
+      $stdout.reopen(File.new('/tmp/stdout.echoe', 'w'))
+      $stderr.reopen(File.new('/tmp/stderr.echoe', 'w'))
+      yield
+      $stdout.reopen(stdout)
+      $stderr.reopen(stderr)
+    else
+      yield
+    end
   end
+  
 end
 
 # Redefine instead of chain a Rake task

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: echoe
 version: !ruby/object:Gem::Version 
-  version: 2.7.3
+  version: 2.7.4
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2007-12-12 00:00:00 -05:00
+date: 2007-12-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency