chef 11.8.4.ohai7.0 → 11.10.0.alpha.1

data/lib/chef/http/basic_client.rb

@@ -47,7 +47,7 @@ class Chef
       end
 
       def host
-        @url.host
+        @url.hostname
       end
 
       def port

data/lib/chef/http/http_request.rb

@@ -58,6 +58,8 @@ class Chef
 
       SLASH = "/".freeze
 
+      HOST_LOWER = "host".freeze
+
       def self.user_agent=(ua)
         @user_agent = ua
       end
@@ -76,6 +78,10 @@ class Chef
       end
 
       def host
+        @url.hostname
+      end
+
+      def uri_safe_host
         @url.host
       end
 
@@ -132,6 +138,7 @@ class Chef
         # No response compression unless we asked for it explicitly:
         @headers[HTTPRequest::ACCEPT_ENCODING] ||= "identity"
         @headers['X-Chef-Version'] = ::Chef::VERSION
+        @headers['Host'] = "#{uri_safe_host}:#{port}" unless @headers.keys.any? {|k| k.downcase.to_s == HOST_LOWER }
         @headers
       end
 

data/lib/chef/knife.rb

@@ -239,7 +239,14 @@ class Chef
     end
 
     def self.working_directory
-      ENV['PWD'] || Dir.pwd
+      a = if Chef::Platform.windows?
+            ENV['CD']
+          else
+            ENV['PWD']
+          end || Dir.pwd
+
+      puts "Working directory: #{a}"
+      a
     end
 
     def self.reset_config_path!

data/lib/chef/knife/bootstrap.rb

@@ -91,7 +91,7 @@ class Chef
 
       option :bootstrap_no_proxy,
         :long => "--bootstrap-no-proxy [NO_PROXY_URL|NO_PROXY_IP]",
-        :description => "Do not proxy locations for the node being bootstrapped",
+        :description => "Do not proxy locations for the node being bootstrapped; this option is used internally by Opscode",
         :proc => Proc.new { |np| Chef::Config[:knife][:bootstrap_no_proxy] = np }
 
       option :distro,

data/lib/chef/knife/cookbook_site_share.rb

@@ -58,7 +58,7 @@ class Chef
             ui.info("Making tarball #{cookbook_name}.tgz")
             Chef::Mixin::Command.run_command(:command => "tar -czf #{cookbook_name}.tgz #{cookbook_name}", :cwd => tmp_cookbook_dir)
           rescue => e
-            ui.error("Error making tarball #{cookbook_name}.tgz: #{e.message}. Set log level to debug (-l debug) for more information.")
+            ui.error("Error making tarball #{cookbook_name}.tgz: #{e.message}. Increase log verbosity (-VV) for more information.")
             Chef::Log.debug("\n#{e.backtrace.join("\n")}")
             exit(1)
           end
@@ -69,7 +69,7 @@ class Chef
             Chef::Log.debug("Removing local staging directory at #{tmp_cookbook_dir}")
             FileUtils.rm_rf tmp_cookbook_dir
           rescue => e
-            ui.error("Error uploading cookbook #{cookbook_name} to the Opscode Cookbook Site: #{e.message}. Set log level to debug (-l debug) for more information.")
+            ui.error("Error uploading cookbook #{cookbook_name} to the Opscode Cookbook Site: #{e.message}. Increase log verbosity (-VV) for more information.")
             Chef::Log.debug("\n#{e.backtrace.join("\n")}")
             exit(1)
           end

data/lib/chef/knife/cookbook_upload.rb

@@ -57,6 +57,12 @@ class Chef
         :boolean => true,
         :description => "Update cookbook versions even if they have been frozen"
 
+      option :concurrency,
+        :long => '--concurrency NUMBER_OF_THREADS',
+        :description => "How many concurrent threads will be used",
+        :default => 10,
+        :proc => lambda { |o| o.to_i }
+
       option :environment,
         :short => '-E',
         :long  => '--environment ENVIRONMENT',
