chef 12.6.0 → 12.7.2

data/lib/chef/knife/recipe_list.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,13 +16,13 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 class Chef::Knife::RecipeList < Chef::Knife
 
   banner "knife recipe list [PATTERN]"
 
   def run
-    recipes = rest.get_rest('cookbooks/_recipes')
+    recipes = rest.get("cookbooks/_recipes")
     if pattern = @name_args.first
       recipes = recipes.grep(Regexp.new(pattern))
     end

data/lib/chef/knife/rehash.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Steven Danna <steve@chef.io>
-# Copyright:: Copyright (c) 2015 Chef Software, Inc
+# Copyright:: Copyright 2015-2016, Chef Software, Inc
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +16,12 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
-require 'chef/knife/core/subcommand_loader'
+require "chef/knife"
+require "chef/knife/core/subcommand_loader"
 
 class Chef
   class Knife
-    class Rehash <  Chef::Knife
+    class Rehash < Chef::Knife
       banner "knife rehash"
 
       def run
@@ -42,17 +42,17 @@ class Chef
         output = if Chef::Knife::SubcommandLoader.plugin_manifest?
                    Chef::Knife::SubcommandLoader.plugin_manifest
                  else
-                   { Chef::Knife::SubcommandLoader::HashedCommandLoader::KEY => {}}
+                   { Chef::Knife::SubcommandLoader::HashedCommandLoader::KEY => {} }
                  end
-        output[Chef::Knife::SubcommandLoader::HashedCommandLoader::KEY]['plugins_paths'] = Chef::Knife.subcommand_files
-        output[Chef::Knife::SubcommandLoader::HashedCommandLoader::KEY]['plugins_by_category'] = Chef::Knife.subcommands_by_category
+        output[Chef::Knife::SubcommandLoader::HashedCommandLoader::KEY]["plugins_paths"] = Chef::Knife.subcommand_files
+        output[Chef::Knife::SubcommandLoader::HashedCommandLoader::KEY]["plugins_by_category"] = Chef::Knife.subcommands_by_category
         output
       end
 
       def write_hash(data)
-        plugin_manifest_dir = File.expand_path('..', Chef::Knife::SubcommandLoader.plugin_manifest_path)
+        plugin_manifest_dir = File.expand_path("..", Chef::Knife::SubcommandLoader.plugin_manifest_path)
         FileUtils.mkdir_p(plugin_manifest_dir) unless File.directory?(plugin_manifest_dir)
-        File.open(Chef::Knife::SubcommandLoader.plugin_manifest_path, 'w') do |f|
+        File.open(Chef::Knife::SubcommandLoader.plugin_manifest_path, "w") do |f|
           f.write(Chef::JSONCompat.to_json_pretty(data))
           ui.msg "Knife subcommands are cached in #{Chef::Knife::SubcommandLoader.plugin_manifest_path}. Delete this file to disable the caching."
         end

data/lib/chef/knife/role_bulk_delete.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,15 +16,15 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
     class RoleBulkDelete < Knife
 
       deps do
-        require 'chef/role'
-        require 'chef/json_compat'
+        require "chef/role"
+        require "chef/json_compat"
       end
 
       banner "knife role bulk delete REGEX (options)"
@@ -63,8 +63,3 @@ class Chef
     end
   end
 end
-
-
-
-
-

data/lib/chef/knife/role_create.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,15 +16,15 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
     class RoleCreate < Knife
 
       deps do
-        require 'chef/role'
-        require 'chef/json_compat'
+        require "chef/role"
+        require "chef/json_compat"
       end
 
       banner "knife role create ROLE (options)"
@@ -51,5 +51,3 @@ class Chef
     end
   end
 end
-
-

data/lib/chef/knife/role_delete.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,15 +16,15 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
     class RoleDelete < Knife
 
       deps do
-        require 'chef/role'
-        require 'chef/json_compat'
+        require "chef/role"
+        require "chef/json_compat"
       end
 
       banner "knife role delete ROLE (options)"
@@ -44,4 +44,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/role_edit.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,15 +16,15 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
     class RoleEdit < Knife
 
       deps do
-        require 'chef/role'
-        require 'chef/json_compat'
+        require "chef/role"
+        require "chef/json_compat"
       end
 
       banner "knife role edit ROLE (options)"
@@ -43,6 +43,3 @@ class Chef
     end
   end
 end
-
-
-

data/lib/chef/knife/role_env_run_list_add.rb

@@ -1,6 +1,6 @@
-# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Adam Jacob (<adam@chef.io>)
 # Author:: William Albenzi (<walbenzi@gmail.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Copyright:: Copyright 2009-2016, Chef Software Inc.
 # 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 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
     class RoleEnvRunListAdd < Knife
 
       deps do
-        require 'chef/role'
-        require 'chef/json_compat'
+        require "chef/role"
+        require "chef/json_compat"
       end
 
       banner "knife role env_run_list add [ROLE] [ENVIRONMENT] [ENTRY[,ENTRY]] (options)"
@@ -34,13 +34,13 @@ class Chef
         :long  => "--after ITEM",
         :description => "Place the ENTRY in the run list after ITEM"
 
