chef-dk 0.15.16 → 0.16.28

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

@@ -1,54 +1,54 @@
-#
-# 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 ChefServerCookbookSource
-
-      attr_reader :uri
-
-      def initialize(uri)
-        @uri = uri
-      end
-
-      def ==(other)
-        other.kind_of?(self.class) && other.uri == uri
-      end
-
-      def universe_graph
-        raise UnsupportedFeature, 'ChefDK does not support chef-server cookbook default sources at this time'
-      end
-
-      def source_options_for(cookbook_name, cookbook_version)
-        raise UnsupportedFeature, 'ChefDK does not support chef-server cookbook default sources at this time'
-      end
-
-      def null?
-        false
-      end
-
-      def desc
-        "chef_server(#{uri})"
-      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 ChefServerCookbookSource
+
+      attr_reader :uri
+
+      def initialize(uri)
+        @uri = uri
+      end
+
+      def ==(other)
+        other.kind_of?(self.class) && other.uri == uri
+      end
+
+      def universe_graph
+        raise UnsupportedFeature, 'ChefDK does not support chef-server cookbook default sources at this time'
+      end
+
+      def source_options_for(cookbook_name, cookbook_version)
+        raise UnsupportedFeature, 'ChefDK does not support chef-server cookbook default sources at this time'
+      end
+
+      def null?
+        false
+      end
+
+      def desc
+        "chef_server(#{uri})"
+      end
+
+    end
+  end
+end
+
+

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

@@ -1,97 +1,97 @@
-#
-# 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 'json'
-require 'chef-dk/cookbook_omnifetch'
-require 'chef-dk/exceptions'
-require 'chef/http/simple'
-
-module ChefDK
-  module Policyfile
-
-    class CommunityCookbookSource
-
-      attr_reader :uri
-      attr_reader :preferred_cookbooks
-
-      def initialize(uri = nil)
-        @uri = uri || "https://supermarket.chef.io"
-        @http_connections = {}
-        @preferred_cookbooks = []
-        yield self if block_given?
-      end
-
-      def default_source_args
-        [:supermarket, uri]
-      end
-
-      def preferred_for(*cookbook_names)
-        preferred_cookbooks.concat(cookbook_names)
-      end
-
-      def preferred_source_for?(cookbook_name)
-        preferred_cookbooks.include?(cookbook_name)
-      end
-
-      def ==(other)
-        other.kind_of?(self.class) && other.uri == uri && other.preferred_cookbooks == preferred_cookbooks
-      end
-
-      def universe_graph
-        @universe_graph ||= begin
-          full_community_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
-            normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
-              deps_by_version[version] = metadata["dependencies"]
-              deps_by_version
-            end
-            normalized_graph
-          end
-        end
-      end
-
-      def source_options_for(cookbook_name, cookbook_version)
-        base_uri = full_community_graph[cookbook_name][cookbook_version]["download_url"]
-        { artifactserver: base_uri, version: cookbook_version }
-      end
-
-      def null?
-        false
-      end
-
-      def desc
-        "supermarket(#{uri})"
-      end
-
-      private
-
-      def http_connection_for(base_url)
-        @http_connections[base_url] ||= Chef::HTTP::Simple.new(base_url)
-      end
-
-
-      def full_community_graph
-        @full_community_graph ||=
-          begin
-            graph_json = http_connection_for(uri).get("/universe")
-            JSON.parse(graph_json)
-          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 'json'
+require 'chef-dk/cookbook_omnifetch'
+require 'chef-dk/exceptions'
+require 'chef/http/simple'
+
+module ChefDK
+  module Policyfile
+
+    class CommunityCookbookSource
+
+      attr_reader :uri
+      attr_reader :preferred_cookbooks
+
+      def initialize(uri = nil)
+        @uri = uri || "https://supermarket.chef.io"
+        @http_connections = {}
+        @preferred_cookbooks = []
+        yield self if block_given?
+      end
+
+      def default_source_args
+        [:supermarket, uri]
+      end
+
+      def preferred_for(*cookbook_names)
+        preferred_cookbooks.concat(cookbook_names)
+      end
+
+      def preferred_source_for?(cookbook_name)
+        preferred_cookbooks.include?(cookbook_name)
+      end
+
+      def ==(other)
+        other.kind_of?(self.class) && other.uri == uri && other.preferred_cookbooks == preferred_cookbooks
+      end
+
+      def universe_graph
+        @universe_graph ||= begin
+          full_community_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
+            normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
+              deps_by_version[version] = metadata["dependencies"]
+              deps_by_version
+            end
+            normalized_graph
+          end
+        end
+      end
+
+      def source_options_for(cookbook_name, cookbook_version)
+        base_uri = full_community_graph[cookbook_name][cookbook_version]["download_url"]
+        { artifactserver: base_uri, version: cookbook_version }
+      end
+
+      def null?
+        false
+      end
+
+      def desc
+        "supermarket(#{uri})"
+      end
+
+      private
+
+      def http_connection_for(base_url)
+        @http_connections[base_url] ||= Chef::HTTP::Simple.new(base_url)
+      end
+
+
+      def full_community_graph
+        @full_community_graph ||=
+          begin
+            graph_json = http_connection_for(uri).get("/universe")
+            JSON.parse(graph_json)
+          end
+      end
+
+    end
+  end
+end
+

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

@@ -1,124 +1,124 @@
-#
-# Copyright:: Copyright (c) 2015 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 'ffi_yajl'
-require 'mixlib/shellout'
-require 'chef-dk/service_exceptions'
-
-module ChefDK
-  module Policyfile
-    module ComparisonBase
-
-      class Local
-
-        attr_reader :policyfile_lock_relpath
-
-        def initialize(policyfile_lock_relpath)
-          @policyfile_lock_relpath = policyfile_lock_relpath
-        end
-
-        def name
-          "local:#{policyfile_lock_relpath}"
-        end
-
-        def lock
-          raise LockfileNotFound, "Expected lockfile at #{policyfile_lock_relpath} does not exist" unless File.exist?(policyfile_lock_relpath)
-          raise LockfileNotFound, "Expected lockfile at #{policyfile_lock_relpath} cannot be read" unless File.readable?(policyfile_lock_relpath)
-          FFI_Yajl::Parser.parse(IO.read(policyfile_lock_relpath))
-        rescue FFI_Yajl::ParseError => e
-          raise MalformedLockfile, "Invalid JSON in lockfile at #{policyfile_lock_relpath}:\n  #{e.message}"
-        end
-
-      end
-
-      class Git
-
-        attr_reader :ref
-        attr_reader :policyfile_lock_relpath
-
-        def initialize(ref, policyfile_lock_relpath)
-          @ref = ref
-          @policyfile_lock_relpath = policyfile_lock_relpath
-        end
-
-        def name
-          "git:#{ref}"
-        end
-
-        def lock
-          git_cmd.run_command
-          git_cmd.error!
-          FFI_Yajl::Parser.parse(git_cmd.stdout)
-        rescue Mixlib::ShellOut::ShellCommandFailed
-          raise GitError, "Git command `#{git_cmd_string}` failed with message: #{git_cmd.stderr.chomp}"
-        rescue FFI_Yajl::ParseError => e
-          raise MalformedLockfile, "Invalid JSON in lockfile at git ref '#{ref}' at path '#{policyfile_lock_relpath}':\n  #{e.message}"
-        end
-
-        def git_cmd
-          @git_cmd ||= Mixlib::ShellOut.new(git_cmd_string)
-        end
-
-        def git_cmd_string
-          # Git is a little picky about how we specify the paths, but it looks
-          # like we don't need to worry about the relative path to the root of
-          # the repo if we give git a leading dot:
-          #
-          #    git show 6644e6cb2ade90b8aff2ebb44728958fbc939ebf:zero.rb
-          #    fatal: Path 'etc/zero.rb' exists, but not 'zero.rb'.
-          #    Did you mean '6644e6cb2ade90b8aff2ebb44728958fbc939ebf:etc/zero.rb' aka '6644e6cb2ade90b8aff2ebb44728958fbc939ebf:./zero.rb'?
-          #    git show 6644e6cb2ade90b8aff2ebb44728958fbc939ebf:./zero.rb
-          #    (works)
-          "git show #{ref}:./#{policyfile_lock_relpath}"
-        end
-
-      end
-
-      class PolicyGroup
-
-        attr_reader :group
-        attr_reader :policy_name
-        attr_reader :http_client
-
-        def initialize(group, policy_name, http_client)
-          @group = group
-          @policy_name = policy_name
-          @http_client = http_client
-        end
-
-        def name
-          "policy_group:#{group}"
-        end
-
-        def lock
-          http_client.get("policy_groups/#{group}/policies/#{policy_name}")
-        rescue Net::ProtocolError => e
-          if e.respond_to?(:response) && e.response.code.to_s == "404"
-            raise PolicyfileDownloadError.new("No policyfile lock named '#{policy_name}' found in policy_group '#{group}' at #{http_client.url}", e)
-          else
-            raise PolicyfileDownloadError.new("HTTP error attempting to fetch policyfile lock from #{http_client.url}", e)
-          end
-        rescue => e
-          raise PolicyfileDownloadError.new("Failed to fetch policyfile lock from #{http_client.url}", e)
-        end
-
-      end
-
-    end
-  end
-end
-
+#
+# Copyright:: Copyright (c) 2015 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 'ffi_yajl'
+require 'mixlib/shellout'
+require 'chef-dk/service_exceptions'
+
+module ChefDK
+  module Policyfile
+    module ComparisonBase
+
+      class Local
+
+        attr_reader :policyfile_lock_relpath
+
+        def initialize(policyfile_lock_relpath)
+          @policyfile_lock_relpath = policyfile_lock_relpath
+        end
+
+        def name
+          "local:#{policyfile_lock_relpath}"
+        end
+
+        def lock
+          raise LockfileNotFound, "Expected lockfile at #{policyfile_lock_relpath} does not exist" unless File.exist?(policyfile_lock_relpath)
+          raise LockfileNotFound, "Expected lockfile at #{policyfile_lock_relpath} cannot be read" unless File.readable?(policyfile_lock_relpath)
+          FFI_Yajl::Parser.parse(IO.read(policyfile_lock_relpath))
+        rescue FFI_Yajl::ParseError => e
+          raise MalformedLockfile, "Invalid JSON in lockfile at #{policyfile_lock_relpath}:\n  #{e.message}"
+        end
+
+      end
+
+      class Git
+
+        attr_reader :ref
+        attr_reader :policyfile_lock_relpath
+
+        def initialize(ref, policyfile_lock_relpath)
+          @ref = ref
+          @policyfile_lock_relpath = policyfile_lock_relpath
+        end
+
+        def name
+          "git:#{ref}"
+        end
+
+        def lock
+          git_cmd.run_command
+          git_cmd.error!
+          FFI_Yajl::Parser.parse(git_cmd.stdout)
+        rescue Mixlib::ShellOut::ShellCommandFailed
+          raise GitError, "Git command `#{git_cmd_string}` failed with message: #{git_cmd.stderr.chomp}"
+        rescue FFI_Yajl::ParseError => e
+          raise MalformedLockfile, "Invalid JSON in lockfile at git ref '#{ref}' at path '#{policyfile_lock_relpath}':\n  #{e.message}"
+        end
+
+        def git_cmd
+          @git_cmd ||= Mixlib::ShellOut.new(git_cmd_string)
+        end
+
+        def git_cmd_string
+          # Git is a little picky about how we specify the paths, but it looks
+          # like we don't need to worry about the relative path to the root of
+          # the repo if we give git a leading dot:
+          #
+          #    git show 6644e6cb2ade90b8aff2ebb44728958fbc939ebf:zero.rb
+          #    fatal: Path 'etc/zero.rb' exists, but not 'zero.rb'.
+          #    Did you mean '6644e6cb2ade90b8aff2ebb44728958fbc939ebf:etc/zero.rb' aka '6644e6cb2ade90b8aff2ebb44728958fbc939ebf:./zero.rb'?
+          #    git show 6644e6cb2ade90b8aff2ebb44728958fbc939ebf:./zero.rb
+          #    (works)
+          "git show #{ref}:./#{policyfile_lock_relpath}"
+        end
+
+      end
+
+      class PolicyGroup
+
+        attr_reader :group
+        attr_reader :policy_name
+        attr_reader :http_client
+
+        def initialize(group, policy_name, http_client)
+          @group = group
+          @policy_name = policy_name
+          @http_client = http_client
+        end
+
+        def name
+          "policy_group:#{group}"
+        end
+
+        def lock
+          http_client.get("policy_groups/#{group}/policies/#{policy_name}")
+        rescue Net::ProtocolError => e
+          if e.respond_to?(:response) && e.response.code.to_s == "404"
+            raise PolicyfileDownloadError.new("No policyfile lock named '#{policy_name}' found in policy_group '#{group}' at #{http_client.url}", e)
+          else
+            raise PolicyfileDownloadError.new("HTTP error attempting to fetch policyfile lock from #{http_client.url}", e)
+          end
+        rescue => e
+          raise PolicyfileDownloadError.new("Failed to fetch policyfile lock from #{http_client.url}", e)
+        end
+
+      end
+
+    end
+  end
+end
+