chef 14.0.202 → 14.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f96a2522ddbe56499bea09ea7cdf72cd70c79680e8571338c43a525a7876cc21
-  data.tar.gz: '04293c6cff5d6482d9a0cf5273da9cc7139b550a94f6e2043a38797e2c68c54a'
+  metadata.gz: 2e193b24c7dc5134566e81762e214f2defe9690571ea49d2b49eef0b42257700
+  data.tar.gz: c0605f463af589d03b64e3071d0a3ec3d645018c11ed80d22757825a0f4c4d0f
 SHA512:
-  metadata.gz: b78b8cfff242ca896ad7c3ae96d81c7ed9d4221c345a589e53564565ddef77a916e719be557c984afe99e6f0c1fd194e53b5d2468a782b35ee45411221a2261c
-  data.tar.gz: e1857d836b14d29bb7a3b2972a21b4fc4636f4cdb9d944c2ee67e1d78c14fee692657fc295e7c23342aef8e38f70eff19f92399911f34444352ac59a763ee152
+  metadata.gz: 4135361fe32d4964d317bbcef9d3b95a09bf2717a0c83c6e4149db536274e51973f9fe828d25d60b91f49322cf61eabf04741d2dfd2099889ef0338eb6091066
+  data.tar.gz: 70f608bfb4320f062b3aa4b85149919067c81070b197fc93d7f71c7abc752167de69615ab95ed4fd7112f077251cb9b167cb0770d97ee49eebfa30ff52da1c28

data/README.md

@@ -85,7 +85,7 @@ The general development process is:
 3. Write code and tests.
 4. Push your feature branch to github and open a pull request against master.
 
-Once your repository is set up, you can start working on the code. We do utilize
+Once your repository is set up, you can start working on the code.  We do utilize
 RSpec for test driven development, so you'll need to get a development
 environment running. Follow the above procedure ("Installing from Git") to get
 your local copy of the source running.

data/VERSION

@@ -1 +1 @@
-14.0.202
+14.1.1

data/chef-universal-mingw32.gemspec

@@ -2,7 +2,6 @@ gemspec = eval(IO.read(File.expand_path("../chef.gemspec", __FILE__)))
 
 gemspec.platform = Gem::Platform.new(%w{universal mingw32})
 
-gemspec.add_dependency "ffi", "~> 1.9"
 gemspec.add_dependency "win32-api", "~> 1.5.3"
 gemspec.add_dependency "win32-dir", "~> 0.5.0"
 gemspec.add_dependency "win32-event", "~> 0.6.1"
@@ -15,6 +14,7 @@ gemspec.add_dependency "win32-process", "~> 0.8.2"
 gemspec.add_dependency "win32-service", "~> 0.8.7"
 gemspec.add_dependency "windows-api", "~> 0.4.4"
 gemspec.add_dependency "wmi-lite", "~> 1.0"
+gemspec.add_dependency "win32-taskscheduler", "~> 0.4.0"
 gemspec.extensions << "ext/win32-eventlog/Rakefile"
 gemspec.files += %w{ext/win32-eventlog/Rakefile ext/win32-eventlog/chef-log.man}
 

data/chef.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-archive", "~> 0.4"
   s.add_dependency "ohai", "~> 14.0"
 
+  # ffi 1.9.22+1.9.23 are buggy in our spec/unit/application/client_spec.rb tests on el6/el7
+  s.add_dependency "ffi", "< 1.9.22"
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "net-ssh", "~> 4.2"
   s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"

data/lib/chef/application/apply.rb

@@ -70,7 +70,7 @@ class Chef::Application::Apply < Chef::Application
   option :log_level,
     :short        => "-l LEVEL",
     :long         => "--log_level LEVEL",
-    :description  => "Set the log level (debug, info, warn, error, fatal)",
+    :description  => "Set the log level (trace, debug, info, warn, error, fatal)",
     :proc         => lambda { |l| l.to_sym }
 
   option :help,

data/lib/chef/application/client.rb

@@ -28,6 +28,7 @@ require "chef/workstation_config_loader"
 require "chef/mixin/shell_out"
 require "chef-config/mixin/dot_d"
 require "mixlib/archive"
+require "uri"
 
 class Chef::Application::Client < Chef::Application
   include Chef::Mixin::ShellOut
@@ -82,7 +83,7 @@ class Chef::Application::Client < Chef::Application
   option :log_level,
     :short        => "-l LEVEL",
     :long         => "--log_level LEVEL",
-    :description  => "Set the log level (auto, debug, info, warn, error, fatal)",
+    :description  => "Set the log level (auto, trace, debug, info, warn, error, fatal)",
     :proc         => lambda { |l| l.to_sym }
 
   option :log_location,
@@ -534,10 +535,17 @@ class Chef::Application::Client < Chef::Application
 
   def fetch_recipe_tarball(url, path)
     Chef::Log.trace("Download recipes tarball from #{url} to #{path}")
-    File.open(path, "wb") do |f|
-      open(url) do |r|
-        f.write(r.read)
+    if url =~ URI.regexp
+      File.open(path, "wb") do |f|
+        open(url) do |r|
+          f.write(r.read)
+        end
       end
+    elsif File.exist?(url)
+      FileUtils.cp(url, path)
+    else
+      Chef::Application.fatal! "You specified --recipe-url but the value is neither a valid URL nor a path to a file that exists on disk." +
+        "Please confirm the location of the tarball and try again."
     end
   end
 end

data/lib/chef/application/solo.rb

@@ -81,7 +81,7 @@ class Chef::Application::Solo < Chef::Application
   option :log_level,
     :short        => "-l LEVEL",
     :long         => "--log_level LEVEL",
-    :description  => "Set the log level (debug, info, warn, error, fatal)",
+    :description  => "Set the log level (trace, debug, info, warn, error, fatal)",
     :proc         => lambda { |l| l.to_sym }
 
   option :log_location,

data/lib/chef/chef_fs/chef_fs_data_store.rb

@@ -307,14 +307,25 @@ class Chef
 
         # GET /cookbooks/NAME/VERSION or /cookbook_artifacts/NAME/IDENTIFIER
         elsif %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length == 3
-          with_cookbook_manifest(path) do |manifest, entry|
+          with_entry(path) do |entry|
             cookbook_type = path[0]
+            result = nil
+            begin
+              result = Chef::CookbookManifest.new(entry.chef_object, policy_mode: cookbook_type == "cookbook_artifacts").to_hash
+            rescue Chef::ChefFS::FileSystem::NotFoundError => e
+              raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
+            end
 
-            manifest.each_pair do |key, value|
+            result.each_pair do |key, value|
               if value.is_a?(Array)
                 value.each do |file|
                   if file.is_a?(Hash) && file.has_key?("checksum")
-                    relative = ["file_store", "repo", cookbook_type, entry.name ]
+                    relative = ["file_store", "repo", cookbook_type]
+                    if chef_fs.versioned_cookbooks || cookbook_type == "cookbook_artifacts"
+                      relative << "#{path[1]}-#{path[2]}"
+                    else
+                      relative << path[1]
+                    end
                     relative += file[:path].split("/")
                     file["url"] = ChefZero::RestBase.build_uri(request.base_uri, relative)
                   end
@@ -323,8 +334,8 @@ class Chef
             end
 
             if cookbook_type == "cookbook_artifacts"
-              manifest["metadata"] = manifest["metadata"].to_hash
-              manifest["metadata"].delete_if do |key, value|
+              result["metadata"] = result["metadata"].to_hash
+              result["metadata"].delete_if do |key, value|
                 value == [] ||
                   (value == {} && !%w{dependencies attributes recipes}.include?(key)) ||
                   (value == "" && %w{source_url issues_url}.include?(key)) ||
@@ -332,8 +343,9 @@ class Chef
               end
             end
 
-            Chef::JSONCompat.to_json_pretty(manifest)
+            Chef::JSONCompat.to_json_pretty(result)
           end
+
         else
           with_entry(path) do |entry|
             begin
@@ -507,7 +519,14 @@ class Chef
         elsif %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length == 1
           with_entry(path) do |entry|
             begin
-              entry.children.map { |child| child.chef_object.name.to_s }.uniq
+              if path[0] == "cookbook_artifacts"
+                entry.children.map { |child| child.name.rpartition("-")[0] }.uniq
+              elsif chef_fs.versioned_cookbooks
+                # /cookbooks/name-version -> /cookbooks/name
+                entry.children.map { |child| split_name_version(child.name)[0] }.uniq
+              else
+                entry.children.map { |child| child.name }
+              end
             rescue Chef::ChefFS::FileSystem::NotFoundError
               # If the cookbooks dir doesn't exist, we have no cookbooks (not 404)
               []
@@ -515,15 +534,22 @@ class Chef
           end
 
         elsif %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length == 2
-          result = with_entry([ path[0] ]) do |entry|
-            cookbooks = entry.children.map { |child| child.chef_object }
-            cookbooks.select { |cookbook| cookbook.name.to_s == path[1] }.
-            map { |cookbook| cookbook.version }
-          end
-          if result.empty?
-            raise ChefZero::DataStore::DataNotFoundError.new(path)
+          if chef_fs.versioned_cookbooks || path[0] == "cookbook_artifacts"
+            result = with_entry([ path[0] ]) do |entry|
+              # list /cookbooks/name = filter /cookbooks/name-version down to name
+              entry.children.map { |child| split_name_version(child.name) }.
+              select { |name, version| name == path[1] }.
+              map { |name, version| version }
+            end
+            if result.empty?
+              raise ChefZero::DataStore::DataNotFoundError.new(path)
+            end
+            result
+          else
+            # list /cookbooks/name = <single version>
+            version = get_single_cookbook_version(path)
+            [version]
           end
-          result
 
         else
           result = with_entry(path) do |entry|
@@ -756,26 +782,6 @@ class Chef
         path.length == 1 && BASE_DIRNAMES.include?(path[0])
       end
 
-      def with_cookbook_manifest(path)
-        cookbook_type = path[0]
-        begin
-          # this is fast and equivalent to with_entry() that also returns the cb manifest
-          entry = Chef::ChefFS::FileSystem.resolve_path(chef_fs, to_chef_fs_path(path))
-          yield Chef::CookbookManifest.new(entry.chef_object, policy_mode: cookbook_type == "cookbook_artifacts").to_hash, entry
-        rescue Chef::ChefFS::FileSystem::NotFoundError, ChefZero::DataStore::DataNotFoundError => e
-          # this is very slow and we walk through all the cookbook versions to find ones that have the correct name in the metadata
-          dir = Chef::ChefFS::FileSystem.resolve_path(chef_fs, to_chef_fs_path([path[0]]))
-          entry = dir.children.select do |child|
-            child.chef_object.full_name == "#{path[1]}-#{path[2]}" ||
-              (child.chef_object.name.to_s == path[1] && child.chef_object.identifier == path[2])
-          end[0]
-          raise ChefZero::DataStore::DataNotFoundError.new(path) if entry.nil?
-          yield Chef::CookbookManifest.new(entry.chef_object, policy_mode: cookbook_type == "cookbook_artifacts").to_hash, entry
-        end
-      rescue Chef::ChefFS::FileSystem::NotFoundError => e
-        raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
-      end
-
       def with_entry(path)
         yield Chef::ChefFS::FileSystem.resolve_path(chef_fs, to_chef_fs_path(path))
       rescue Chef::ChefFS::FileSystem::NotFoundError => e