chef 12.6.0 → 12.7.2

data/lib/chef/knife/cookbook_list.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Nuo Yan (<nuo@opscode.com>)
-# Copyright:: Copyright (c) 2009, 2010, 2011 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Nuo Yan (<nuo@chef.io>)
+# Copyright:: Copyright 2009-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
@@ -39,7 +39,7 @@ class Chef
         env          = config[:environment]
         num_versions = config[:all_versions] ? "num_versions=all" : "num_versions=1"
         api_endpoint = env ? "/environments/#{env}/cookbooks?#{num_versions}" : "/cookbooks?#{num_versions}"
-        cookbook_versions = rest.get_rest(api_endpoint)
+        cookbook_versions = rest.get(api_endpoint)
         ui.output(format_cookbook_list_for_display(cookbook_versions))
       end
     end

data/lib/chef/knife/cookbook_metadata.rb

@@ -1,7 +1,7 @@
 #
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2009-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,15 +17,15 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
     class CookbookMetadata < Knife
 
       deps do
-        require 'chef/cookbook_loader'
-        require 'chef/cookbook/metadata'
+        require "chef/cookbook_loader"
+        require "chef/cookbook/metadata"
       end
 
       banner "knife cookbook metadata COOKBOOK (options)"
@@ -62,7 +62,7 @@ class Chef
 
       def generate_metadata(cookbook)
         Array(config[:cookbook_path]).reverse.each do |path|
-          file = File.expand_path(File.join(path, cookbook, 'metadata.rb'))
+          file = File.expand_path(File.join(path, cookbook, "metadata.rb"))
           if File.exists?(file)
             generate_metadata_from_file(cookbook, file)
           else
@@ -76,7 +76,7 @@ class Chef
         md = Chef::Cookbook::Metadata.new
         md.name(cookbook)
         md.from_file(file)
-        json_file = File.join(File.dirname(file), 'metadata.json')
+        json_file = File.join(File.dirname(file), "metadata.json")
         File.open(json_file, "w") do |f|
           f.write(Chef::JSONCompat.to_json_pretty(md))
         end
@@ -91,7 +91,7 @@ class Chef
       end
 
       def validate_metadata_json(path, cookbook)
-        json_file = File.join(path, cookbook, 'metadata.json')
+        json_file = File.join(path, cookbook, "metadata.json")
         if File.exist?(json_file)
           Chef::Cookbook::Metadata.validate_json(IO.read(json_file))
         end

data/lib/chef/knife/cookbook_metadata_from_file.rb

