knife-supermarket 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcc161bf2cd8fd29483a6e6edaef9ce22e81e13c
-  data.tar.gz: b6e10ebb089cfb2aa93ac9dcb46b30ea83084ef2
+  metadata.gz: 8474981819bce841989f81880315cfda302b7a93
+  data.tar.gz: 66872e5a548a8d94e415e2ae2d13ddadbd71fa67
 SHA512:
-  metadata.gz: 83910ba6e26da78c05f5df73e3a53f02a229fa3fc7f022b85df97b15fafdc5647964e14be8fc85c0a9f48391403d41e5c9b2734e22a8e30d7141b4e81d9bf43e
-  data.tar.gz: 1fd733b3f5f2d39b15b2d9ff370faffb0c2625d4d53486966f4b3acf994159177af8a79a42374cbe81d01a5336cdcdc0ff89d24b141fdead528713ae78a02568
+  metadata.gz: e29ed028e2a28e238d39501b871f93980980737fdd1e55beea1ad512c3de6b6830f689bced4ac2083fb11eb8faf27cd52aac2350e5300cf29b88070baff302a0
+  data.tar.gz: ab5b5d0ba35d16cc7a0f70d3a51fbcaf7a024ea81d85141e3145ccbb7f73dfdf4af176815b02819e22ca927ecdb4ac923664df7c72b48785f7569c474a5a056b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.2.1
+* Pass empty string for category
+
 ## v0.2.0
 * Add support for specifying --cookbook-path on `knife supermarket share`
 

data/lib/chef/knife/supermarket_share.rb

@@ -22,7 +22,7 @@ class Chef
   class Knife
     class SupermarketShare < Knife::CookbookSiteShare
 
-      banner "knife supermarket share COOKBOOK CATEGORY (options)"
+      banner "knife supermarket share COOKBOOK (options)"
       category "supermarket"
 
       deps do
@@ -44,10 +44,26 @@ class Chef
         :description => "A colon-separated path to look for cookbooks in",
         :proc => lambda { |o| Chef::Config.cookbook_path = o.split(":") }
 
+      # since we subclass cookbook_site and it expects a category, pass a phantom empty category
+      # parameter before invoking Chef::Knife::CookbookSiteShare#run ...
+      # Tested on 11.16.4 and 12.0.3.
+      def run
+        @name_args << "" if @name_args.length == 1
+        super
+      end
       def do_upload(cookbook_filename, cookbook_category, user_id, user_secret_filename)
          uri = "#{config[:supermarket_site]}/api/v1/cookbooks"
 
-         category_string = { 'category'=>cookbook_category }.to_json
+         # Categories are optional both in knife cookbook site 
+         # (which this plugin seeks to replace) and on the
+         # Supermarket community site.  Best practice now
+         # seems to be to just omit the category entirely.
+         #
+         # see: 
+         # https://github.com/chef/supermarket/pull/915
+         # https://github.com/chef/chef/pull/2198
+         
+         category_string = { 'category'=>'' }.to_json
 
          http_resp = Chef::CookbookSiteStreamingUploader.post(uri, user_id, user_secret_filename, {
            :tarball => File.open(cookbook_filename),

data/lib/knife-supermarket/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Supermarket
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-supermarket
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Christopher Webber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef