knife-chop 0.6.7 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGQyNmM4YzYxMmJjMmY4N2UzMzNjYjUwYjM1ZGRjZGM2YTQ2ODM0Mw==
+    Mzg4N2I5ZGIwZTdkMWQ1MzJkMjk1MmRlOWZjZWVlM2Y1OGJjMWMxNQ==
   data.tar.gz: !binary |-
-    ZTg5MGQwYWQ0ZmI3YmM0ZWZkNGM3YWZiOTMyY2EzMjUwNmI1ODgyOA==
+    ZWE3NjU2NDg4NzYyNWNmZTdkZWUwN2FiZDNlYWI4MDc3NWE0MDA0Nw==
 SHA512:
   metadata.gz: !binary |-
-    OGQ5NDhlYmNjMGEyZmFhMzU2MGZmNjAyZWU1MjI1NjYyNzRlZWI0MzQ0ZjA0
-    NTYxNTA0MDU1ZDg4ZDdkZWRkMGJlOWUwYTZlNTExNTMzYTc4Y2I0MTFmZmU4
-    YTczNGRiNTFkMDNiZjQ1YmYyNzMwODc3NGM1MzkzNGQwZGMyMjE=
+    NmQ4YTk4YmY1ZjhjZjk4MDcxNDk1N2M4YWFlYjg5ZWI4MWIzNDE2MzYwODYw
+    N2Y5NDhhOTIwN2RiNzhiOTJmZmNiN2FmYTYzOTI0NThjNTdkOGE2ZmUyMzky
+    NzQ3ZjZlNzg0NDlkZjU5MDNhZGMwZTM1NDY1OGE0NjgzZDNkYjY=
   data.tar.gz: !binary |-
-    OGM2NDNjODRmOGVlYzk0NWViZmM2Mzc1MzAzYTc5OTZiZGI3MTcxN2Y2OTY0
-    MmQ3YTFjZTA3M2VkNzJiYzExNzdmMTcwYTNlNTQ1ZTc1YzYyNmJhMmI1Mjc4
-    NmM5ZmY1MzRjNjFjZDk2MWE5YTk1ZDdjNWM3ZDU2NzllZGE1ZmQ=
+    ZWIzZmZiYmI2MDRmZDllMjE0YmQyMzRlOGYzNmZjOGM1ZWZmOWYyYzhiNjYy
+    NWJmOTY2MzFjNjJmNWIxNWMyNTRiMDMzNjMwNjgwMGU4NTM3NTdkYjM3YzM3
+    Y2VmNGFiYWNiMGQ2ZmI4OGY4ZWQ5ZTMyNTI0YzUxN2M4NmEwYWU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    knife-chop (0.6.7)
+    knife-chop (0.7.0)
       awesome_print (~> 1.2, >= 1.2.0)
       chef (~> 11.12, >= 11.10.0)
       colorize (~> 0.7, >= 0.7.1)

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.7.0

data/knife-chop.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Christo De Lange"]
-  s.date = "2014-05-14"
+  s.date = Date.today.to_s
   s.description = "Knife plugin to assist with the upload and sync of Chef server assets like roles, environments and cookbooks allowing for multiple parts to be uploaded at once to multiple environments. Resources can be matched with regular expressions."
   s.email = "rubygems@dldinternet.com"
   s.executables = ["chop"]

data/lib/chef/knife/chop_base.rb

@@ -685,7 +685,6 @@ class Chef
           end
         }
         set = res
-        set
       end
 
       # --------------------------------------------------------------------------------

data/lib/chef/knife/chop_upload.rb

@@ -66,17 +66,19 @@ class Chef
           %(#{cmd} #{file})
         }
         cmd = callCmdProc(cmdp, rsrc,verb,xtra)
-
-        if @use_knife_api
+        # RubyLocalVariableNamingConvention
+        _getsubcmd = lambda{ ||
           argv = "#{rsrc} #{verb}".split(%r(\s+))
           klass= Chef::Knife.subcommand_class_from(argv)
-          subc = klass.new()
+          subc = klass.new
           subc.config = @config.dup
           subc.config[:cookbook_path] = @config[:cookbook_path].map{|p| p.match(%r(^/)) ? p : "#{@config[:repo_path]}/#{p}" } #.join(::File::PATH_SEPARATOR)
           subc.ui = ::Chef::Knife::ChopUI.new(@logger,@config)
-        end
+          subc
+        }
 
         if args[:aggregate] and @use_knife_api
+          subc = _getsubcmd.call
           subc.name_args << xtra if xtra != ''
           subc.name_args << set.map{ |name,file|
             extname  = File.extname(file)
@@ -118,7 +120,7 @@ class Chef
         else
           set.each{ |name,file|
             cmd = callCmdProc(filp, cmd, name, file)
-						fLog = false
+
             if rsrc == 'cookbook'
 	            fLog = @logger.info "#{args[:environment]}:#{File.basename(file)} (Dependencies: #{@config[:depends]})"
 	          else
@@ -127,6 +129,7 @@ class Chef
 	          @logger.debug "... #{cmd}" if fLog
             if @use_knife_api
               unless @config[:dry_run]
+                subc = _getsubcmd.call
                 subc.name_args = rsrc == 'cookbook' ? [ name ] : [ file ]
                 subc.run
               end
@@ -202,7 +205,7 @@ class Chef
           if p.match(%r(^/))
             p
           else
-            File.expand_path("#{@config[:repo_path]}/#{p}")
+            File.realpath(File.expand_path("#{@config[:repo_path]}/#{p}"))
           end
         }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-chop
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print