knife-supermarket 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8474981819bce841989f81880315cfda302b7a93
-  data.tar.gz: 66872e5a548a8d94e415e2ae2d13ddadbd71fa67
+  metadata.gz: dbe81f168d581bc4dae8c8bd3338f8db49b1fe9c
+  data.tar.gz: d50acda261b2cfe4e7ae09a8380632ae4b481d91
 SHA512:
-  metadata.gz: e29ed028e2a28e238d39501b871f93980980737fdd1e55beea1ad512c3de6b6830f689bced4ac2083fb11eb8faf27cd52aac2350e5300cf29b88070baff302a0
-  data.tar.gz: ab5b5d0ba35d16cc7a0f70d3a51fbcaf7a024ea81d85141e3145ccbb7f73dfdf4af176815b02819e22ca927ecdb4ac923664df7c72b48785f7569c474a5a056b
+  metadata.gz: 0dcae880ccd5ec541a075f27ec2e166abd74f235bddfcae20437ea6bcb26f8459d3ab2babfc2f99cb35b56f2395499fd6c64d29ca64e791fc6178f8fe179da14
+  data.tar.gz: 4e5dbbe206c5815a3b741225b80e9b5902029ead5298eeb4bcac8d4b49b5a6812174098d3c874fb7c7fbc092dfab749809325aca6437bf80d892710ce87632e5

data/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gemspec

data/README.md

@@ -1,10 +1,15 @@
 # knife-supermarket
 
