removing logify

lib/stove.rb

@@ -1,5 +1,5 @@
-require 'logify'
 require 'pathname'
+require 'chef/log'
 
 module Stove
   autoload :Artifactory, 'stove/artifactory'
@@ -72,7 +72,7 @@ def root
     #   the log level to set
     #
     def log_level=(level)
-      Logify.level = level.to_sym
+      Chef::Log.level = level.to_sym
     end
 
     #
@@ -81,7 +81,7 @@ def log_level=(level)
     # @return [Symbol]
     #
     def log_level
-      Logify.level
+      Chef::Log.level
     end
   end
 end

lib/stove/cli.rb

@@ -3,8 +3,6 @@
 
 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 @@ def execute!
 
       # 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}")
+      Chef::Log.info("Options: #{options.inspect}")
+      Chef::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,10 @@ def execute!
       # 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"))
+      Chef::Log.error('Stove experienced an error!')
+      Chef::Log.error(e.class.name)
+      Chef::Log.error(e.message)
+      Chef::Log.error(e.backtrace.join("\n"))
 
       @kernel.exit(e.respond_to?(:exit_code) ? e.exit_code : 500)
     ensure

lib/stove/config.rb

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

lib/stove/cookbook.rb

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

lib/stove/filter.rb

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

lib/stove/packager.rb

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

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 }
+          Chef::Log.info description
           instance.instance_eval(&block)
         end
       end

lib/stove/runner.rb

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

lib/stove/validator.rb

@@ -1,7 +1,5 @@
 module Stove
   class Validator
-    include Logify
-
     include Mixin::Insideable
 
     #
@@ -49,20 +47,20 @@ def initialize(klass, id, &block)
     #   the cookbook to run this validation against
     #
     def run(cookbook, options = {})
-      log.info("Running validations for `#{klass.id}.#{id}'")
+      Chef::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}")
+          Chef::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")
           raise error.new(path: Dir.pwd, result: result)
         end
       end
 
-      log.debug("Validation #{id} passed!")
+      Chef::Log.debug("Validation #{id} passed!")
     end
   end
 end

stove.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   # Runtime dependencies
   spec.add_dependency 'chef-infra-api', '~> 0.5'
-  spec.add_dependency 'logify',   '~> 0.2'
+  spec.add_dependency 'chef'
 
   spec.add_development_dependency 'aruba',          '~> 0.6.0'
   spec.add_development_dependency 'bundler'