stove 7.1.5 → 7.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4babcc9d14e923933194a1fea0954df9422dd238eda6b9cbe076cce178ed7cc9
-  data.tar.gz: b28fa43ea06c34dff7205decd2fb91f0df75ab9baf20be3d347e2f0963d8581e
+  metadata.gz: 289f8b64202303e4a5832f9a251847e7a1fb68effb5d849a2173a65371ad13e9
+  data.tar.gz: b684583a1633977b5f4da0170bd1f05e61cf127c2614ef0abd367246c50f9427
 SHA512:
-  metadata.gz: e8f1e338d56383b8a8edd0524a1cb97785138badb65d96818757ab8fd0732b700a18b8550d65714ab9cbd81b39f7d932f0e6ceac2e41d764240eb56915531eec
-  data.tar.gz: f41ee31ba0f00e0478dce07a524dad97e03e91dbd530899535e3db0f67f1d72cecc64311ef7635cca832d489a3fb4c99bb76948589f2590507f0885fb43c89b8
+  metadata.gz: 77d298d45d4b8ef2e868ab45e63336c19434c7b0fe11dd61daf7e133a1c6c37e1b65ad4c1ad71ee4aac79c1ea96d94f7aa9ad5447aee5fa880a98a0de54f1096
+  data.tar.gz: ce389310b9f187525f49dd93d2c674a74e0c14b3388e341be69e1485dd8cc9393acbbd6e2ab706085d68b387b63415b40914e702609031051356a82cc7b3ba79

data/lib/stove.rb

@@ -1,4 +1,3 @@
-require 'logify'
 require 'pathname'
 
 module Stove
@@ -15,6 +14,7 @@ module Stove
   autoload :Util,        'stove/util'
   autoload :Validator,   'stove/validator'
   autoload :VERSION,     'stove/version'
+  autoload :Log,         'stove/log'
 
   module Middleware
     autoload :ChefAuthentication, 'stove/middlewares/chef_authentication'
@@ -53,7 +53,7 @@ module Stove
 
   class << self
     #
-    # The source root of the ChefAPI gem. This is useful when requiring files
+    # The source root of the Stove gem. This is useful when requiring files
     # that are relative to the root of the project.
     #
     # @return [Pathname]
@@ -66,13 +66,13 @@ module Stove
     # Set the log level.
     #
     # @example Set the log level to :info
-    #   ChefAPI.log_level = :info
+    #   Stove.log_level = :info
     #
     # @param [#to_sym] level
     #   the log level to set
     #
-    def log_level=(level)
-      Logify.level = level.to_sym
+    def log_level=(lev)
+      Stove::Log.level = lev.to_sym
     end
 
     #
@@ -81,7 +81,7 @@ module Stove
     # @return [Symbol]
     #
     def log_level
-      Logify.level
+      Stove::Log.level
     end
   end
 end

data/lib/stove/cli.rb

@@ -3,8 +3,6 @@ require 'stove'
 
 module Stove
   class Cli
-    include Logify
-
     def initialize(argv, stdin=STDIN, stdout=STDOUT, stderr=STDERR, kernel=Kernel)
       @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
     end
@@ -48,8 +46,8 @@ module Stove
 
       # Useful debugging output for when people type the wrong fucking command
       # and then open an issue like it's somehow my fault
-      log.info("Options: #{options.inspect}")
-      log.info("ARGV: #{@argv.inspect}")
+      Stove::Log.info("Options: #{options.inspect}")
+      Stove::Log.info("ARGV: #{@argv.inspect}")
 
       # Make a new cookbook object - this will raise an exception if there is
       # no cookbook at the given path
@@ -62,10 +60,11 @@ module Stove
       # If we got this far, everything was successful :)
       @kernel.exit(0)
     rescue => e
-      log.error('Stove experienced an error!')
-      log.error(e.class.name)
-      log.error(e.message)
-      log.error(e.backtrace.join("\n"))
+      Stove::Log.init($stderr)
+      Stove::Log.error('Stove experienced an error!')
+      Stove::Log.error(e.class.name)
+      Stove::Log.error(e.message)
+      Stove::Log.error(e.backtrace.join("\n"))
 
       @kernel.exit(e.respond_to?(:exit_code) ? e.exit_code : 500)
     ensure

data/lib/stove/config.rb

@@ -3,7 +3,6 @@ require 'json'
 
 module Stove
   class Config
-    include Logify
     include Mixin::Instanceable
 
     def method_missing(m, *args, &block)
@@ -69,7 +68,7 @@ module Stove
 
       @__raw__
     rescue Errno::ENOENT => e
-      log.warn { "No config file found at `#{__path__}'!" }
+      Stove::Log.warn { "No config file found at `#{__path__}'!" }
       @__raw__ = {}
     end
   end

data/lib/stove/cookbook.rb

@@ -4,8 +4,6 @@ require 'time'
 
 module Stove
   class Cookbook
-    include Logify
-
     require_relative 'cookbook/metadata'
 
     #

data/lib/stove/cookbook/metadata.rb

@@ -3,9 +3,9 @@ require 'json'
 module Stove
   class Cookbook
     # Borrowed and modified from:
-    # {https://raw.github.com/opscode/chef/11.4.0/lib/chef/cookbook/metadata.rb}
+    # {https://raw.github.com/chef/chef/11.4.0/lib/chef/cookbook/metadata.rb}
     #
-    # Copyright:: Copyright 2008-2017 Chef Software, Inc.
+    # Copyright:: Copyright 2008-2019 Chef Software, Inc.
     #
     # Licensed under the Apache License, Version 2.0 (the "License");
     # you may not use this file except in compliance with the License.

data/lib/stove/filter.rb

@@ -1,7 +1,5 @@
 module Stove
   class Filter
-    include Logify
-
     include Mixin::Insideable
 
     #
@@ -49,7 +47,7 @@ module Stove
     #   the cookbook to run this filter against
     #
     def run(cookbook, options = {})
-      log.info(message)
+      Stove::Log.info(message)
       instance = klass.new(cookbook, options)
 
       inside(cookbook) do

data/lib/stove/log.rb

@@ -0,0 +1,25 @@
+#
+# Copyright:: 2019 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 'mixlib/log'
+
+module Stove
+  class Log
+    extend Mixlib::Log
+    Mixlib::Log::Formatter.show_time = false
+  end
+end

data/lib/stove/packager.rb

@@ -5,8 +5,6 @@ require 'zlib'
 
 module Stove
   class Packager
-    include Logify
-
     ACCEPTABLE_FILES = [
       '.foodcritic',
       'README.*',

data/lib/stove/plugins/base.rb

@@ -1,14 +1,12 @@
 module Stove
   class Plugin::Base
-    include Logify
-
     extend Mixin::Optionable
     extend Mixin::Validatable
 
     class << self
       def run(description, &block)
         actions << Proc.new do |instance|
-          log.info { description }
+          Stove::Log.info { description }
           instance.instance_eval(&block)
         end
       end

data/lib/stove/plugins/git.rb

@@ -16,8 +16,8 @@ module Stove
       local_sha  = git_null("rev-parse #{branch}").strip
       remote_sha = git_null("rev-parse #{remote}/#{branch}").strip
 
-      log.debug("Local SHA: #{local_sha}")
-      log.debug("Remote SHA: #{remote_sha}")
+      Stove::Log.debug("Local SHA: #{local_sha}")
+      Stove::Log.debug("Remote SHA: #{remote_sha}")
 
       local_sha == remote_sha
     end
@@ -34,8 +34,8 @@ module Stove
     private
 
     def git(command, errors = true)
-      log.debug("the command matches")
-      log.debug("Running `git #{command}', errors: #{errors}")
+      Stove::Log.debug("the command matches")
+      Stove::Log.debug("Running `git #{command}', errors: #{errors}")
       Dir.chdir(cookbook.path) do
         response = %x|git #{command}|
 

data/lib/stove/runner.rb

@@ -1,7 +1,5 @@
 module Stove
   class Runner
-    include Logify
-
     attr_reader :cookbook
     attr_reader :options
 
@@ -23,9 +21,9 @@ module Stove
 
     def run_plugin(name)
       if skip?(name)
-        log.info { "Skipping plugin `:#{name}'" }
+        Stove::Log.info { "Skipping plugin `:#{name}'" }
       else
-        log.info { "Running plugin `:#{name}'" }
+        Stove::Log.info { "Running plugin `:#{name}'" }
         klass = Plugin.const_get(Util.camelize(name))
         klass.new(cookbook, options).run
       end

data/lib/stove/validator.rb

@@ -1,7 +1,5 @@
 module Stove
   class Validator
-    include Logify
-
     include Mixin::Insideable
 
     #
@@ -49,12 +47,12 @@ module Stove
     #   the cookbook to run this validation against
     #
     def run(cookbook, options = {})
-      log.info("Running validations for `#{klass.id}.#{id}'")
+      Stove::Log.info("Running validations for `#{klass.id}.#{id}'")
 
       inside(cookbook) do
         instance = klass.new(cookbook, options)
         unless result = instance.instance_eval(&block)
-          log.debug("Validation failed, result: #{result.inspect}")
+          Stove::Log.debug("Validation failed, result: #{result.inspect}")
 
           # Convert the class and id to their magical equivalents
           error = Error.const_get("#{Util.camelize(klass.id)}#{Util.camelize(id)}ValidationFailed")
@@ -62,7 +60,7 @@ module Stove
         end
       end
 
-      log.debug("Validation #{id} passed!")
+      Stove::Log.debug("Validation #{id} passed!")
     end
   end
 end

data/lib/stove/version.rb

@@ -1,3 +1,3 @@
 module Stove
-  VERSION = "7.1.5".freeze
+  VERSION = "7.1.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stove
 version: !ruby/object:Gem::Version
-  version: 7.1.5
+  version: 7.1.6
 platform: ruby
 authors:
 - Seth Vargo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-api
@@ -26,19 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: logify
+  name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +156,7 @@ files:
 - lib/stove/cookbook/metadata.rb
 - lib/stove/error.rb
 - lib/stove/filter.rb
+- lib/stove/log.rb
 - lib/stove/mash.rb
 - lib/stove/mixins/insideable.rb
 - lib/stove/mixins/instanceable.rb