knife-chop 0.12.17 → 0.12.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f5f4644e5feef3f390e4ef4cbc9dc62cdaf36e2
-  data.tar.gz: 282a9c5a0dfd21d78bbad95e6194d1027e78d2c3
+  metadata.gz: 595b83ce07b3dc32105e0e86c3251cf40ca0174b
+  data.tar.gz: 97aa36f0ee3668627f71baf7623c9b0382a9cc7e
 SHA512:
-  metadata.gz: ef516e8266fad777910b091402c36c1c3278975ad1a6b95fa31b66a258abe875ac626edbe0c123e2217c75f7288c8e010bcf928a969d4b8aaf23ec04a464efda
-  data.tar.gz: c8d45d56e8d2c9f0d03be14ec8fc257bd8c196b0462a785f2a3f9961f536366938a991cd2355242573e51d20491fac748e81e646f5e59fb65ad8fcf99bac0c1e
+  metadata.gz: 135574fd435b22c1505d94efde6d1103401d74cc89cd3a644d583c3a92f18981c1e977a19a23d933ff0c0a8ee35b5127c749d629fe1c352c9642caf2ffb47e9d
+  data.tar.gz: 74a2d515075ed6c3618dc77f8e58cfe045a61f7c7f4938388003bdeb3fc1573e7d07596baaeee54d013f5e2aa1aed13ffcbd2a670edad0a23ad95445ef8a4a34

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    knife-chop (0.12.17)
+    knife-chop (0.12.18)
       awesome_print (~> 1.2, >= 1.2.0)
       chef (>= 12.17, < 13.0)
       colorize (~> 0.7, >= 0.7.1)
       ffi-yajl (~> 2.2)
       inifile (~> 3.0, >= 3.0.0)
       json (~> 1.8, >= 1.8.1)
-      logging (~> 1.8, >= 1.8.2)
+      logging (~> 2.0, >= 2.0.0)
       mixlib-config (~> 2.1, >= 2.1.0)
       safe_yaml (~> 1.0, >= 1.0.4)
 
@@ -74,9 +74,9 @@ GEM
     json (1.8.6)
     libyajl2 (1.2.0)
     little-plugger (1.1.4)
-    logging (1.8.2)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.8.4)
+    logging (2.1.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
     mixlib-archive (0.3.0)
       mixlib-log
     mixlib-authentication (1.4.1)
@@ -161,4 +161,4 @@ DEPENDENCIES
   rubygems-tasks (~> 0)
 
 BUNDLED WITH
-   1.13.7
+   1.14.2

data/VERSION

@@ -1 +1 @@
-0.12.17
+0.12.18

data/knife-chop.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'awesome_print', [">= 1.2.0", "~> 1.2"]
   s.add_dependency 'colorize',      [">= 0.7.1", "~> 0.7"]
-  s.add_dependency 'logging',       [">= 1.8.2", "~> 1.8"]
+  s.add_dependency 'logging',       [">= 2.0.0", "~> 2.0"]
   s.add_dependency 'inifile',       [">= 3.0.0", "~> 3.0"]
   s.add_dependency 'chef',          [">= 12.17", "< 13.0"]
   s.add_dependency 'json',          [">= 1.8.1", "~> 1.8"]

data/lib/chef/knife/chop/logging.rb

@@ -54,6 +54,12 @@ class Chef
           end
         end
 
+        unless ::Logging::VERSION =~ /^2/
+          def caller_tracing
+            @trace
+          end
+        end
+
         def logEvent(evt)
           log_event evt
         end
@@ -95,6 +101,13 @@ class Chef
             'C' => :file_line,
         }.freeze
 
+        if ::Logging::VERSION =~ /^2/
+          class FormatMethodBuilder
+            DIRECTIVE_TABLE = ::Logging::Layouts::Pattern::DIRECTIVE_TABLE
+            COLOR_ALIAS_TABLE = ::Logging::Layouts::Pattern::COLOR_ALIAS_TABLE
+          end
+        end
+
       ensure
         $VERBOSE = verbose
       end
@@ -232,7 +245,14 @@ class Chef
               logger.add_appenders appender
 
               logger.level = args[:log_level] ? args[:log_level] : :warn
-              logger.trace = true if args[:trace]
+              # logger.trace = true if args[:trace]
+              if args[:trace]
+                if ::Logging::VERSION =~ /^2/
+                  logger.caller_tracing = true
+                else
+                  logger.trace = true
+                end
+              end
               @args = args
             rescue Gem::LoadError
               logger = FakeLogger.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-chop
 version: !ruby/object:Gem::Version
-  version: 0.12.17
+  version: 0.12.18
 platform: ruby
 authors:
 - Christo De Lange
@@ -56,20 +56,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 2.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 2.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement