chef-dk 0.8.0 → 0.9.0

data/lib/chef-dk/command/generator_commands/repo.rb

@@ -1,96 +1,96 @@
-#
-# Copyright:: Copyright (c) 2014 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 'chef-dk/command/generator_commands/base'
-
-module ChefDK
-  module Command
-    module GeneratorCommands
-
-      # ## Repo
-      # chef generate repo path/to/basename --generator-cookbook=path/to/generator --policy-only
-      #
-      # Generates a full "chef-repo" directory structure.
-      class Repo < Base
-
-        banner "Usage: chef generate repo NAME [options]"
-
-        attr_reader :errors
-        attr_reader :repo_name_or_path
-
-        option :policy_only,
-          :short => "-p",
-          :long => "--policy-only",
-          :description => "Create a repository for policy only, not cookbooks",
-          :default => false
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def initialize(params)
-          @params_valid = true
-          @repo_name = nil
-          super
-        end
-
-        def run
-          read_and_validate_params
-          if params_valid?
-            setup_context
-            chef_runner.converge
-          else
-            err(opt_parser)
-            1
-          end
-        end
-
-        def setup_context
-          super
-          Generator.add_attr_to_context(:repo_root, repo_root)
-          Generator.add_attr_to_context(:repo_name, repo_name)
-        end
-
-        def recipe
-          "repo"
-        end
-
-        def repo_name
-          File.basename(repo_full_path)
-        end
-
-        def repo_root
-          File.dirname(repo_full_path)
-        end
-
-        def repo_full_path
-          File.expand_path(repo_name_or_path, Dir.pwd)
-        end
-
-        def read_and_validate_params
-          arguments = parse_options(params)
-          @repo_name_or_path = arguments[0]
-          @params_valid = false unless @repo_name_or_path
-        end
-
-        def params_valid?
-          @params_valid
-        end
-      end
-    end
-  end
-end
-
-
+#
+# Copyright:: Copyright (c) 2014 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 'chef-dk/command/generator_commands/base'
+
+module ChefDK
+  module Command
+    module GeneratorCommands
+
+      # ## Repo
+      # chef generate repo path/to/basename --generator-cookbook=path/to/generator --policy-only
+      #
+      # Generates a full "chef-repo" directory structure.
+      class Repo < Base
+
+        banner "Usage: chef generate repo NAME [options]"
+
+        attr_reader :errors
+        attr_reader :repo_name_or_path
+
+        option :policy_only,
+          :short => "-p",
+          :long => "--policy-only",
+          :description => "Create a repository for policy only, not cookbooks",
+          :default => false
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def initialize(params)
+          @params_valid = true
+          @repo_name = nil
+          super
+        end
+
+        def run
+          read_and_validate_params
+          if params_valid?
+            setup_context
+            chef_runner.converge
+          else
+            err(opt_parser)
+            1
+          end
+        end
+
+        def setup_context
+          super
+          Generator.add_attr_to_context(:repo_root, repo_root)
+          Generator.add_attr_to_context(:repo_name, repo_name)
+        end
+
+        def recipe
+          "repo"
+        end
+
+        def repo_name
+          File.basename(repo_full_path)
+        end
+
+        def repo_root
+          File.dirname(repo_full_path)
+        end
+
+        def repo_full_path
+          File.expand_path(repo_name_or_path, Dir.pwd)
+        end
+
+        def read_and_validate_params
+          arguments = parse_options(params)
+          @repo_name_or_path = arguments[0]
+          @params_valid = false unless @repo_name_or_path
+        end
+
+        def params_valid?
+          @params_valid
+        end
+      end
+    end
+  end
+end
+
+

data/lib/chef-dk/command/generator_commands/template.rb

@@ -1,46 +1,46 @@
-#
-# Copyright:: Copyright (c) 2014 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 'chef-dk/command/generator_commands/cookbook_code_file'
-
-module ChefDK
-  module Command
-    module GeneratorCommands
-      # chef generate template [path/to/cookbook_root] name --source=source_file
-      class Template < CookbookCodeFile
-
-        option :source,
-          :short => "-s SOURCE_FILE",
-          :long  => "--source SOURCE_FILE",
-          :description => "Copy content from SOURCE_FILE"
-
-        banner "Usage: chef generate template [path/to/cookbook] NAME [options]"
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def recipe
-          'template'
-        end
-
-        def setup_context
-          super
-          Generator.add_attr_to_context(:content_source, config[:source])
-        end
-      end
-    end
-  end
-end
+#
+# Copyright:: Copyright (c) 2014 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 'chef-dk/command/generator_commands/cookbook_code_file'
+
+module ChefDK
+  module Command
+    module GeneratorCommands
+      # chef generate template [path/to/cookbook_root] name --source=source_file
+      class Template < CookbookCodeFile
+
+        option :source,
+          :short => "-s SOURCE_FILE",
+          :long  => "--source SOURCE_FILE",
+          :description => "Copy content from SOURCE_FILE"
+
+        banner "Usage: chef generate template [path/to/cookbook] NAME [options]"
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def recipe
+          'template'
+        end
+
+        def setup_context
+          super
+          Generator.add_attr_to_context(:content_source, config[:source])
+        end
+      end
+    end
+  end
+end

data/lib/chef-dk/command/install.rb

@@ -1,121 +1,121 @@
-#
-# Copyright:: Copyright (c) 2014 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 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/policyfile_services/install'
-require 'chef-dk/configurable'
-
-module ChefDK
-  module Command
-
-    class Install < Base
-
-      include Configurable
-
-      banner(<<-E)
-Usage: chef install [ POLICY_FILE ] [options]
-
-`chef install` evaluates a `Policyfile.rb` to find a compatible set of
-cookbooks for the policy's run_list and caches them locally. It emits a
-Policyfile.lock.json describing the locked cookbook set. You can use the
-lockfile to install the locked cookbooks on another machine. You can also push
-the lockfile to a "policy group" on a Chef Server and apply that exact set of
-cookbooks to nodes in your infrastructure.
-
-See our detailed README for more information:
-
-https://github.com/opscode/chef-dk/blob/master/POLICYFILE_README.md
-
-Options:
-
-E
-
-      option :config_file,
-        short:       "-c CONFIG_FILE",
-        long:        "--config CONFIG_FILE",
-        description: "Path to configuration file"
-
-      option :debug,
-        short:       "-D",
-        long:        "--debug",
-        description: "Enable stacktraces and other debug output",
-        default:     false
-
-      attr_reader :policyfile_relative_path
-
-      attr_accessor :ui
-
-      def initialize(*args)
-        super
-        @ui = UI.new
-
-        @policyfile_relative_path = nil
-        @installer = nil
-      end
-
-      def run(params = [])
-        return 1 unless apply_params!(params)
-        # Force config file to be loaded. We don't use the configuration
-        # directly, but the user may have SSL configuration options that they
-        # need to talk to a private supermarket (e.g., trusted_certs or
-        # ssl_verify_mode)
-        chef_config
-        installer.run
-        0
-      rescue PolicyfileServiceError => e
-        handle_error(e)
-        1
-      end
-
-      def installer
-        @installer ||= PolicyfileServices::Install.new(policyfile: policyfile_relative_path, ui: ui, root_dir: Dir.pwd)
-      end
-
-      def debug?
-        !!config[:debug]
-      end
-
-      def config_path
-        config[:config_file]
-      end
-
-      def handle_error(error)
-        ui.err("Error: #{error.message}")
-        if error.respond_to?(:reason)
-          ui.err("Reason: #{error.reason}")
-          ui.err("")
-          ui.err(error.extended_error_info) if debug?
-          ui.err(error.cause.backtrace.join("\n")) if debug?
-        end
-      end
-
-      def apply_params!(params)
-        remaining_args = parse_options(params)
-        if remaining_args.size > 1
-          ui.err(opt_parser)
-          return false
-        else
-          @policyfile_relative_path = remaining_args.first
-          true
-        end
-      end
-
-    end
-  end
-end
-
+#
+# Copyright:: Copyright (c) 2014 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 'chef-dk/command/base'
+require 'chef-dk/ui'
+require 'chef-dk/policyfile_services/install'
+require 'chef-dk/configurable'
+
+module ChefDK
+  module Command
+
+    class Install < Base
+
+      include Configurable
+
+      banner(<<-E)
+Usage: chef install [ POLICY_FILE ] [options]
+
+`chef install` evaluates a `Policyfile.rb` to find a compatible set of
+cookbooks for the policy's run_list and caches them locally. It emits a
+Policyfile.lock.json describing the locked cookbook set. You can use the
+lockfile to install the locked cookbooks on another machine. You can also push
+the lockfile to a "policy group" on a Chef Server and apply that exact set of
+cookbooks to nodes in your infrastructure.
+
+See our detailed README for more information:
+
+https://github.com/opscode/chef-dk/blob/master/POLICYFILE_README.md
+
+Options:
+
+E
+
+      option :config_file,
+        short:       "-c CONFIG_FILE",
+        long:        "--config CONFIG_FILE",
+        description: "Path to configuration file"
+
+      option :debug,
+        short:       "-D",
+        long:        "--debug",
+        description: "Enable stacktraces and other debug output",
+        default:     false
+
+      attr_reader :policyfile_relative_path
+
+      attr_accessor :ui
+
+      def initialize(*args)
+        super
+        @ui = UI.new
+
+        @policyfile_relative_path = nil
+        @installer = nil
+      end
+
+      def run(params = [])
+        return 1 unless apply_params!(params)
+        # Force config file to be loaded. We don't use the configuration
+        # directly, but the user may have SSL configuration options that they
+        # need to talk to a private supermarket (e.g., trusted_certs or
+        # ssl_verify_mode)
+        chef_config
+        installer.run
+        0
+      rescue PolicyfileServiceError => e
+        handle_error(e)
+        1
+      end
+
+      def installer
+        @installer ||= PolicyfileServices::Install.new(policyfile: policyfile_relative_path, ui: ui, root_dir: Dir.pwd)
+      end
+
+      def debug?
+        !!config[:debug]
+      end
+
+      def config_path
+        config[:config_file]
+      end
+
+      def handle_error(error)
+        ui.err("Error: #{error.message}")
+        if error.respond_to?(:reason)
+          ui.err("Reason: #{error.reason}")
+          ui.err("")
+          ui.err(error.extended_error_info) if debug?
+          ui.err(error.cause.backtrace.join("\n")) if debug?
+        end
+      end
+
+      def apply_params!(params)
+        remaining_args = parse_options(params)
+        if remaining_args.size > 1
+          ui.err(opt_parser)
+          return false
+        else
+          @policyfile_relative_path = remaining_args.first
+          true
+        end
+      end
+
+    end
+  end
+end
+