chef 12.6.0-universal-mingw32 → 12.7.2-universal-mingw32

data/lib/chef/shell/ext.rb

@@ -1,6 +1,6 @@
 #--
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
-# Copyright:: Copyright (c) 2009 Daniel DeLeo
+# Copyright:: Copyright 2009-2016, Daniel DeLeo
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,15 +16,15 @@
 # limitations under the License.
 #
 
-require 'tempfile'
-require 'chef/recipe'
-require 'fileutils'
-require 'chef/dsl/platform_introspection'
-require 'chef/version'
-require 'chef/shell/shell_session'
-require 'chef/shell/model_wrapper'
-require 'chef/shell/shell_rest'
-require 'chef/json_compat'
+require "tempfile"
+require "chef/recipe"
+require "fileutils"
+require "chef/dsl/platform_introspection"
+require "chef/version"
+require "chef/shell/shell_session"
+require "chef/shell/model_wrapper"
+require "chef/server_api"
+require "chef/json_compat"
 
 module Shell
   module Extensions
@@ -40,17 +40,17 @@ module Shell
         # so these methods need to be defined at the latest possible time.
         unless jobs.respond_to?(:select_session_by_context)
           def jobs.select_session_by_context(&block)
-            @jobs.select { |job| block.call(job[1].context.main)}
+            @jobs.select { |job| block.call(job[1].context.main) }
           end
         end
 
         unless jobs.respond_to?(:session_select)
           def jobs.select_shell_session(target_context)
             session = if target_context.kind_of?(Class)
-              select_session_by_context { |main| main.kind_of?(target_context) }
-            else
-              select_session_by_context { |main| main.equal?(target_context) }
-            end
+                        select_session_by_context { |main| main.kind_of?(target_context) }
+                      else
+                        select_session_by_context { |main| main.equal?(target_context) }
+                      end
             Array(session.first)[1]
           end
         end
@@ -125,7 +125,7 @@ module Shell
         @explain = explain_text
       end
 
-      def subcommands(subcommand_help={})
+      def subcommands(subcommand_help = {})
         @subcommand_help = subcommand_help
       end
 
@@ -196,8 +196,8 @@ module Shell
   chef-shell commands. When called with an argument COMMAND, +help+
   prints a detailed explanation of the command if available, or the
   description if no explanation is available.
-E
-      def help(commmand=nil)
+      E
+      def help(commmand = nil)
         if commmand
           explain_command(commmand)
         else
@@ -209,10 +209,10 @@ E
 
       desc "prints information about chef"
       def version
-        puts  "This is the chef-shell.\n" +
-              " Chef Version: #{::Chef::VERSION}\n" +
-              " http://www.chef.io/\n" +
-              " http://docs.chef.io/"
+        puts "This is the chef-shell.\n" +
+             " Chef Version: #{::Chef::VERSION}\n" +
+             " http://www.chef.io/\n" +
+             " http://docs.chef.io/"
         :ucanhaz_automation
       end
       alias :shell :version
@@ -295,7 +295,7 @@ E
       end
 
       desc "pretty print the node's attributes"
-      def ohai(key=nil)
+      def ohai(key = nil)
         pp(key ? node.attribute[key] : node.attribute)
       end
     end
@@ -314,7 +314,7 @@ E
   1. Looks for an EDITOR set by Shell.editor = "EDITOR"
   2. Looks for an EDITOR configured in your chef-shell config file
   3. Uses the value of the EDITOR environment variable
-E
+      E
       def edit(object)
         unless Shell.editor
           puts "Please set your editor with Shell.editor = \"vim|emacs|mate|ed\""
@@ -331,7 +331,7 @@ E
         edited_data = Tempfile.open([filename, ".js"]) do |tempfile|
           tempfile.sync = true
           tempfile.puts Chef::JSONCompat.to_json(object)
-          system("#{Shell.editor.to_s} #{tempfile.path}")
+          system("#{Shell.editor} #{tempfile.path}")
           tempfile.rewind
           tempfile.read
         end
@@ -392,7 +392,7 @@ E
       end
 
   This will strip the admin privileges from any client named after borat.
-E
+      E
       subcommands :all        => "list all api clients",
                   :show       => "load an api client by name",
                   :search     => "search for API clients",
@@ -454,7 +454,7 @@ E
       end
 
   This will assign the attribute to every node with a FQDN matching the regex.
-E
+      E
       subcommands :all        => "list all nodes",
                   :show       => "load a node by name",
                   :search     => "search for nodes",
@@ -476,7 +476,7 @@ E
 
 ## SEE ALSO ##
   See the help for +nodes+ for more information about the subcommands.
-E
+      E
       subcommands :all        => "list all roles",
                   :show       => "load a role by name",
                   :search     => "search for roles",
@@ -502,7 +502,7 @@ E
 ## SEE ALSO ##
   See the help for +nodes+ for more information about the subcommands.
 
-E
+      E
       subcommands :all        => "list all items in the data bag",
                   :show       => "load a data bag item by id",
                   :search     => "search for items in the data bag",
@@ -525,7 +525,7 @@ E
 
 ## SEE ALSO ##
   See the help for +nodes+ for more information about the subcommands.
-E
+      E
       subcommands :all        => "list all environments",
                   :show       => "load an environment by name",
                   :search     => "search for environments",
@@ -536,7 +536,7 @@ E
 
       desc "A REST Client configured to authenticate with the API"
       def api
-        @rest = Shell::ShellREST.new(Chef::Config[:chef_server_url])
+        @rest = Chef::ServerAPI.new(Chef::Config[:chef_server_url])
       end
 
     end

data/lib/chef/shell/model_wrapper.rb

@@ -1,6 +1,6 @@
 #--
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# Author:: Daniel DeLeo (<dan@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/mixin/convert_to_class_name'
-require 'chef/mixin/language'
+require "chef/mixin/convert_to_class_name"
+require "chef/mixin/language"
 
 module Shell
   class ModelWrapper
@@ -26,7 +26,7 @@ module Shell
 
     attr_reader :model_symbol
 
-    def initialize(model_class, symbol=nil)
+    def initialize(model_class, symbol = nil)
       @model_class = model_class
       @model_symbol = symbol || convert_to_snake_case(model_class.name, "Chef").to_sym
     end
@@ -79,8 +79,8 @@ module Shell
     # paper over inconsistencies in the model classes APIs, and return the objects
     # the user wanted instead of the URI=>object stuff
     def list_objects
-      objects = @model_class.method(:list).arity == 0? @model_class.list : @model_class.list(true)
-      objects.map { |obj| Array(obj).find {|o| o.kind_of?(@model_class)} }
+      objects = @model_class.method(:list).arity == 0 ? @model_class.list : @model_class.list(true)
+      objects.map { |obj| Array(obj).find { |o| o.kind_of?(@model_class) } }
     end
 
     def format_query(query)
@@ -98,7 +98,6 @@ module Shell
       @model_symbol = @databag_name = databag_name
     end
 
-
     alias :list :all
 
     def show(item)

data/lib/chef/shell/shell_session.rb

@@ -1,8 +1,8 @@
 #--
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
-# Author:: Tim Hinderliter (<tim@opscode.com>)
-# Copyright:: Copyright (c) 2009 Daniel DeLeo
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Tim Hinderliter (<tim@chef.io>)
+# Copyright:: Copyright 2009-2016, Daniel DeLeo
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,22 +18,22 @@
 # limitations under the License.
 #
 
-require 'chef/recipe'
-require 'chef/run_context'
-require 'chef/config'
-require 'chef/client'
-require 'chef/cookbook/cookbook_collection'
-require 'chef/cookbook_loader'
-require 'chef/run_list/run_list_expansion'
-require 'chef/formatters/base'
-require 'chef/formatters/doc'
-require 'chef/formatters/minimal'
+require "chef/recipe"
+require "chef/run_context"
+require "chef/config"
+require "chef/client"
+require "chef/cookbook/cookbook_collection"
+require "chef/cookbook_loader"
+require "chef/run_list/run_list_expansion"
+require "chef/formatters/base"
+require "chef/formatters/doc"
+require "chef/formatters/minimal"
 
 module Shell
   class ShellSession
     include Singleton
 
-    def self.session_type(type=nil)
+    def self.session_type(type = nil)
       @session_type = type if type
       @session_type
     end
@@ -201,7 +201,7 @@ module Shell
 
     def rebuild_context
       @run_status = Chef::RunStatus.new(@node, @events)
-      Chef::Cookbook::FileVendor.fetch_from_remote(Chef::REST.new(Chef::Config[:chef_server_url]))
+      Chef::Cookbook::FileVendor.fetch_from_remote(Chef::ServerAPI.new(Chef::Config[:chef_server_url]))
       cookbook_hash = @client.sync_cookbooks
       cookbook_collection = Chef::CookbookCollection.new(cookbook_hash)
       @run_context = Chef::RunContext.new(node, cookbook_collection, @events)
@@ -235,7 +235,7 @@ module Shell
     # Run the very smallest amount of ohai we can get away with and still
     # hope to have things work. Otherwise we're not very good doppelgangers
     def run_ohai
-      @ohai.require_plugin('os')
+      @ohai.require_plugin("os")
     end
 
     # DoppelGanger implementation of build_node. preserves as many of the node's
@@ -244,8 +244,8 @@ module Shell
       Chef::Log.debug("Building node object for #{@node_name}")
       @node = Chef::Node.find_or_create(node_name)
       ohai_data = @ohai.data.merge(@node.automatic_attrs)
-      @node.consume_external_attrs(ohai_data,nil)
-      @run_list_expansion = @node.expand!('server')
+      @node.consume_external_attrs(ohai_data, nil)
+      @run_list_expansion = @node.expand!("server")
       @expanded_run_list_with_versions = @run_list_expansion.recipes.with_version_constraints_strings
       Chef::Log.info("Run List is [#{@node.run_list}]")
       Chef::Log.info("Run List expands to [#{@expanded_run_list_with_versions.join(', ')}]")
@@ -253,7 +253,8 @@ module Shell
     end
 
     def register
-      @rest = Chef::REST.new(Chef::Config[:chef_server_url], Chef::Config[:node_name], Chef::Config[:client_key])
+      @rest = Chef::ServerAPI.new(Chef::Config[:chef_server_url], :client_name => Chef::Config[:node_name],
+                                                                  :signing_key_filename => Chef::Config[:client_key])
     end
 
   end

data/lib/chef/shell_out.rb

@@ -1,11 +1,11 @@
-require 'mixlib/shellout'
+require "mixlib/shellout"
 
 class Chef
   class ShellOut < Mixlib::ShellOut
 
     def initialize(*args)
       Chef::Log.warn("Chef::ShellOut is deprecated, please use Mixlib::ShellOut")
-      called_from = caller[0..3].inject("Called from:\n") {|msg, trace_line| msg << "  #{trace_line}\n" }
+      called_from = caller[0..3].inject("Called from:\n") { |msg, trace_line| msg << "  #{trace_line}\n" }
       Chef::Log.warn(called_from)
       super
     end

data/lib/chef/tasks/chef_repo.rake

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008, 2009 Opscode, Inc.
-# Copyright:: Copyright (c) 2014, Chef Software, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-TOPDIR = '.'
-require 'rake'
+TOPDIR = "."
+require "rake"
 
 desc "By default, print deprecation notice"
 task :default do
@@ -27,37 +27,37 @@ end
 desc "Install the latest copy of the repository on this Chef Server"
 task :install do
   puts deprecation_notice
-  puts 'The `install` rake task, which included the `update`, `roles`, and'
-  puts '`upload_cookbooks` rake tasks is replaced by the `knife upload`'
+  puts "The `install` rake task, which included the `update`, `roles`, and"
+  puts "`upload_cookbooks` rake tasks is replaced by the `knife upload`"
   puts 'sub-command. The notion of "installing" the chef-repo to the Chef'
-  puts 'Server. Previously the `install` task would manage server and'
-  puts 'client configuration. This will not work at all on Chef Server 11+'
-  puts 'and client configuration should be managed with the `chef-client`'
-  puts 'cookbook.'
+  puts "Server. Previously the `install` task would manage server and"
+  puts "client configuration. This will not work at all on Chef Server 11+"
+  puts "and client configuration should be managed with the `chef-client`"
+  puts "cookbook."
 end
 
 desc "Update your repository from source control"
 task :update do
   puts deprecation_notice
-  puts 'The `update` rake task previously updated the chef-repo from'
-  puts 'the detected version control system, either svn or git. However,'
-  puts 'it has not been recommended for users for years. Most users in'
-  puts 'the community use `git`, so the Subversion functionality is not'
-  puts 'required, and `git pull` is sufficient for many workflows. The'
-  puts 'world of git workflows is rather different now than it was when'
-  puts 'this rake task was created.'
+  puts "The `update` rake task previously updated the chef-repo from"
+  puts "the detected version control system, either svn or git. However,"
+  puts "it has not been recommended for users for years. Most users in"
+  puts "the community use `git`, so the Subversion functionality is not"
+  puts "required, and `git pull` is sufficient for many workflows. The"
+  puts "world of git workflows is rather different now than it was when"
+  puts "this rake task was created."
 end
 
 desc "Create a new cookbook (with COOKBOOK=name, optional CB_PREFIX=site-)"
 task :new_cookbook do
-  cb = ENV['COOKBOOK'] || 'my_cookbook_name'
+  cb = ENV["COOKBOOK"] || "my_cookbook_name"
   puts deprecation_notice
-  puts 'The `new_cookbook` rake task is replaced by the ChefDK cookbook'
-  puts 'generator. To generate a new cookbook run:'
+  puts "The `new_cookbook` rake task is replaced by the ChefDK cookbook"
+  puts "generator. To generate a new cookbook run:"
   puts
   puts "chef generate cookbook #{ENV['COOKBOOK']}"
   puts
-  puts 'Or, if you are not using ChefDK, use `knife cookbook create`:'
+  puts "Or, if you are not using ChefDK, use `knife cookbook create`:"
   puts
   puts "knife cookbook create #{ENV['COOKBOOK']}"
 end
@@ -65,46 +65,46 @@ end
 desc "Create a new self-signed SSL certificate for FQDN=foo.example.com"
 task :ssl_cert do
   puts deprecation_notice
-  puts 'The `ssl_cert` rake task is superseded by using the CHEF-maintained'
+  puts "The `ssl_cert` rake task is superseded by using the CHEF-maintained"
   puts '`openssl` cookbook\'s `openssl_x509` resource which can generate'
-  puts 'self-signed certificate chains as convergent resources.'
+  puts "self-signed certificate chains as convergent resources."
   puts
-  puts 'https://supermarket.getchef.com/cookbooks/openssl'
+  puts "https://supermarket.getchef.com/cookbooks/openssl"
 end
 
 desc "Build cookbook metadata.json from metadata.rb"
 task :metadata do
   puts deprecation_notice
-  puts 'The `metadata` rake task is not recommended. Cookbook'
-  puts '`metadata.json` is automatically generated from `metadata.rb`'
-  puts 'by `knife` when uploading cookbooks to the Chef Server.'
+  puts "The `metadata` rake task is not recommended. Cookbook"
+  puts "`metadata.json` is automatically generated from `metadata.rb`"
+  puts "by `knife` when uploading cookbooks to the Chef Server."
 end
 
 desc "Update roles"
 task :roles do
   puts deprecation_notice
-  puts 'The `roles` rake task is not recommended. If you are using Ruby'
-  puts 'role files (roles/*.rb), you can upload them all with:'
+  puts "The `roles` rake task is not recommended. If you are using Ruby"
+  puts "role files (roles/*.rb), you can upload them all with:"
   puts
-  puts 'knife role from file roles/*'
+  puts "knife role from file roles/*"
   puts
-  puts 'If you are using JSON role files (roles/*.json), you can upload'
-  puts 'them all with:'
+  puts "If you are using JSON role files (roles/*.json), you can upload"
+  puts "them all with:"
   puts
-  puts 'knife upload roles/*.json'
+  puts "knife upload roles/*.json"
 end
 
 desc "Update a specific role"
 task :role do
   puts deprecation_notice
