chef 12.6.0 → 12.7.2

data/lib/chef/cookbook/remote_file_vendor.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Tim Hinderliter (<tim@opscode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# Author:: Tim Hinderliter (<tim@chef.io>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/cookbook/file_vendor'
+require "chef/cookbook/file_vendor"
 
 class Chef
   class Cookbook
@@ -45,10 +45,10 @@ class Chef
         end
 
         raise "No such segment #{segment} in cookbook #{@cookbook_name}" unless @manifest[segment]
-        found_manifest_record = @manifest[segment].find {|manifest_record| manifest_record[:path] == filename }
+        found_manifest_record = @manifest[segment].find { |manifest_record| manifest_record[:path] == filename }
         raise "No such file #{filename} in #{@cookbook_name}" unless found_manifest_record
 
-        cache_filename = File.join("cookbooks", @cookbook_name, found_manifest_record['path'])
+        cache_filename = File.join("cookbooks", @cookbook_name, found_manifest_record["path"])
 
         # update valid_cache_entries so the upstream cache cleaner knows what
         # we've used.
@@ -62,8 +62,8 @@ class Chef
         # If the checksums are different between on-disk (current) and on-server
         # (remote, per manifest), do the update. This will also execute if there
         # is no current checksum.
-        if current_checksum != found_manifest_record['checksum']
-          raw_file = @rest.get_rest(found_manifest_record[:url], true)
+        if current_checksum != found_manifest_record["checksum"]
+          raw_file = @rest.streaming_request(found_manifest_record[:url])
 
           Chef::Log.debug("Storing updated #{cache_filename} in the cache.")
           Chef::FileCache.move_to(raw_file.path, cache_filename)

data/lib/chef/cookbook/synchronizer.rb

@@ -1,6 +1,7 @@
-require 'chef/client'
-require 'chef/util/threaded_job_queue'
-require 'singleton'
+require "chef/client"
+require "chef/util/threaded_job_queue"
+require "chef/server_api"
+require "singleton"
 
 class Chef
 
@@ -140,7 +141,7 @@ class Chef
     # === Returns
     # true:: Always returns true
     def sync_cookbooks
-      Chef::Log.info("Loading cookbooks [#{cookbooks.map {|ckbk| ckbk.name + '@' + ckbk.version}.join(', ')}]")
+      Chef::Log.info("Loading cookbooks [#{cookbooks.map { |ckbk| ckbk.name + '@' + ckbk.version }.join(', ')}]")
       Chef::Log.debug("Cookbooks detail: #{cookbooks.inspect}")
 
       clear_obsoleted_cookbooks
@@ -175,7 +176,7 @@ class Chef
     # Saves the full_path to the file of the cookbook to be updated
     # in the manifest later
     def save_full_file_path(file, full_path)
-      @cookbook_full_file_paths[file.cookbook] ||= { }
+      @cookbook_full_file_paths[file.cookbook] ||= {}
       @cookbook_full_file_paths[file.cookbook][file.segment] ||= [ ]
       @cookbook_full_file_paths[file.cookbook][file.segment] << full_path
     end
@@ -244,14 +245,14 @@ class Chef
     # === Returns
     # Full path to the cached file as a String
     def sync_file(file)
-      cache_filename = File.join("cookbooks", file.cookbook.name, file.manifest_record['path'])
+      cache_filename = File.join("cookbooks", file.cookbook.name, file.manifest_record["path"])
       mark_cached_file_valid(cache_filename)
 
       # If the checksums are different between on-disk (current) and on-server
       # (remote, per manifest), do the update. This will also execute if there
       # is no current checksum.
-      if !cached_copy_up_to_date?(cache_filename, file.manifest_record['checksum'])
-        download_file(file.manifest_record['url'], cache_filename)
+      if !cached_copy_up_to_date?(cache_filename, file.manifest_record["checksum"])
+        download_file(file.manifest_record["url"], cache_filename)
         @events.updated_cookbook_file(file.cookbook.name, cache_filename)
       else
         Chef::Log.debug("Not storing #{cache_filename}, as the cache is up to date.")
@@ -274,7 +275,7 @@ class Chef
     # downloaded to the path +destination+ which is relative to the Chef file
     # cache root.
     def download_file(url, destination)
-      raw_file = server_api.get_rest(url, true)
+      raw_file = server_api.streaming_request(url)
 
       Chef::Log.info("Storing updated #{destination} in the cache.")
       cache.move_to(raw_file.path, destination)
@@ -286,7 +287,7 @@ class Chef
     end
 
     def server_api
-      Chef::REST.new(Chef::Config[:chef_server_url])
+      Chef::ServerAPI.new(Chef::Config[:chef_server_url])
     end
 
   end

data/lib/chef/cookbook/syntax_check.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +16,12 @@
 # limitations under the License.
 #
 
-require 'pathname'
-require 'stringio'
-require 'erubis'
-require 'chef/mixin/shell_out'
-require 'chef/mixin/checksum'
-require 'chef/util/path_helper'
+require "pathname"
+require "stringio"
+require "erubis"
+require "chef/mixin/shell_out"
+require "chef/mixin/checksum"
+require "chef/util/path_helper"
 
 class Chef
   class Cookbook
@@ -43,7 +43,7 @@ class Chef
 
         # Create a new PersistentSet. Values in the set are persisted by
         # creating a file in the +cache_path+ directory.
-        def initialize(cache_path=Chef::Config[:syntax_check_cache_path])
+        def initialize(cache_path = Chef::Config[:syntax_check_cache_path])
           @cache_path = cache_path
           @cache_path_created = false
         end
@@ -82,7 +82,7 @@ class Chef
 
       # Creates a new SyntaxCheck given the +cookbook_name+ and a +cookbook_path+.
       # If no +cookbook_path+ is given, +Chef::Config.cookbook_path+ is used.
-      def self.for_cookbook(cookbook_name, cookbook_path=nil)
+      def self.for_cookbook(cookbook_name, cookbook_path = nil)
         cookbook_path ||= Chef::Config.cookbook_path
         unless cookbook_path
           raise ArgumentError, "Cannot find cookbook #{cookbook_name} unless Chef::Config.cookbook_path is set or an explicit cookbook path is given"
@@ -115,7 +115,7 @@ class Chef
 
       def ruby_files
         path  = Chef::Util::PathHelper.escape_glob(cookbook_path)
-        files = Dir[File.join(path, '**', '*.rb')]
+        files = Dir[File.join(path, "**", "*.rb")]
         files = remove_ignored_files(files)
         files = remove_uninteresting_ruby_files(files)
         files
@@ -133,7 +133,7 @@ class Chef
       end
 
       def template_files
-        remove_ignored_files Dir[File.join(Chef::Util::PathHelper.escape_glob(cookbook_path), '**/templates/**', '*.erb')]
+        remove_ignored_files Dir[File.join(Chef::Util::PathHelper.escape_glob(cookbook_path), "**/templates/**", "*.erb")]
       end
 
       def untested_template_files
@@ -209,7 +209,7 @@ class Chef
 
       # Debug a syntax error in a template.
       def invalid_erb_file(erb_file, error_message)
-        file_relative_path = erb_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
+        file_relative_path = erb_file[/^#{Regexp.escape(cookbook_path + File::Separator)}(.*)/, 1]
         Chef::Log.fatal("Erb template #{file_relative_path} has a syntax error:")
         error_message.each_line { |l| Chef::Log.fatal(l.chomp) }
         nil
@@ -244,7 +244,7 @@ class Chef
       # Debugs ruby syntax errors by printing the path to the file and any
       # diagnostic info given in +error_message+
       def invalid_ruby_file(ruby_file, error_message)
-        file_relative_path = ruby_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
+        file_relative_path = ruby_file[/^#{Regexp.escape(cookbook_path + File::Separator)}(.*)/, 1]
         Chef::Log.fatal("Cookbook file #{file_relative_path} has a ruby syntax error:")
         error_message.each_line { |l| Chef::Log.fatal(l.chomp) }
         false

data/lib/chef/cookbook_loader.rb

@@ -1,9 +1,9 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Christopher Walters (<cw@opscode.com>)
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Christopher Walters (<cw@chef.io>)
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# Copyright:: Copyright (c) 2009 Daniel DeLeo
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2009-2016, Daniel DeLeo
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,12 +18,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'chef/config'
-require 'chef/exceptions'
-require 'chef/cookbook/cookbook_version_loader'
-require 'chef/cookbook_version'
-require 'chef/cookbook/chefignore'
-require 'chef/cookbook/metadata'
+require "chef/config"
+require "chef/exceptions"
+require "chef/cookbook/cookbook_version_loader"
+require "chef/cookbook_version"
+require "chef/cookbook/chefignore"
+require "chef/cookbook/metadata"
 
 #
 # CookbookLoader class loads the cookbooks lazily as read
@@ -44,7 +44,7 @@ class Chef
       @cookbooks_by_name = Mash.new
       @loaded_cookbooks = {}
       @metadata = Mash.new
-      @cookbooks_paths = Hash.new {|h,k| h[k] = []} # for deprecation warnings
+      @cookbooks_paths = Hash.new { |h, k| h[k] = [] } # for deprecation warnings
       @chefignores = {}
       @repo_paths = repo_paths.map do |repo_path|
         repo_path = File.expand_path(repo_path)
@@ -62,7 +62,7 @@ class Chef
 
     def merged_cookbook_paths # for deprecation warnings
       merged_cookbook_paths = {}
-      @merged_cookbooks.each {|c| merged_cookbook_paths[c] = @cookbooks_paths[c]}
+      @merged_cookbooks.each { |c| merged_cookbook_paths[c] = @cookbooks_paths[c] }
       merged_cookbook_paths
     end
 
@@ -106,7 +106,7 @@ class Chef
       if @cookbooks_by_name.has_key?(cookbook.to_sym) or load_cookbook(cookbook.to_sym)
         @cookbooks_by_name[cookbook.to_sym]
       else
-        raise Exceptions::CookbookNotFoundInRepo, "Cannot find a cookbook named #{cookbook.to_s}; did you forget to add metadata to a cookbook? (https://docs.chef.io/config_rb_metadata.html)"
+        raise Exceptions::CookbookNotFoundInRepo, "Cannot find a cookbook named #{cookbook}; did you forget to add metadata to a cookbook? (https://docs.chef.io/config_rb_metadata.html)"
       end
     end
 
@@ -119,7 +119,7 @@ class Chef
     alias :key? :has_key?
 
     def each
-      @cookbooks_by_name.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |cname|
+      @cookbooks_by_name.keys.sort { |a, b| a.to_s <=> b.to_s }.each do |cname|
         yield(cname, @cookbooks_by_name[cname])
       end
     end

data/lib/chef/cookbook_manifest.rb

@@ -1,5 +1,5 @@
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2015 Opscode, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'forwardable'
-require 'chef/util/path_helper'
-require 'chef/log'
+require "forwardable"
+require "chef/util/path_helper"
+require "chef/log"
 
 class Chef
 
@@ -127,14 +127,14 @@ class Chef
 
     def to_hash
       result = manifest.dup
-      result['frozen?'] = frozen_version?
-      result['chef_type'] = 'cookbook_version'
+      result["frozen?"] = frozen_version?
+      result["chef_type"] = "cookbook_version"
       result.to_hash
     end
 
     def to_json(*a)
       result = to_hash
-      result['json_class'] = "Chef::CookbookVersion"
+      result["json_class"] = "Chef::CookbookVersion"
       Chef::JSONCompat.to_json(result, *a)
     end
 
@@ -152,6 +152,7 @@ class Chef
     def named_cookbook_url
       "#{cookbook_url_path}/#{name}"
     end
+
     # Adds the `force=true` parameter to the upload URL. This allows
     # the user to overwrite a frozen cookbook (a PUT against the
     # normal #save_url raises a 409 Conflict in this case).
@@ -169,7 +170,7 @@ class Chef
 
       COOKBOOK_SEGMENTS.each do |segment|
         next unless @manifest.has_key?(segment)
-        filenames = @manifest[segment].map{|manifest_record| manifest_record['name']}
+        filenames = @manifest[segment].map { |manifest_record| manifest_record["name"] }
 
         cookbook_version.replace_segment_filenames(segment, filenames)
       end
@@ -193,8 +194,8 @@ class Chef
         :templates => Array.new,
         :resources => Array.new,
         :providers => Array.new,
-        :root_files => Array.new
-      })
+        :root_files => Array.new,
+      },)
       @checksums = {}
 
       if !root_paths || root_paths.size == 0
@@ -215,8 +216,8 @@ class Chef
             :name => file_name,
             :path => path,
             :checksum => csum,
-            :specificity => specificity
-          })
+            :specificity => specificity,
+          },)
 
           manifest[segment] << rs
         end
@@ -243,17 +244,17 @@ class Chef
 
         parts = pathname.each_filename.take(2)
         # Check if path is actually under root_path
-        next if parts[0] == '..'
+        next if parts[0] == ".."
         if segment == :templates || segment == :files
           # Check if pathname looks like files/foo or templates/foo (unscoped)
           if pathname.each_filename.to_a.length == 2
             # Use root_default in case the same path exists at root_default and default
-            return [ pathname.to_s, 'root_default' ]
+            return [ pathname.to_s, "root_default" ]
           else
             return [ pathname.to_s, parts[1] ]
           end
         else
-          return [ pathname.to_s, 'default' ]
+          return [ pathname.to_s, "default" ]
         end
       end
       Chef::Log.error("Cookbook file #{segment_file} not under cookbook root paths #{root_paths.inspect}.")

data/lib/chef/cookbook_site_streaming_uploader.rb

@@ -1,8 +1,8 @@
 #
 # Author:: Stanislav Vitvitskiy
-# Author:: Nuo Yan (nuo@opscode.com)
-# Author:: Christopher Walters (<cw@opscode.com>)
-# Copyright:: Copyright (c) 2009, 2010 Opscode, Inc.
+# Author:: Nuo Yan (nuo@chef.io)
+# Author:: Christopher Walters (<cw@chef.io>)
+# Copyright:: Copyright 2009-2016, 2010-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,10 +18,10 @@
 # limitations under the License.
 #
 
-require 'uri'
-require 'net/http'
-require 'mixlib/authentication/signedheaderauth'
-require 'openssl'
+require "uri"
+require "net/http"
+require "mixlib/authentication/signedheaderauth"
+require "openssl"
 
 class Chef
   # == Chef::CookbookSiteStreamingUploader
@@ -31,7 +31,7 @@ class Chef
   # inspired by http://stanislavvitvitskiy.blogspot.com/2008/12/multipart-post-in-ruby.html
   class CookbookSiteStreamingUploader
 
-    DefaultHeaders = { 'accept' => 'application/json', 'x-chef-version' => ::Chef::VERSION }
+    DefaultHeaders = { "accept" => "application/json", "x-chef-version" => ::Chef::VERSION }
 
     class << self
 
@@ -73,7 +73,7 @@ class Chef
       end
 
       def make_request(http_verb, to_url, user_id, secret_key_filename, params = {}, headers = {})
-        boundary = '----RubyMultipartClient' + rand(1000000).to_s + 'ZZZZZ'
+        boundary = "----RubyMultipartClient" + rand(1000000).to_s + "ZZZZZ"
         parts = []
         content_file = nil
 
@@ -114,14 +114,14 @@ class Chef
         # TODO: tim: 2009-12-28: It'd be nice to remove this special case, and
         # always hash the entire request body. In the file case it would just be
         # expanded multipart text - the entire body of the POST.
-        content_body = parts.inject("") { |result,part| result + part.read(0, part.size) }
+        content_body = parts.inject("") { |result, part| result + part.read(0, part.size) }
         content_file.rewind if content_file # we consumed the file for the above operation, so rewind it.
 
         signing_options = {
-          :http_method=>http_verb,
-          :path=>url.path,
-          :user_id=>user_id,
-          :timestamp=>timestamp}
+          :http_method => http_verb,
+          :path => url.path,
+          :user_id => user_id,
+          :timestamp => timestamp }
         (content_file && signing_options[:file] = content_file) || (signing_options[:body] = (content_body || ""))
 
         headers.merge!(Mixlib::Authentication::SignedHeaderAuth.signing_object(signing_options).sign(secret_key))
@@ -129,7 +129,7 @@ class Chef
         content_file.rewind if content_file
 
         # net/http doesn't like symbols for header keys, so we'll to_s each one just in case
-        headers = DefaultHeaders.merge(Hash[*headers.map{ |k,v| [k.to_s, v] }.flatten])
+        headers = DefaultHeaders.merge(Hash[*headers.map { |k, v| [k.to_s, v] }.flatten])
 
         req = case http_verb
               when :put
@@ -138,7 +138,7 @@ class Chef
                 Net::HTTP::Post.new(url.path, headers)
               end
         req.content_length = body_stream.size
-        req.content_type = 'multipart/form-data; boundary=' + boundary unless parts.empty?
+        req.content_type = "multipart/form-data; boundary=" + boundary unless parts.empty?
         req.body_stream = body_stream
 
         http = Chef::HTTP::BasicClient.new(url).http_client
@@ -201,12 +201,12 @@ class Chef
       end
 
       def size
-        @parts.inject(0) {|size, part| size + part.size}
+        @parts.inject(0) { |size, part| size + part.size }
       end
 
       def read(how_much, dst_buf = nil)
         if @part_no >= @parts.size
-          dst_buf.replace('') if dst_buf
+          dst_buf.replace("") if dst_buf
           return dst_buf
         end
 
@@ -229,14 +229,14 @@ class Chef
           next_part = read(how_much_next_part)
           result = current_part + if next_part
                                     next_part
-          else
-            ''
-          end
+                                  else
+                                    ""
+                                  end
         else
           @part_offset += how_much_current_part
           result = current_part
         end
-        dst_buf ? dst_buf.replace(result || '') : result
+        dst_buf ? dst_buf.replace(result || "") : result
       end
     end