knife-chop 0.9.5 → 0.11.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3c5de151068a70b4bb1894c3dc0a2500e4ad170
-  data.tar.gz: e6305cab67567b707dd1acd0cd46a699ed2c271e
+  metadata.gz: f89fe228289c45cab8ca01624e0e01b36f241361
+  data.tar.gz: 91accb72367a675459f2eaff591cbd9af96bf0aa
 SHA512:
-  metadata.gz: b9b9af3af0391157985494403e4a3b0febd679104773713cdc04f235c4c1eeec5c60f596831780c16895d07a27c2509cd8f7ebdaf9fa8565f940f66885ed5d87
-  data.tar.gz: 8a0ad37b54e5f01f8a0438a346d3219a919c3126718e0145462fd945f8a10076add75516cd614180c82cf557d103c24c44b4ee5f7e131d2bd229ea85ab45f6da
+  metadata.gz: c154ed516310bee02ba2a538d59e711ac78ef7592c962704f315a154a89025ddcc4d3ff87ef01c12abd961eb0d1e7d8567b0277420d090477028d18d538811c7
+  data.tar.gz: 7e78edbe7f7f51f84e1fa853f51eb9a2e4d58065dc8963bf07734e6a7bed6bdfb81758ef45208313bea95bac8b3420da0548427a478c2f09c91f887e9a69d385

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    knife-chop (0.9.5)
+    knife-chop (0.11.12)
       awesome_print (~> 1.2, >= 1.2.0)
       chef (>= 10.0, < 12.0)
       colorize (~> 0.7, >= 0.7.1)

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.11.12

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

@@ -127,7 +127,7 @@ class Chef
 
       # -----------------------------------------------------------------------------
       def logStep(msg)
-        if logger = getLogger(@args,'logStep')
+        if logger = getLogger(@args || @config,'logStep')
           logger.step "Resource #{@step+=1}: #{msg} ..."
         end
       end
@@ -165,21 +165,27 @@ class Chef
 
             begin
               ::Logging.init :trace, :debug, :info, :step, :warn, :error, :fatal, :todo unless defined? ::Logging::MAX_LEVEL_LENGTH
+              if !args[:origins] && @origins
+                args[:origins] = @origins
+              end
               if args[:origins] and args[:origins][:log_level]
-                if (::Logging::LEVELS[args[:log_level].to_s] and ::Logging::LEVELS[args[:log_level].to_s] < 2)
-                  #puts "#{args[:log_level].to_s} = #{::Logging::LEVELS[args[:log_level].to_s]}".light_yellow
-                  puts "#{args[:origins][:log_level]} says #{args[:log_level]}".light_yellow
-                else
-                  from = ''
-                end
+                args[:from] = "#{args[:origins][:log_level] rescue @origins[:log_level]} "
+              else
+                args[:from] = ''
               end
-              l_opts = args[:log_opts].call(::Logging::MAX_LEVEL_LENGTH) || {
-                  :pattern      => "#{from}%d %#{::Logging::MAX_LEVEL_LENGTH}l: %m\n",
+              # @config[:log_opts] = lambda{|mlll| {
+              #     :pattern      => "%#{mlll}l: %m %C\n",
+              #     :date_pattern => '%Y-%m-%d %H:%M:%S',
+              #   }
+              # }
+              #
+              l_opts = args[:log_opts].call(::Logging::MAX_LEVEL_LENGTH) rescue {
+                  :pattern      => "#{args[:from]}%d %#{::Logging::MAX_LEVEL_LENGTH}l: %m\n",
                   :date_pattern => '%Y-%m-%d %H:%M:%S',
               }
               logger = ::Logging.logger( STDOUT, l_opts)
-              l_opts = args[:log_opts].call(::Logging::MAX_LEVEL_LENGTH) || {
-                  :pattern      => "#{from}%d %#{::Logging::MAX_LEVEL_LENGTH}l: %m %C\n",
+              l_opts = args[:log_opts].call(::Logging::MAX_LEVEL_LENGTH) rescue {
+                  :pattern      => "#{args[:from]}%d %#{::Logging::MAX_LEVEL_LENGTH}l: %m %C\n",
                   :date_pattern => '%Y-%m-%d %H:%M:%S',
               }
               layout = ::Logging::Layouts::Pattern.new(l_opts)
@@ -207,13 +213,13 @@ class Chef
               end
 
               scheme = ::Logging::ColorScheme.new( 'christo', :levels => {
-                  :trace => [:blue, :on_white],
+                  :trace => :light_blue,
                   :debug => :cyan,
                   :info  => :green,
                   :step  => :green,
                   :warn  => :yellow,
                   :error => :red,
-                  :fatal => [:red, :on_white],
+                  :fatal => :light_red,
                   :todo  => :purple,
               }).scheme
               scheme[:todo]  = "\e[38;5;55m"

data/lib/chef/knife/chop_base.rb

@@ -427,7 +427,7 @@ class Chef
       def parse_options(args,source=nil)
         argv = super(args)
 
-        @config = parse_and_validate_options(@config,source ? source : "ARGV - #{__LINE__}")
+        @config = parse_and_validate_options(@config,source ? source : "ARGV - #{File.basename(__FILE__)}:#{__LINE__}")
         v = @config[:depends]
         m = (v.is_a?(String) && v.downcase.match(%r/^(no|false|disable|0)/) )
         @config[:depends] = (v === true) || (m.nil? ? true : false)
@@ -469,7 +469,7 @@ class Chef
       # --------------------------------------------------------------------------------
       def configure_chef
         super
-        @config[:log_opts] = lambda{|mlll| {
+        @config[:log_opts] ||= lambda{|mlll| {
             :pattern      => "%#{mlll}l: %m %C\n",
             :date_pattern => '%Y-%m-%d %H:%M:%S',
           }
@@ -515,8 +515,8 @@ class Chef
             ini = IniFile.load(options[:inifile])
             @inis << options[:inifile]
             ini['global'].each { |key, value|
-              #puts "#{key}=#{value}"
-              ENV[key]= value.nil? ? '' : value
+              logger.trace "#{key}=#{value} (#{value.class.name})"
+              ENV[key]= value.nil? ? '' : value.to_s
             }
             argv=[]
             cli = ini['cli'] || []
@@ -529,6 +529,7 @@ class Chef
             end
           rescue => e
             puts e.message.light_red
+            logger.trace e.backtrace.ai
             raise e
           end
         end

data/lib/chef/knife/chop_upload.rb

@@ -243,6 +243,7 @@ class Chef
         cmdp = lambda{ |resource,verb,xtra|
           "#{resource} #{verb} #{xtra} --cookbook-path #{cbpaths.join(File::PATH_SEPARATOR)}"
         }
+        @logger.error "Unable to upload cookbooks. Environment list is empty!" unless environments.size > 0
         environments.each{ |name,file|
           @logger.info "Environment: #{name}"
           filp = lambda{ |cbcmd,cbname,cbfile|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-chop
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.11.12
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print