chef 0.9.0.a8 → 0.9.0.a10

data/lib/chef/cookbook_version.rb

@@ -765,7 +765,7 @@ class Chef
           specificity = "default"
           
           if segment == :root_files
-            matcher = segment_file.match("/#{name}/(.+)")
+            matcher = segment_file.match(".+/#{name}/(.+)")
             file_name = matcher[1]
             path = file_name
           elsif segment == :templates || segment == :files
@@ -830,4 +830,4 @@ class Chef
     end
     
   end
-end
+end

data/lib/chef/knife/cookbook_upload.rb

@@ -168,6 +168,7 @@ class Chef
             on_disk_path = checksums_to_on_disk_paths[manifest_record[:checksum]]
             dest = File.join(tmp_cookbook_dir, cookbook.name.to_s, path_in_cookbook)
             FileUtils.mkdir_p(File.dirname(dest))
+            Chef::Log.debug("Staging #{on_disk_path} to #{dest}")
             FileUtils.cp(on_disk_path, dest)
           end
         end
@@ -182,6 +183,8 @@ class Chef
         kcm.config[:cookbook_path] = [ tmp_cookbook_dir ]
         kcm.name_args = [ cookbook.name.to_s ]
         kcm.run
+
+        tmp_cookbook_dir
       end
 
       def catch_auth_exceptions

data/lib/chef/provider/package.rb

@@ -143,7 +143,7 @@ class Chef
 
         Chef::Log.debug("Fetching preseed file to #{cache_seed_to}")
 
-        remote_file = Chef::Resource::CookbookFile.new(cache_seed_to)
+        remote_file = Chef::Resource::CookbookFile.new(cache_seed_to, run_context)
         remote_file.cookbook_name = @new_resource.cookbook_name
         remote_file.source(@new_resource.response_file)
         remote_file.backup(false)

data/lib/chef/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 class Chef
-  VERSION = '0.9.0.a8'
+  VERSION = '0.9.0.a10'
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
+  hash: 829723527
   prerelease: true
   segments: 
   - 0
   - 9
   - 0
-  - a8
-  version: 0.9.0.a8
+  - a10
+  version: 0.9.0.a10
 platform: ruby
 authors: 
 - Adam Jacob
@@ -26,6 +27,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -41,6 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -56,6 +59,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -71,6 +75,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -86,6 +91,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 5
@@ -101,6 +107,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 0
@@ -108,6 +115,7 @@ dependencies:
         version: 1.0.4
     - - <=
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 5
@@ -123,6 +131,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
@@ -138,6 +147,7 @@ dependencies:
     requirements: 
     - - <=
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
@@ -153,6 +163,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -166,6 +177,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -179,6 +191,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -192,6 +205,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -205,6 +219,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -537,6 +552,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -545,6 +561,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3