chef-dk 0.15.16 → 0.16.28

data/lib/chef-dk/helpers.rb

@@ -98,6 +98,15 @@ module ChefDK
       File.join(usr_bin_prefix, command)
     end
 
+    # Unix users do not want git on their path if they already have it installed.
+    # Because we put `embedded/bin` on the path we must move the git binaries
+    # somewhere else that we can append to the end of the path.
+    # This is only a temporary solution - see https://github.com/chef/chef-dk/issues/854
+    # for a better proposed solution.
+    def git_bin_dir
+      @git_bin_dir ||= File.expand_path(File.join(omnibus_root, "gitbin"))
+    end
+
     # In our Windows ChefDK omnibus package we include Git For Windows, which
     # has a bunch of helpful unix utilties (like ssh, scp, etc.) bundled with it
     def git_windows_bin_dir
@@ -112,6 +121,7 @@ module ChefDK
         begin
           user_bin_dir = File.expand_path(File.join(Gem.user_dir, 'bin'))
           path = [ omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV['PATH'] ]
+          path << git_bin_dir if Dir.exists?(git_bin_dir)
           path << git_windows_bin_dir if Dir.exists?(git_windows_bin_dir)
           {
             'PATH' => path.join(File::PATH_SEPARATOR),

data/lib/chef-dk/pager.rb

@@ -1,106 +1,106 @@
-#
-# 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 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
+

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

@@ -1,138 +1,138 @@
-#
-# 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'
-require 'chef/cookbook_loader'
-require 'chef/cookbook/file_system_file_vendor'
-require 'chef-dk/ui'
-
-module ChefDK
-  module Policyfile
-    class ChefRepoCookbookSource
-
-      # path to a chef-repo or the cookbook path under it
-      attr_reader :path
-      # UI object for output
-      attr_accessor :ui
-
-      attr_reader :preferred_cookbooks
-
-      # Constructor
-      #
-      # @param path [String] path to a chef-repo or the cookbook path under it
-      def initialize(path)
-        self.path = path
-        @ui = UI.new
-        @preferred_cookbooks = []
-        yield self if block_given?
-      end
-
-      def default_source_args
-        [:chef_repo, path]
-      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.path == path && other.preferred_cookbooks == preferred_cookbooks
-      end
-
-      # Calls the slurp_metadata! helper once to calculate the @universe_graph
-      # and @cookbook_version_paths metadata.  Returns the @universe_graph.
-      #
-      # @return [Hash] universe_graph
-      def universe_graph
-        slurp_metadata! if @universe_graph.nil?
-        @universe_graph
-      end
-
-      # Returns the metadata (path and version) for an individual cookbook
-      #
-      # @return [Hash] metadata for a single cookbook version
-      def source_options_for(cookbook_name, cookbook_version)
-        { path: cookbook_version_paths[cookbook_name][cookbook_version], version: cookbook_version }
-      end
-
-      def null?
-        false
-      end
-
-      def desc
-        "chef_repo(#{path})"
-      end
-
-      private
-
-      # Setter for setting the path.  It may either be a full chef-repo with
-      # a cookbooks directory in it, or only a path to the cookbooks directory,
-      # and it autodetects which it is passed.
-      #
-      # @param path [String] path to a chef-repo or the cookbook path under it
-      def path=(path)
-        cookbooks_path = "#{path}/cookbooks"
-        if Dir.exist?(cookbooks_path)
-          @path = cookbooks_path
-        else
-          @path = path
-        end
-      end
-
-      # Calls the slurp_metadata! helper once to calculate the @universe_graph
-      # and @cookbook_version_paths metadata.  Returns the @cookbook_version_paths.
-      #
-      # @return [Hash] cookbook_version_paths
-      def cookbook_version_paths
-        slurp_metadata! if @cookbook_version_paths.nil?
-        @cookbook_version_paths
-      end
-
-      # Helper to compute the @universe_graph and @cookbook_version_paths once
-      # from the Chef::CookbookLoader on-disk cookbook repo.
-      def slurp_metadata!
-        @universe_graph = {}
-        @cookbook_version_paths = {}
-        cookbook_repo.load_cookbooks
-        cookbook_repo.each do |cookbook_name, cookbook_version|
-          metadata = cookbook_version.metadata
-          if metadata.name.nil?
-            ui.err("WARN: #{cookbook_name} cookbook missing metadata or no name field, skipping")
-            next
-          end
-          @universe_graph[metadata.name] ||= {}
-          @universe_graph[metadata.name][metadata.version] = metadata.dependencies.to_a
-          @cookbook_version_paths[metadata.name] ||= {}
-          @cookbook_version_paths[metadata.name][metadata.version] = cookbook_version.root_dir
-        end
-      end
-
-      # @return [Chef::CookbookLoader] cookbook loader using on disk FileVendor
-      def cookbook_repo
-        @cookbook_repo ||= begin
-          Chef::Cookbook::FileVendor.fetch_from_disk(path)
-          Chef::CookbookLoader.new(path)
-        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/exceptions'
+require 'chef/cookbook_loader'
+require 'chef/cookbook/file_system_file_vendor'
+require 'chef-dk/ui'
+
+module ChefDK
+  module Policyfile
+    class ChefRepoCookbookSource
+
+      # path to a chef-repo or the cookbook path under it
+      attr_reader :path
+      # UI object for output
+      attr_accessor :ui
+
+      attr_reader :preferred_cookbooks
+
+      # Constructor
+      #
+      # @param path [String] path to a chef-repo or the cookbook path under it
+      def initialize(path)
+        self.path = path
+        @ui = UI.new
+        @preferred_cookbooks = []
+        yield self if block_given?
+      end
+
+      def default_source_args
+        [:chef_repo, path]
+      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.path == path && other.preferred_cookbooks == preferred_cookbooks
+      end
+
+      # Calls the slurp_metadata! helper once to calculate the @universe_graph
+      # and @cookbook_version_paths metadata.  Returns the @universe_graph.
+      #
+      # @return [Hash] universe_graph
+      def universe_graph
+        slurp_metadata! if @universe_graph.nil?
+        @universe_graph
+      end
+
+      # Returns the metadata (path and version) for an individual cookbook
+      #
+      # @return [Hash] metadata for a single cookbook version
+      def source_options_for(cookbook_name, cookbook_version)
+        { path: cookbook_version_paths[cookbook_name][cookbook_version], version: cookbook_version }
+      end
+
+      def null?
+        false
+      end
+
+      def desc
+        "chef_repo(#{path})"
+      end
+
+      private
+
+      # Setter for setting the path.  It may either be a full chef-repo with
+      # a cookbooks directory in it, or only a path to the cookbooks directory,
+      # and it autodetects which it is passed.
+      #
+      # @param path [String] path to a chef-repo or the cookbook path under it
+      def path=(path)
+        cookbooks_path = "#{path}/cookbooks"
+        if Dir.exist?(cookbooks_path)
+          @path = cookbooks_path
+        else
+          @path = path
+        end
+      end
+
+      # Calls the slurp_metadata! helper once to calculate the @universe_graph
+      # and @cookbook_version_paths metadata.  Returns the @cookbook_version_paths.
+      #
+      # @return [Hash] cookbook_version_paths
+      def cookbook_version_paths
+        slurp_metadata! if @cookbook_version_paths.nil?
+        @cookbook_version_paths
+      end
+
+      # Helper to compute the @universe_graph and @cookbook_version_paths once
+      # from the Chef::CookbookLoader on-disk cookbook repo.
+      def slurp_metadata!
+        @universe_graph = {}
+        @cookbook_version_paths = {}
+        cookbook_repo.load_cookbooks
+        cookbook_repo.each do |cookbook_name, cookbook_version|
+          metadata = cookbook_version.metadata
+          if metadata.name.nil?
+            ui.err("WARN: #{cookbook_name} cookbook missing metadata or no name field, skipping")
+            next
+          end
+          @universe_graph[metadata.name] ||= {}
+          @universe_graph[metadata.name][metadata.version] = metadata.dependencies.to_a
+          @cookbook_version_paths[metadata.name] ||= {}
+          @cookbook_version_paths[metadata.name][metadata.version] = cookbook_version.root_dir
+        end
+      end
+
+      # @return [Chef::CookbookLoader] cookbook loader using on disk FileVendor
+      def cookbook_repo
+        @cookbook_repo ||= begin
+          Chef::Cookbook::FileVendor.fetch_from_disk(path)
+          Chef::CookbookLoader.new(path)
+        end
+      end
+
+    end
+  end
+end