mixlib-log 2.0.4 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f38162b462a52fdf0dd4465f19065171321ac07e34a5a65f9ab577f77b22dcf
-  data.tar.gz: dafa77b839b7ea7f94ee5614d29a054756d2d0115100fa7f3b44f2afcb23624a
+  metadata.gz: 95493c0814c7d9168427a11a611f5e55eb9b104635267bb2f62fae5c29b5d005
+  data.tar.gz: 3a64b2405bbe57c2cb2bfb72b815c67c3470b38c47dd6835c2dba61d5195f18d
 SHA512:
-  metadata.gz: e4b4141f0fcbe6f14ac1ff949f7771179cb617af4fc0f7d1f934d7e3db67e70dfd9dc443886f64ceda4a1531b946c945567bea69e82405cef3ea746bb28bf9ff
-  data.tar.gz: 6c2a02ccc1d4967241d5a4439562cff07ef0620c750ee29809ecb172c81a24e7b7b746ebcc4da8fdf6a3f2f1d89210f7cc3fee5efbe96eac460aa082c720ecdf
+  metadata.gz: cde4bc246b2e9878fe2ce87026c6be03cf6c9d7d031f3fe29c73eb1d162076f8b30820ad8cccfa125f012787da33de5e681c25bc15f4ac1413e45b3dc8cd6b07
+  data.tar.gz: 6f88ebc29a7e9989f1d391d44a105c1583573e7b7f70a4c8cb6853202c52417614dece03a48b3bdb9210e9a2f1a9e42fc24540ce3ad921406c6d2041ba30fdbd

data/lib/mixlib/log.rb

@@ -17,26 +17,27 @@
 # limitations under the License.
 
 require "logger"
-require "mixlib/log/version"
-require "mixlib/log/formatter"
-require "mixlib/log/child"
-require "mixlib/log/logging"
-require "mixlib/log/logger"
+require_relative "log/version"
+require_relative "log/formatter"
+require_relative "log/child"
+require_relative "log/logging"
+require_relative "log/logger"
 
 module Mixlib
   module Log
 
     include Logging
-    @logger, @loggers = nil
 
     def reset!
+      @logger  ||= nil
+      @loggers ||= []
       close!
-      @logger, @loggers = nil, nil
+      @logger = @loggers = nil
       @metadata = {}
     end
 
     # An Array of log devices that will be logged to. Defaults to just the default
-    # @logger log device, but you can push to this array to add more devices.
+    # \@logger log device, but you can push to this array to add more devices.
     def loggers
       @loggers ||= [logger]
     end
@@ -46,7 +47,7 @@ module Mixlib
     # and creates a new one if it doesn't yet exist
     ##
     def logger
-      @logger || init
+      @logger ||= init
     end
 
     # Sets the log device to +new_log_device+. Any additional loggers
@@ -60,7 +61,7 @@ module Mixlib
       if other.respond_to?(:loggers) && other.respond_to?(:logger)
         @loggers = other.loggers
         @logger = other.logger
-      elsif other.kind_of?(Array)
+      elsif other.is_a?(Array)
         @loggers = other
         @logger = other.first
       else
@@ -81,7 +82,7 @@ module Mixlib
     def init(*opts)
       reset!
       @logger = logger_for(*opts)
-      @logger.formatter = Mixlib::Log::Formatter.new() if @logger.respond_to?(:formatter=)
+      @logger.formatter = Mixlib::Log::Formatter.new if @logger.respond_to?(:formatter=)
       @logger.level = Logger::WARN
       @configured = true
       @parent = nil
@@ -109,6 +110,7 @@ module Mixlib
     def level=(new_level)
       level_int = LEVEL_NAMES.key?(new_level) ? new_level : LEVELS[new_level]
       raise ArgumentError, "Log level must be one of :trace, :debug, :info, :warn, :error, or :fatal" if level_int.nil?
+
       loggers.each { |l| l.level = level_int }
     end
 
@@ -124,7 +126,7 @@ module Mixlib
     # Note that we *only* query the default logger (@logger) and not any other
     # loggers that may have been added, even though it is possible to configure
     # two (or more) loggers at different log levels.
-    [:trace?, :debug?, :info?, :warn?, :error?, :fatal?].each do |method_name|
+    %i{trace? debug? info? warn? error? fatal?}.each do |method_name|
       define_method(method_name) do
         logger.send(method_name)
       end
@@ -136,7 +138,7 @@ module Mixlib
 
     def add(severity, message = nil, progname = nil, data: {}, &block)
       message, progname, data = yield if block_given?
-      data = metadata.merge(data) if metadata.kind_of?(Hash) && data.kind_of?(Hash)
+      data = metadata.merge(data) if metadata.is_a?(Hash) && data.is_a?(Hash)
       loggers.each do |l|
         # if we don't have any metadata, let's not do the potentially expensive
         # merging and managing that this call requires
@@ -170,7 +172,7 @@ module Mixlib
 
     def logger_for(*opts)
       if opts.empty?
-        Mixlib::Log::Logger.new(STDOUT)
+        Mixlib::Log::Logger.new($stdout)
       elsif LEVELS.keys.inject(true) { |quacks, level| quacks && opts.first.respond_to?(level) }
         opts.first
       else
@@ -190,7 +192,9 @@ module Mixlib
         # via public API. In order to reduce amount of impact and
         # handle only File type log devices I had to use this method
         # to get access to it.
+        next unless logger.instance_variable_defined?(:"@logdev")
         next unless (logdev = logger.instance_variable_get(:"@logdev"))
+
         loggers_to_close << logger if logdev.filename
       end
       loggers_to_close

data/lib/mixlib/log/child.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "mixlib/log/logging"
+require_relative "logging"
 
 module Mixlib
   module Log
@@ -36,14 +36,14 @@ module Mixlib
       # Note that we *only* query the default logger (@logger) and not any other
       # loggers that may have been added, even though it is possible to configure
       # two (or more) loggers at different log levels.
-      [:trace?, :debug?, :info?, :warn?, :error?, :fatal?].each do |method_name|
+      %i{trace? debug? info? warn? error? fatal?}.each do |method_name|
         define_method(method_name) do
           parent.send(method_name)
         end
       end
 
       def add(severity, message = nil, progname = nil, data: {}, &block)
-        data = metadata.merge(data) if data.kind_of?(Hash)
+        data = metadata.merge(data) if data.is_a?(Hash)
         parent.send(:pass, severity, message, progname, data: data, &block)
       end
 

data/lib/mixlib/log/formatter.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 
 require "logger"
-require "time"
+require "time" unless defined?(Time.zone_offset)
 
 module Mixlib
   module Log
@@ -31,7 +31,7 @@ module Mixlib
       # Otherwise, doesn't print the time.
       def call(severity, time, progname, msg)
         if @@show_time
-          sprintf("[%s] %s: %s\n", time.iso8601(), severity, msg2str(msg))
+          sprintf("[%s] %s: %s\n", time.iso8601, severity, msg2str(msg))
         else
           sprintf("%s: %s\n", severity, msg2str(msg))
         end

data/lib/mixlib/log/logger.rb

@@ -1,5 +1,5 @@
 require "logger"
-require "mixlib/log/logging"
+require_relative "logging"
 
 # A subclass of Ruby's stdlib Logger with all the mutex and logrotation stuff
 # ripped out, and metadata added in.
@@ -21,7 +21,7 @@ module Mixlib
       #
       # +logdev+::
       #   The log device.  This is a filename (String) or IO object (typically
-      #   +STDOUT+, +STDERR+, or an open file).
+      #   +$stdout+, +$stderr+, or an open file).
       # +shift_age+::
       #   Number of old log files to keep, *or* frequency of rotation (+daily+,
       #   +weekly+ or +monthly+).
@@ -45,14 +45,16 @@ module Mixlib
 
       def add_data(severity, message, progname, data: {})
         return true if @logdev.nil? || severity < @level
+
         data ||= {}
-        if message.kind_of?(::Exception)
+        if message.is_a?(::Exception)
           data[:err] = message
         else
           data[:msg] = message
         end
         @logdev.write(
-          format_message(to_label(severity), Time.now, progname, data))
+          format_message(to_label(severity), Time.now, progname, data)
+        )
         true
       end
       alias_method :add, :add_data

data/lib/mixlib/log/logging.rb

@@ -29,7 +29,7 @@ module Mixlib
         SEV_LABEL[sev + 1] || -"ANY"
       end
 
-      LEVELS = { :trace => TRACE, :debug => DEBUG, :info => INFO, :warn => WARN, :error => ERROR, :fatal => FATAL }.freeze
+      LEVELS = { trace: TRACE, debug: DEBUG, info: INFO, warn: WARN, error: ERROR, fatal: FATAL }.freeze
       LEVEL_NAMES = LEVELS.invert.freeze
 
       attr_accessor :metadata
@@ -41,7 +41,7 @@ module Mixlib
 
       # Define the standard logger methods on this class programmatically.
       # No need to incur method_missing overhead on every log call.
-      [:trace, :debug, :info, :warn, :error, :fatal].each do |method_name|
+      %i{trace debug info warn error fatal}.each do |method_name|
         level = LEVELS[method_name]
         define_method(method_name) do |msg = nil, data: {}, &block|
           pass(level, msg, data: data, &block)

data/lib/mixlib/log/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   module Log
-    VERSION = "2.0.4"
+    VERSION = "3.0.9".freeze
   end
 end

metadata

@@ -1,112 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-log
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 3.0.9
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: chefstyle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.3
+date: 2020-08-21 00:00:00.000000000 Z
+dependencies: []
 description: 
 email: info@chef.io
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
-- LICENSE
-- NOTICE
+extra_rdoc_files: []
 files:
-- ".gemtest"
-- Gemfile
 - LICENSE
-- NOTICE
-- README.md
-- Rakefile
 - lib/mixlib/log.rb
 - lib/mixlib/log/child.rb
 - lib/mixlib/log/formatter.rb
 - lib/mixlib/log/logger.rb
 - lib/mixlib/log/logging.rb
 - lib/mixlib/log/version.rb
-- mixlib-log.gemspec
-- spec/mixlib/log/child_spec.rb
-- spec/mixlib/log/formatter_spec.rb
-- spec/mixlib/log_spec.rb
-- spec/spec_helper.rb
-homepage: https://www.chef.io
+homepage: https://github.com/chef/mixlib-log
 licenses:
 - Apache-2.0
 metadata: {}
@@ -118,15 +35,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A gem that provides a simple mixin for log functionality

data/Gemfile

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-group :development do
-  gem "rdoc"
-  gem "bundler"
-end

data/NOTICE

