mixlib-log 1.1.0 → 1.2.0

data/Rakefile

@@ -14,22 +14,31 @@ begin
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install gemcutter jeweler (installs jeweler from gemcutter)"
+  STDERR.puts
+  STDERR.puts "Jeweler is not installed. (sudo) gem install jeweler to use gem packaging tasks"
+  STDERR.puts
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+begin
+  require 'spec/rake/spectask'
+  Spec::Rake::SpecTask.new(:spec) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+    spec.spec_files = FileList['spec/**/*_spec.rb']
+  end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+  Spec::Rake::SpecTask.new(:rcov) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+  end
+rescue LoadError
+  task :spec do
+    abort "Rspec is not available. (sudo) gem install rspec to run unit tests"
+  end
 end
 
+
 begin
   require 'cucumber/rake/task'
   Cucumber::Rake::Task.new(:features)
@@ -42,6 +51,8 @@ end
 task :default => :spec
 
 require 'rake/rdoctask'
+require 'yaml'
+
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION.yml')
     config = YAML.load(File.read('VERSION.yml'))

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
 :major: 1
-:minor: 1 
-:patch: 0 
+:minor: 2
+:patch: 0
+:build: 

data/lib/mixlib/log.rb

@@ -30,7 +30,7 @@ module Mixlib
     # and creates a new one if it doesn't yet exist
     ##
     def logger
-      init
+      @logger || init
     end
 
     def logger=(value)
@@ -45,11 +45,9 @@ module Mixlib
     #
     # It also configures the Logger instance it creates to use the custom Mixlib::Log::Formatter class.
     def init(*opts)
-      if @logger.nil?
-        @logger = (opts.empty? ? Logger.new(STDOUT) : Logger.new(*opts))
-        @logger.formatter = Mixlib::Log::Formatter.new()
-        @logger.level = Logger::WARN
-      end
+      @logger = (opts.empty? ? Logger.new(STDOUT) : Logger.new(*opts))
+      @logger.formatter = Mixlib::Log::Formatter.new()
+      @logger.level = Logger::WARN
       @logger
     end
     
@@ -79,8 +77,8 @@ module Mixlib
     # Passes any other method calls on directly to the underlying Logger object created with init. If
     # this method gets hit before a call to Mixlib::Logger.init has been made, it will call 
     # Mixlib::Logger.init() with no arguments.
-    def method_missing(method_symbol, *args)
-      logger.send(method_symbol, *args)
+    def method_missing(method_symbol, *args, &block)
+      logger.send(method_symbol, *args, &block)
     end
     
   end

data/spec/mixlib/log_spec.rb

@@ -29,10 +29,21 @@ describe Mixlib::Log do
   end
   
   it "should accept regular options to Logger.new via init" do
-    tf = Tempfile.new("chef-test-log")
-    tf.open
-    lambda { Logit.init(STDOUT) }.should_not raise_error
-    lambda { Logit.init(tf) }.should_not raise_error
+    Tempfile.open("chef-test-log") do |tf|
+      lambda { Logit.init(STDOUT) }.should_not raise_error
+      lambda { Logit.init(tf) }.should_not raise_error
+    end
+  end
+
+  it "should re-initialize the logger if init is called again" do
+    first_logdev, second_logdev = StringIO.new, StringIO.new
+    Logit.init(first_logdev)
+    Logit.fatal "FIRST"
+    first_logdev.string.should match(/FIRST/)
+    Logit.init(second_logdev)
+    Logit.fatal "SECOND"
+    first_logdev.string.should_not match(/SECOND/)
+    second_logdev.string.should match(/SECOND/)
   end
   
   it "should set the log level using the binding form,  with :debug, :info, :warn, :error, or :fatal" do
@@ -49,7 +60,15 @@ describe Mixlib::Log do
       Logit.level.should == symbol
     end
   end
-  
+
+  it "passes blocks to the underlying logger object" do
+    logdev = StringIO.new
+    Logit.init(logdev)
+    Logit.fatal { "the_message" }
+    logdev.string.should match(/the_message/)
+  end
+
+
   it "should set the log level using the method form, with :debug, :info, :warn, :error, or :fatal" do
     levels = {
       :debug => Logger::DEBUG,

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Opscode, Inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -08:00
+date: 2010-10-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -54,6 +54,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -61,6 +62,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -70,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A gem that provides a simple mixin for log functionality