chef 12.8.1 → 12.9.38

data/lib/chef/knife/diff.rb

@@ -1,68 +1,68 @@
-require "chef/chef_fs/knife"
-
-class Chef
-  class Knife
-    class Diff < Chef::ChefFS::Knife
-      banner "knife diff PATTERNS"
-
-      category "path-based"
-
-      deps do
-        require "chef/chef_fs/command_line"
-      end
-
-      option :recurse,
-        :long => "--[no-]recurse",
-        :boolean => true,
-        :default => true,
-        :description => "List directories recursively."
-
-      option :name_only,
-        :long => "--name-only",
-        :boolean => true,
-        :description => "Only show names of modified files."
-
-      option :name_status,
-        :long => "--name-status",
-        :boolean => true,
-        :description => "Only show names and statuses of modified files: Added, Deleted, Modified, and Type Changed."
-
-      option :diff_filter,
-        :long => "--diff-filter=[(A|D|M|T)...[*]]",
-        :description => "Select only files that are Added (A), Deleted (D), Modified (M), or have their type (i.e. regular file, directory) changed (T). Any combination of the filter characters (including none) can be used. When * (All-or-none) is added to the combination, all paths are selected if
-           there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected."
-
-      option :cookbook_version,
-        :long => "--cookbook-version VERSION",
-        :description => "Version of cookbook to download (if there are multiple versions and cookbook_versions is false)"
-
-      def run
-        if config[:name_only]
-          output_mode = :name_only
-        end
-        if config[:name_status]
-          output_mode = :name_status
-        end
-        patterns = pattern_args_from(name_args.length > 0 ? name_args : [ "" ])
-
-        # Get the matches (recursively)
-        error = false
-        begin
-          patterns.each do |pattern|
-            found_error = Chef::ChefFS::CommandLine.diff_print(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, output_mode, proc { |entry| format_path(entry) }, config[:diff_filter], ui ) do |diff|
-              stdout.print diff
-            end
-            error = true if found_error
-          end
-        rescue Chef::ChefFS::FileSystem::OperationFailedError => e
-          ui.error "Failed on #{format_path(e.entry)} in #{e.operation}: #{e.message}"
-          error = true
-        end
-
-        if error
-          exit 1
-        end
-      end
-    end
-  end
-end
+require "chef/chef_fs/knife"
+
+class Chef
+  class Knife
+    class Diff < Chef::ChefFS::Knife
+      banner "knife diff PATTERNS"
+
+      category "path-based"
+
+      deps do
+        require "chef/chef_fs/command_line"
+      end
+
+      option :recurse,
+        :long => "--[no-]recurse",
+        :boolean => true,
+        :default => true,
+        :description => "List directories recursively."
+
+      option :name_only,
+        :long => "--name-only",
+        :boolean => true,
+        :description => "Only show names of modified files."
+
+      option :name_status,
+        :long => "--name-status",
+        :boolean => true,
+        :description => "Only show names and statuses of modified files: Added, Deleted, Modified, and Type Changed."
+
+      option :diff_filter,
+        :long => "--diff-filter=[(A|D|M|T)...[*]]",
+        :description => "Select only files that are Added (A), Deleted (D), Modified (M), or have their type (i.e. regular file, directory) changed (T). Any combination of the filter characters (including none) can be used. When * (All-or-none) is added to the combination, all paths are selected if
+           there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected."
+
+      option :cookbook_version,
+        :long => "--cookbook-version VERSION",
+        :description => "Version of cookbook to download (if there are multiple versions and cookbook_versions is false)"
+
+      def run
+        if config[:name_only]
+          output_mode = :name_only
+        end
+        if config[:name_status]
+          output_mode = :name_status
+        end
+        patterns = pattern_args_from(name_args.length > 0 ? name_args : [ "" ])
+
+        # Get the matches (recursively)
+        error = false
+        begin
+          patterns.each do |pattern|
+            found_error = Chef::ChefFS::CommandLine.diff_print(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, output_mode, proc { |entry| format_path(entry) }, config[:diff_filter], ui ) do |diff|
+              stdout.print diff
+            end
+            error = true if found_error
+          end
+        rescue Chef::ChefFS::FileSystem::OperationFailedError => e
+          ui.error "Failed on #{format_path(e.entry)} in #{e.operation}: #{e.message}"
+          error = true
+        end
+
+        if error
+          exit 1
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/download.rb

