chef-dk 2.6.2 → 3.0.36

data/lib/chef-dk/pager.rb

@@ -1,105 +1,104 @@
-#
-# 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 "chef-dk/ui"
-
-module ChefDK
-  class Pager
-
-    attr_reader :pager_pid
-
-    def initialize(enable_pager: true)
-      @enable_pager = enable_pager
-      @pipe = nil
-      @pager_pid
-    end
-
-    def pager_enabled?
-      !!(@enable_pager && have_tty? && env["PAGER"])
-    end
-
-    def ui
-      @ui ||=
-        if pager_enabled?
-          UI.new(out: parent_stdout)
-        else
-          UI.new
-        end
-    end
-
-    def with_pager
-      start
-      begin
-        yield self
-      ensure
-        wait
-      end
-    end
-
-    def start
-      return false unless pager_enabled?
-
-      # Ignore CTRL-C because it can cause the parent to die before the
-      # pager which causes wonky behavior in the terminal
-      Kernel.trap(:INT, "IGNORE")
-
-      @pager_pid = Process.spawn(pager_env, env["PAGER"], in: child_stdin)
-
-      child_stdin.close
-    end
-
-    def wait
-      return false unless pager_enabled?
-
-      # Sends EOF to the PAGER
-      parent_stdout.close
-      # wait or else we'd kill the pager when we exit
-      Process.waitpid(pager_pid)
-    end
-
-    # @api private
-    # This is just public so we can stub it for testing
-    def env
-      ENV
-    end
-
-    # @api private
-    # This is just public so we can stub it for testing
-    def have_tty?
-      $stdout.tty?
-    end
-
-    private
-
-    def child_stdin
-      pipe[0]
-    end
-
-    def parent_stdout
-      pipe[1]
-    end
-
-    def pipe
-      @pipe ||= IO.pipe
-    end
-
-    def pager_env
-      { "LESS" => "-FRX", "LV" => "-c" }
-    end
-
-  end
-end
+#
+# Copyright:: Copyright (c) 2015-2018, 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/ui"
+
+module ChefDK
+  class Pager
+
+    attr_reader :pager_pid
+
+    def initialize(enable_pager: true)
+      @enable_pager = enable_pager
+      @pipe = nil
+    end
+
+    def pager_enabled?
+      !!(@enable_pager && have_tty? && env["PAGER"])
+    end
+
+    def ui
+      @ui ||=
+        if pager_enabled?
+          UI.new(out: parent_stdout)
+        else
+          UI.new
+        end
+    end
+
+    def with_pager
+      start
+      begin
+        yield self
+      ensure
+        wait
+      end
+    end
+
+    def start
+      return false unless pager_enabled?
+
+      # Ignore CTRL-C because it can cause the parent to die before the
+      # pager which causes wonky behavior in the terminal
+      Kernel.trap(:INT, "IGNORE")
+
+      @pager_pid = Process.spawn(pager_env, env["PAGER"], in: child_stdin)
+
+      child_stdin.close
+    end
+
+    def wait
+      return false unless pager_enabled?
+
+      # Sends EOF to the PAGER
+      parent_stdout.close
+      # wait or else we'd kill the pager when we exit
+      Process.waitpid(pager_pid)
+    end
+
+    # @api private
+    # This is just public so we can stub it for testing
+    def env
+      ENV
+    end
+
+    # @api private
+    # This is just public so we can stub it for testing
+    def have_tty?
+      $stdout.tty?
+    end
+
+    private
+
+    def child_stdin
+      pipe[0]
+    end
+
+    def parent_stdout
+      pipe[1]
+    end
+
+    def pipe
+      @pipe ||= IO.pipe
+    end
+
+    def pager_env
+      { "LESS" => "-FRX", "LV" => "-c" }
+    end
+
+  end
+end

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

@@ -1,102 +1,102 @@
-#
-# Copyright:: Copyright (c) 2017 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/policyfile/source_uri"
-require "chef-dk/exceptions"
-require "chef/http/simple"
-
-module ChefDK
-  module Policyfile
-    class ArtifactoryCookbookSource
-
-      attr_reader :uri
-      attr_reader :preferred_cookbooks
-      attr_reader :chef_config
-
-      def initialize(uri, chef_config: nil)
-        @uri = uri
-        @http_connections = {}
-        @chef_config = chef_config
-        @preferred_cookbooks = []
-        yield self if block_given?
-      end
-
-      def default_source_args
-        [:artifactory, uri]
-      end
-
-      def ==(other)
-        other.kind_of?(self.class) && other.uri == uri && other.preferred_cookbooks == preferred_cookbooks
-      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 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"]
-        {
-          artifactory: base_uri,
-          version: cookbook_version,
-          http_client: http_connection_for(base_uri.to_s),
-        }
-      end
-
-      def null?
-        false
-      end
-
-      def desc
-        "artifactory(#{uri})"
-      end
-
-      private
-
-      def http_connection_for(base_url)
-        headers = { "X-Jfrog-Art-API" => chef_config.artifactory_api_key || ENV["ARTIFACTORY_API_KEY"] }
-        @http_connections[base_url] ||= Chef::HTTP::Simple.new(base_url, headers: headers)
-      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) 2017 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/policyfile/source_uri"
+require "chef-dk/exceptions"
+require "chef/http/simple"
+
+module ChefDK
+  module Policyfile
+    class ArtifactoryCookbookSource
+
+      attr_reader :uri
+      attr_reader :preferred_cookbooks
+      attr_reader :chef_config
+
+      def initialize(uri, chef_config: nil)
+        @uri = uri
+        @http_connections = {}
+        @chef_config = chef_config
+        @preferred_cookbooks = []
+        yield self if block_given?
+      end
+
+      def default_source_args
+        [:artifactory, uri]
+      end
+
+      def ==(other)
+        other.kind_of?(self.class) && other.uri == uri && other.preferred_cookbooks == preferred_cookbooks
+      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 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"]
+        {
+          artifactory: base_uri,
+          version: cookbook_version,
+          http_client: http_connection_for(base_uri.to_s),
+        }
+      end
+
+      def null?
+        false
+      end
+
+      def desc
+        "artifactory(#{uri})"
+      end
+
+      private
+
+      def http_connection_for(base_url)
+        headers = { "X-Jfrog-Art-API" => chef_config.artifactory_api_key || ENV["ARTIFACTORY_API_KEY"] }
+        @http_connections[base_url] ||= Chef::HTTP::Simple.new(base_url, headers: headers)
+      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/attribute_merge_checker.rb

@@ -1,110 +1,110 @@
-#
-# Copyright:: Copyright (c) 2017 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/mash"
-
-module ChefDK
-  module Policyfile
-    class AttributeMergeChecker
-      # A ConflictError is used to specify a conflict has occurred
-      class ConflictError < StandardError
-        attr_reader :attribute_path
-        attr_reader :provided_by
-
-        def initialize(attribute_path, provided_by)
-          @attribute_path = attribute_path
-          @provided_by = provided_by
-          super("Attribute '#{attribute_path}' provided conflicting values by the following sources #{provided_by}")
-        end
-      end
-
-      # A Leaf is used to mark an individual attribute that has already
-      # been provided, along with its value and by who
-      #
-      # @api private
-      class Leaf
-        attr_reader :provided_by
-        attr_reader :val
-
-        def initialize(provided_by, val)
-          @provided_by = provided_by
-          @val = val
-        end
-      end
-
-      # An AttributeHashInfo holds a set of attributes along with where they came from
-      class AttributeHashInfo
-        attr_reader :source_name
-        attr_reader :hash
-        def initialize(source_name, hash)
-          @source_name = source_name
-          @hash = hash
-        end
-      end
-
-      # @return [Array<AttributeHashInfo>] A list of attributes and who they were provided by
-      attr_reader :attribute_hash_infos
-
-      def initialize
-        @attribute_hash_infos = []
-      end
-
-      # Add a hash of attributes to the set of attributes that will be compared
-      # for conflicts
-      #
-      # @param source_name [String] Where the attributes came from
-      # @param hash [Hash] attributes from source_name
-      def with_attributes(source_name, hash)
-        attribute_hash_infos << AttributeHashInfo.new(source_name, hash)
-      end
-
-      # Check all added attributes for conflicts. Different sources can provide
-      # the same attribute if they have the same value. Otherwise, it is considered
-      # a conflict
-      #
-      # @raise ConflictError if there are conflicting attributes
-      def check!
-        check_struct = Mash.new
-        attribute_hash_infos.each do |attr_hash_info|
-          fill!(check_struct, attr_hash_info.source_name, "", attr_hash_info.hash)
-        end
-      end
-
-      private
-
-      def fill!(acc, source_name, path, hash)
-        hash.each do |(key, val)|
-          new_path = "#{path}[#{key}]"
-          if val.kind_of?(Hash)
-            acc[key] ||= Mash.new
-            fill!(acc[key], source_name, new_path, val)
-          else
-            if acc[key].nil?
-              acc[key] = Leaf.new(source_name, val)
-            else
-              leaf = acc[key]
-              if leaf.val != val
-                raise ConflictError.new(new_path, [leaf.provided_by, source_name])
-              end
-            end
-          end
-        end
-      end
-
-    end
-  end
-end
+#
+# Copyright:: Copyright (c) 2017 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/mash"
+
+module ChefDK
+  module Policyfile
+    class AttributeMergeChecker
+      # A ConflictError is used to specify a conflict has occurred
+      class ConflictError < StandardError
+        attr_reader :attribute_path
+        attr_reader :provided_by
+
+        def initialize(attribute_path, provided_by)
+          @attribute_path = attribute_path
+          @provided_by = provided_by
+          super("Attribute '#{attribute_path}' provided conflicting values by the following sources #{provided_by}")
+        end
+      end
+
+      # A Leaf is used to mark an individual attribute that has already
+      # been provided, along with its value and by who
+      #
+      # @api private
+      class Leaf
+        attr_reader :provided_by
+        attr_reader :val
+
+        def initialize(provided_by, val)
+          @provided_by = provided_by
+          @val = val
+        end
+      end
+
+      # An AttributeHashInfo holds a set of attributes along with where they came from
+      class AttributeHashInfo
+        attr_reader :source_name
+        attr_reader :hash
+        def initialize(source_name, hash)
+          @source_name = source_name
+          @hash = hash
+        end
+      end
+
+      # @return [Array<AttributeHashInfo>] A list of attributes and who they were provided by
+      attr_reader :attribute_hash_infos
+
+      def initialize
+        @attribute_hash_infos = []
+      end
+
+      # Add a hash of attributes to the set of attributes that will be compared
+      # for conflicts
+      #
+      # @param source_name [String] Where the attributes came from
+      # @param hash [Hash] attributes from source_name
+      def with_attributes(source_name, hash)
+        attribute_hash_infos << AttributeHashInfo.new(source_name, hash)
+      end
+
+      # Check all added attributes for conflicts. Different sources can provide
+      # the same attribute if they have the same value. Otherwise, it is considered
+      # a conflict
+      #
+      # @raise ConflictError if there are conflicting attributes
+      def check!
+        check_struct = Mash.new
+        attribute_hash_infos.each do |attr_hash_info|
+          fill!(check_struct, attr_hash_info.source_name, "", attr_hash_info.hash)
+        end
+      end
+
+      private
+
+      def fill!(acc, source_name, path, hash)
+        hash.each do |(key, val)|
+          new_path = "#{path}[#{key}]"
+          if val.kind_of?(Hash)
+            acc[key] ||= Mash.new
+            fill!(acc[key], source_name, new_path, val)
+          else
+            if acc[key].nil?
+              acc[key] = Leaf.new(source_name, val)
+            else
+              leaf = acc[key]
+              if leaf.val != val
+                raise ConflictError.new(new_path, [leaf.provided_by, source_name])
+              end
+            end
+          end
+        end
+      end
+
+    end
+  end
+end