-  puts 'The `role` rake task is not recommended. If you are using Ruby'
-  puts 'role files, you can upload a single role with:'
+  puts "The `role` rake task is not recommended. If you are using Ruby"
+  puts "role files, you can upload a single role with:"
   puts
-  puts 'knife role from file rolename.rb'
+  puts "knife role from file rolename.rb"
   puts
-  puts 'If you are using JSON role files, you can upload a single role with'
+  puts "If you are using JSON role files, you can upload a single role with"
   puts
-  puts 'knife upload roles/rolename.json'
+  puts "knife upload roles/rolename.json"
 end
 
 desc "Upload all cookbooks"
@@ -122,18 +122,18 @@ end
 desc "Test all cookbooks"
 task :test_cookbooks do
   puts deprecation_notice
-  puts 'The `test_cookbooks` rake task is no longer recommended. Previously'
-  puts 'it only performed a syntax check, and did no other kind of testing,'
-  puts 'and the Chef Community has a rich ecosystem of testing tools for'
-  puts 'various purposes:'
+  puts "The `test_cookbooks` rake task is no longer recommended. Previously"
+  puts "it only performed a syntax check, and did no other kind of testing,"
+  puts "and the Chef Community has a rich ecosystem of testing tools for"
+  puts "various purposes:"
   puts
-  puts '- knife cookbook test will perform a syntax check, as this task did'
-  puts '  before.'
-  puts '- rubocop and foodcritic will perform lint checking for Ruby and'
-  puts '  Chef cookbook style according to community standards.'
-  puts '- ChefSpec will perform unit testing'
-  puts '- Test Kitchen will perform convergence and post-convergence'
-  puts '  testing on virtual machines.'
+  puts "- knife cookbook test will perform a syntax check, as this task did"
+  puts "  before."
+  puts "- rubocop and foodcritic will perform lint checking for Ruby and"
+  puts "  Chef cookbook style according to community standards."
+  puts "- ChefSpec will perform unit testing"
+  puts "- Test Kitchen will perform convergence and post-convergence"
+  puts "  testing on virtual machines."
 end
 
 desc "Test a single cookbook"
@@ -143,19 +143,19 @@ namespace :databag do
   desc "Upload a single databag"
   task :upload do
     puts deprecation_notice
-    puts 'The `data_bags:upload` task is not recommended. You should use'
-    puts 'the `knife upload` sub-command for uploading data bag items.'
+    puts "The `data_bags:upload` task is not recommended. You should use"
+    puts "the `knife upload` sub-command for uploading data bag items."
     puts
-    puts 'knife upload data_bags/bagname/itemname.json'
+    puts "knife upload data_bags/bagname/itemname.json"
   end
 
   desc "Upload all databags"
   task :upload_all do
     puts deprecation_notice
-    puts 'The `data_bags:upload_all` task is not recommended. You should'
-    puts 'use the `knife upload` sub-command for uploading data bag items.'
+    puts "The `data_bags:upload_all` task is not recommended. You should"
+    puts "use the `knife upload` sub-command for uploading data bag items."
     puts
-    puts 'knife upload data_bags/*'
+    puts "knife upload data_bags/*"
   end
 
   desc "Create a databag"
@@ -172,23 +172,22 @@ namespace :databag do
 end
 
 def deprecation_notice
-  %Q[*************************************************
+  %Q{*************************************************
 NOTICE: Chef Repository Rake Tasks Are Deprecated
 *************************************************
-]
-
+}
 end
 
 def deprecated_cookbook_upload
-  %Q[
+  %Q{
 The `upload_cookbook` and `upload_cookbooks` rake tasks are not
 recommended. These tasks are replaced by other, better workflow
 tools, such as `knife cookbook upload`, `knife upload`, or `berks`
-]
+}
 end
 
 def deprecated_data_bag_creation
-  %Q[
+  %Q{
 The `data_bags:create` and `data_bags:create_item` tasks are not
 recommended. You should create data bag items as JSON files in the data_bags
 directory, with a sub-directory for each bag, and use `knife upload` to
@@ -197,5 +196,5 @@ upload them. For example, if you have a data bags named `users`, with
 
 ./data_bags/users/finn.json
 ./data-bags/users/jake.json
-]
+}
 end