@@ -1,68 +1,68 @@
-require "chef/chef_fs/knife"
-
-class Chef
-  class Knife
-    class Download < Chef::ChefFS::Knife
-      banner "knife download PATTERNS"
-
-      category "path-based"
-
-      deps do
-        require "chef/chef_fs/command_line"
-      end
-
-      option :recurse,
-        :long => "--[no-]recurse",
-        :boolean => true,
-        :default => true,
-        :description => "List directories recursively."
-
-      option :purge,
-        :long => "--[no-]purge",
-        :boolean => true,
-        :default => false,
-        :description => "Delete matching local files and directories that do not exist remotely."
-
-      option :force,
-        :long => "--[no-]force",
-        :boolean => true,
-        :default => false,
-        :description => "Force upload of files even if they match (quicker and harmless, but doesn't print out what it changed)"
-
-      option :dry_run,
-        :long => "--dry-run",
-        :short => "-n",
-        :boolean => true,
-        :default => false,
-        :description => "Don't take action, only print what would happen"
-
-      option :diff,
-        :long => "--[no-]diff",
-        :boolean => true,
-        :default => true,
-        :description => "Turn off to avoid uploading existing files; only new (and possibly deleted) files with --no-diff"
-
-      option :cookbook_version,
-        :long => "--cookbook-version VERSION",
-        :description => "Version of cookbook to download (if there are multiple versions and cookbook_versions is false)"
-
-      def run
-        if name_args.length == 0
-          show_usage
-          ui.fatal("Must specify at least one argument.  If you want to download everything in this directory, type \"knife download .\"")
-          exit 1
-        end
-
-        error = false
-        pattern_args.each do |pattern|
-          if Chef::ChefFS::FileSystem.copy_to(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
-            error = true
-          end
-        end
-        if error
-          exit 1
-        end
-      end
-    end
-  end
-end
+require "chef/chef_fs/knife"
+
+class Chef
+  class Knife
+    class Download < Chef::ChefFS::Knife
+      banner "knife download PATTERNS"
+
+      category "path-based"
+
+      deps do
+        require "chef/chef_fs/command_line"
+      end
+
+      option :recurse,
+        :long => "--[no-]recurse",
+        :boolean => true,
+        :default => true,
+        :description => "List directories recursively."
+
+      option :purge,
+        :long => "--[no-]purge",
+        :boolean => true,
+        :default => false,
+        :description => "Delete matching local files and directories that do not exist remotely."
+
+      option :force,
+        :long => "--[no-]force",
+        :boolean => true,
+        :default => false,
+        :description => "Force upload of files even if they match (quicker and harmless, but doesn't print out what it changed)"
+
+      option :dry_run,
+        :long => "--dry-run",
+        :short => "-n",
+        :boolean => true,
+        :default => false,
+        :description => "Don't take action, only print what would happen"
+
+      option :diff,
+        :long => "--[no-]diff",
+        :boolean => true,
+        :default => true,
+        :description => "Turn off to avoid uploading existing files; only new (and possibly deleted) files with --no-diff"
+
+      option :cookbook_version,
+        :long => "--cookbook-version VERSION",
+        :description => "Version of cookbook to download (if there are multiple versions and cookbook_versions is false)"
+
+      def run
+        if name_args.length == 0
+          show_usage
+          ui.fatal("You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"")
+          exit 1
+        end
+
+        error = false
+        pattern_args.each do |pattern|
+          if Chef::ChefFS::FileSystem.copy_to(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
+            error = true
+          end
+        end
+        if error
+          exit 1
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/edit.rb

@@ -1,72 +1,72 @@
-require "chef/chef_fs/knife"
-
-class Chef
-  class Knife
-    class Edit < Chef::ChefFS::Knife
-      banner "knife edit [PATTERN1 ... PATTERNn]"
-
-      category "path-based"
-
-      deps do
-        require "chef/chef_fs/file_system"
-        require "chef/chef_fs/file_system/not_found_error"
-      end
-
-      option :local,
-        :long => "--local",
-        :boolean => true,
-        :description => "Show local files instead of remote"
-
-      def run
-        # Get the matches (recursively)
-        error = false
-        pattern_args.each do |pattern|
-          Chef::ChefFS::FileSystem.list(config[:local] ? local_fs : chef_fs, pattern).each do |result|
-            if result.dir?
-              ui.error "#{format_path(result)}: is a directory" if pattern.exact_path
-              error = true
-            else
-              begin
-                new_value = edit_text(result.read, File.extname(result.name))
-                if new_value
-                  result.write(new_value)
-                  output "Updated #{format_path(result)}"
-                else
-                  output "#{format_path(result)} unchanged!"
-                end
-              rescue Chef::ChefFS::FileSystem::OperationNotAllowedError => e
-                ui.error "#{format_path(e.entry)}: #{e.reason}."
-                error = true
-              rescue Chef::ChefFS::FileSystem::NotFoundError => e
-                ui.error "#{format_path(e.entry)}: No such file or directory"
-                error = true
-              end
-            end
-          end
-        end
-        if error
-          exit 1
-        end
-      end
-
-      def edit_text(text, extension)
-        if !config[:disable_editing]
-          Tempfile.open([ "knife-edit-", extension ]) do |file|
-            # Write the text to a temporary file
-            file.write(text)
-            file.close
-
-            # Let the user edit the temporary file
-            if !system("#{config[:editor]} #{file.path}")
-              raise "Please set EDITOR environment variable"
-            end
-
-            result_text = IO.read(file.path)
-
-            return result_text if result_text != text
-          end
-        end
-      end
-    end
-  end
-end
+require "chef/chef_fs/knife"
+
+class Chef
+  class Knife
+    class Edit < Chef::ChefFS::Knife
+      banner "knife edit [PATTERN1 ... PATTERNn]"
+
+      category "path-based"
+
+      deps do
+        require "chef/chef_fs/file_system"
+        require "chef/chef_fs/file_system/not_found_error"
+      end
+
+      option :local,
+        :long => "--local",
+        :boolean => true,
+        :description => "Show local files instead of remote"
+
+      def run
+        # Get the matches (recursively)
+        error = false
+        pattern_args.each do |pattern|
+          Chef::ChefFS::FileSystem.list(config[:local] ? local_fs : chef_fs, pattern).each do |result|
+            if result.dir?
+              ui.error "#{format_path(result)}: is a directory" if pattern.exact_path
+              error = true
+            else
+              begin
+                new_value = edit_text(result.read, File.extname(result.name))
+                if new_value
+                  result.write(new_value)
+                  output "Updated #{format_path(result)}"
+                else
+                  output "#{format_path(result)} unchanged"
+                end
+              rescue Chef::ChefFS::FileSystem::OperationNotAllowedError => e
+                ui.error "#{format_path(e.entry)}: #{e.reason}."
+                error = true
+              rescue Chef::ChefFS::FileSystem::NotFoundError => e
+                ui.error "#{format_path(e.entry)}: No such file or directory"
+                error = true
+              end
+            end
+          end
+        end
+        if error
+          exit 1
+        end
+      end
+
+      def edit_text(text, extension)
+        if !config[:disable_editing]
+          Tempfile.open([ "knife-edit-", extension ]) do |file|
+            # Write the text to a temporary file
+            file.write(text)
+            file.close
+
+            # Let the user edit the temporary file
+            if !system("#{config[:editor]} #{file.path}")
+              raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_using.html for details."
+            end
+
+            result_text = IO.read(file.path)
+
+            return result_text if result_text != text
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/environment_compare.rb

@@ -1,127 +1,127 @@
-#
-# Author:: Sander Botman (<sbotman@schubergphilis.com>)
-# Copyright:: Copyright 2013-2016, Sander Botman.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "chef/knife"
-
-class Chef
-  class Knife
-    class EnvironmentCompare < Knife
-
-      deps do
-        require "chef/environment"
-      end
-
-      banner "knife environment compare [ENVIRONMENT..] (options)"
-
-      option :all,
-        :short => "-a",
-        :long => "--all",
-        :description => "Show all cookbooks",
-        :boolean => true
-
-      option :mismatch,
-        :short => "-m",
-        :long => "--mismatch",
-        :description => "Only show mismatching versions",
-        :boolean => true
-
-      def run
-        # Get the commandline environments or all if none are provided.
-        environments = environment_list
-
-        # Get a list of all cookbooks that have constraints and their environment.
-        constraints = constraint_list(environments)
-
-        # Get the total list of cookbooks that have constraints
-        cookbooks = cookbook_list(constraints)
-
-        # If we cannot find any cookbooks, we can stop here.
-        if cookbooks.nil? || cookbooks.empty?
-          ui.error "Cannot find any environment cookbook constraints"
-          exit 1
-        end
-
-        # Get all cookbooks so we can compare them all
-        cookbooks = rest.get("/cookbooks?num_versions=1") if config[:all]
-
-        # display matrix view of in the requested format.
-        if config[:format] == "summary"
-          matrix = matrix_output(cookbooks, constraints)
-          ui.output(matrix)
-        else
-          ui.output(constraints)
-        end
-      end
-
-      private
-
-      def environment_list
-        environments = []
-        unless @name_args.nil? || @name_args.empty?
-          @name_args.each { |name| environments << name }
-        else
-          environments = Chef::Environment.list
-        end
-      end
-
-      def constraint_list(environments)
-        constraints = {}
-        environments.each do |env, url|
-          # Because you cannot modify the default environment I filter it out here.
-          unless env == "_default"
-            envdata = Chef::Environment.load(env)
-            ver = envdata.cookbook_versions
-            constraints[env] = ver
-          end
-        end
-        constraints
-      end
-
-      def cookbook_list(constraints)
-        result = {}
-        constraints.each { |env, cb| result.merge!(cb) }
-        result
-      end
-
-      def matrix_output(cookbooks, constraints)
-        rows = [ "" ]
-        environments = []
-        constraints.each { |e, v| environments << e.to_s }
-        columns = environments.count + 1
-        environments.each { |env| rows << ui.color(env, :bold) }
-        cookbooks.each do |c, v|
-          total = []
-          environments.each { |n| total << constraints[n][c] }
-          if total.uniq.count == 1
-            next if config[:mismatch]
-            color = :white
-          else
-            color = :yellow
-          end
-          rows << ui.color(c, :bold)
-          environments.each do |e|
-            tag = constraints[e][c] || "latest"
-            rows << ui.color(tag, color)
-          end
-        end
-        ui.list(rows, :uneven_columns_across, columns)
-      end
-
-    end
-  end
-end
+#
+# Author:: Sander Botman (<sbotman@schubergphilis.com>)
+# Copyright:: Copyright 2013-2016, Sander Botman.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/knife"
+
+class Chef
+  class Knife
+    class EnvironmentCompare < Knife
+
+      deps do
+        require "chef/environment"
+      end
+
+      banner "knife environment compare [ENVIRONMENT..] (options)"
+
+      option :all,
+        :short => "-a",
+        :long => "--all",
+        :description => "Show all cookbooks",
+        :boolean => true
+
+      option :mismatch,
+        :short => "-m",
+        :long => "--mismatch",
+        :description => "Only show mismatching versions",
+        :boolean => true
+
+      def run
+        # Get the commandline environments or all if none are provided.
+        environments = environment_list
+
+        # Get a list of all cookbooks that have constraints and their environment.
+        constraints = constraint_list(environments)
+
+        # Get the total list of cookbooks that have constraints
+        cookbooks = cookbook_list(constraints)
+
+        # If we cannot find any cookbooks, we can stop here.
+        if cookbooks.nil? || cookbooks.empty?
+          ui.error "Cannot find any environment cookbook constraints"
+          exit 1
+        end
+
+        # Get all cookbooks so we can compare them all
+        cookbooks = rest.get("/cookbooks?num_versions=1") if config[:all]
+
+        # display matrix view of in the requested format.
+        if config[:format] == "summary"
+          matrix = matrix_output(cookbooks, constraints)
+          ui.output(matrix)
+        else
+          ui.output(constraints)
+        end
+      end
+
+      private
+
+      def environment_list
+        environments = []
+        unless @name_args.nil? || @name_args.empty?
+          @name_args.each { |name| environments << name }
+        else
+          environments = Chef::Environment.list
+        end
+      end
+
+      def constraint_list(environments)
+        constraints = {}
+        environments.each do |env, url|
+          # Because you cannot modify the default environment I filter it out here.
+          unless env == "_default"
+            envdata = Chef::Environment.load(env)
+            ver = envdata.cookbook_versions
+            constraints[env] = ver
+          end
+        end
+        constraints
+      end
+
+      def cookbook_list(constraints)
+        result = {}
+        constraints.each { |env, cb| result.merge!(cb) }
+        result
+      end
+
+      def matrix_output(cookbooks, constraints)
+        rows = [ "" ]
+        environments = []
+        constraints.each { |e, v| environments << e.to_s }
+        columns = environments.count + 1
+        environments.each { |env| rows << ui.color(env, :bold) }
+        cookbooks.each do |c, v|
+          total = []
+          environments.each { |n| total << constraints[n][c] }
+          if total.uniq.count == 1
+            next if config[:mismatch]
+            color = :white
+          else
+            color = :yellow
+          end
+          rows << ui.color(c, :bold)
+          environments.each do |e|
+            tag = constraints[e][c] || "latest"
+            rows << ui.color(tag, color)
+          end
+        end
+        ui.list(rows, :uneven_columns_across, columns)
+      end
+
+    end
+  end
+end