knife-sharp 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a5548924fee079df802660b4e9a9d1980386db
-  data.tar.gz: c6f27200d24340b77a27570c95e73ee10c106d94
+  metadata.gz: b78ccd3e3e6bbc90de1f096bbacbabf3d0c425d0
+  data.tar.gz: d0c0aa39d3c612b4967af96edbe28b297ba3ac19
 SHA512:
-  metadata.gz: 556242f0e8727b7e9bdbe5384265b2f3f12fcef57756cf978ae5de787b8a1ff4cf69ebadab5fa737d918d5748da5935765a4bacbe3852e04f77de08cedaa6ca0
-  data.tar.gz: 16ac33df09b42e16d5796bf63e1d88a3093c67f48e5d75c2e9e7940c7afc64f8c310b635e385c280b3ab8c09e52a7b19b3d8be7e240364cc28e2f4f52239f6dc
+  metadata.gz: 3988ac9a8e7986a48000f517aba4d507dee19291a619fcb87db86cc82aa544be2bcd7a583661902650df9c226ad124613fde5ce066fc7c58748cfd134356d8f8
+  data.tar.gz: 0576546edf62936eb81209157f56d8dab59f4b0540d963e535a05ded5fbaa44587b421d25eba8b50799c01cd058f51ecab2e5c1dafe463a89abf68c0eca646c4

data/lib/chef/knife/sharp-align.rb

@@ -212,8 +212,8 @@ module KnifeSharp
         end
 
         ui.msg "* Uploading cookbook(s) #{@cookbooks.join(", ")}"
-        uploader = Chef::CookbookUploader.new(cbs, @cb_path)
-        uploader.upload_cookbooks
+        cookbook_uploader(cbs).upload_cookbooks
+
 
         if env.save
           cbs.each do |cb|
@@ -496,6 +496,13 @@ module KnifeSharp
         ui.error "Unable to notify via hubot."
       end
     end
-  end
 
+    def cookbook_uploader(cookbooks)
+      if Gem::Version.new(Chef::VERSION).release >= Gem::Version.new('12.0.0')
+        uploader = Chef::CookbookUploader.new(cookbooks)
+      else
+        uploader = Chef::CookbookUploader.new(cookbooks, Chef::Config.cookbook_path)
+      end
+    end
+  end
 end

data/lib/chef/knife/sharp-backup.rb

@@ -8,7 +8,6 @@ module KnifeSharp
     deps do
       require 'chef/cookbook/metadata'
       require 'chef/cookbook_loader'
-      require 'chef/cookbook_uploader'
     end
 
     def run

data/lib/chef/knife/sharp-rollback.rb

@@ -24,7 +24,6 @@ module KnifeSharp
     deps do
       require 'chef/cookbook/metadata'
       require 'chef/cookbook_loader'
-      require 'chef/cookbook_uploader'
     end
 
     def run()

data/lib/knife-sharp.rb

@@ -1,3 +1,3 @@
 module KnifeSharp
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-sharp
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Nicolas Szalay
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Knife sharp plugin