knife-chop 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b077953c883233a9ed946bc175f3d8646ffaf022
-  data.tar.gz: 862a23a7b9276fe78f49498e895cdfd2ec6c35f5
+  metadata.gz: c65cb951cd53c3054c7c0db94de726a3ee927a18
+  data.tar.gz: 2bd41e012154c7d1304e2c1251a45d799c360db2
 SHA512:
-  metadata.gz: 4ea2febe762e151a4731fb448986c501bc9b7441367fa1e241676b8241cc8450b26699f351fbd89c8173230e541b345cf2496b588176d3a1496b2a8d766a39a0
-  data.tar.gz: f270a79100f42ccfc1d776659024c5728c379a957e897d924e650100c81d18b435b50593ab619f4ebe2cabfd14684d9a0a867d58d74256cc5be411f3bd6de9c0
+  metadata.gz: 885e0fa5e29ce50b1843c1b6c06a72c905012940787ca7c69fc5550f835dd496965c4903c15eae8d67ae707a1998a7dd1c77ab824c3c962c49d894a40dfee902
+  data.tar.gz: aeba7983c0afe3e4132181de6d4650ee2096734e3915666037af3897b46e19bc04db88beaa7fb581ee2075f04a47f75abf19551dc658ea947015164920876168

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    knife-chop (0.9.1)
+    knife-chop (0.9.2)
       awesome_print (~> 1.2, >= 1.2.0)
-      chef (~> 12.0, >= 12.0)
       colorize (~> 0.7, >= 0.7.1)
       ffi-yajl (~> 1.2)
       inifile (~> 3.0, >= 3.0.0)
@@ -16,81 +15,21 @@ GEM
   remote: http://rubygems.org/
   specs:
     awesome_print (1.2.0)
-    chef (12.0.1)
-      chef-zero (~> 3.2)
-      diff-lcs (~> 1.2, >= 1.2.4)
-      erubis (~> 2.7)
-      ffi-yajl (~> 1.2)
-      highline (~> 1.6, >= 1.6.9)
-      mixlib-authentication (~> 1.3)
-      mixlib-cli (~> 1.4)
-      mixlib-config (~> 2.0)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
-      net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1)
-      ohai (~> 8.0)
-      plist (~> 3.1.0)
-      pry (~> 0.9)
-    chef-zero (3.2.1)
-      ffi-yajl (~> 1.1)
-      hashie (~> 2.0)
-      mixlib-log (~> 1.3)
-      rack
-      uuidtools (~> 2.1)
-    coderay (1.1.0)
-    colorize (0.7.3)
+    colorize (0.7.4)
     diff-lcs (1.2.5)
-    erubis (2.7.0)
     ffi (1.9.6)
     ffi-yajl (1.2.0)
       ffi (~> 1.5)
-      libyajl2 (~> 1.0)
-    hashie (2.1.2)
-    highline (1.6.21)
+      libyajl2 (~> 1.2)
     inifile (3.0.0)
-    ipaddress (0.8.0)
     json (1.8.1)
     libyajl2 (1.2.0)
     little-plugger (1.1.3)
     logging (1.8.2)
       little-plugger (>= 1.1.3)
       multi_json (>= 1.8.4)
-    method_source (0.8.2)
-    mime-types (1.25.1)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-cli (1.5.0)
     mixlib-config (2.1.0)
-    mixlib-log (1.6.0)
-    mixlib-shellout (2.0.0)
     multi_json (1.10.1)
-    net-dhcp (1.3.2)
-    net-ssh (2.9.1)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    net-ssh-multi (1.2.0)
-      net-ssh (>= 2.6.5)
-      net-ssh-gateway (>= 1.2.0)
-    ohai (8.0.1)
-      ffi (~> 1.9)
-      ffi-yajl (~> 1.1)
-      ipaddress
-      mime-types (~> 1.16)
-      mixlib-cli
-      mixlib-config (~> 2.0)
-      mixlib-log
-      mixlib-shellout (~> 2.0)
-      net-dhcp
-      rake (~> 10.1)
-      systemu (~> 2.6.4)
-      wmi-lite (~> 1.0)
-    plist (3.1.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.2)
     rake (10.4.2)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
@@ -102,10 +41,6 @@ GEM
     rspec-mocks (2.99.2)
     rubygems-tasks (0.2.4)
     safe_yaml (1.0.4)
-    slop (3.6.0)
-    systemu (2.6.4)
-    uuidtools (2.1.5)
-    wmi-lite (1.0.0)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/knife-chop.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'colorize',      [">= 0.7.1", "~> 0.7"]
   s.add_dependency 'logging',       [">= 1.8.2", "~> 1.8"]
   s.add_dependency 'inifile',       [">= 3.0.0", "~> 3.0"]
-  s.add_dependency 'chef',          [">= 12.0", "~> 12.0"]
+  # s.add_dependency 'chef',          [">= 12.0", "~> 12.0"]
   s.add_dependency 'json',          [">= 1.8.1", "~> 1.8"]
   s.add_dependency 'mixlib-config', [">= 2.1.0", "~> 2.1"]
   s.add_dependency 'safe_yaml',     [">= 1.0.4", '~> 1.0']

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