@@ -1,9 +1,9 @@
 #
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Matthew Kent (<mkent@magoazul.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
-# Copyright:: Copyright (c) 2010 Matthew Kent
+# Copyright:: Copyright 2009-2016, Chef Software Inc.
+# Copyright:: Copyright 2010-2016, Matthew Kent
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,14 +19,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
     class CookbookMetadataFromFile < Knife
 
       deps do
-        require 'chef/cookbook/metadata'
+        require "chef/cookbook/metadata"
       end
 
       banner "knife cookbook metadata from FILE (options)"

data/lib/chef/knife/cookbook_show.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2009-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,16 +16,16 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
     class CookbookShow < Knife
 
       deps do
-        require 'chef/json_compat'
-        require 'uri'
-        require 'chef/cookbook_version'
+        require "chef/json_compat"
+        require "uri"
+        require "chef/cookbook_version"
       end
 
       banner "knife cookbook show COOKBOOK [VERSION] [PART] [FILENAME] (options)"
@@ -65,28 +65,28 @@ class Chef
           end
 
           cookbook_name, segment, filename = @name_args[0], @name_args[2], @name_args[3]
-          cookbook_version = @name_args[1] == 'latest' ? '_latest' : @name_args[1]
+          cookbook_version = @name_args[1] == "latest" ? "_latest" : @name_args[1]
 
-          cookbook = rest.get_rest("cookbooks/#{cookbook_name}/#{cookbook_version}")
+          cookbook = rest.get("cookbooks/#{cookbook_name}/#{cookbook_version}")
           manifest_entry = cookbook.preferred_manifest_record(node, segment, filename)
-          temp_file = rest.get_rest(manifest_entry[:url], true)
+          temp_file = rest.streaming_request(manifest_entry[:url])
 
           # the temp file is cleaned up elsewhere
           temp_file.open if temp_file.closed?
           pretty_print(temp_file.read)
 
         when 3 # We are showing a specific part of the cookbook
-          cookbook_version = @name_args[1] == 'latest' ? '_latest' : @name_args[1]
-          result = rest.get_rest("cookbooks/#{@name_args[0]}/#{cookbook_version}")
+          cookbook_version = @name_args[1] == "latest" ? "_latest" : @name_args[1]
+          result = rest.get("cookbooks/#{@name_args[0]}/#{cookbook_version}")
           output(result.manifest[@name_args[2]])
         when 2 # We are showing the whole cookbook data
-          cookbook_version = @name_args[1] == 'latest' ? '_latest' : @name_args[1]
-          output(rest.get_rest("cookbooks/#{@name_args[0]}/#{cookbook_version}"))
+          cookbook_version = @name_args[1] == "latest" ? "_latest" : @name_args[1]
+          output(rest.get("cookbooks/#{@name_args[0]}/#{cookbook_version}"))
         when 1 # We are showing the cookbook versions (all of them)
           cookbook_name = @name_args[0]
           env           = config[:environment]
           api_endpoint  = env ? "environments/#{env}/cookbooks/#{cookbook_name}" : "cookbooks/#{cookbook_name}"
-          output(format_cookbook_list_for_display(rest.get_rest(api_endpoint)))
+          output(format_cookbook_list_for_display(rest.get(api_endpoint)))
         when 0
           show_usage
           ui.fatal("You must specify a cookbook name")
@@ -96,7 +96,3 @@ class Chef
     end
   end
 end
-
-
-
-

data/lib/chef/knife/cookbook_site_download.rb

@@ -1,5 +1,5 @@
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2009-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +15,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
     class CookbookSiteDownload < Knife
 
       deps do
-        require 'fileutils'
+        require "fileutils"
       end
 
       banner "knife cookbook site download COOKBOOK [VERSION] (options)"
@@ -39,12 +39,12 @@ class Chef
 
       def run
         if current_cookbook_deprecated?
-          message = 'DEPRECATION: This cookbook has been deprecated. '
+          message = "DEPRECATION: This cookbook has been deprecated. "
           message << "It has been replaced by #{replacement_cookbook}."
           ui.warn message
 
           unless config[:force]
-            ui.warn 'Use --force to force download deprecated cookbook.'
+            ui.warn "Use --force to force download deprecated cookbook."
             return
           end
         end
@@ -53,40 +53,40 @@ class Chef
       end
 
       def version
-        @version = desired_cookbook_data['version']
+        @version = desired_cookbook_data["version"]
       end
 
       private
+
       def cookbooks_api_url
-        'https://supermarket.chef.io/api/v1/cookbooks'
+        "https://supermarket.chef.io/api/v1/cookbooks"
       end
 
       def current_cookbook_data
         @current_cookbook_data ||= begin
-          noauth_rest.get_rest "#{cookbooks_api_url}/#{@name_args[0]}"
-        end
+                                     noauth_rest.get "#{cookbooks_api_url}/#{@name_args[0]}"
+                                   end
       end
 
       def current_cookbook_deprecated?
-        current_cookbook_data['deprecated'] == true
+        current_cookbook_data["deprecated"] == true
       end
 
       def desired_cookbook_data
         @desired_cookbook_data ||= begin
-          uri = if @name_args.length == 1
-            current_cookbook_data['latest_version']
-          else
-            specific_cookbook_version_url
-          end
-
-          noauth_rest.get_rest uri
-        end
+                                     uri = if @name_args.length == 1
+                                             current_cookbook_data["latest_version"]
+                                           else
+                                             specific_cookbook_version_url
+                                           end
+
+                                     noauth_rest.get uri
+                                   end
       end
 
       def download_cookbook
         ui.info "Downloading #{@name_args[0]} from Supermarket at version #{version} to #{download_location}"
-        noauth_rest.sign_on_redirect = false
-        tf = noauth_rest.get_rest desired_cookbook_data["file"], true
+        tf = noauth_rest.streaming_request(desired_cookbook_data["file"])
 
         ::FileUtils.cp tf.path, download_location
         ui.info "Cookbook saved: #{download_location}"
@@ -98,7 +98,7 @@ class Chef
       end
 
       def replacement_cookbook
-        replacement = File.basename(current_cookbook_data['replacement'])
+        replacement = File.basename(current_cookbook_data["replacement"])
       end
 
       def specific_cookbook_version_url

data/lib/chef/knife/cookbook_site_install.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,18 +16,18 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
-require 'chef/exceptions'
-require 'shellwords'
+require "chef/knife"
+require "chef/exceptions"
+require "shellwords"
 
 class Chef
   class Knife
     class CookbookSiteInstall < Knife
 
       deps do
-        require 'chef/mixin/shell_out'
-        require 'chef/knife/core/cookbook_scm_repo'
-        require 'chef/cookbook/metadata'
+        require "chef/mixin/shell_out"
+        require "chef/knife/core/cookbook_scm_repo"
+        require "chef/cookbook/metadata"
       end
 
       banner "knife cookbook site install COOKBOOK [VERSION] (options)"
@@ -142,7 +142,7 @@ class Chef
       def extract_cookbook(upstream_file, version)
         ui.info("Uncompressing #{@cookbook_name} version #{version}.")
         # FIXME: Detect if we have the bad tar from git on Windows: https://github.com/opscode/chef/issues/1753
-        extract_command="tar zxvf \"#{convert_path upstream_file}\"" 
+        extract_command = "tar zxvf \"#{convert_path upstream_file}\""
         if Chef::Platform.windows?
           extract_command << " --force-local"
         end
@@ -156,7 +156,7 @@ class Chef
 
       def convert_path(upstream_file)
         # converts a Windows path (C:\foo) to a mingw path (/c/foo)
-        if ENV['MSYSTEM'] == 'MINGW32'
+        if ENV["MSYSTEM"] == "MINGW32"
           return upstream_file.sub(/^([[:alpha:]]):/, '/\1')
         else
           return Shellwords.escape upstream_file

data/lib/chef/knife/cookbook_site_list.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2009-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
@@ -33,16 +33,16 @@ class Chef
       def run
         if config[:with_uri]
           cookbooks = Hash.new
-          get_cookbook_list.each{ |k,v| cookbooks[k] = v['cookbook'] }
+          get_cookbook_list.each { |k, v| cookbooks[k] = v["cookbook"] }
           ui.output(format_for_display(cookbooks))
         else
           ui.msg(ui.list(get_cookbook_list.keys.sort, :columns_down))
         end
       end
 
-      def get_cookbook_list(items=10, start=0, cookbook_collection={})
+      def get_cookbook_list(items = 10, start = 0, cookbook_collection = {})
         cookbooks_url = "https://supermarket.chef.io/api/v1/cookbooks?items=#{items}&start=#{start}"
-        cr = noauth_rest.get_rest(cookbooks_url)
+        cr = noauth_rest.get(cookbooks_url)
         cr["items"].each do |cookbook|
           cookbook_collection[cookbook["cookbook_name"]] = cookbook
         end
@@ -56,7 +56,3 @@ class Chef
     end
   end
 end
-
-
-
-

data/lib/chef/knife/cookbook_site_search.rb

@@ -1,5 +1,5 @@
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2009-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
@@ -28,9 +28,9 @@ class Chef
         output(search_cookbook(name_args[0]))
       end
 
-      def search_cookbook(query, items=10, start=0, cookbook_collection={})
+      def search_cookbook(query, items = 10, start = 0, cookbook_collection = {})
         cookbooks_url = "https://supermarket.chef.io/api/v1/search?q=#{query}&items=#{items}&start=#{start}"
-        cr = noauth_rest.get_rest(cookbooks_url)
+        cr = noauth_rest.get(cookbooks_url)
         cr["items"].each do |cookbook|
           cookbook_collection[cookbook["cookbook_name"]] = cookbook
         end
@@ -44,8 +44,3 @@ class Chef
     end
   end
 end
-
-
-
-
-

data/lib/chef/knife/cookbook_site_share.rb

@@ -1,6 +1,6 @@
-# Author:: Nuo Yan (<nuo@opscode.com>)
-# Author:: Tim Hinderliter (<tim@opscode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# Author:: Nuo Yan (<nuo@chef.io>)
+# Author:: Tim Hinderliter (<tim@chef.io>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
-require 'chef/mixin/shell_out'
+require "chef/knife"
+require "chef/mixin/shell_out"
 
 class Chef
   class Knife
@@ -26,10 +26,10 @@ class Chef
       include Chef::Mixin::ShellOut
 
       deps do
-        require 'chef/cookbook_loader'
-        require 'chef/cookbook_uploader'
-        require 'chef/cookbook_site_streaming_uploader'
-        require 'mixlib/shellout'
+        require "chef/cookbook_loader"
+        require "chef/cookbook_uploader"
+        require "chef/cookbook_site_streaming_uploader"
+        require "mixlib/shellout"
       end
 
       include Chef::Mixin::ShellOut
@@ -44,8 +44,8 @@ class Chef
         :proc => lambda { |o| Chef::Config.cookbook_path = o.split(":") }
 
       option :dry_run,
-        :long => '--dry-run',
-        :short => '-n',
+        :long => "--dry-run",
+        :short => "-n",
         :boolean => true,
         :default => false,
         :description => "Don't take action, only print what files will be uploaded to Supermarket."
@@ -103,17 +103,16 @@ class Chef
           ui.error("Could not find cookbook #{cookbook_name} in your cookbook path.")
           exit(1)
         end
-
       end
 
       def get_category(cookbook_name)
         begin
-          data = noauth_rest.get_rest("https://supermarket.chef.io/api/v1/cookbooks/#{@name_args[0]}")
+          data = noauth_rest.get("https://supermarket.chef.io/api/v1/cookbooks/#{@name_args[0]}")
           if !data["category"] && data["error_code"]
             ui.fatal("Received an error from Supermarket: #{data["error_code"]}. On the first time you upload it, you are required to specify the category you want to share this cookbook to.")
             exit(1)
           else
-            data['category']
+            data["category"]
           end
         rescue => e
           ui.fatal("Unable to reach Supermarket: #{e.message}. Increase log verbosity (-VV) for more information.")
@@ -125,17 +124,17 @@ class Chef
       def do_upload(cookbook_filename, cookbook_category, user_id, user_secret_filename)
         uri = "https://supermarket.chef.io/api/v1/cookbooks"
 
-        category_string = Chef::JSONCompat.to_json({ 'category'=>cookbook_category })
+        category_string = Chef::JSONCompat.to_json({ "category" => cookbook_category })
 
         http_resp = Chef::CookbookSiteStreamingUploader.post(uri, user_id, user_secret_filename, {
           :tarball => File.open(cookbook_filename),
-          :cookbook => category_string
+          :cookbook => category_string,
         })
 
         res = Chef::JSONCompat.from_json(http_resp.body)
         if http_resp.code.to_i != 201
-          if res['error_messages']
-            if res['error_messages'][0] =~ /Version already exists/
+          if res["error_messages"]
+            if res["error_messages"][0] =~ /Version already exists/
               ui.error "The same version of this cookbook already exists on Supermarket."
               exit(1)
             else