@@ -1,28 +0,0 @@
-============
-Mixin::Log Notices
-============
-
-Developed at Chef (http://www.chef.io).
-
-
- * Copyright 2009-2016, Chef Software, Inc. <legal@chef.io>
-
-Mixin::Log incorporates code from Chef.  The Chef notice file follows:
-
-============
-Chef Notices
-============
-
-Developed at Chef (http://www.chef.io).
-
-Contributors and Copyright holders:
-
- * Copyright 2008, Adam Jacob <adam@chef.io>
- * Copyright 2008, Arjuna Christensen <aj@hjksolutions.com>
- * Copyright 2008, Bryan McLellan <btm@loftninjas.org>
- * Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com>
- * Copyright 2009, Sean Cribbs <seancribbs@gmail.com>
- * Copyright 2009, Christopher Brown <cb@chef.io>
- * Copyright 2009, Thom May <thom@clearairturbulence.org>
-
-Chef incorporates code modified from Open4 (http://www.codeforpeople.com/lib/ruby/open4/), which was written by Ara T. Howard.

data/README.md

@@ -1,55 +0,0 @@
-# Mixlib::Log
-
-[![Build Status Master](https://travis-ci.org/chef/mixlib-log.svg?branch=master)](https://travis-ci.org/chef/mixlib-log) [![Gem Version](https://badge.fury.io/rb/mixlib-log.svg)](https://badge.fury.io/rb/mixlib-log)
-
-Mixlib::Log provides a mixin for enabling a class based logger object, a-la Merb, Chef, and Nanite. To use it:
-
-```ruby
-require 'mixlib/log'
-
-class Log
-  extend Mixlib::Log
-end
-```
-
-You can then do:
-
-```ruby
-Log.debug('foo')
-Log.info('bar')
-Log.warn('baz')
-Log.error('baz')
-Log.fatal('wewt')
-```
-
-By default, `Mixlib::Logger` logs to STDOUT. To alter this, you should call `Log.init`, passing any arguments to the standard Ruby Logger. For example:
-
-```ruby
-Log.init('/tmp/logfile')  # log to /tmp/logfile   
-Log.init('/tmp/logfile', 7)  # log to /tmp/logfile, rotate every day
-```
-
-Enjoy!
-
-## Contributing
-
-For information on contributing to this project see <https://github.com/chef/chef/blob/master/CONTRIBUTING.md>
-
-## License
-
-- Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
-- License:: Apache License, Version 2.0
-
-```text
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-```

data/Rakefile

@@ -1,43 +0,0 @@
-require "bundler/gem_tasks"
-require "rdoc/task"
-require "rspec/core/rake_task"
-require "cucumber/rake/task"
-
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = "spec/**/*_spec.rb"
-end
-
-task default: [:style, :spec, :features]
-
-# For rubygems-test
-task :test => :spec
-
-RDoc::Task.new do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.title = "mixlib-log #{Mixlib::Log::VERSION}"
-  rdoc.rdoc_files.include("README*")
-  rdoc.rdoc_files.include("lib/**/*.rb")
-end
-
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "--format pretty"
-end
-
-begin
-  require "chefstyle"
-  require "rubocop/rake_task"
-  RuboCop::RakeTask.new(:style) do |task|
-    task.options += ["--display-cop-names", "--no-color"]
-  end
-rescue LoadError
-  puts "chefstyle/rubocop is not available.  gem install chefstyle to do style checking."
-end
-
-require "github_changelog_generator/task"
-
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.future_release = Mixlib::Log::VERSION
-  config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
-  config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
-  config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion".split(",")
-end

data/mixlib-log.gemspec

@@ -1,22 +0,0 @@
-$:.unshift File.expand_path("../lib", __FILE__)
-require "mixlib/log/version"
-
-Gem::Specification.new do |gem|
-  gem.name = "mixlib-log"
-  gem.version = Mixlib::Log::VERSION
-  gem.platform = Gem::Platform::RUBY
-  gem.summary = "A gem that provides a simple mixin for log functionality"
-  gem.email = "info@chef.io"
-  gem.homepage = "https://www.chef.io"
-  gem.license = "Apache-2.0"
-  gem.authors = ["Chef Software, Inc."]
-  gem.has_rdoc = true
-  gem.extra_rdoc_files = ["README.md", "LICENSE", "NOTICE"]
-  gem.files = Dir["lib/**/*"] + Dir["spec/**/*"] + ["Gemfile", "Rakefile", ".gemtest", "mixlib-log.gemspec"]
-  gem.required_ruby_version = ">= 2.2"
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 3.7"
-  gem.add_development_dependency "chefstyle"
-  gem.add_development_dependency "cucumber"
-  gem.add_development_dependency "github_changelog_generator", ">= 1.11.3"
-end

data/spec/mixlib/log/child_spec.rb

@@ -1,99 +0,0 @@
-#
-# Copyright:: Copyright (c) 2018 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "tempfile"
-require "stringio"
-require "spec_helper"
-
-RSpec.describe Mixlib::Log::Child do
-  before do
-    Logit.reset!
-    Logit.init(io)
-    Logit.level = :warn
-  end
-
-  let(:io) { StringIO.new }
-
-  let(:child) { Logit.with_child }
-
-  it "has a parent" do
-    expect(child.parent).to be(Logit)
-  end
-
-  it "accepts a message" do
-    Logit.with_child { |l| l.add(Logger::WARN, "a message") }
-    expect(io.string).to match(/a message$/)
-  end
-
-  context "with structured data" do
-    it "can be created with metadata" do
-      expect(Logit).to receive(:pass).with(Mixlib::Log::LEVELS[:warn], "a message", nil, data: { child: "true" })
-      Logit.with_child({ child: "true" }) { |l| l.warn("a message") }
-    end
-
-    it "a message can be logged" do
-      expect(Logit).to receive(:pass).with(Mixlib::Log::LEVELS[:warn], "a message", nil, data: { child: "true" })
-      Logit.with_child { |l| l.warn("a message", data: { child: "true" }) }
-    end
-
-    context "merges properly" do
-      it "in the simple case" do
-        expect(Logit).to receive(:pass).with(Mixlib::Log::LEVELS[:warn], "a message", nil, data: { child: "true", meta: "data" })
-        Logit.with_child(meta: "data") { |l| l.warn("a message", data: { child: "true" }) }
-      end
-
-      it "when overwriting" do
-        expect(Logit).to receive(:pass).with(Mixlib::Log::LEVELS[:warn], "a message", nil, data: { child: "true", meta: "overwritten" })
-        Logit.with_child(meta: "data") { |l| l.warn("a message", data: { child: "true", meta: "overwritten" }) }
-      end
-    end
-
-    context "when receiving a message from a child" do
-      it "passes data on" do
-        expect(Logit).to receive(:pass).with(Mixlib::Log::LEVELS[:warn], "a message", nil, data: { child: "true", parent: "first" })
-        child.metadata = { parent: "first" }
-        child.with_child { |l| l.warn("a message", data: { child: "true" }) }
-      end
-
-      it "merges its own data" do
-        expect(Logit).to receive(:pass).with(Mixlib::Log::LEVELS[:warn], "a message", nil, data: { child: "true", parent: "second" })
-        child.metadata = { parent: "first" }
-        child.with_child { |l| l.warn("a message", data: { child: "true", parent: "second" }) }
-      end
-    end
-  end
-
-  context "sends a message to the parent" do
-    %i{ debug info warn error fatal }.each do |level|
-      it "at #{level}" do
-        expect(Logit).to receive(:pass).with(Mixlib::Log::LEVELS[level], "a #{level} message", nil, data: {})
-        Logit.level = level
-        child.send(level, "a #{level} message")
-      end
-    end
-  end
-
-  context "can query the parent's level" do
-    %i{ debug info warn error fatal }.each do |level|
-      it "at #{level}" do
-        query = "#{level}?".to_sym
-        Logit.level = level
-        expect(child.send(query)).to be(true)
-      end
-    end
-  end
-end

data/spec/mixlib/log/formatter_spec.rb

@@ -1,64 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "time"
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
-
-RSpec.describe Mixlib::Log::Formatter do
-  before(:each) do
-    @formatter = Mixlib::Log::Formatter.new
-  end
-
-  it "should print raw strings with msg2str(string)" do
-    expect(@formatter.msg2str("nuthin new")).to eq("nuthin new")
-  end
-
-  it "should format exceptions properly with msg2str(e)" do
-    e = IOError.new("legendary roots crew")
-    expect(@formatter.msg2str(e)).to eq("legendary roots crew (IOError)\n")
-  end
-
-  it "should format random objects via inspect with msg2str(Object)" do
-    expect(@formatter.msg2str([ "black thought", "?uestlove" ])).to eq('["black thought", "?uestlove"]')
-  end
-
-  it "should return a formatted string with call" do
-    time = Time.new
-    Mixlib::Log::Formatter.show_time = true
-    expect(@formatter.call("monkey", time, "test", "mos def")).to eq("[#{time.iso8601}] monkey: mos def\n")
-  end
-
-  it "should allow you to turn the time on and off in the output" do
-    Mixlib::Log::Formatter.show_time = false
-    expect(@formatter.call("monkey", Time.new, "test", "mos def")).to eq("monkey: mos def\n")
-  end
-
-  context "with structured data" do
-    let(:data) { {} }
-
-    it "should format a message" do
-      data[:msg] = "nuthin new"
-      expect(@formatter.msg2str(data)).to eq("nuthin new")
-    end
-
-    it "should format an exception" do
-      data[:err] = IOError.new("legendary roots crew")
-      expect(@formatter.msg2str(data)).to eq("legendary roots crew (IOError)\n")
-    end
-  end
-end

data/spec/mixlib/log_spec.rb

@@ -1,234 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Christopher Brown (<cb@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "tempfile"
-require "stringio"
-require "spec_helper"
-
-class LoggerLike
-  attr_accessor :level
-  attr_reader :messages, :data
-  def initialize
-    @messages = ""
-    @data = []
-  end
-
-  def add_data(severity, message = nil, progname = nil, data: {})
-    @messages << message
-    @data << data
-  end
-
-  def add(severity, message = nil, progname = nil, data: {})
-    @messages << message
-  end
-
-  [:trace, :debug, :info, :warn, :error, :fatal].each do |method_name|
-    class_eval(<<-E)
-      def #{method_name}(message)
-        @messages << message
-      end
-    E
-  end
-end
-
-RSpec.describe Mixlib::Log do
-
-  # Since we are testing class behaviour for an instance variable
-  # that gets set once, we need to reset it prior to each example [cb]
-  before(:each) do
-    Logit.reset!
-  end
-
-  it "creates a logger using an IO object" do
-    io = StringIO.new
-    Logit.init(io)
-    Logit << "foo"
-    expect(io.string).to match(/foo/)
-  end
-
-  it "creates a logger with a file name" do
-    Tempfile.open("chef-test-log") do |tempfile|
-      Logit.init(tempfile.path)
-      Logit << "bar"
-      tempfile.rewind
-      expect(tempfile.read).to match(/bar/)
-    end
-  end
-
-  it "uses the logger provided when initialized with a logger like object" do
-    logger = LoggerLike.new
-    Logit.init(logger)
-    Logit.level = :debug
-    Logit.debug "qux"
-    expect(logger.messages).to match(/qux/)
-  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"
-    expect(first_logdev.string).to match(/FIRST/)
-    Logit.init(second_logdev)
-    Logit.fatal "SECOND"
-    expect(first_logdev.string).to_not match(/SECOND/)
-    expect(second_logdev.string).to match(/SECOND/)
-  end
-
-  it "knows that it's been configured" do
-    Logit.init
-    expect(Logit.configured?).to be true
-  end
-
-  it "should set the log level using the binding form,  with :trace, :debug, :info, :warn, :error, or :fatal" do
-    levels = {
-      :trace => Mixlib::Log::TRACE,
-      :debug => Mixlib::Log::DEBUG,
-      :info  => Mixlib::Log::INFO,
-      :warn  => Mixlib::Log::WARN,
-      :error => Mixlib::Log::ERROR,
-      :fatal => Mixlib::Log::FATAL,
-    }
-    levels.each do |symbol, constant|
-      Logit.level = symbol
-      expect(Logit.logger.level).to eq(constant)
-      expect(Logit.level).to eq(symbol)
-    end
-  end
-
-  it "passes blocks to the underlying logger object" do
-    logdev = StringIO.new
-    Logit.init(logdev)
-    Logit.fatal { "the_message" }
-    expect(logdev.string).to match(/the_message/)
-  end
-
-  it "should set the log level using the method form, with :trace, :debug, :info, :warn, :error, or :fatal" do
-    levels = {
-      :trace => Mixlib::Log::TRACE,
-      :debug => Mixlib::Log::DEBUG,
-      :info  => Mixlib::Log::INFO,
-      :warn  => Mixlib::Log::WARN,
-      :error => Mixlib::Log::ERROR,
-      :fatal => Mixlib::Log::FATAL,
-    }
-    levels.each do |symbol, constant|
-      Logit.level(symbol)
-      expect(Logit.logger.level).to eq(constant)
-    end
-  end
-
-  it "should raise an ArgumentError if you try and set the level to something strange using the binding form" do
-    expect(lambda { Logit.level = :the_roots }).to raise_error(ArgumentError)
-  end
-
-  it "should raise an ArgumentError if you try and set the level to something strange using the method form" do
-    expect(lambda { Logit.level(:the_roots) }).to raise_error(ArgumentError)
-  end
-
-  it "should pass other method calls directly to logger" do
-    Logit.level = :debug
-    expect(Logit).to be_debug
-    expect(lambda { Logit.debug("Gimme some sugar!") }).to_not raise_error
-  end
-
-  it "should pass add method calls directly to logger" do
-    logdev = StringIO.new
-    Logit.init(logdev)
-    Logit.level = :debug
-    expect(Logit).to be_debug
-    expect(lambda { Logit.add(Logger::DEBUG, "Gimme some sugar!") }).to_not raise_error
-    expect(logdev.string).to match(/Gimme some sugar/)
-  end
-
-  it "should default to STDOUT if init is called with no arguments" do
-    logger_mock = Struct.new(:formatter, :level).new
-    expect(Logger).to receive(:new).with(STDOUT).and_return(logger_mock)
-    Logit.init
-  end
-
-  it "should have by default a base log level of warn" do
-    logger_mock = Struct.new(:formatter, :level).new
-    expect(Logger).to receive(:new).and_return(logger_mock)
-    Logit.init
-    expect(Logit.level).to eq(:warn)
-  end
-
-  it "should close File logger" do
-    opened_files_count_before = 0
-    ObjectSpace.each_object(File) do |f|
-      opened_files_count_before += 1 unless f.closed?
-    end
-    name = File.join(Dir.tmpdir, "logger.log")
-    Logit.init(name)
-    Logit.init(name)
-    Logit.init(name)
-    opened_files_count_after = 0
-    ObjectSpace.each_object(File) do |f|
-      opened_files_count_after += 1 unless f.closed?
-    end
-    expect(opened_files_count_after).to eq(opened_files_count_before + 1)
-  end
-
-  it "should not close IO logger" do
-    opened_files_count_before = 0
-    ObjectSpace.each_object(File) do |f|
-      opened_files_count_before += 1 unless f.closed?
-    end
-    Tempfile.open("chef-test-log") do |file|
-      Logit.init(file)
-      Logit.init(file)
-      Logit.init(file)
-      opened_files_count_after = 0
-      ObjectSpace.each_object(File) do |f|
-        opened_files_count_after += 1 unless f.closed?
-      end
-      expect(opened_files_count_after).to eq(opened_files_count_before + 1)
-    end
-  end
-
-  it "should return nil from its logging methods" do
-    expect(Logger).to receive(:new).with(STDOUT) { double("a-quiet-logger").as_null_object }
-    Logit.init
-
-    aggregate_failures "returns nil from logging method" do
-      expect(Logit.trace("hello")).to be_nil
-      expect(Logit.debug("hello")).to be_nil
-      expect(Logit.info("hello")).to be_nil
-      expect(Logit.warn("hello")).to be_nil
-      expect(Logit.error("hello")).to be_nil
-      expect(Logit.fatal("hello")).to be_nil
-    end
-  end
-
-  it "should set metadata correctly" do
-    Logit.metadata = { test: "data" }
-    expect(Logit.metadata).to eql({ test: "data" })
-  end
-
-  it "should format :trace level messages with TRACE: label" do
-    logdev = StringIO.new
-    Logit.init(logdev)
-    Logit.level = :trace
-    Logit.trace("this is a log message")
-    aggregate_failures do
-      expect(logdev.string).to_not match(/ANY:/)
-      expect(logdev.string).to match(/TRACE:/)
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,33 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Christopher Brown (<cb@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-$TESTING = true
-$:.push File.join(File.dirname(__FILE__), "..", "lib")
-
-require "rspec"
-require "mixlib/log"
-require "mixlib/log/formatter"
-
-RSpec.configure do |config|
-  config.disable_monkey_patching!
-end
-
-class Logit
-  extend Mixlib::Log
-end