chef-dk 2.4.17 → 2.5.3

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

@@ -1,36 +1,36 @@
-#
-# 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 helpers [path/to/cookbook_root] NAME
-      class Helpers < CookbookCodeFile
-
-        banner "Usage: chef generate helpers [path/to/cookbook] NAME [options]"
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def recipe
-          "helpers"
-        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 helpers [path/to/cookbook_root] NAME
+      class Helpers < CookbookCodeFile
+
+        banner "Usage: chef generate helpers [path/to/cookbook] NAME [options]"
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def recipe
+          "helpers"
+        end
+      end
+    end
+  end
+end

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

@@ -1,126 +1,126 @@
-#
-# 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
-
-      class Policyfile < Base
-
-        banner "Usage: chef generate policyfile [NAME] [options]"
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        attr_reader :new_file_basename
-        attr_reader :policyfile_dir
-        attr_reader :policy_name
-        attr_reader :policy_run_list
-
-        def initialize(*args)
-          super
-          @new_file_basename = nil
-          @policyfile_dir = nil
-          @policy_name = nil
-          @policy_run_list = nil
-          @params_valid = true
-        end
-
-        def recipe
-          "policyfile"
-        end
-
-        def setup_context
-          super
-          Generator.add_attr_to_context(:policyfile_dir, policyfile_dir)
-          Generator.add_attr_to_context(:new_file_basename, new_file_basename)
-          Generator.add_attr_to_context(:include_chef_repo_source, chef_repo_mode?)
-          Generator.add_attr_to_context(:policy_name, policy_name)
-          Generator.add_attr_to_context(:policy_run_list, policy_run_list)
-          Generator.add_attr_to_context(:policy_local_cookbook, nil)
-        end
-
-        def run
-          read_and_validate_params
-          if params_valid?
-            setup_context
-            chef_runner.converge
-            0
-          else
-            err(opt_parser)
-            1
-          end
-        end
-
-        def read_and_validate_params
-          arguments = parse_options(params)
-
-          new_file_path = nil
-          case arguments.size
-          when 0
-            if chef_repo_mode?
-              err("ERROR: You must give a policy name when generating a policy in a chef-repo.")
-              @params_valid = false
-              return false
-            else
-              use_default_policy_settings
-            end
-          when 1
-            new_file_path = arguments[0]
-            derive_policy_settings_from_args(arguments[0])
-          else
-            @params_valid = false
-            err("ERROR: too many arguments")
-            return false
-          end
-        end
-
-        private
-
-        def use_default_policy_settings
-          @new_file_basename = "Policyfile"
-          @policy_name = "example-application-service"
-          @policy_run_list = "example_cookbook::default"
-          @policyfile_dir = Dir.pwd
-        end
-
-        def derive_policy_settings_from_args(new_file_path)
-          @new_file_basename = File.basename(new_file_path, ".rb")
-          @policy_name = @new_file_basename
-          @policy_run_list = "#{policy_name}::default"
-          given_policy_dirname = File.expand_path(File.dirname(new_file_path))
-          @policyfile_dir =
-            if chef_repo_mode? && (given_policy_dirname == Dir.pwd)
-              File.expand_path("policies")
-            else
-              given_policy_dirname
-            end
-        end
-
-        def params_valid?
-          @params_valid
-        end
-
-        def chef_repo_mode?
-          File.exist?(File.expand_path(".chef-repo.txt"))
-        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
+
+      class Policyfile < Base
+
+        banner "Usage: chef generate policyfile [NAME] [options]"
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        attr_reader :new_file_basename
+        attr_reader :policyfile_dir
+        attr_reader :policy_name
+        attr_reader :policy_run_list
+
+        def initialize(*args)
+          super
+          @new_file_basename = nil
+          @policyfile_dir = nil
+          @policy_name = nil
+          @policy_run_list = nil
+          @params_valid = true
+        end
+
+        def recipe
+          "policyfile"
+        end
+
+        def setup_context
+          super
+          Generator.add_attr_to_context(:policyfile_dir, policyfile_dir)
+          Generator.add_attr_to_context(:new_file_basename, new_file_basename)
+          Generator.add_attr_to_context(:include_chef_repo_source, chef_repo_mode?)
+          Generator.add_attr_to_context(:policy_name, policy_name)
+          Generator.add_attr_to_context(:policy_run_list, policy_run_list)
+          Generator.add_attr_to_context(:policy_local_cookbook, nil)
+        end
+
+        def run
+          read_and_validate_params
+          if params_valid?
+            setup_context
+            chef_runner.converge
+            0
+          else
+            err(opt_parser)
+            1
+          end
+        end
+
+        def read_and_validate_params
+          arguments = parse_options(params)
+
+          new_file_path = nil
+          case arguments.size
+          when 0
+            if chef_repo_mode?
+              err("ERROR: You must give a policy name when generating a policy in a chef-repo.")
+              @params_valid = false
+              return false
+            else
+              use_default_policy_settings
+            end
+          when 1
+            new_file_path = arguments[0]
+            derive_policy_settings_from_args(arguments[0])
+          else
+            @params_valid = false
+            err("ERROR: too many arguments")
+            return false
+          end
+        end
+
+        private
+
+        def use_default_policy_settings
+          @new_file_basename = "Policyfile"
+          @policy_name = "example-application-service"
+          @policy_run_list = "example_cookbook::default"
+          @policyfile_dir = Dir.pwd
+        end
+
+        def derive_policy_settings_from_args(new_file_path)
+          @new_file_basename = File.basename(new_file_path, ".rb")
+          @policy_name = @new_file_basename
+          @policy_run_list = "#{policy_name}::default"
+          given_policy_dirname = File.expand_path(File.dirname(new_file_path))
+          @policyfile_dir =
+            if chef_repo_mode? && (given_policy_dirname == Dir.pwd)
+              File.expand_path("policies")
+            else
+              given_policy_dirname
+            end
+        end
+
+        def params_valid?
+          @params_valid
+        end
+
+        def chef_repo_mode?
+          File.exist?(File.expand_path(".chef-repo.txt"))
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,36 +1,36 @@
-#
-# 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 recipe [path/to/cookbook/root] name
-      class Recipe < CookbookCodeFile
-
-        banner "Usage: chef generate recipe [path/to/cookbook] NAME [options]"
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def recipe
-          "recipe"
-        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 recipe [path/to/cookbook/root] name
+      class Recipe < CookbookCodeFile
+
+        banner "Usage: chef generate recipe [path/to/cookbook] NAME [options]"
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def recipe
+          "recipe"
+        end
+      end
+    end
+  end
+end

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

@@ -1,123 +1,123 @@
-#
-# 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
-
-        option :roles,
-          short:        "-r",
-          long:         "--roles",
-          description:  "Create roles and environments directories instead of using policyfiles",
-          default:      nil
-
-        option :policy,
-          short:        "-P",
-          long:         "--policy",
-          description:  "Use policyfiles instead of Berkshelf",
-          boolean:      true,
-          default:      nil
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def initialize(params)
-          @params_valid = true
-          @repo_name = nil
-          @use_roles = true
-          super
-        end
-
-        def run
-          read_and_validate_params
-          if params_valid?
-            setup_context
-            chef_runner.converge
-            0
-          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)
-          Generator.add_attr_to_context(:use_roles, use_roles?)
-        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 use_roles?
-          @use_roles
-        end
-
-        def read_and_validate_params
-          arguments = parse_options(params)
-          @repo_name_or_path = arguments[0]
-          unless @repo_name_or_path
-            @params_valid = false
-          end
-          if !config[:roles].nil? && !config[:policy].nil?
-            err("Roles and Policyfiles are exclusive. Please only select one.")
-            @params_valid = false
-          end
-          if config[:policy]
-            @use_roles = false
-          end
-        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
+
+        option :roles,
+          short:        "-r",
+          long:         "--roles",
+          description:  "Create roles and environments directories instead of using policyfiles",
+          default:      nil
+
+        option :policy,
+          short:        "-P",
+          long:         "--policy",
+          description:  "Use policyfiles instead of Berkshelf",
+          boolean:      true,
+          default:      nil
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def initialize(params)
+          @params_valid = true
+          @repo_name = nil
+          @use_roles = true
+          super
+        end
+
+        def run
+          read_and_validate_params
+          if params_valid?
+            setup_context
+            chef_runner.converge
+            0
+          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)
+          Generator.add_attr_to_context(:use_roles, use_roles?)
+        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 use_roles?
+          @use_roles
+        end
+
+        def read_and_validate_params
+          arguments = parse_options(params)
+          @repo_name_or_path = arguments[0]
+          unless @repo_name_or_path
+            @params_valid = false
+          end
+          if !config[:roles].nil? && !config[:policy].nil?
+            err("Roles and Policyfiles are exclusive. Please only select one.")
+            @params_valid = false
+          end
+          if config[:policy]
+            @use_roles = false
+          end
+        end
+
+        def params_valid?
+          @params_valid
+        end
+      end
+    end
+  end
+end