furnish 0.0.3 → 0.0.4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+* 0.0.4 (03/25/2013)
+  * Support for FURNISH_DEBUG environment variable for test suites.
+  * Ruby 2.0.0-p0 Compatibility Fixes
+  * Documentation is RDoc 4.0 compatible.
+
 * 0.0.3 (03/21/2013)
   * Fix an issue where state wasn't tracked for provisioners themselves after the provisioning process had started.
 

data/Rakefile

@@ -10,7 +10,8 @@ end
 
 RDoc::Task.new do |rdoc|
   rdoc.title = "Furnish: A novel way to do virtual machine provisioning"
-  rdoc.rdoc_files.include("lib/**/*.rb")
+  rdoc.main = "README.md"
+  rdoc.rdoc_files.include("README.md", "lib/**/*.rb")
   rdoc.rdoc_files -= ["lib/furnish/version.rb"]
   if ENV["RDOC_COVER"]
     rdoc.options << "-C"

data/furnish.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'minitest', '~> 4.5.0'
   gem.add_development_dependency 'guard-minitest'
   gem.add_development_dependency 'guard-rake'
-  gem.add_development_dependency 'rdoc'
+  gem.add_development_dependency 'rdoc', '~> 4'
   gem.add_development_dependency 'rb-fsevent'
   gem.add_development_dependency 'simplecov'
 end

data/lib/furnish/logger.rb

@@ -89,13 +89,17 @@ module Furnish
     # if_debug is synchronized over the logger's mutex.
     #
     def if_debug(level=1, else_block=nil, &block)
-      @write_mutex.synchronize do
+      run = lambda do
         if debug_level >= level and block
           io.instance_eval(&block)
         elsif else_block
           io.instance_eval(&else_block)
         end
       end
+
+      @write_mutex.synchronize { run.call }
+    rescue ThreadError
+      run.call
     end
 
     #
@@ -104,7 +108,10 @@ module Furnish
     #
     def method_missing(sym, *args)
       raise NoMethodError, "#{io.inspect} has no method #{sym}" unless io.respond_to?(sym)
-      @write_mutex.synchronize { io.__send__(sym, *args) }
+      run = lambda { io.__send__(sym, *args) }
+      @write_mutex.synchronize { run.call }
+    rescue ThreadError
+      run.call
     end
   end
 end

data/lib/furnish/test.rb

@@ -14,20 +14,31 @@ module Furnish
   # The basic case initializes furnish and the logger in a safe way in setup,
   # and cleans up in teardown.
   #
+  # If FURNISH_DEBUG is present in the environment, the output of the furnish
+  # log will be presented to the standard error. Otherwise, it is sent a log
+  # file.
+  #
   class TestCase < MiniTest::Unit::TestCase
     def setup # :nodoc:
       @tempfiles ||= []
       file = Tempfile.new('furnish_db')
       @tempfiles.push(file)
-      logfile = Tempfile.new('furnish_log')
-      @tempfiles.push(logfile)
-      Furnish.logger = Furnish::Logger.new(logfile, 3)
+      if ENV["FURNISH_DEBUG"]
+        Furnish.logger = Furnish::Logger.new($stderr, 3)
+      else
+        logfile = Tempfile.new('furnish_log')
+        @tempfiles.push(logfile)
+        Furnish.logger = Furnish::Logger.new(logfile, 3)
+      end
       Furnish.init(file.path)
       return file
     end
 
     def teardown # :nodoc:
-      Furnish.logger.close
+      unless ENV["FURNISH_DEBUG"]
+        Furnish.logger.close
+      end
+
       Furnish.shutdown
       @tempfiles.each do |file|
         file.unlink

data/lib/furnish/version.rb

@@ -1,4 +1,4 @@
 module Furnish
   # The current version of Furnish.
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/test_provisioner_group.rb

@@ -19,6 +19,12 @@ class TestProvisionerGroup < Furnish::TestCase
   end
 
   def test_up_down
+    if ENV["FURNISH_DEBUG"]
+      $stderr.puts "Testing logging, output muted"
+      require 'stringio'
+      Furnish.logger = Furnish::Logger.new(StringIO.new, 3)
+    end
+
     store = Palsy::Object.new('dummy')
     dummy = Dummy.new
     pg = Furnish::ProvisionerGroup.new(dummy, 'blarg')
@@ -46,6 +52,6 @@ class TestProvisionerGroup < Furnish::TestCase
     assert_raises(RuntimeError, "Could not deprovision #{pg.name}/#{dummy.class.name}") { pg.shutdown }
     pg.shutdown(true)
     sleep 0.1 # wait for flush
-    assert_match(%r!Deprovision #{dummy.class.name}/#{pg.name} had errors:!, File.binread(Furnish.logger.path))
+    assert_match(%r!Deprovision #{dummy.class.name}/#{pg.name} had errors:!, Furnish.logger.string)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furnish
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: palsy
@@ -96,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -184,12 +184,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2505276676287387659
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2505276676287387659
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25