knife 18.0.185 → 18.1.0

data/lib/chef/knife/environment_from_file.rb

@@ -1,84 +1,84 @@
-#
-# Author:: Stephen Delano (<stephen@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# 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_relative "../knife"
-
-class Chef
-  class Knife
-    class EnvironmentFromFile < Knife
-
-      deps do
-        require "chef/environment" unless defined?(Chef::Environment)
-        require_relative "core/object_loader"
-      end
-
-      banner "knife environment from file FILE [FILE..] (options)"
-
-      option :all,
-        short: "-a",
-        long: "--all",
-        description: "Upload all environments."
-
-      def loader
-        @loader ||= Knife::Core::ObjectLoader.new(Chef::Environment, ui)
-      end
-
-      def environments_path
-        @environments_path ||= "environments"
-      end
-
-      def find_all_environments
-        loader.find_all_objects("./#{environments_path}/")
-      end
-
-      def load_all_environments
-        environments = find_all_environments
-        if environments.empty?
-          ui.fatal("Unable to find any environment files in '#{environments_path}'")
-          exit(1)
-        end
-        environments.each do |env|
-          load_environment(env)
-        end
-      end
-
-      def load_environment(env)
-        updated = loader.load_from("environments", env)
-        updated.save
-        output(format_for_display(updated)) if config[:print_after]
-        ui.info("Updated Environment #{updated.name}")
-      end
-
-      def run
-        if config[:all] == true
-          load_all_environments
-        else
-          if @name_args[0].nil?
-            show_usage
-            ui.fatal("You must specify a file to load")
-            exit 1
-          end
-
-          @name_args.each do |arg|
-            load_environment(arg)
-          end
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Stephen Delano (<stephen@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# 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_relative "../knife"
+
+class Chef
+  class Knife
+    class EnvironmentFromFile < Knife
+
+      deps do
+        require "chef/environment" unless defined?(Chef::Environment)
+        require_relative "core/object_loader"
+      end
+
+      banner "knife environment from file FILE [FILE..] (options)"
+
+      option :all,
+        short: "-a",
+        long: "--all",
+        description: "Upload all environments."
+
+      def loader
+        @loader ||= Knife::Core::ObjectLoader.new(Chef::Environment, ui)
+      end
+
+      def environments_path
+        @environments_path ||= "environments"
+      end
+
+      def find_all_environments
+        loader.find_all_objects("./#{environments_path}/")
+      end
+
+      def load_all_environments
+        environments = find_all_environments
+        if environments.empty?
+          ui.fatal("Unable to find any environment files in '#{environments_path}'")
+          exit(1)
+        end
+        environments.each do |env|
+          load_environment(env)
+        end
+      end
+
+      def load_environment(env)
+        updated = loader.load_from("environments", env)
+        updated.save
+        output(format_for_display(updated)) if config[:print_after]
+        ui.info("Updated Environment #{updated.name}")
+      end
+
+      def run
+        if config[:all] == true
+          load_all_environments
+        else
+          if @name_args[0].nil?
+            show_usage
+            ui.fatal("You must specify a file to load")
+            exit 1
+          end
+
+          @name_args.each do |arg|
+            load_environment(arg)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/environment_list.rb

@@ -1,41 +1,41 @@
-#
-# Author:: Stephen Delano (<stephen@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# 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_relative "../knife"
-
-class Chef
-  class Knife
-    class EnvironmentList < Knife
-
-      deps do
-        require "chef/environment" unless defined?(Chef::Environment)
-      end
-
-      banner "knife environment list (options)"
-
-      option :with_uri,
-        short: "-w",
-        long: "--with-uri",
-        description: "Show corresponding URIs."
-
-      def run
-        output(format_list_for_display(Chef::Environment.list))
-      end
-    end
-  end
-end
+#
+# Author:: Stephen Delano (<stephen@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# 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_relative "../knife"
+
+class Chef
+  class Knife
+    class EnvironmentList < Knife
+
+      deps do
+        require "chef/environment" unless defined?(Chef::Environment)
+      end
+
+      banner "knife environment list (options)"
+
+      option :with_uri,
+        short: "-w",
+        long: "--with-uri",
+        description: "Show corresponding URIs."
+
+      def run
+        output(format_list_for_display(Chef::Environment.list))
+      end
+    end
+  end
+end

data/lib/chef/knife/environment_show.rb

@@ -1,47 +1,47 @@
-#
-# Author:: Stephen Delano (<stephen@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# 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_relative "../knife"
-
-class Chef
-  class Knife
-    class EnvironmentShow < Knife
-
-      include Knife::Core::MultiAttributeReturnOption
-
-      deps do
-        require "chef/environment" unless defined?(Chef::Environment)
-      end
-
-      banner "knife environment show ENVIRONMENT (options)"
-
-      def run
-        env_name = @name_args[0]
-
-        if env_name.nil?
-          show_usage
-          ui.fatal("You must specify an environment name")
-          exit 1
-        end
-
-        env = Chef::Environment.load(env_name)
-        output(format_for_display(env))
-      end
-    end
-  end
-end
+#
+# Author:: Stephen Delano (<stephen@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# 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_relative "../knife"
+
+class Chef
+  class Knife
+    class EnvironmentShow < Knife
+
+      include Knife::Core::MultiAttributeReturnOption
+
+      deps do
+        require "chef/environment" unless defined?(Chef::Environment)
+      end
+
+      banner "knife environment show ENVIRONMENT (options)"
+
+      def run
+        env_name = @name_args[0]
+
+        if env_name.nil?
+          show_usage
+          ui.fatal("You must specify an environment name")
+          exit 1
+        end
+
+        env = Chef::Environment.load(env_name)
+        output(format_for_display(env))
+      end
+    end
+  end
+end

data/lib/chef/knife/exec.rb

@@ -1,99 +1,99 @@
-#--
-# Author:: Daniel DeLeo (<dan@chef.io)
-# Copyright:: Copyright (c) Chef Software Inc.
-# 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_relative "../knife"
-require "chef-utils/dist" unless defined?(ChefUtils::Dist)
-
-class Chef::Knife::Exec < Chef::Knife
-
-  banner "knife exec [SCRIPT] (options)"
-
-  deps do
-    require "chef-config/path_helper" unless defined?(ChefConfig::PathHelper)
-  end
-
-  option :exec,
-    short: "-E CODE",
-    long: "--exec CODE",
-    description: "A string of #{ChefUtils::Dist::Infra::PRODUCT} code to execute."
-
-  option :script_path,
-    short: "-p PATH:PATH",
-    long: "--script-path PATH:PATH",
-    description: "A colon-separated path to look for scripts in.",
-    proc: lambda { |o| o.split(":") }
-
-  deps do
-    require "chef/shell/ext" unless defined?(Chef::Shell::Extensions)
-  end
-
-  def run
-    config[:script_path] = Array(config[:script_path] || Chef::Config[:script_path])
-
-    # Default script paths are chef-repo/.chef/scripts and ~/.chef/scripts
-    config[:script_path] << File.join(Chef::Knife.chef_config_dir, "scripts") if Chef::Knife.chef_config_dir
-    ChefConfig::PathHelper.home(".chef", "scripts") { |p| config[:script_path] << p }
-
-    scripts = Array(name_args)
-    context = Object.new
-    Shell::Extensions.extend_context_object(context)
-    if config[:exec]
-      context.instance_eval(config[:exec], "-E Argument", 0)
-    elsif !scripts.empty?
-      scripts.each do |script|
-        file = find_script(script)
-        context.instance_eval(IO.read(file), file, 0)
-      end
-    else
-      puts "An interactive shell is opened"
-      puts
-      puts "Type your script and do:"
-      puts
-      puts "1. To run the script, use 'Ctrl D'"
-      puts "2. To exit, use 'Ctrl/Shift C'"
-      puts
-      puts "Type here a script..."
-      script = STDIN.read
-      context.instance_eval(script, "STDIN", 0)
-    end
-  end
-
-  def find_script(x)
-    # Try to find a script. First try expanding the path given.
-    script = File.expand_path(x)
-    return script if File.exist?(script)
-
-    # Failing that, try searching the script path. If we can't find
-    # anything, fail gracefully.
-    Chef::Log.trace("Searching script_path: #{config[:script_path].inspect}")
-
-    config[:script_path].each do |path|
-      path = File.expand_path(path)
-      test = File.join(path, x)
-      Chef::Log.trace("Testing: #{test}")
-      if File.exist?(test)
-        script = test
-        Chef::Log.trace("Found: #{test}")
-        return script
-      end
-    end
-    ui.error("\"#{x}\" not found in current directory or script_path, giving up.")
-    exit(1)
-  end
-
-end
+#--
+# Author:: Daniel DeLeo (<dan@chef.io)
+# Copyright:: Copyright (c) Chef Software Inc.
+# 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_relative "../knife"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
+
+class Chef::Knife::Exec < Chef::Knife
+
+  banner "knife exec [SCRIPT] (options)"
+
+  deps do
+    require "chef-config/path_helper" unless defined?(ChefConfig::PathHelper)
+  end
+
+  option :exec,
+    short: "-E CODE",
+    long: "--exec CODE",
+    description: "A string of #{ChefUtils::Dist::Infra::PRODUCT} code to execute."
+
+  option :script_path,
+    short: "-p PATH:PATH",
+    long: "--script-path PATH:PATH",
+    description: "A colon-separated path to look for scripts in.",
+    proc: lambda { |o| o.split(":") }
+
+  deps do
+    require "chef/shell/ext" unless defined?(Chef::Shell::Extensions)
+  end
+
+  def run
+    config[:script_path] = Array(config[:script_path] || Chef::Config[:script_path])
+
+    # Default script paths are chef-repo/.chef/scripts and ~/.chef/scripts
+    config[:script_path] << File.join(Chef::Knife.chef_config_dir, "scripts") if Chef::Knife.chef_config_dir
+    ChefConfig::PathHelper.home(".chef", "scripts") { |p| config[:script_path] << p }
+
+    scripts = Array(name_args)
+    context = Object.new
+    Shell::Extensions.extend_context_object(context)
+    if config[:exec]
+      context.instance_eval(config[:exec], "-E Argument", 0)
+    elsif !scripts.empty?
+      scripts.each do |script|
+        file = find_script(script)
+        context.instance_eval(IO.read(file), file, 0)
+      end
+    else
+      puts "An interactive shell is opened"
+      puts
+      puts "Type your script and do:"
+      puts
+      puts "1. To run the script, use 'Ctrl D'"
+      puts "2. To exit, use 'Ctrl/Shift C'"
+      puts
+      puts "Type here a script..."
+      script = STDIN.read
+      context.instance_eval(script, "STDIN", 0)
+    end
+  end
+
+  def find_script(x)
+    # Try to find a script. First try expanding the path given.
+    script = File.expand_path(x)
+    return script if File.exist?(script)
+
+    # Failing that, try searching the script path. If we can't find
+    # anything, fail gracefully.
+    Chef::Log.trace("Searching script_path: #{config[:script_path].inspect}")
+
+    config[:script_path].each do |path|
+      path = File.expand_path(path)
+      test = File.join(path, x)
+      Chef::Log.trace("Testing: #{test}")
+      if File.exist?(test)
+        script = test
+        Chef::Log.trace("Found: #{test}")
+        return script
+      end
+    end
+    ui.error("\"#{x}\" not found in current directory or script_path, giving up.")
+    exit(1)
+  end
+
+end

data/lib/chef/knife/group_add.rb

@@ -1,55 +1,55 @@
-#
-# Author:: Seth Falcon (<seth@chef.io>)
-# Author:: Jeremiah Snapp (<jeremiah@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# 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_relative "../knife"
-
-class Chef
-  class Knife
-    class GroupAdd < Chef::Knife
-      category "group"
-      banner "knife group add MEMBER_TYPE MEMBER_NAME GROUP_NAME"
-
-      deps do
-        require_relative "acl_base"
-        include Chef::Knife::AclBase
-      end
-
-      def run
-        member_type, member_name, group_name = name_args
-
-        if name_args.length != 3
-          show_usage
-          ui.fatal "You must specify member type [client|group|user], member name and group name"
-          exit 1
-        end
-
-        validate_member_name!(group_name)
-        validate_member_type!(member_type)
-        validate_member_name!(member_name)
-
-        if group_name.downcase == "users"
-          ui.fatal "knife group can not manage members of Chef Infra Server's 'users' group, which contains all users."
-          exit 1
-        end
-
-        add_to_group!(member_type, member_name, group_name)
-      end
-    end
-  end
-end
+#
+# Author:: Seth Falcon (<seth@chef.io>)
+# Author:: Jeremiah Snapp (<jeremiah@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# 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_relative "../knife"
+
+class Chef
+  class Knife
+    class GroupAdd < Chef::Knife
+      category "group"
+      banner "knife group add MEMBER_TYPE MEMBER_NAME GROUP_NAME"
+
+      deps do
+        require_relative "acl_base"
+        include Chef::Knife::AclBase
+      end
+
+      def run
+        member_type, member_name, group_name = name_args
+
+        if name_args.length != 3
+          show_usage
+          ui.fatal "You must specify member type [client|group|user], member name and group name"
+          exit 1
+        end
+
+        validate_member_name!(group_name)
+        validate_member_type!(member_type)
+        validate_member_name!(member_name)
+
+        if group_name.downcase == "users"
+          ui.fatal "knife group can not manage members of Chef Infra Server's 'users' group, which contains all users."
+          exit 1
+        end
+
+        add_to_group!(member_type, member_name, group_name)
+      end
+    end
+  end
+end