@@ -228,7 +234,7 @@ WARNING
           check_for_broken_links!(cb)
           check_for_dependencies!(cb)
         end
-        Chef::CookbookUploader.new(cookbooks, config[:cookbook_path], :force => config[:force]).upload_cookbooks
+        Chef::CookbookUploader.new(cookbooks, config[:cookbook_path], :force => config[:force], :concurrency => config[:concurrency]).upload_cookbooks
       rescue Chef::Exceptions::CookbookFrozen => e
         ui.error e
         raise

data/lib/chef/knife/core/subcommand_loader.rb

@@ -121,9 +121,9 @@ class Chef
 
       def latest_gem_specs
         @latest_gem_specs ||= if Gem::Specification.respond_to? :latest_specs
-          Gem::Specification.latest_specs
+          Gem::Specification.latest_specs(true)  # find prerelease gems
         else
-          Gem.source_index.latest_specs
+          Gem.source_index.latest_specs(true)
         end
       end
 

data/lib/chef/knife/data_bag_create.rb

@@ -67,6 +67,13 @@ class Chef
           exit 1
         end
 
+        begin
+          Chef::DataBag.validate_name!(@data_bag_name)
+        rescue Chef::Exceptions::InvalidDataBagName => e
+          ui.fatal(e.message)
+          exit(1)
+        end
+
         # create the data bag
         begin
           rest.post_rest("data", { "name" => @data_bag_name })

data/lib/chef/knife/environment_compare.rb

@@ -0,0 +1,127 @@
+#
+# Author:: Sander Botman (<sbotman@schubergphilis.com>)
+# Copyright:: Copyright (c) 2013 Sander Botman.
+# 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/knife'
+ 
+class Chef
+  class Knife
+    class EnvironmentCompare < Knife
+ 
+      deps do
+        require 'chef/environment'
+      end
+ 
+      banner "knife environment compare [ENVIRONMENT..] (options)"
+
+      option :all,
+        :short => "-a",
+        :long => "--all",
+        :description => "Show all cookbooks",
+        :boolean => true 
+
+      option :mismatch,
+        :short => "-m",
+        :long => "--mismatch",
+        :description => "Only show mismatching versions",
+        :boolean => true
+ 
+      def run
+        # Get the commandline environments or all if none are provided.
+        environments = environment_list     
+
+        # Get a list of all cookbooks that have constraints and their environment.
+        constraints = constraint_list(environments) 
+
+        # Get the total list of cookbooks that have constraints
+        cookbooks = cookbook_list(constraints)
+
+        # If we cannot find any cookbooks, we can stop here.
+        if cookbooks.nil? || cookbooks.empty?
+          ui.error "Cannot find any environment cookbook constraints"
+          exit 1
+        end
+     
+        # Get all cookbooks so we can compare them all
+        cookbooks = rest.get_rest("/cookbooks?num_versions=1") if config[:all]
+
+        # display matrix view of in the requested format.
+        if config[:format] == 'summary'
+          matrix = matrix_output(cookbooks, constraints)
+          ui.output(matrix)
+        else
+          ui.output(constraints)
+        end
+      end
+
+      private
+
+      def environment_list
+        environments = []
+        unless @name_args.nil? || @name_args.empty?
+          @name_args.each { |name| environments << name }
+        else
+          environments = Chef::Environment.list
+        end
+      end 
+
+      def constraint_list(environments)
+        constraints = {}
+        environments.each do |env,url|
+          # Because you cannot modify the default environment I filter it out here.
+          unless env == "_default"
+            envdata = Chef::Environment.load(env)
+            ver = envdata.cookbook_versions
+            constraints[env] = ver
+          end
+        end
+        constraints
+      end
+ 
+      def cookbook_list(constraints)
+        result = {}
+        constraints.each { |env, cb| result.merge!(cb) }
+        result
+      end      
+
+      def matrix_output(cookbooks, constraints)
+        rows = [ '' ]
+        environments = []
+        constraints.each { |e,v| environments << e.to_s }
+        columns = environments.count + 1
+        environments.each { |env| rows << ui.color(env, :bold) }
+        cookbooks.each do |c,v|
+          total = []
+          environments.each { |n| total << constraints[n][c]}
+          if total.uniq.count == 1
+            next if config[:mismatch]
+            color = :white
+          else
+            color = :yellow
+          end
+          rows << ui.color(c, :bold)
+          environments.each do |e|
+            tag = constraints[e][c] || "latest"
+            rows << ui.color(tag, color)   
+          end
+        end
+        ui.list(rows, :uneven_columns_across, columns)
+      end
+
+    end
+  end
+end

data/lib/chef/mixin/command.rb

@@ -144,19 +144,18 @@ class Chef
       end
 
       def handle_command_failures(status, command_output, opts={})
-        unless opts[:ignore_failure]
-          opts[:returns] ||= 0
-          unless Array(opts[:returns]).include?(status.exitstatus)
-            # if the log level is not debug, through output of command when we fail
-            output = ""
-            if Chef::Log.level == :debug || opts[:output_on_failure]
-              output << "\n---- Begin output of #{opts[:command]} ----\n"
-              output << command_output.to_s
-              output << "\n---- End output of #{opts[:command]} ----\n"
-            end
-            raise Chef::Exceptions::Exec, "#{opts[:command]} returned #{status.exitstatus}, expected #{opts[:returns]}#{output}"
-          end
+        return if opts[:ignore_failure]
+        opts[:returns] ||= 0
+        return if Array(opts[:returns]).include?(status.exitstatus)
+
+        # if the log level is not debug, through output of command when we fail
+        output = ""
+        if Chef::Log.level == :debug || opts[:output_on_failure]
+          output << "\n---- Begin output of #{opts[:command]} ----\n"
+          output << command_output.to_s
+          output << "\n---- End output of #{opts[:command]} ----\n"
         end
+        raise Chef::Exceptions::Exec, "#{opts[:command]} returned #{status.exitstatus}, expected #{opts[:returns]}#{output}"
       end
 
       # Call #run_command but set LC_ALL to the system's current environment so it doesn't get changed to C.

data/lib/chef/mixin/deep_merge.rb

@@ -84,17 +84,17 @@ class Chef
         when nil
           dest
         when Hash
-          source.each do |src_key, src_value|
-            if dest.kind_of?(Hash)
+          if dest.kind_of?(Hash)
+            source.each do |src_key, src_value|
               if dest[src_key]
                 dest[src_key] = deep_merge!(src_value, dest[src_key])
               else # dest[src_key] doesn't exist so we take whatever source has
                 raise_if_knockout_used!(src_value)
                 dest[src_key] = src_value
               end
-            else # dest isn't a hash, so we overwrite it completely
-              dest = source
             end
+          else # dest isn't a hash, so we overwrite it completely
+            dest = source
           end
         when Array
           if dest.kind_of?(Array)

data/lib/chef/monkey_patches/net_http.rb

@@ -20,3 +20,37 @@ module Net
     include ChefNetHTTPExceptionExtensions
   end
 end
+
+if Net::HTTP.instance_methods.map {|m| m.to_s}.include?("proxy_uri")
+  begin
+    # Ruby 2.0 changes the way proxy support is implemented in Net::HTTP.
+    # The implementation does not work correctly with IPv6 literals because it
+    # concatenates the address into a URI without adding square brackets for
+    # IPv6 addresses.
+    #
+    # If the bug is present, a call to Net::HTTP#proxy_uri when the host is an
+    # IPv6 address will fail by creating an invalid URI, like so:
+    #
+    #    ruby -r'net/http' -e 'Net::HTTP.new("::1", 80).proxy_uri'
+    #    /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/uri/generic.rb:214:in `initialize': the scheme http does not accept registry part: ::1:80 (or bad hostname?) (URI::InvalidURIError)
+    #    	from /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/uri/http.rb:84:in `initialize'
+    #    	from /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/uri/common.rb:214:in `new'
+    #    	from /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/uri/common.rb:214:in `parse'
+    #    	from /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/uri/common.rb:747:in `parse'
+    #    	from /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/uri/common.rb:994:in `URI'
+    #    	from /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/net/http.rb:1027:in `proxy_uri'
+    #    	from -e:1:in `<main>'
+    #
+    # https://bugs.ruby-lang.org/issues/9129
+    Net::HTTP.new("::1", 80).proxy_uri
+  rescue URI::InvalidURIError
+    class Net::HTTP
+
+      def proxy_uri # :nodoc:
+        ipv6_safe_addr = address.to_s.include?(":") ? "[#{address}]" : address
+        @proxy_uri ||= URI("http://#{ipv6_safe_addr}:#{port}").find_proxy
+      end
+
+    end
+  end
+end