@@ -108,7 +108,7 @@ class ::Chef::Knife::CookbookUpload
       # if upload_failures == 0
       #   ui.info "Uploaded #{upload_ok} cookbook#{upload_ok > 1 ? "s" : ""}."
       # elsif upload_failures > 0 && upload_ok > 0
-      #   ui.warn "Uploaded #{upload_ok} cookbook#{upload_ok > 1 ? "s" : ""} ok but #{upload_failures} " +
+      #   ui.warn "Uploaded #{upload_ok} cookbook#{upload_ok > 1 ? "s" : ""} but #{upload_failures} " +
       #               "cookbook#{upload_failures > 1 ? "s" : ""} upload failed."
       # elsif upload_failures > 0 && upload_ok == 0
       #   ui.error "Failed to upload #{upload_failures} cookbook#{upload_failures > 1 ? "s" : ""}."
@@ -120,16 +120,16 @@ class ::Chef::Knife::CookbookUpload
         if upload_skips == 0
           ui.step "Uploaded #{upload_ok} cookbook".plural(upload_ok)+"."
         elsif upload_skips > 0 && upload_ok > 0
-          ui.step "Uploaded #{upload_ok} #{'cookbook'.plural(upload_ok)} ok but #{upload_skips} #{'cookbook'.plural(upload_skips)} were not included."
+          ui.step "Uploaded #{upload_ok} #{'cookbook'.plural(upload_ok)} but #{upload_skips} #{'cookbook'.plural(upload_skips)} were not included."
         elsif upload_ok == 0
           ui.fatal "Did not upload any cookbooks."
           exit 1
         end
       elsif upload_failures > 0 && upload_ok > 0
         if upload_skips == 0
-          ui.error "Uploaded #{upload_ok} #{'cookbook'.plural(upload_ok)} ok but #{upload_failures} #{'cookbook'.plural(upload_failures)} failed upload."
+          ui.error "Uploaded #{upload_ok} #{'cookbook'.plural(upload_ok)} but #{upload_failures} #{'cookbook'.plural(upload_failures)} failed upload."
         elsif upload_skips > 0
-          ui.error "Uploaded #{upload_ok} #{'cookbook'.plural(upload_ok)} ok but #{upload_skips} #{'cookbook'.plural(upload_skips)} were not included and #{upload_failures} #{'cookbook'.plural(upload_failures)} failed upload."
+          ui.error "Uploaded #{upload_ok} #{'cookbook'.plural(upload_ok)} but #{upload_skips} #{'cookbook'.plural(upload_skips)} were not included and #{upload_failures} #{'cookbook'.plural(upload_failures)} failed upload."
         end
       elsif upload_failures > 0 && upload_ok == 0
         ui.fatal "Failed to upload #{upload_failures} #{'cookbook'.plural(upload_failures)}."

data/lib/chef/knife/chop_base.rb

@@ -516,7 +516,7 @@ class Chef
             @inis << options[:inifile]
             ini['global'].each { |key, value|
               #puts "#{key}=#{value}"
-              ENV[key]=value
+              ENV[key]= value.nil? ? '' : value
             }
             argv=[]
             cli = ini['cli'] || []

data/lib/chef/knife/chop_upload.rb

@@ -98,19 +98,8 @@ class Chef
           %(#{cmd} #{file})
         }
         cmd = callCmdProc(cmdp, rsrc,verb,xtra)
-        # [2014-07-28 Christo] Distilled out a reusable method called getKnifeSubCommand
-        # _getsubcmd = lambda do |r,v|
-        #   argv = "#{r} #{v}".split(%r(\s+))
-        #   klass= Chef::Knife.subcommand_class_from(argv)
-        #   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)
-        #   subc
-        # end
 
         if args[:aggregate] and @use_knife_api
-          # subc = _getsubcmd.call(rsrc,verb)
           subc = getKnifeSubCommand(rsrc,verb)
           subc.name_args << xtra if xtra != ''
           subc.name_args << set.map{ |name,file|
@@ -132,7 +121,6 @@ class Chef
                 end
                 json
               when /^(rb|json)$/
-                # noop
                 file
               else
                 raise ChopError.new("'#{extname}' files are not supported!")
@@ -161,9 +149,10 @@ class Chef
 	          @logger.debug "... #{cmd}" if fLog
             if @use_knife_api
               unless @config[:dry_run]
-                #subc = _getsubcmd.call
                 subc = getKnifeSubCommand(rsrc,verb)
                 subc.name_args = rsrc == 'cookbook' ? [ name ] : [ file ]
+                cb2ul = subc.cookbooks_to_upload
+                @logger.info "#{cb2ul.size} Cookbooks to load: #{cb2ul.keys}"
                 subc.run
               end
             else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-chop
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -90,26 +90,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '12.0'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '12.0'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement