chef-dk 0.13.21 → 0.14.25

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

@@ -1,153 +1,153 @@
-#
-# 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
-
-      # ## CookbookFile
-      # chef generate cookbook path/to/basename --generator-cookbook=path/to/generator
-      #
-      # Generates a basic cookbook directory structure. Most file types are
-      # omitted, the user is expected to add additional files as needed using
-      # the relevant generators.
-      class Cookbook < Base
-
-        banner "Usage: chef generate cookbook NAME [options]"
-
-        attr_reader :errors
-
-        attr_reader :cookbook_name_or_path
-
-        option :berks,
-          short:       "-b",
-          long:        "--berks",
-          description: "Generate cookbooks with berkshelf integration",
-          boolean:     true,
-          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
-          @cookbook_name = nil
-          @berks_mode = true
-          super
-        end
-
-        def run
-          read_and_validate_params
-          if params_valid?
-            setup_context
-            chef_runner.converge
-            0
-          else
-            err(opt_parser)
-            1
-          end
-        rescue ChefDK::ChefRunnerError => e
-          err("ERROR: #{e}")
-          1
-        end
-
-        def setup_context
-          super
-          Generator.add_attr_to_context(:skip_git_init, cookbook_path_in_git_repo?)
-          Generator.add_attr_to_context(:cookbook_root, cookbook_root)
-          Generator.add_attr_to_context(:cookbook_name, cookbook_name)
-          Generator.add_attr_to_context(:recipe_name, recipe_name)
-          Generator.add_attr_to_context(:include_chef_repo_source, false)
-          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, ".")
-
-          Generator.add_attr_to_context(:use_berkshelf, berks_mode?)
-        end
-
-        def policy_name
-          cookbook_name
-        end
-
-        def policy_run_list
-          "#{cookbook_name}::#{recipe_name}"
-        end
-
-        def recipe
-          "cookbook"
-        end
-
-        def recipe_name
-          "default"
-        end
-
-        def cookbook_name
-          File.basename(cookbook_full_path)
-        end
-
-        def cookbook_root
-          File.dirname(cookbook_full_path)
-        end
-
-        def cookbook_full_path
-          File.expand_path(cookbook_name_or_path, Dir.pwd)
-        end
-
-        def berks_mode?
-          @berks_mode
-        end
-
-        def read_and_validate_params
-          arguments = parse_options(params)
-          @cookbook_name_or_path = arguments[0]
-          unless @cookbook_name_or_path
-            @params_valid = false
-          end
-
-          if config[:berks] && config[:policy]
-            err("Berkshelf and Policyfiles are mutually exclusive. Please specify only one.")
-            @params_valid = false
-          end
-
-          if config[:policy]
-            @berks_mode = false
-          end
-        end
-
-        def params_valid?
-          @params_valid
-        end
-
-        def cookbook_path_in_git_repo?
-          Pathname.new(cookbook_full_path).ascend do |dir|
-            return true if File.directory?(File.join(dir.to_s, ".git"))
-          end
-          false
-        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
+
+      # ## CookbookFile
+      # chef generate cookbook path/to/basename --generator-cookbook=path/to/generator
+      #
+      # Generates a basic cookbook directory structure. Most file types are
+      # omitted, the user is expected to add additional files as needed using
+      # the relevant generators.
+      class Cookbook < Base
+
+        banner "Usage: chef generate cookbook NAME [options]"
+
+        attr_reader :errors
+
+        attr_reader :cookbook_name_or_path
+
+        option :berks,
+          short:       "-b",
+          long:        "--berks",
+          description: "Generate cookbooks with berkshelf integration",
+          boolean:     true,
+          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
+          @cookbook_name = nil
+          @berks_mode = true
+          super
+        end
+
+        def run
+          read_and_validate_params
+          if params_valid?
+            setup_context
+            chef_runner.converge
+            0
+          else
+            err(opt_parser)
+            1
+          end
+        rescue ChefDK::ChefRunnerError => e
+          err("ERROR: #{e}")
+          1
+        end
+
+        def setup_context
+          super
+          Generator.add_attr_to_context(:skip_git_init, cookbook_path_in_git_repo?)
+          Generator.add_attr_to_context(:cookbook_root, cookbook_root)
+          Generator.add_attr_to_context(:cookbook_name, cookbook_name)
+          Generator.add_attr_to_context(:recipe_name, recipe_name)
+          Generator.add_attr_to_context(:include_chef_repo_source, false)
+          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, ".")
+
+          Generator.add_attr_to_context(:use_berkshelf, berks_mode?)
+        end
+
+        def policy_name
+          cookbook_name
+        end
+
+        def policy_run_list
+          "#{cookbook_name}::#{recipe_name}"
+        end
+
+        def recipe
+          "cookbook"
+        end
+
+        def recipe_name
+          "default"
+        end
+
+        def cookbook_name
+          File.basename(cookbook_full_path)
+        end
+
+        def cookbook_root
+          File.dirname(cookbook_full_path)
+        end
+
+        def cookbook_full_path
+          File.expand_path(cookbook_name_or_path, Dir.pwd)
+        end
+
+        def berks_mode?
+          @berks_mode
+        end
+
+        def read_and_validate_params
+          arguments = parse_options(params)
+          @cookbook_name_or_path = arguments[0]
+          unless @cookbook_name_or_path
+            @params_valid = false
+          end
+
+          if config[:berks] && config[:policy]
+            err("Berkshelf and Policyfiles are mutually exclusive. Please specify only one.")
+            @params_valid = false
+          end
+
+          if config[:policy]
+            @berks_mode = false
+          end
+        end
+
+        def params_valid?
+          @params_valid
+        end
+
+        def cookbook_path_in_git_repo?
+          Pathname.new(cookbook_full_path).ascend do |dir|
+            return true if File.directory?(File.join(dir.to_s, ".git"))
+          end
+          false
+        end
+      end
+    end
+  end
+end
+

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

@@ -1,100 +1,100 @@
-#
-# 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
-      # ## CookbookCodeFile
-      # A base class for generators that add individual files to existing
-      # cookbooks.
-      class CookbookCodeFile < Base
-
-        attr_reader :errors
-        attr_reader :cookbook_path
-        attr_reader :new_file_basename
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def initialize(params)
-          @params_valid = true
-          @cookbook_full_path = nil
-          @new_file_basename = nil
-          @errors = []
-          @params = params
-          super
-        end
-
-        def run
-          read_and_validate_params
-          if params_valid?
-            setup_context
-            chef_runner.converge
-          else
-            errors.each {|error| err("Error: #{error}") }
-            parse_options(params)
-            msg(opt_parser)
-            1
-          end
-        end
-
-        def setup_context
-          super
-          Generator.add_attr_to_context(:cookbook_root, cookbook_root)
-          Generator.add_attr_to_context(:cookbook_name, cookbook_name)
-          Generator.add_attr_to_context(:new_file_basename, new_file_basename)
-          Generator.add_attr_to_context(:recipe_name, new_file_basename)
-        end
-
-        def cookbook_root
-          File.dirname(cookbook_path)
-        end
-
-        def cookbook_name
-          File.basename(cookbook_path)
-        end
-
-        def read_and_validate_params
-          arguments = parse_options(params)
-          case arguments.size
-          when 1
-            @new_file_basename = arguments[0]
-            @cookbook_path = Dir.pwd
-            validate_cookbook_path
-          when 2
-            @cookbook_path = arguments[0]
-            @new_file_basename = arguments[1]
-          else
-            @params_valid = false
-          end
-        end
-
-        def validate_cookbook_path
-          unless File.directory?(File.join(cookbook_path, "recipes"))
-            @errors << "Directory #{cookbook_path} is not a cookbook"
-            @params_valid = 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
+      # ## CookbookCodeFile
+      # A base class for generators that add individual files to existing
+      # cookbooks.
+      class CookbookCodeFile < Base
+
+        attr_reader :errors
+        attr_reader :cookbook_path
+        attr_reader :new_file_basename
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def initialize(params)
+          @params_valid = true
+          @cookbook_full_path = nil
+          @new_file_basename = nil
+          @errors = []
+          @params = params
+          super
+        end
+
+        def run
+          read_and_validate_params
+          if params_valid?
+            setup_context
+            chef_runner.converge
+          else
+            errors.each {|error| err("Error: #{error}") }
+            parse_options(params)
+            msg(opt_parser)
+            1
+          end
+        end
+
+        def setup_context
+          super
+          Generator.add_attr_to_context(:cookbook_root, cookbook_root)
+          Generator.add_attr_to_context(:cookbook_name, cookbook_name)
+          Generator.add_attr_to_context(:new_file_basename, new_file_basename)
+          Generator.add_attr_to_context(:recipe_name, new_file_basename)
+        end
+
+        def cookbook_root
+          File.dirname(cookbook_path)
+        end
+
+        def cookbook_name
+          File.basename(cookbook_path)
+        end
+
+        def read_and_validate_params
+          arguments = parse_options(params)
+          case arguments.size
+          when 1
+            @new_file_basename = arguments[0]
+            @cookbook_path = Dir.pwd
+            validate_cookbook_path
+          when 2
+            @cookbook_path = arguments[0]
+            @new_file_basename = arguments[1]
+          else
+            @params_valid = false
+          end
+        end
+
+        def validate_cookbook_path
+          unless File.directory?(File.join(cookbook_path, "recipes"))
+            @errors << "Directory #{cookbook_path} is not a cookbook"
+            @params_valid = false
+          end
+        end
+
+        def params_valid?
+          @params_valid
+        end
+      end
+    end
+  end
+end