data/lib/chef/monkey_patches/uri.rb

@@ -0,0 +1,70 @@
+# Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+# You can redistribute it and/or modify it under either the terms of the
+# 2-clause BSDL (see the file BSDL), or the conditions below:
+#
+#   1. You may make and give away verbatim copies of the source form of the
+#      software without restriction, provided that you duplicate all of the
+#      original copyright notices and associated disclaimers.
+#
+#   2. You may modify your copy of the software in any way, provided that
+#      you do at least ONE of the following:
+#
+#        a) place your modifications in the Public Domain or otherwise
+#           make them Freely Available, such as by posting said
+# 	  modifications to Usenet or an equivalent medium, or by allowing
+# 	  the author to include your modifications in the software.
+#
+#        b) use the modified software only within your corporation or
+#           organization.
+#
+#        c) give non-standard binaries non-standard names, with
+#           instructions on where to get the original software distribution.
+#
+#        d) make other distribution arrangements with the author.
+#
+#   3. You may distribute the software in object code or binary form,
+#      provided that you do at least ONE of the following:
+#
+#        a) distribute the binaries and library files of the software,
+# 	  together with instructions (in the manual page or equivalent)
+# 	  on where to get the original distribution.
+#
+#        b) accompany the distribution with the machine-readable source of
+# 	  the software.
+#
+#        c) give non-standard binaries non-standard names, with
+#           instructions on where to get the original software distribution.
+#
+#        d) make other distribution arrangements with the author.
+#
+#   4. You may modify and include the part of the software into any other
+#      software (possibly commercial).  But some files in the distribution
+#      are not written by the author, so that they are not under these terms.
+#
+#      For the list of those files and their copying conditions, see the
+#      file LEGAL.
+#
+#   5. The scripts and library files supplied as input to or produced as
+#      output from the software do not automatically fall under the
+#      copyright of the software, but belong to whomever generated them,
+#      and may be sold commercially, and may be aggregated with this
+#      software.
+#
+#   6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+#      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+#      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#      PURPOSE.
+
+require 'uri'
+
+unless URI::Generic.instance_methods.map {|m| m.to_s}.include?("hostname")
+
+  class URI::Generic
+    # Copied from the MRI source for Ruby 1.9.3
+    # File lib/uri/generic.rb, line 659
+    def hostname
+      v = self.host
+      /\A\[(.*)\]\z/ =~ v ? $1 : v
+    end
+  end
+end

data/lib/chef/platform/provider_mapping.rb

@@ -369,6 +369,7 @@ class Chef
             :route => Chef::Provider::Route,
             :ifconfig => Chef::Provider::Ifconfig,
             :ruby_block => Chef::Provider::RubyBlock,
+            :whyrun_safe_ruby_block => Chef::Provider::WhyrunSafeRubyBlock,
             :erl_call => Chef::Provider::ErlCall,
             :log => Chef::Provider::Log::ChefLog
           }

data/lib/chef/provider/cookbook_file.rb

@@ -38,6 +38,14 @@ class Chef
         super
       end
 
+      private
+
+      def managing_content?
+        return true if @new_resource.checksum
+        return true if !@new_resource.source.nil? && @action != :create_if_missing
+        false
+      end
+
     end
   end
 end