-This Knife Plugin is an easy way to switch between various supermarkets, the biggest of them being the Chef Community Site, located at [https://supermarket.getchef.com](https://supermarket.getchef.com). The `knife supermarket` commands mimic the `knife cookbook site` commands and work the same way.
+This Knife Plugin is an easy way to switch between various supermarkets, the
+biggest of them being the Chef Community Site, located at
+[https://supermarket.chef.io](https://supermarket.chef.io). The `knife
+supermarket` commands mimic the `knife cookbook site` commands and work the
+same way.
 
 ## Installation
 
-If you are running [Chef-DK](http://www.getchef.com/downloads/chef-dk) you can install it by running:
+If you are running [Chef-DK](https://downloads.chef.io/chef-dk/) you can
+install it by running:
 
     $ chef gem install knife-supermarket
 
@@ -16,7 +21,8 @@ Depending on your system's configuration, you may need to run this command with
 
 ## Configuration
 
-Out of the box, knife-supermarket is configured to point at [https://supermarket.getchef.com](https://supermarket.getchef.com), but it can be configured to point at a supermarket that isn't the official one. To do this you can do this a few ways:
+Out of the box, knife-supermarket is configured to point at [https://supermarket.chef.io](https://supermarket.chef.io), but it can be
+configured to point at the unofficial supermarket. This can be done two ways:
 
 ### On The Command Line
 
@@ -24,12 +30,14 @@ When using the `knife supermarket` commands you can specify a `--supermarket-sit
 
 ### `knife.rb` Configuration
 
-It may be preferable to use have this setting default to another host. For that, we can set the `knife[:supermarket_site]` setting in our `knife.rb`. So if we wanted to default to a supermarket hosted at `https://franchise.somecompany.com` it would be:
+It may be preferable to have this setting default to another host. For that, we can set the `knife[:supermarket_site]` setting in our `knife.rb`. So if we
+wanted to default to a supermarket hosted at
+`https://franchise.somecompany.com` it would be:
 
     knife[:supermarket_site] = 'https://franchise.somecompany.com'
 
 Now when you run `knife supermarket install mysql` it will install the mysql cookbook from `https://franchise.somecompany.com`.
 
 ## Subcommands
-
-The subcommands work the same way they for [knife cookbook site](http://docs.opscode.com/chef/knife.html#cookbook-site). Please see [http://docs.opscode.com/chef/knife.html#cookbook-site](http://docs.opscode.com/chef/knife.html#cookbook-site) for more information on the subcommands.
+The subcommands work the same way they for [knife cookbook site](https://docs.chef.io/chef/knife.html#cookbook-site). Please see
+<https://docs.chef.io/chef/knife.html#cookbook-site> for more information on the subcommands.

data/lib/chef/knife/supermarket_download.rb

@@ -1,4 +1,4 @@
-# 
+#
 # Author:: Christopher Webber (<cwebber@getchef.com>)
 # Copyright:: Copyright (c) 2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
@@ -21,6 +21,9 @@ require 'chef/knife'
 class Chef
   class Knife
     class SupermarketDownload < Knife::CookbookSiteDownload
+      # Handle the subclassing (knife doesn't do this :()
+      dependency_loaders.concat(superclass.dependency_loaders)
+      options.merge!(superclass.options)
 
       banner "knife supermarket download COOKBOOK [VERSION] (options)"
       category "supermarket"
@@ -29,7 +32,7 @@ class Chef
         :short => '-m SUPERMARKET_SITE',
         :long => '--supermarket-site SUPERMARKET_SITE',
         :description => 'Supermarket Site',
-        :default => 'https://supermarket.getchef.com',
+        :default => 'https://supermarket.chef.io',
         :proc => Proc.new { |supermarket| Chef::Config[:knife][:supermarket_site] = supermarket }
 
       def cookbooks_api_url

data/lib/chef/knife/supermarket_install.rb

@@ -17,16 +17,16 @@
 #
 
 require 'chef/knife'
-require 'shellwords'
 
 class Chef
   class Knife
     class SupermarketInstall < Knife::CookbookSiteInstall
+      # Handle the subclassing (knife doesn't do this :()
+      dependency_loaders.concat(superclass.dependency_loaders)
+      options.merge!(superclass.options)
 
       deps do
-        require 'chef/mixin/shell_out'
-        require 'chef/knife/core/cookbook_scm_repo'
-        require 'chef/cookbook/metadata'
+        require 'chef/knife/supermarket_download'
       end
 
       banner "knife supermarket install COOKBOOK [VERSION] (options)"
@@ -36,7 +36,7 @@ class Chef
         :short => '-m SUPERMARKET_SITE',
         :long => '--supermarket-site SUPERMARKET_SITE',
         :description => 'Supermarket Site',
-        :default => 'https://supermarket.getchef.com',
+        :default => 'https://supermarket.chef.io',
         :proc => Proc.new { |supermarket| Chef::Config[:knife][:supermarket_site] = supermarket }
 
       def download_cookbook_to(download_path)

data/lib/chef/knife/supermarket_list.rb

@@ -21,6 +21,9 @@ require 'chef/knife'
 class Chef
   class Knife
     class SupermarketList < Knife::CookbookSiteList
+      # Handle the subclassing (knife doesn't do this :()
+      dependency_loaders.concat(superclass.dependency_loaders)
+      options.merge!(superclass.options)
 
       banner "knife supermarket list (options)"
       category "supermarket"
@@ -29,7 +32,7 @@ class Chef
         :short => '-m SUPERMARKET_SITE',
         :long => '--supermarket-site SUPERMARKET_SITE',
         :description => 'Supermarket Site',
-        :default => 'https://supermarket.getchef.com',
+        :default => 'https://supermarket.chef.io',
         :proc => Proc.new { |supermarket| Chef::Config[:knife][:supermarket_site] = supermarket }
 
       def get_cookbook_list(items=10, start=0, cookbook_collection={})

data/lib/chef/knife/supermarket_search.rb

@@ -29,7 +29,7 @@ class Chef
         :short => '-m SUPERMARKET_SITE',
         :long => '--supermarket-site SUPERMARKET_SITE',
         :description => 'Supermarket Site',
-        :default => 'https://supermarket.getchef.com',
+        :default => 'https://supermarket.chef.io',
         :proc => Proc.new { |supermarket| Chef::Config[:knife][:supermarket_site] = supermarket }
 
       def run

data/lib/chef/knife/supermarket_share.rb

@@ -21,13 +21,15 @@ require 'chef/knife'
 class Chef
   class Knife
     class SupermarketShare < Knife::CookbookSiteShare
+      # Handle the subclassing (knife doesn't do this :()
+      dependency_loaders.concat(superclass.dependency_loaders)
+      options.merge!(superclass.options)
 
       banner "knife supermarket share COOKBOOK (options)"
       category "supermarket"
 
       deps do
-        require 'chef/cookbook_loader'
-        require 'chef/cookbook_uploader'
+        require 'chef/json_compat'
         require 'chef/cookbook_site_streaming_uploader'
       end
 
@@ -35,7 +37,7 @@ class Chef
         :short => '-m SUPERMARKET_SITE',
         :long => '--supermarket-site SUPERMARKET_SITE',
         :description => 'Supermarket Site',
-        :default => 'https://supermarket.getchef.com',
+        :default => 'https://supermarket.chef.io',
         :proc => Proc.new { |supermarket| Chef::Config[:knife][:supermarket_site] = supermarket }
 
       option :cookbook_path,
@@ -54,15 +56,15 @@ class Chef
       def do_upload(cookbook_filename, cookbook_category, user_id, user_secret_filename)
          uri = "#{config[:supermarket_site]}/api/v1/cookbooks"
 
-         # Categories are optional both in knife cookbook site 
+         # 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: 
+         # 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, {

data/lib/chef/knife/supermarket_show.rb

@@ -21,6 +21,9 @@ require 'chef/knife'
 class Chef
   class Knife
     class SupermarketShow < Knife::CookbookSiteShow
+      # Handle the subclassing (knife doesn't do this :()
+      dependency_loaders.concat(superclass.dependency_loaders)
+      options.merge!(superclass.options)
 
       banner "knife supermarket show COOKBOOK [VERSION] (options)"
       category "supermarket"
@@ -29,7 +32,7 @@ class Chef
         :short => '-m SUPERMARKET_SITE',
         :long => '--supermarket-site SUPERMARKET_SITE',
         :description => 'Supermarket Site',
-        :default => 'https://supermarket.getchef.com',
+        :default => 'https://supermarket.chef.io',
         :proc => Proc.new { |supermarket| Chef::Config[:knife][:supermarket_site] = supermarket }
 
       def get_cookbook_data

data/lib/chef/knife/supermarket_unshare.rb

@@ -33,7 +33,7 @@ class Chef
         :short => '-m SUPERMARKET_SITE',
         :long => '--supermarket-site SUPERMARKET_SITE',
         :description => 'Supermarket Site',
-        :default => 'https://supermarket.getchef.com',
+        :default => 'https://supermarket.chef.io',
         :proc => Proc.new { |supermarket| Chef::Config[:knife][:supermarket_site] = supermarket }
 
       def run

data/lib/knife-supermarket/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Supermarket
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
     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.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Christopher Webber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -32,6 +32,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - CHANGELOG.md
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -64,9 +65,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Knife support for interacting with Chef Supermarkets
 test_files: []
-has_rdoc: