chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/spec/unit/cookbook/synchronizer_spec.rb

@@ -176,11 +176,11 @@ describe Chef::CookbookSynchronizer do
           @cookbook_a_template_default_tempfile = mock("Tempfile for cookbook_a apache.conf.erb template",
                                                      :path => "/tmp/cookbook_a_template_default_tempfile")
         end
-  
+
         after do
           Chef::Config[:no_lazy_load] = false
         end
-  
+
         it "fetches templates and cookbook files" do
           @file_cache.should_receive(:has_key?).
             with("cookbooks/cookbook_a/files/default/megaman.conf").
@@ -206,7 +206,7 @@ describe Chef::CookbookSynchronizer do
           @file_cache.should_receive(:load).
             with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false).
             and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
-  
+
           @synchronizer.sync_cookbooks
         end
       end

data/spec/unit/cookbook/syntax_check_spec.rb

@@ -32,7 +32,7 @@ describe Chef::Cookbook::SyntaxCheck do
     @attr_files = %w{default.rb smokey.rb}.map { |f| File.join(cookbook_path, 'attributes', f) }
     @defn_files = %w{client.rb server.rb}.map { |f| File.join(cookbook_path, 'definitions', f)}
     @recipes = %w{default.rb gigantor.rb one.rb}.map { |f| File.join(cookbook_path, 'recipes', f) }
-    @ruby_files = @attr_files + @defn_files + @recipes
+    @ruby_files = @attr_files + @defn_files + @recipes + [File.join(cookbook_path, "metadata.rb")]
     basenames = %w{ helpers_via_partial_test.erb
                     helper_test.erb
                     openldap_stuff.conf.erb
@@ -74,7 +74,6 @@ describe Chef::Cookbook::SyntaxCheck do
 
     after do
       FileUtils.rm_rf(cache_path) if File.exist?(cache_path)
-      Chef::Config[:syntax_check_cache_path] = nil
     end
 
     describe "and the files have not been syntax checked previously" do

data/spec/unit/cookbook_loader_spec.rb

@@ -71,7 +71,7 @@ describe Chef::CookbookLoader do
         seen[5].should == "openldap"
       end
     end
-  
+
     describe "load_cookbooks" do
       it "should find all the cookbooks in the cookbook path" do
         Chef::Config.cookbook_path << File.expand_path(File.join(CHEF_SPEC_DATA, "hidden-cookbooks"))
@@ -79,7 +79,7 @@ describe Chef::CookbookLoader do
         @cookbook_loader.should have_key(:openldap)
         @cookbook_loader.should have_key(:apache2)
       end
-  
+
       it "should allow you to override an attribute file via cookbook_path" do
         @cookbook_loader[:openldap].attribute_filenames.detect { |f|
           f =~ /cookbooks\/openldap\/attributes\/default.rb/
@@ -88,13 +88,13 @@ describe Chef::CookbookLoader do
           f =~ /kitchen\/openldap\/attributes\/default.rb/
         }.should eql(nil)
       end
-  
+
       it "should load different attribute files from deeper paths" do
         @cookbook_loader[:openldap].attribute_filenames.detect { |f|
           f =~ /kitchen\/openldap\/attributes\/robinson.rb/
         }.should_not eql(nil)
       end
-  
+
       it "should allow you to override a definition file via cookbook_path" do
         @cookbook_loader[:openldap].definition_filenames.detect { |f|
           f =~ /cookbooks\/openldap\/definitions\/client.rb/
@@ -103,13 +103,13 @@ describe Chef::CookbookLoader do
           f =~ /kitchen\/openldap\/definitions\/client.rb/
         }.should eql(nil)
       end
-  
+
       it "should load definition files from deeper paths" do
         @cookbook_loader[:openldap].definition_filenames.detect { |f|
           f =~ /kitchen\/openldap\/definitions\/drewbarrymore.rb/
         }.should_not eql(nil)
       end
-  
+
       it "should allow you to override a recipe file via cookbook_path" do
         @cookbook_loader[:openldap].recipe_filenames.detect { |f|
           f =~ /cookbooks\/openldap\/recipes\/gigantor.rb/
@@ -118,19 +118,19 @@ describe Chef::CookbookLoader do
           f =~ /kitchen\/openldap\/recipes\/gigantor.rb/
         }.should eql(nil)
       end
-  
+
       it "should load recipe files from deeper paths" do
         @cookbook_loader[:openldap].recipe_filenames.detect { |f|
           f =~ /kitchen\/openldap\/recipes\/woot.rb/
         }.should_not eql(nil)
       end
-  
+
       it "should allow you to have an 'ignore' file, which skips loading files in later cookbooks" do
         @cookbook_loader[:openldap].recipe_filenames.detect { |f|
           f =~ /kitchen\/openldap\/recipes\/ignoreme.rb/
         }.should eql(nil)
       end
-  
+
       it "should find files that start with a ." do
         @cookbook_loader[:openldap].file_filenames.detect { |f|
           f =~ /\.dotfile$/
@@ -139,9 +139,9 @@ describe Chef::CookbookLoader do
           f =~ /\.ssh\/id_rsa$/
         }.should =~ /\.ssh\/id_rsa$/
       end
-  
+
       it "should load the metadata for the cookbook" do
-        @cookbook_loader.metadata[:openldap].name.should == :openldap
+        @cookbook_loader.metadata[:openldap].name.to_s.should == "openldap"
         @cookbook_loader.metadata[:openldap].should be_a_kind_of(Chef::Cookbook::Metadata)
       end
 
@@ -173,6 +173,22 @@ describe Chef::CookbookLoader do
       seen.should have_key("openldap")
     end
 
+    it "should not duplicate keys when serialized to JSON" do
+      # Chef JSON serialization will generate duplicate keys if given
+      # a Hash containing matching string and symbol keys. See CHEF-4571.
+      aa = @cookbook_loader["openldap"]
+      aa.to_hash["metadata"].recipes.keys.should_not include(:openldap)
+      aa.to_hash["metadata"].recipes.keys.should include("openldap")
+      expected_desc = "Main Open LDAP configuration"
+      aa.to_hash["metadata"].recipes["openldap"].should == expected_desc
+      raw = aa.to_hash["metadata"].recipes.to_json
+      search_str = "\"openldap\":\""
+      key_idx = raw.index(search_str)
+      key_idx.should be > 0
+      dup_idx = raw[(key_idx + 1)..-1].index(search_str)
+      dup_idx.should be_nil
+    end
+
     it "should not load the cookbook again when accessed" do
       @cookbook_loader.should_not_receive('load_cookbook')
       @cookbook_loader["openldap"]
@@ -202,7 +218,7 @@ describe Chef::CookbookLoader do
         end
         seen.should have_key("openldap")
         seen.should have_key("apache2")
-      end   
+      end
     end
   end # loading only one cookbook
 end

data/spec/unit/cookbook_manifest_spec.rb

@@ -7,9 +7,9 @@
 # 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.
@@ -96,7 +96,7 @@ describe "Chef::CookbookVersion manifest" do
          :checksum => "csum-host-2",
          :specificity => "host-examplehost.example.org"
        },
-       
+
        {
          :name => "anotherfile1.rb",
          :path => "files/ubuntu-9.10/adirectory/anotherfile1.rb.platform-full-version",
@@ -122,7 +122,7 @@ describe "Chef::CookbookVersion manifest" do
          :checksum => "csum-platver-partial-2",
          :specificity => "nweubuntu-9"
        },
-       
+
        {
          :name => "anotherfile1.rb",
          :path => "files/ubuntu/adirectory/anotherfile1.rb.platform",
@@ -135,7 +135,7 @@ describe "Chef::CookbookVersion manifest" do
          :checksum => "csum-plat-2",
          :specificity => "ubuntu"
        },
-       
+
        {
          :name => "anotherfile1.rb",
          :path => "files/default/adirectory/anotherfile1.rb.default",
@@ -201,8 +201,8 @@ describe "Chef::CookbookVersion manifest" do
     }
 
   end
-  
-  
+
+
   it "should return a manifest record based on priority preference: host" do
     node = Chef::Node.new
     node.automatic_attrs[:platform] = "ubuntu"
@@ -213,7 +213,7 @@ describe "Chef::CookbookVersion manifest" do
     manifest_record.should_not be_nil
     manifest_record[:checksum].should == "csum-host"
   end
-  
+
   it "should return a manifest record based on priority preference: platform & full version" do
     node = Chef::Node.new
     node.automatic_attrs[:platform] = "ubuntu"
@@ -235,7 +235,7 @@ describe "Chef::CookbookVersion manifest" do
     manifest_record.should_not be_nil
     manifest_record[:checksum].should == "csum-platver-partial"
   end
-  
+
   it "should return a manifest record based on priority preference: platform only" do
     node = Chef::Node.new
     node.automatic_attrs[:platform] = "ubuntu"
@@ -246,7 +246,7 @@ describe "Chef::CookbookVersion manifest" do
     manifest_record.should_not be_nil
     manifest_record[:checksum].should == "csum-plat"
   end
-  
+
   it "should return a manifest record based on priority preference: default" do
     node = Chef::Node.new
     node.automatic_attrs[:platform] = "notubuntu"
@@ -301,7 +301,7 @@ describe "Chef::CookbookVersion manifest" do
     manifest_record.should_not be_nil
     manifest_record[:checksum].should == "csum4-platver-full"
   end
-  
+
   describe "when fetching the contents of a directory by file specificity" do
 
     it "should return a directory of manifest records based on priority preference: host" do

data/spec/unit/cookbook_site_streaming_uploader.rb

@@ -0,0 +1,200 @@
+#
+# Author:: Xabier de Zuazo (xabier@onddo.com)
+# Copyright:: Copyright (c) 2013 Onddo Labs, SL.
+# 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 'spec_helper'
+
+require 'chef/cookbook_site_streaming_uploader'
+
+class FakeTempfile
+  def initialize(basename)
+    @basename = basename
+  end
+
+  def close
+  end
+
+  def path
+    "#{@basename}.ZZZ"
+  end
+
+end
+
+describe Chef::CookbookSiteStreamingUploader do
+
+  describe "create_build_dir" do
+
+    before(:each) do
+      @cookbook_repo = File.expand_path(File.join(CHEF_SPEC_DATA, 'cookbooks'))
+      @loader = Chef::CookbookLoader.new(@cookbook_repo)
+      @loader.load_cookbooks
+      File.stub(:unlink).and_return()
+    end
+
+    it "should create the cookbook tmp dir" do
+      cookbook = @loader[:openldap]
+      files_count = Dir.glob(File.join(@cookbook_repo, cookbook.name.to_s, '**', '*'), File::FNM_DOTMATCH).count { |file| File.file?(file) }
+
+      Tempfile.should_receive(:new).with("chef-#{cookbook.name}-build").and_return(FakeTempfile.new("chef-#{cookbook.name}-build"))
+      FileUtils.should_receive(:mkdir_p).exactly(files_count + 1).times
+      FileUtils.should_receive(:cp).exactly(files_count).times
+      Chef::CookbookSiteStreamingUploader.create_build_dir(cookbook)
+    end
+
+  end # create_build_dir
+
+  describe "make_request" do
+
+    before(:each) do
+      @uri = "http://cookbooks.dummy.com/api/v1/cookbooks"
+      @secret_filename = File.join(CHEF_SPEC_DATA, 'ssl/private_key.pem')
+      @rsa_key = File.read(@secret_filename)
+      response = Net::HTTPResponse.new('1.0', '200', 'OK')
+      Net::HTTP.any_instance.stub(:request).and_return(response)
+    end
+
+    it "should send an http request" do
+      Net::HTTP.any_instance.should_receive(:request)
+      Chef::CookbookSiteStreamingUploader.make_request(:post, @uri, 'bill', @secret_filename)
+    end
+
+    it "should read the private key file" do
+      File.should_receive(:read).with(@secret_filename).and_return(@rsa_key)
+      Chef::CookbookSiteStreamingUploader.make_request(:post, @uri, 'bill', @secret_filename)
+    end
+
+    it "should add the authentication signed header" do
+      Mixlib::Authentication::SigningObject.any_instance.should_receive(:sign).and_return({})
+      Chef::CookbookSiteStreamingUploader.make_request(:post, @uri, 'bill', @secret_filename)
+    end
+
+    it "should be able to send post requests" do
+      post = Net::HTTP::Post.new(@uri, {})
+
+      Net::HTTP::Post.should_receive(:new).once.and_return(post)
+      Net::HTTP::Put.should_not_receive(:new)
+      Net::HTTP::Get.should_not_receive(:new)
+      Chef::CookbookSiteStreamingUploader.make_request(:post, @uri, 'bill', @secret_filename)
+    end
+
+    it "should be able to send put requests" do
+      put = Net::HTTP::Put.new(@uri, {})
+
+      Net::HTTP::Post.should_not_receive(:new)
+      Net::HTTP::Put.should_receive(:new).once.and_return(put)
+      Net::HTTP::Get.should_not_receive(:new)
+      Chef::CookbookSiteStreamingUploader.make_request(:put, @uri, 'bill', @secret_filename)
+    end
+
+    it "should be able to receive files to attach as argument" do
+      Chef::CookbookSiteStreamingUploader.make_request(:put, @uri, 'bill', @secret_filename, {
+        :myfile => File.new(File.join(CHEF_SPEC_DATA, 'config.rb')), # a dummy file
+      })
+    end
+
+    it "should be able to receive strings to attach as argument" do
+      Chef::CookbookSiteStreamingUploader.make_request(:put, @uri, 'bill', @secret_filename, {
+        :mystring => 'Lorem ipsum',
+      })
+    end
+
+    it "should be able to receive strings and files as argument at the same time" do
+      Chef::CookbookSiteStreamingUploader.make_request(:put, @uri, 'bill', @secret_filename, {
+        :myfile1 => File.new(File.join(CHEF_SPEC_DATA, 'config.rb')),
+        :mystring1 => 'Lorem ipsum',
+        :myfile2 => File.new(File.join(CHEF_SPEC_DATA, 'config.rb')),
+        :mystring2 => 'Dummy text',
+      })
+    end
+
+  end # make_request
+
+  describe "StreamPart" do
+    before(:each) do
+      @file = File.new(File.join(CHEF_SPEC_DATA, 'config.rb'))
+      @stream_part = Chef::CookbookSiteStreamingUploader::StreamPart.new(@file, File.size(@file))
+    end
+
+    it "should create a StreamPart" do
+      @stream_part.should be_instance_of(Chef::CookbookSiteStreamingUploader::StreamPart)
+    end
+
+    it "should expose its size" do
+      @stream_part.size.should eql(File.size(@file))
+    end
+
+    it "should read with offset and how_much" do
+      content = @file.read(4)
+      @file.rewind
+      @stream_part.read(0, 4).should eql(content)
+    end
+
+  end # StreamPart
+
+  describe "StringPart" do
+    before(:each) do
+      @str = 'What a boring string'
+      @string_part = Chef::CookbookSiteStreamingUploader::StringPart.new(@str)
+    end
+
+    it "should create a StringPart" do
+      @string_part.should be_instance_of(Chef::CookbookSiteStreamingUploader::StringPart)
+    end
+
+    it "should expose its size" do
+      @string_part.size.should eql(@str.size)
+    end
+
+    it "should read with offset and how_much" do
+      @string_part.read(2, 4).should eql(@str[2, 4])
+    end
+
+  end # StringPart
+
+  describe "MultipartStream" do
+    before(:each) do
+      @string1 = "stream1"
+      @string2 = "stream2"
+      @stream1 = Chef::CookbookSiteStreamingUploader::StringPart.new(@string1)
+      @stream2 = Chef::CookbookSiteStreamingUploader::StringPart.new(@string2)
+      @parts = [ @stream1, @stream2 ]
+
+      @multipart_stream = Chef::CookbookSiteStreamingUploader::MultipartStream.new(@parts)
+    end
+
+    it "should create a MultipartStream" do
+      @multipart_stream.should be_instance_of(Chef::CookbookSiteStreamingUploader::MultipartStream)
+    end
+
+    it "should expose its size" do
+      @multipart_stream.size.should eql(@stream1.size + @stream2.size)
+    end
+
+    it "should read with how_much" do
+      @multipart_stream.read(10).should eql("#{@string1}#{@string2}"[0, 10])
+    end
+
+    it "should read receiving destination buffer as second argument (CHEF-4456: Ruby 2 compat)" do
+      dst_buf = ''
+      @multipart_stream.read(10, dst_buf)
+      dst_buf.should eql("#{@string1}#{@string2}"[0, 10])
+    end
+
+  end # MultipartStream
+
+end
+

data/spec/unit/cookbook_version_spec.rb

@@ -130,6 +130,12 @@ describe Chef::CookbookVersion do
       @cookbook_version.provider_filenames   = @cookbook[:provider_filenames]
       @cookbook_version.root_filenames       = @cookbook[:root_filenames]
       @cookbook_version.metadata_filenames   = @cookbook[:metadata_filenames]
+
+      # Used to test file-specificity related file lookups
+      @node = Chef::Node.new
+      @node.set[:platform] = "ubuntu"
+      @node.set[:platform_version] = "13.04"
+      @node.name("testing")
     end
 
     it "generates a manifest containing the cookbook's files" do
@@ -211,6 +217,16 @@ describe Chef::CookbookVersion do
       readme["specificity"].should == "default"
     end
 
+    it "determines whether a template is available for a given node" do
+      @cookbook_version.should have_template_for_node(@node, "configuration.erb")
+      @cookbook_version.should_not have_template_for_node(@node, "missing.erb")
+    end
+
+    it "determines whether a cookbook_file is available for a given node" do
+      @cookbook_version.should have_cookbook_file_for_node(@node, "giant_blob.tgz")
+      @cookbook_version.should_not have_cookbook_file_for_node(@node, "missing.txt")
+    end
+
     describe "raises an error when attempting to load a missing cookbook_file and" do
       before do
         node = Chef::Node.new.tap do |n|