knife-chop 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7e0016d5dbddd4f403439b4489af58be9e51943
-  data.tar.gz: a7b3f3d8f4acce7131fbed239dc8380e8e49d742
+  metadata.gz: b077953c883233a9ed946bc175f3d8646ffaf022
+  data.tar.gz: 862a23a7b9276fe78f49498e895cdfd2ec6c35f5
 SHA512:
-  metadata.gz: 706ac238181952dee7211f7257c385bab5f6101bef065bd38f273c0e914e2a98d1c810cf24fb59e565b1b1de81d789e073504d529f3ca83547d6543d5d4c536f
-  data.tar.gz: b543e8116bcb70509895d72b608920eb93579e1fe1333250b747a096e830a8eb60a9b868767a3f07e4d49d0e65c4107821195a4376bf45e57e44bbf2c7469621
+  metadata.gz: 4ea2febe762e151a4731fb448986c501bc9b7441367fa1e241676b8241cc8450b26699f351fbd89c8173230e541b345cf2496b588176d3a1496b2a8d766a39a0
+  data.tar.gz: f270a79100f42ccfc1d776659024c5728c379a957e897d924e650100c81d18b435b50593ab619f4ebe2cabfd14684d9a0a867d58d74256cc5be411f3bd6de9c0

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    knife-chop (0.9.0)
+    knife-chop (0.9.1)
       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)
       json (~> 1.8, >= 1.8.1)
       logging (~> 1.8, >= 1.8.2)
@@ -42,9 +43,9 @@ GEM
     diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi (1.9.6)
-    ffi-yajl (1.3.1)
+    ffi-yajl (1.2.0)
       ffi (~> 1.5)
-      libyajl2 (~> 1.2)
+      libyajl2 (~> 1.0)
     hashie (2.1.2)
     highline (1.6.21)
     inifile (3.0.0)

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/knife-chop.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   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']
+  s.add_dependency 'ffi-yajl',      ['~> 1.2']
 
   s.add_development_dependency 'rubygems-tasks', '~> 0'
 

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

@@ -34,7 +34,9 @@ end
 
 class ::Chef::Knife::CookbookUpload
   def run
-    raise StandardError.new("I was crafted from Chef::Knife::VERSION == '11.x'. Please verify that #{self.class.name}.run is still relevant in your version '#{Chef::VERSION}'!") unless Chef::VERSION.match(%r/^11\./)
+    unless Chef::VERSION.match(%r/^(11|12)\./)
+      raise StandardError.new("I was crafted from Chef::VERSION == '11.x'. Please verify that #{self.class.name}.run is still relevant in your version == '#{Chef::VERSION}'!")
+    end
     # Sanity check before we load anything from the server
     unless config[:all]
       if @name_args.empty?
@@ -141,9 +143,13 @@ class ::Chef::Knife::CookbookUpload
     end
   end
 
+  if Chef::VERSION.split('\.')[0].to_i < 12
+    # DLDInternet monkey patch of original
   def upload(cookbooks, justify_width)
     cookbooks.each do |cb|
+      # BEGIN changes DLDInternet
       ui.step("Uploading #{cb.name.to_s.ljust(justify_width + 10)} [#{cb.version}]")
+      # END changes DLDInternet
       check_for_broken_links!(cb)
       check_for_dependencies!(cb)
     end
@@ -152,6 +158,6 @@ class ::Chef::Knife::CookbookUpload
     ui.error e
     raise
   end
-
+  end
 end
 

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

@@ -15,6 +15,7 @@ class ::Chef::Knife::DataBagFromFile
     @location = 'data_bags'
   end
 
+  if Chef::VERSION.split('\.')[0].to_i < 12
   # DLDInternet monkey patch of original
   def load_data_bag_items(data_bag, items = nil)
     items ||= find_all_data_bag_items(data_bag)
@@ -35,5 +36,7 @@ class ::Chef::Knife::DataBagFromFile
       ui.info("Updated data_bag_item[#{dbag.data_bag}::#{dbag.id}]")
       # END changes DLDInternet
     end
+
+  end
   end
 end

data/lib/chef/knife/chop_base.rb

@@ -507,6 +507,7 @@ class Chef
         options = @config unless options
         if options.key?(:inifile)
           logStep "Parse INI file - #{options[:inifile]}"
+          options[:inifile] = File.expand_path(options[:inifile])
           raise ChopError.new("Cannot find inifile (#{options[:inifile]})") unless File.exist?(options[:inifile])
           raise ChopError.new("Recursive call to inifile == '#{options[:inifile]}'") if @inis.include?(options[:inifile])
           ini = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-chop
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -170,6 +170,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ffi-yajl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement