chef-dk 0.11.2 → 0.12.0

data/lib/chef-dk/policyfile/null_cookbook_source.rb

@@ -1,45 +1,45 @@
-#
-# 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/exceptions'
-
-module ChefDK
-  module Policyfile
-    class NullCookbookSource
-
-      def initialize(_uri=nil)
-      end
-
-      def universe_graph
-        {}
-      end
-
-      def source_options_for(cookbook_name, cookbook_version)
-        raise UnsupportedFeature, 'You must set a default_source in your Policyfile to download cookbooks without explicit sources'
-      end
-
-      def null?
-        true
-      end
-
-      def desc
-        "null_cookbook_source"
-      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/exceptions'
+
+module ChefDK
+  module Policyfile
+    class NullCookbookSource
+
+      def initialize(_uri=nil)
+      end
+
+      def universe_graph
+        {}
+      end
+
+      def source_options_for(cookbook_name, cookbook_version)
+        raise UnsupportedFeature, 'You must set a default_source in your Policyfile to download cookbooks without explicit sources'
+      end
+
+      def null?
+        true
+      end
+
+      def desc
+        "null_cookbook_source"
+      end
+
+    end
+  end
+end

data/lib/chef-dk/policyfile/read_cookbook_for_compat_mode_upload.rb

@@ -1,124 +1,124 @@
-#
-# 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.
-#
-
-# This fixes a missing require in chef/digester:
-require 'singleton'
-require 'chef/cookbook/cookbook_version_loader'
-require 'chef/cookbook/chefignore'
-
-module ChefDK
-  module Policyfile
-
-    class CookbookLoaderWithChefignore
-
-      # Convenience method to load a cookbook and return a
-      # Chef::CookbookVersion object.
-      #
-      def self.load(name, directory_path)
-        new(name, directory_path).cookbook_version
-      end
-
-      attr_reader :cookbook_name
-      attr_reader :directory_path
-
-      def initialize(cookbook_name, directory_path)
-        @cookbook_name = cookbook_name
-        @directory_path = directory_path
-
-        @cookbook_version = nil
-        @loader = nil
-      end
-
-      def cookbook_version
-        @cookbook_version ||= loader.cookbook_version
-      end
-
-      def loader
-        @loader ||=
-          begin
-            cbvl = Chef::Cookbook::CookbookVersionLoader.new(directory_path, chefignore)
-            cbvl.load!
-            cbvl
-          end
-      end
-
-      def chefignore
-        @chefignore ||= Chef::Cookbook::Chefignore.new(File.join(directory_path, "chefignore"))
-      end
-
-    end
-
-    # TODO: when compat mode is removed, this class should be removed and the
-    # file should be renamed
-    class ReadCookbookForCompatModeUpload
-
-      # Convenience method to load a cookbook, set up name and version overrides
-      # as necessary, and return a Chef::CookbookVersion object.
-      def self.load(name, version_override, directory_path)
-        new(name, version_override, directory_path).cookbook_version
-      end
-
-      attr_reader :cookbook_name
-      attr_reader :directory_path
-      attr_reader :version_override
-
-      def initialize(cookbook_name, version_override, directory_path)
-        @cookbook_name = cookbook_name
-        @version_override = version_override
-        @directory_path = directory_path
-
-        @cookbook_version = nil
-        @loader = nil
-      end
-
-      def cookbook_version
-        @cookbook_version ||=
-          begin
-            cookbook_version = loader.cookbook_version
-            # TODO: dont do this for non-compat mode
-            cookbook_version.version = version_override
-            # TODO: dont do this either
-
-            # Fixup manifest.
-            # What happens is, the 'manifest' representation of cookbook
-            # version is created, it has a "name" field like foo-1.0.0, then we
-            # change the version to 1234.5678.9876 but the manifest is not
-            # regenerated so erchef rejects our upload b/c the name field
-            # doesn't match the expected `$cookbook_name-$version` based on the
-            # other fields.
-            cookbook_version.manifest[:name] = "#{cookbook_version.name}-#{version_override}"
-            cookbook_version.freeze_version
-            cookbook_version
-          end
-      end
-
-      def loader
-        @loader ||=
-          begin
-            cbvl = Chef::Cookbook::CookbookVersionLoader.new(directory_path, chefignore)
-            cbvl.load!
-            cbvl
-          end
-      end
-
-      def chefignore
-        @chefignore ||= Chef::Cookbook::Chefignore.new(File.join(directory_path, "chefignore"))
-      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.
+#
+
+# This fixes a missing require in chef/digester:
+require 'singleton'
+require 'chef/cookbook/cookbook_version_loader'
+require 'chef/cookbook/chefignore'
+
+module ChefDK
+  module Policyfile
+
+    class CookbookLoaderWithChefignore
+
+      # Convenience method to load a cookbook and return a
+      # Chef::CookbookVersion object.
+      #
+      def self.load(name, directory_path)
+        new(name, directory_path).cookbook_version
+      end
+
+      attr_reader :cookbook_name
+      attr_reader :directory_path
+
+      def initialize(cookbook_name, directory_path)
+        @cookbook_name = cookbook_name
+        @directory_path = directory_path
+
+        @cookbook_version = nil
+        @loader = nil
+      end
+
+      def cookbook_version
+        @cookbook_version ||= loader.cookbook_version
+      end
+
+      def loader
+        @loader ||=
+          begin
+            cbvl = Chef::Cookbook::CookbookVersionLoader.new(directory_path, chefignore)
+            cbvl.load!
+            cbvl
+          end
+      end
+
+      def chefignore
+        @chefignore ||= Chef::Cookbook::Chefignore.new(File.join(directory_path, "chefignore"))
+      end
+
+    end
+
+    # TODO: when compat mode is removed, this class should be removed and the
+    # file should be renamed
+    class ReadCookbookForCompatModeUpload
+
+      # Convenience method to load a cookbook, set up name and version overrides
+      # as necessary, and return a Chef::CookbookVersion object.
+      def self.load(name, version_override, directory_path)
+        new(name, version_override, directory_path).cookbook_version
+      end
+
+      attr_reader :cookbook_name
+      attr_reader :directory_path
+      attr_reader :version_override
+
+      def initialize(cookbook_name, version_override, directory_path)
+        @cookbook_name = cookbook_name
+        @version_override = version_override
+        @directory_path = directory_path
+
+        @cookbook_version = nil
+        @loader = nil
+      end
+
+      def cookbook_version
+        @cookbook_version ||=
+          begin
+            cookbook_version = loader.cookbook_version
+            # TODO: dont do this for non-compat mode
+            cookbook_version.version = version_override
+            # TODO: dont do this either
+
+            # Fixup manifest.
+            # What happens is, the 'manifest' representation of cookbook
+            # version is created, it has a "name" field like foo-1.0.0, then we
+            # change the version to 1234.5678.9876 but the manifest is not
+            # regenerated so erchef rejects our upload b/c the name field
+            # doesn't match the expected `$cookbook_name-$version` based on the
+            # other fields.
+            cookbook_version.manifest[:name] = "#{cookbook_version.name}-#{version_override}"
+            cookbook_version.freeze_version
+            cookbook_version
+          end
+      end
+
+      def loader
+        @loader ||=
+          begin
+            cbvl = Chef::Cookbook::CookbookVersionLoader.new(directory_path, chefignore)
+            cbvl.load!
+            cbvl
+          end
+      end
+
+      def chefignore
+        @chefignore ||= Chef::Cookbook::Chefignore.new(File.join(directory_path, "chefignore"))
+      end
+
+    end
+  end
+end

data/lib/chef-dk/policyfile/reports/install.rb

@@ -1,70 +1,70 @@
-#
-# 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/policyfile/reports/table_printer'
-
-module ChefDK
-  module Policyfile
-    module Reports
-
-      class Install
-
-        attr_reader :ui
-        attr_reader :policyfile_compiler
-
-        def initialize(ui: nil, policyfile_compiler: nil)
-          @ui = ui
-          @policyfile_compiler = policyfile_compiler
-
-          @fixed_version_install_table = nil
-          @install_table = nil
-        end
-
-        def installing_fixed_version_cookbook(cookbook_spec)
-          verb = cookbook_spec.installed? ? "Using     " : "Installing"
-          fixed_version_install_table.print_row(verb, cookbook_spec.name, cookbook_spec.version_constraint.to_s, "from #{cookbook_spec.source_type}")
-        end
-
-        def installing_cookbook(cookbook_spec)
-          verb = cookbook_spec.installed? ? "Using     " : "Installing"
-          install_table.print_row(verb, cookbook_spec.name, cookbook_spec.version_constraint.version)
-        end
-
-        private
-
-        def fixed_version_install_table
-          @fixed_version_install_table ||= TablePrinter.new(ui) do |t|
-            t.column(["Using", "Installing"])
-            t.column(policyfile_compiler.fixed_version_cookbooks_specs.keys)
-            t.column
-            t.column
-          end
-        end
-
-        def install_table
-          @install_table ||= TablePrinter.new(ui) do |t|
-            t.column(["Using", "Installing"])
-            t.column(policyfile_compiler.graph_solution.keys)
-            t.column(policyfile_compiler.graph_solution.values)
-          end
-        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/policyfile/reports/table_printer'
+
+module ChefDK
+  module Policyfile
+    module Reports
+
+      class Install
+
+        attr_reader :ui
+        attr_reader :policyfile_compiler
+
+        def initialize(ui: nil, policyfile_compiler: nil)
+          @ui = ui
+          @policyfile_compiler = policyfile_compiler
+
+          @fixed_version_install_table = nil
+          @install_table = nil
+        end
+
+        def installing_fixed_version_cookbook(cookbook_spec)
+          verb = cookbook_spec.installed? ? "Using     " : "Installing"
+          fixed_version_install_table.print_row(verb, cookbook_spec.name, cookbook_spec.version_constraint.to_s, "from #{cookbook_spec.source_type}")
+        end
+
+        def installing_cookbook(cookbook_spec)
+          verb = cookbook_spec.installed? ? "Using     " : "Installing"
+          install_table.print_row(verb, cookbook_spec.name, cookbook_spec.version_constraint.version)
+        end
+
+        private
+
+        def fixed_version_install_table
+          @fixed_version_install_table ||= TablePrinter.new(ui) do |t|
+            t.column(["Using", "Installing"])
+            t.column(policyfile_compiler.fixed_version_cookbooks_specs.keys)
+            t.column
+            t.column
+          end
+        end
+
+        def install_table
+          @install_table ||= TablePrinter.new(ui) do |t|
+            t.column(["Using", "Installing"])
+            t.column(policyfile_compiler.graph_solution.keys)
+            t.column(policyfile_compiler.graph_solution.values)
+          end
+        end
+
+      end
+    end
+  end
+end
+