-      def add_to_env_run_list(role, environment, entries, after=nil)
+      def add_to_env_run_list(role, environment, entries, after = nil)
         if after
           nlist = []
           unless role.env_run_lists.key?(environment)
             role.env_run_lists_add(environment => nlist)
           end
-          role.run_list_for(environment).each do |entry| 
+          role.run_list_for(environment).each do |entry|
             nlist << entry
             if entry == after
               entries.each { |e| nlist << e }
@@ -68,11 +68,11 @@ class Chef
         if @name_args.size > 2
           # Check for nested lists and create a single plain one
           entries = @name_args[2..-1].map do |entry|
-            entry.split(',').map { |e| e.strip }
+            entry.split(",").map { |e| e.strip }
           end.flatten
         else
           # Convert to array and remove the extra spaces
-          entries = @name_args[2].split(',').map { |e| e.strip }
+          entries = @name_args[2].split(",").map { |e| e.strip }
         end
 
         add_to_env_run_list(role, environment, entries, config[:after])

data/lib/chef/knife/role_env_run_list_clear.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Mike Fiedler (<miketheman@gmail.com>)
 # Author:: William Albenzi (<walbenzi@gmail.com>)
-# Copyright:: Copyright (c) 2013 Mike Fiedler
+# Copyright:: Copyright 2013-2016, Mike Fiedler
 # 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 RoleEnvRunListClear < Knife
 
       deps do
-        require 'chef/role'
-        require 'chef/json_compat'
+        require "chef/role"
+        require "chef/json_compat"
       end
 
       banner "knife role env_run_list clear [ROLE] [ENVIRONMENT]"

data/lib/chef/knife/role_env_run_list_remove.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,28 +16,28 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
     class RoleEnvRunListRemove < Knife
 
       deps do
-        require 'chef/role'
-        require 'chef/json_compat'
+        require "chef/role"
+        require "chef/json_compat"
       end
 
       banner "knife role env_run_list remove [ROLE] [ENVIRONMENT] [ENTRIES]"
 
       def remove_from_env_run_list(role, environment, item_to_remove)
-          nlist = []
-          role.run_list_for(environment).each do |entry|
-            nlist << entry unless entry == item_to_remove
-            #unless entry == @name_args[2]
-            #  nlist << entry
-            #end
-          end
-          role.env_run_lists_add(environment => nlist)
+        nlist = []
+        role.run_list_for(environment).each do |entry|
+          nlist << entry unless entry == item_to_remove
+          #unless entry == @name_args[2]
+          #  nlist << entry
+          #end
+        end
+        role.env_run_lists_add(environment => nlist)
       end
 
       def run

data/lib/chef/knife/role_env_run_list_replace.rb

@@ -1,6 +1,6 @@
-# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Adam Jacob (<adam@chef.io>)
 # Author:: William Albenzi (<walbenzi@gmail.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Copyright:: Copyright 2009-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,22 +16,22 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
     class RoleEnvRunListReplace < Knife
 
       deps do
-        require 'chef/role'
-        require 'chef/json_compat'
+        require "chef/role"
+        require "chef/json_compat"
       end
 
       banner "knife role env_run_list replace [ROLE] [ENVIRONMENT] [OLD_ENTRY] [NEW_ENTRY] "
 
       def replace_in_env_run_list(role, environment, old_entry, new_entry)
         nlist = []
-        role.run_list_for(environment).each do |entry| 
+        role.run_list_for(environment).each do |entry|
           if entry == old_entry
             nlist << new_entry
           else

data/lib/chef/knife/role_env_run_list_set.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Mike Fiedler (<miketheman@gmail.com>)
 # Author:: William Albenzi (<walbenzi@gmail.com>)
-# Copyright:: Copyright (c) 2013 Mike Fiedler
+# Copyright:: Copyright 2013-2016, Mike Fiedler
 # 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 RoleEnvRunListSet < Knife
 
       deps do
-        require 'chef/role'
-        require 'chef/json_compat'
+        require "chef/role"
+        require "chef/json_compat"
       end
 
       banner "knife role env_run_list set [ROLE] [ENVIRONMENT] [ENTRIES]"
@@ -52,11 +52,11 @@ class Chef
         elsif @name_args.size > 2
           # Check for nested lists and create a single plain one
           entries = @name_args[2..-1].map do |entry|
-            entry.split(',').map { |e| e.strip }
+            entry.split(",").map { |e| e.strip }
           end.flatten
         else
           # Convert to array and remove the extra spaces
-          entries = @name_args[2].split(',').map { |e| e.strip }
+          entries = @name_args[2].split(",").map { |e| e.strip }
         end
 
         set_env_run_list(role, environment, entries )

data/lib/chef/knife/role_from_file.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 RoleFromFile < Knife
 
       deps do
-        require 'chef/role'
-        require 'chef/knife/core/object_loader'
-        require 'chef/json_compat'
+        require "chef/role"
+        require "chef/knife/core/object_loader"
+        require "chef/json_compat"
       end
 
       banner "knife role from file FILE [FILE..] (options)"
@@ -49,8 +49,3 @@ class Chef
     end
   end
 end
-
-
-
-
-