knife-chop 0.8.0 → 0.8.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjFlM2VlMTY3MDAzYTM0MzdkZjEyNzMyYTY0YzZkNzJmZTQ4OWZjMw==
+    M2IzMjcxMjNlZGRjNjA2YWVjMjdmNTkwMzA2MjRjZjA2MTJjMTMxYw==
   data.tar.gz: !binary |-
-    NzJiNmJlYTY1OTA4ZGFjNTViYmExNTA3M2ZjNzJiNjQ3YTRlMDRjNw==
+    ZmNiM2Y0M2U3YWMyZDkxNzNhMDVhNjllOGRjMzVhY2Q3NzI0ZmMwYw==
 SHA512:
   metadata.gz: !binary |-
-    NDZjNWI1NmIyZTU3NGI4M2YwYmEzYjMzM2QwMjU1ZWE2Nzg5YjUzNGVmNDIw
-    Y2Y4NTI0MjMyZDEzY2FiMWEyZmQ1MWJiNmFhYzRhYmQ0NDkwNzJkZmEzYWY3
-    NmY5OTRjNmNjMTFlOWViNDE5OTRhZjIzMWIzNWVmZGFkYmVkMzU=
+    NTAwNjRhZGM4NDFlYTkzMmRlZWJkNzFjOGFhM2VkZmMyZDUwMmVkNTE5OTdh
+    NzIxYmI1MDAwZWY5OWY4Yjk0NjM4Y2FkYTZiOWE4MmZiMDJhZmQ4ODIwZmE0
+    NzYzZmIxOGViOGJkN2NkMzQzMjVjMDgzMTYwNmVlODZhMWRhYjg=
   data.tar.gz: !binary |-
-    OGNiNDViZjA1N2Q2MGUzNTI1MmQwZmY1MWUzZDM4ZWU3MmI4Yjg3OGE5YjM0
-    NzBhOTZmZGFkN2I5NThjYTgyNTNmODIyNzM1ZDdhZjU5YjBhYjliZmI2NTAz
-    ZTc2ZGNiM2YwYzAwMTMxNGFlYWFhYzNiNWZhNzY5NmRkYWRhMGE=
+    N2UzNzI2MWIzM2ZhYzg4MGRmN2QxYmNkMjhiNTY4YWM2MTZlMmQ0MmI0MmU2
+    ODdlZjViODJiYjBhOWMwOTA5YWNiODUyYWE0MmVlYTVjZTgwMDRhMDY1YTc3
+    ZDdjM2E5YmQ5MWNmMDBhNTNhZjM3NGM4ZTQ2Zjg5MDk0MThlMjY=

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.2

data/lib/chef/knife/chop_base.rb

@@ -548,18 +548,18 @@ class Chef
       def validate_options(options=nil)
         options = @config unless options
 
-        # Check for the necessary environment variables
-        logStep ("Check ENVironment")
-        env = ENV.to_hash
-        missing = {}
-        %w(AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY KNIFE_CHEF_SERVER_URL KNIFE_CLIENT_KEY KNIFE_CLIENT_NAME).each { |k|
-          missing[k] = true unless ENV.has_key?(k)
-        }
-
-        if missing.count() > 0
-          #@logger.error "Missing keys: #{missing.keys.ai}"
-          raise ChopError.new("Missing environment variables: #{missing.keys}")
-        end
+        # # Check for the necessary environment variables
+        # logStep ("Check ENVironment")
+        # env = ENV.to_hash
+        # missing = {}
+        # %w(AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY KNIFE_CHEF_SERVER_URL KNIFE_CLIENT_KEY KNIFE_CLIENT_NAME).each { |k|
+        #   missing[k] = true unless ENV.has_key?(k)
+        # }
+        #
+        # if missing.count() > 0
+        #   #@logger.error "Missing keys: #{missing.keys.ai}"
+        #   raise ChopError.new("Missing environment variables: #{missing.keys}")
+        # end
       end
 
       # -----------------------------------------------------------------------------

data/lib/chef/knife/chop_upload.rb

@@ -90,8 +90,8 @@ class Chef
         rsrc = args[:resource]
         verb = args[:verb] || "from file"
         xtra = args[:extra] || ''
-        cmdp = args[:command] || lambda{|rsrc,verb,xtra|
-          %(knife #{rsrc} #{verb} #{xtra})
+        cmdp = args[:command] || lambda{|r,v,x|
+          %(knife #{r} #{v} #{x})
         }
         filp = args[:fileproc] || lambda{|cmd,name,file|
           # name not used/needed
@@ -161,7 +161,8 @@ class Chef
 	          @logger.debug "... #{cmd}" if fLog
             if @use_knife_api
               unless @config[:dry_run]
-                subc = _getsubcmd.call
+                #subc = _getsubcmd.call
+                subc = getKnifeSubCommand(rsrc,verb)
                 subc.name_args = rsrc == 'cookbook' ? [ name ] : [ file ]
                 subc.run
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-chop
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Christo De Lange