chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

data/spec/functional/resource/remote_directory_spec.rb

@@ -22,12 +22,15 @@ describe Chef::Resource::RemoteDirectory do
   include_context Chef::Resource::Directory
 
   let(:directory_base) { "directory_spec" }
+  let(:default_mode) { ((0100777 - File.umask) & 07777).to_s(8) }
 
   def create_resource
     cookbook_repo = File.expand_path(File.join(CHEF_SPEC_DATA, "cookbooks"))
     Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest, cookbook_repo) }
     node = Chef::Node.new
-    cookbook_collection = Chef::CookbookCollection.new(Chef::CookbookLoader.new(cookbook_repo))
+    cl = Chef::CookbookLoader.new(cookbook_repo)
+    cl.load_cookbooks
+    cookbook_collection = Chef::CookbookCollection.new(cl)
     events = Chef::EventDispatch::Dispatcher.new
     run_context = Chef::RunContext.new(node, cookbook_collection, events)
 
@@ -37,57 +40,90 @@ describe Chef::Resource::RemoteDirectory do
     resource
   end
 
-  let!(:resource) do
+  def create_extraneous_files
+    FileUtils.mkdir_p(File.join(path, 'remotesubdir'))
+    @existing1 = File.join(path, 'marked_for_death.txt')
+    @existing2 = File.join(path, 'remotesubdir', 'marked_for_death_again.txt')
+    FileUtils.touch(@existing1)
+    FileUtils.touch(@existing2)
+  end
+
+  let(:resource) do
+    create_resource
+  end
+
+  let(:resource_second_pass) do
     create_resource
   end
 
+  # See spec/data/cookbooks/openldap/files/default
+  let(:expected_files) do
+    [
+      File.join(path, 'remote_dir_file1.txt'),
+      File.join(path, 'remote_dir_file2.txt'),
+      File.join(path, 'remotesubdir', 'remote_subdir_file1.txt'),
+      File.join(path, 'remotesubdir', 'remote_subdir_file2.txt'),
+      File.join(path, 'remotesubdir', '.a_dotfile'),
+      File.join(path, '.a_dotdir', '.a_dotfile_in_a_dotdir')
+    ]
+  end
+
   it_behaves_like "a directory resource"
 
-  context "when creating the remote directory" do
-    it "transfers the directory with all contents" do
-      resource.run_action(:create)
-      File.should exist(File.join(path, 'remote_dir_file1.txt'))
-      File.should exist(File.join(path, 'remote_dir_file2.txt'))
-      File.should exist(File.join(path, 'remotesubdir', 'remote_subdir_file1.txt'))
-      File.should exist(File.join(path, 'remotesubdir', 'remote_subdir_file2.txt'))
-      File.should exist(File.join(path, 'remotesubdir', '.a_dotfile'))
-      File.should exist(File.join(path, '.a_dotdir', '.a_dotfile_in_a_dotdir'))
-    end
+  it_behaves_like "a securable resource with reporting"
 
-    context "with purging enabled" do
-      before(:each) do
-        resource.purge(true)
+  context "when creating the remote directory with purging disabled" do
+
+    context "and the directory does not yet exist" do
+      before do
+        resource.run_action(:create)
       end
 
-      it "removes existing files if purge is true" do
-        FileUtils.mkdir_p(File.join(path, 'remotesubdir'))
-        existing1 = File.join(path, 'marked_for_death.txt')
-        existing2 = File.join(path, 'remotesubdir', 'marked_for_death_again.txt')
-        FileUtils.touch(existing1)
-        FileUtils.touch(existing2)
+      it "transfers the directory with all contents" do
+        expected_files.each do |file_path|
+          File.should exist(file_path)
+        end
+      end
+
+      it "is marked as updated by last action" do
+        resource.should be_updated_by_last_action
+      end
+    end
 
+    context "and there are extraneous files in the directory" do
+      before do
+        create_extraneous_files
         resource.run_action(:create)
-        File.should_not exist(existing1)
-        File.should_not exist(existing2)
       end
 
-      it "removes files in subdirectories before files above" do
-        FileUtils.mkdir_p(File.join(path, 'a', 'multiply', 'nested', 'directory'))
-        existing1 = File.join(path, 'a', 'foo.txt')
-        existing2 = File.join(path, 'a', 'multiply', 'bar.txt')
-        existing3 = File.join(path, 'a', 'multiply', 'nested', 'baz.txt')
-        existing4 = File.join(path, 'a', 'multiply', 'nested', 'directory', 'qux.txt')
-        FileUtils.touch(existing1)
-        FileUtils.touch(existing2)
-        FileUtils.touch(existing3)
-        FileUtils.touch(existing4)
+      it "does not modify the expected state of the directory" do
+        expected_files.each do |file_path|
+          File.should exist(file_path)
+        end
+      end
 
+      it "does not remove unmanaged files" do
+        File.should exist(@existing1)
+        File.should exist(@existing2)
+      end
+    end
+
+    context "and the directory is in the desired state" do
+      before do
         resource.run_action(:create)
-        File.should_not exist(existing1)
-        File.should_not exist(existing2)
-        File.should_not exist(existing3)
-        File.should_not exist(existing4)
+        resource_second_pass.run_action(:create)
       end
+
+      it "does not modify the expected state of the directory" do
+        expected_files.each do |file_path|
+          File.should exist(file_path)
+        end
+      end
+
+      it "is not marked as updated by last action" do
+        resource_second_pass.should_not be_updated_by_last_action
+      end
+
     end
 
     describe "with overwrite disabled" do
@@ -111,4 +147,74 @@ describe Chef::Resource::RemoteDirectory do
       end
     end
   end
+
+  context "when creating the directory with purging enabled" do
+    before(:each) do
+      resource.purge(true)
+    end
+
+    context "and there are no extraneous files in the directory" do
+      before do
+        resource.run_action(:create)
+      end
+
+      it "creates the directory contents as normal" do
+        expected_files.each do |file_path|
+          File.should exist(file_path)
+        end
+      end
+
+    end
+
+    context "and there are extraneous files in the directory" do
+      before do
+        create_extraneous_files
+        resource.run_action(:create)
+      end
+
+      it "removes unmanaged files" do
+        File.should_not exist(@existing1)
+        File.should_not exist(@existing2)
+      end
+
+      it "does not modify managed files" do
+        expected_files.each do |file_path|
+          File.should exist(file_path)
+        end
+      end
+
+      it "is marked as updated by last action" do
+        resource.should be_updated_by_last_action
+      end
+    end
+
+    context "and there are deeply nested extraneous files in the directory" do
+      before do
+        FileUtils.mkdir_p(File.join(path, 'a', 'multiply', 'nested', 'directory'))
+        @existing1 = File.join(path, 'a', 'foo.txt')
+        @existing2 = File.join(path, 'a', 'multiply', 'bar.txt')
+        @existing3 = File.join(path, 'a', 'multiply', 'nested', 'baz.txt')
+        @existing4 = File.join(path, 'a', 'multiply', 'nested', 'directory', 'qux.txt')
+        FileUtils.touch(@existing1)
+        FileUtils.touch(@existing2)
+        FileUtils.touch(@existing3)
+        FileUtils.touch(@existing4)
+
+        resource.run_action(:create)
+      end
+
+      it "removes files in subdirectories before files above" do
+        File.should_not exist(@existing1)
+        File.should_not exist(@existing2)
+        File.should_not exist(@existing3)
+        File.should_not exist(@existing4)
+      end
+
+      it "is marked as updated by last action" do
+        resource.should be_updated_by_last_action
+      end
+
+    end
+  end
+
 end

data/spec/functional/resource/remote_file_spec.rb

@@ -20,17 +20,22 @@ require 'spec_helper'
 require 'tiny_server'
 
 describe Chef::Resource::RemoteFile do
+
+  let(:file_cache_path) { Dir.mktmpdir }
+
+  before(:each) do
+    @old_file_cache = Chef::Config[:file_cache_path]
+    Chef::Config[:file_cache_path] = file_cache_path
+  end
+
+  after(:each) do
+    Chef::Config[:file_cache_path] = @old_file_cache
+    FileUtils.rm_rf(file_cache_path)
+  end
+
   include_context Chef::Resource::File
 
   let(:file_base) { "remote_file_spec" }
-  let(:source) { 'http://localhost:9000/nyan_cat.png' }
-  let(:expected_content) do
-    content = File.open(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png'), "rb") do |f|
-      f.read
-    end
-    content.force_encoding(Encoding::BINARY) if content.respond_to?(:force_encoding)
-    content
-  end
 
   def create_resource
     node = Chef::Node.new
@@ -41,12 +46,14 @@ describe Chef::Resource::RemoteFile do
     resource
   end
 
-  let!(:resource) do
+  let(:resource) do
     create_resource
   end
 
-  before(:all) do
-    @server = TinyServer::Manager.new
+  let(:default_mode) { ((0100666 - File.umask) & 07777).to_s(8) }
+
+  def start_tiny_server(server_opts={})
+    @server = TinyServer::Manager.new(server_opts)
     @server.start
     @api = TinyServer::API.instance
     @api.clear
@@ -55,11 +62,90 @@ describe Chef::Resource::RemoteFile do
         f.read
       end
     }
+    @api.get("/nyan_cat.png.gz", 200, nil, { 'Content-Type' => 'application/gzip', 'Content-Encoding' => 'gzip' } ) {
+      File.open(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png.gz'), "rb") do |f|
+        f.read
+      end
+    }
   end
 
-  after(:all) do
+  def stop_tiny_server
     @server.stop
+    @server = @api = nil
+  end
+
+  context "when fetching files over HTTP" do
+    before(:all) do
+      start_tiny_server
+    end
+
+    after(:all) do
+      stop_tiny_server
+    end
+
+    context "when using normal encoding" do
+      let(:source) { 'http://localhost:9000/nyan_cat.png' }
+      let(:expected_content) do
+        content = File.open(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png'), "rb") do |f|
+          f.read
+        end
+        content.force_encoding(Encoding::BINARY) if content.respond_to?(:force_encoding)
+        content
+      end
+
+      it_behaves_like "a file resource"
+
+      it_behaves_like "a securable resource with reporting"
+    end
+
+    context "when using gzip encoding" do
+      let(:source) { 'http://localhost:9000/nyan_cat.png.gz' }
+      let(:expected_content) do
+        content = File.open(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png.gz'), "rb") do |f|
+          f.read
+        end
+        content.force_encoding(Encoding::BINARY) if content.respond_to?(:force_encoding)
+        content
+      end
+
+      it_behaves_like "a file resource"
+
+      it_behaves_like "a securable resource with reporting"
+    end
+  end
+
+  context "when fetching files over HTTPS" do
+
+    before(:all) do
+      cert_text = File.read(File.expand_path("ssl/chef-rspec.cert", CHEF_SPEC_DATA))
+      cert = OpenSSL::X509::Certificate.new(cert_text)
+      key_text = File.read(File.expand_path("ssl/chef-rspec.key", CHEF_SPEC_DATA))
+      key = OpenSSL::PKey::RSA.new(key_text)
+
+      server_opts = { :SSLEnable => true,
+                      :SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE,
+                      :SSLCertificate => cert,
+                      :SSLPrivateKey => key }
+
+      start_tiny_server(server_opts)
+    end
+
+    after(:all) do
+      stop_tiny_server
+    end
+
+    let(:source) { 'https://localhost:9000/nyan_cat.png' }
+
+    let(:expected_content) do
+      content = File.open(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png'), "rb") do |f|
+        f.read
+      end
+      content.force_encoding(Encoding::BINARY) if content.respond_to?(:force_encoding)
+      content
+    end
+
+    it_behaves_like "a file resource"
+
   end
 
-  it_behaves_like "a file resource"
 end

data/spec/functional/resource/template_spec.rb

@@ -20,6 +20,10 @@ require 'spec_helper'
 
 describe Chef::Resource::Template do
 
+  def binread(file)
+    File.open(file,"rb") {|f| f.read }
+  end
+
   include_context Chef::Resource::File
 
   let(:file_base) { "template_spec" }
@@ -27,28 +31,39 @@ describe Chef::Resource::Template do
 
   let(:node) do
     node = Chef::Node.new
-    node[:slappiness] = "a warm gun"
+    node.normal[:slappiness] = "a warm gun"
     node
   end
 
   def create_resource
     cookbook_repo = File.expand_path(File.join(CHEF_SPEC_DATA, "cookbooks"))
     Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest, cookbook_repo) }
-    cookbook_collection = Chef::CookbookCollection.new(Chef::CookbookLoader.new(cookbook_repo))
+    cl = Chef::CookbookLoader.new(cookbook_repo)
+    cl.load_cookbooks
+    cookbook_collection = Chef::CookbookCollection.new(cl)
     events = Chef::EventDispatch::Dispatcher.new
     run_context = Chef::RunContext.new(node, cookbook_collection, events)
     resource = Chef::Resource::Template.new(path, run_context)
     resource.source('openldap_stuff.conf.erb')
     resource.cookbook('openldap')
+
+    # NOTE: partials rely on `cookbook_name` getting set by chef internals and
+    # ignore the user-set `cookbook` attribute.
+    resource.cookbook_name = "openldap"
+
     resource
   end
 
-  let!(:resource) do
+  let(:resource) do
     create_resource
   end
 
+  let(:default_mode) { ((0100666 - File.umask) & 07777).to_s(8) }
+
   it_behaves_like "a file resource"
 
+  it_behaves_like "a securable resource with reporting"
+
   context "when the target file does not exist" do
     it "creates the template with the rendered content using the variable attribute when the :create action is run" do
       resource.source('openldap_variable_stuff.conf.erb')
@@ -65,4 +80,166 @@ describe Chef::Resource::Template do
       IO.read(path).should == expected_content
     end
   end
+
+  describe "when the template resource defines helper methods" do
+
+    include_context "diff disabled"
+
+    let(:resource) do
+      r = create_resource
+      r.source "helper_test.erb"
+      r
+    end
+
+    let(:expected_content) { "value from helper method" }
+
+    shared_examples "a template with helpers" do
+      it "generates expected content by calling helper methods" do
+        resource.run_action(:create)
+        binread(path).strip.should == expected_content
+      end
+    end
+
+    context "using single helper syntax" do
+      before do
+        resource.helper(:helper_method) { "value from helper method" }
+      end
+
+      it_behaves_like "a template with helpers"
+    end
+
+    context "using single helper syntax referencing @node" do
+      before do
+        node.set[:helper_test_attr] = "value from helper method"
+        resource.helper(:helper_method) { "#{@node[:helper_test_attr]}" }
+      end
+
+      it_behaves_like "a template with helpers"
+    end
+
+    context "using an inline block to define helpers" do
+      before do
+        resource.helpers do
+          def helper_method
+            "value from helper method"
+          end
+        end
+      end
+
+      it_behaves_like "a template with helpers"
+    end
+
+    context "using an inline block referencing @node" do
+      before do
+        node.set[:helper_test_attr] = "value from helper method"
+
+        resource.helpers do
+          def helper_method
+            @node[:helper_test_attr]
+          end
+        end
+      end
+
+      it_behaves_like "a template with helpers"
+
+    end
+
+    context "using a module from a library" do
+
+      module ExampleModule
+        def helper_method
+          "value from helper method"
+        end
+      end
+
+      before do
+        resource.helpers(ExampleModule)
+      end
+
+      it_behaves_like "a template with helpers"
+
+    end
+    context "using a module from a library referencing @node" do
+
+      module ExampleModuleReferencingATNode
+        def helper_method
+          @node[:helper_test_attr]
+        end
+      end
+
+      before do
+        node.set[:helper_test_attr] = "value from helper method"
+
+        resource.helpers(ExampleModuleReferencingATNode)
+      end
+
+      it_behaves_like "a template with helpers"
+
+    end
+
+    context "using helpers with partial templates" do
+      before do
+        resource.source("helpers_via_partial_test.erb")
+        resource.helper(:helper_method) { "value from helper method" }
+      end
+
+      it_behaves_like "a template with helpers"
+
+    end
+  end
+
+  describe "when template source contains windows style line endings" do
+
+    include_context "diff disabled"
+
+    let(:expected_content) {
+      "Template rendering libraries\r\nshould support\r\ndifferent line endings\r\n\r\n"
+    }
+
+    context "for all lines" do
+      let(:resource) do
+        r = create_resource
+        r.source "all_windows_line_endings.erb"
+        r
+      end
+
+      it "output should contain windows line endings" do
+        resource.run_action(:create)
+        binread(path).each_line do |line|
+          line.should end_with("\r\n")
+        end
+      end
+    end
+
+    context "for some lines" do
+      let(:resource) do
+        r = create_resource
+        r.source "some_windows_line_endings.erb"
+        r
+      end
+
+      it "output should contain windows line endings" do
+        resource.run_action(:create)
+        binread(path).each_line do |line|
+          line.should end_with("\r\n")
+        end
+      end
+    end
+
+    context "for no lines" do
+      let(:resource) do
+        r = create_resource
+        r.source "no_windows_line_endings.erb"
+        r
+      end
+
+      it "output should not contain windows line endings" do
+        resource.run_action(:create)
+        IO.read(path).each_line do |line|
+          line.should_not end_with("\r\n")
+        end
+      end
+    end
+  end
+
 end