chef 12.21.31-universal-mingw32 → 12.22.1-universal-mingw32

data/spec/unit/file_cache_spec.rb

@@ -1,114 +1,114 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
-# 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"
-
-describe Chef::FileCache do
-  before do
-    @file_cache_path = Dir.mktmpdir
-    Chef::Config[:file_cache_path] = @file_cache_path
-    @io = StringIO.new
-  end
-
-  after do
-    FileUtils.rm_rf(Chef::Config[:file_cache_path])
-  end
-
-  describe "when the relative path to the cache file doesn't exist" do
-    it "creates intermediate directories as needed" do
-      Chef::FileCache.store("whiz/bang", "I found a poop")
-      expect(File).to exist(File.join(@file_cache_path, "whiz"))
-    end
-
-    it "creates the cached file at the correct relative path" do
-      expect(File).to receive(:open).with(File.join(@file_cache_path, "whiz", "bang"), "w", 416).and_yield(@io)
-      Chef::FileCache.store("whiz/bang", "borkborkbork")
-    end
-
-  end
-
-  describe "when storing a file" do
-    before do
-      allow(File).to receive(:open).and_yield(@io)
-    end
-
-    it "should print the contents to the file" do
-      Chef::FileCache.store("whiz/bang", "borkborkbork")
-      expect(@io.string).to eq("borkborkbork")
-    end
-
-  end
-
-  describe "when loading cached files" do
-    it "finds and reads the cached file" do
-      FileUtils.mkdir_p(File.join(@file_cache_path, "whiz"))
-      File.open(File.join(@file_cache_path, "whiz", "bang"), "w") { |f| f.print("borkborkbork") }
-      expect(Chef::FileCache.load("whiz/bang")).to eq("borkborkbork")
-    end
-
-    it "should raise a Chef::Exceptions::FileNotFound if the file doesn't exist" do
-      expect { Chef::FileCache.load("whiz/bang") }.to raise_error(Chef::Exceptions::FileNotFound)
-    end
-  end
-
-  describe "when deleting cached files" do
-    before(:each) do
-      FileUtils.mkdir_p(File.join(@file_cache_path, "whiz"))
-      File.open(File.join(@file_cache_path, "whiz", "bang"), "w") { |f| f.print("borkborkbork") }
-    end
-
-    it "unlinks the file" do
-      Chef::FileCache.delete("whiz/bang")
-      expect(File).not_to exist(File.join(@file_cache_path, "whiz", "bang"))
-    end
-
-  end
-
-  describe "when listing files in the cache" do
-    before(:each) do
-      FileUtils.mkdir_p(File.join(@file_cache_path, "whiz"))
-      FileUtils.touch(File.join(@file_cache_path, "whiz", "bang"))
-      FileUtils.mkdir_p(File.join(@file_cache_path, "snappy"))
-      FileUtils.touch(File.join(@file_cache_path, "snappy", "patter"))
-    end
-
-    it "should return the relative paths" do
-      expect(Chef::FileCache.list.sort).to eq(%w{snappy/patter whiz/bang})
-    end
-
-    it "searches for cached files by globbing" do
-      expect(Chef::FileCache.find("snappy/**/*")).to eq(%w{snappy/patter})
-    end
-
-  end
-
-  describe "when checking for the existence of a file" do
-    before do
-      FileUtils.mkdir_p(File.join(@file_cache_path, "whiz"))
-    end
-
-    it "has a key if the corresponding cache file exists" do
-      FileUtils.touch(File.join(@file_cache_path, "whiz", "bang"))
-      expect(Chef::FileCache).to have_key("whiz/bang")
-    end
-
-    it "doesn't have a key if the corresponding cache file doesn't exist" do
-      expect(Chef::FileCache).not_to have_key("whiz/bang")
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# 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"
+
+describe Chef::FileCache do
+  before do
+    @file_cache_path = Dir.mktmpdir
+    Chef::Config[:file_cache_path] = @file_cache_path
+    @io = StringIO.new
+  end
+
+  after do
+    FileUtils.rm_rf(Chef::Config[:file_cache_path])
+  end
+
+  describe "when the relative path to the cache file doesn't exist" do
+    it "creates intermediate directories as needed" do
+      Chef::FileCache.store("whiz/bang", "I found a poop")
+      expect(File).to exist(File.join(@file_cache_path, "whiz"))
+    end
+
+    it "creates the cached file at the correct relative path" do
+      expect(File).to receive(:open).with(File.join(@file_cache_path, "whiz", "bang"), "w", 416).and_yield(@io)
+      Chef::FileCache.store("whiz/bang", "borkborkbork")
+    end
+
+  end
+
+  describe "when storing a file" do
+    before do
+      allow(File).to receive(:open).and_yield(@io)
+    end
+
+    it "should print the contents to the file" do
+      Chef::FileCache.store("whiz/bang", "borkborkbork")
+      expect(@io.string).to eq("borkborkbork")
+    end
+
+  end
+
+  describe "when loading cached files" do
+    it "finds and reads the cached file" do
+      FileUtils.mkdir_p(File.join(@file_cache_path, "whiz"))
+      File.open(File.join(@file_cache_path, "whiz", "bang"), "w") { |f| f.print("borkborkbork") }
+      expect(Chef::FileCache.load("whiz/bang")).to eq("borkborkbork")
+    end
+
+    it "should raise a Chef::Exceptions::FileNotFound if the file doesn't exist" do
+      expect { Chef::FileCache.load("whiz/bang") }.to raise_error(Chef::Exceptions::FileNotFound)
+    end
+  end
+
+  describe "when deleting cached files" do
+    before(:each) do
+      FileUtils.mkdir_p(File.join(@file_cache_path, "whiz"))
+      File.open(File.join(@file_cache_path, "whiz", "bang"), "w") { |f| f.print("borkborkbork") }
+    end
+
+    it "unlinks the file" do
+      Chef::FileCache.delete("whiz/bang")
+      expect(File).not_to exist(File.join(@file_cache_path, "whiz", "bang"))
+    end
+
+  end
+
+  describe "when listing files in the cache" do
+    before(:each) do
+      FileUtils.mkdir_p(File.join(@file_cache_path, "whiz"))
+      FileUtils.touch(File.join(@file_cache_path, "whiz", "bang"))
+      FileUtils.mkdir_p(File.join(@file_cache_path, "snappy"))
+      FileUtils.touch(File.join(@file_cache_path, "snappy", "patter"))
+    end
+
+    it "should return the relative paths" do
+      expect(Chef::FileCache.list.sort).to eq(%w{snappy/patter whiz/bang})
+    end
+
+    it "searches for cached files by globbing" do
+      expect(Chef::FileCache.find("snappy/**/*")).to eq(%w{snappy/patter})
+    end
+
+  end
+
+  describe "when checking for the existence of a file" do
+    before do
+      FileUtils.mkdir_p(File.join(@file_cache_path, "whiz"))
+    end
+
+    it "has a key if the corresponding cache file exists" do
+      FileUtils.touch(File.join(@file_cache_path, "whiz", "bang"))
+      expect(Chef::FileCache).to have_key("whiz/bang")
+    end
+
+    it "doesn't have a key if the corresponding cache file doesn't exist" do
+      expect(Chef::FileCache).not_to have_key("whiz/bang")
+    end
+  end
+end

data/spec/unit/file_content_management/deploy/cp_spec.rb

@@ -1,44 +1,44 @@
-#
-# Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
-# 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"
-
-describe Chef::FileContentManagement::Deploy::Cp do
-
-  let(:content_deployer) { described_class.new }
-  let(:target_file_path) { "/etc/my_app.conf" }
-
-  describe "creating the file" do
-
-    it "touches the file to create it" do
-      expect(FileUtils).to receive(:touch).with(target_file_path)
-      content_deployer.create(target_file_path)
-    end
-  end
-
-  describe "updating the file" do
-
-    let(:staging_file_path) { "/tmp/random-dir/staging-file.tmp" }
-
-    it "copies the staging file's content" do
-      expect(FileUtils).to receive(:cp).with(staging_file_path, target_file_path)
-      content_deployer.deploy(staging_file_path, target_file_path)
-    end
-
-  end
-end
+#
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# 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"
+
+describe Chef::FileContentManagement::Deploy::Cp do
+
+  let(:content_deployer) { described_class.new }
+  let(:target_file_path) { "/etc/my_app.conf" }
+
+  describe "creating the file" do
+
+    it "touches the file to create it" do
+      expect(FileUtils).to receive(:touch).with(target_file_path)
+      content_deployer.create(target_file_path)
+    end
+  end
+
+  describe "updating the file" do
+
+    let(:staging_file_path) { "/tmp/random-dir/staging-file.tmp" }
+
+    it "copies the staging file's content" do
+      expect(FileUtils).to receive(:cp).with(staging_file_path, target_file_path)
+      content_deployer.deploy(staging_file_path, target_file_path)
+    end
+
+  end
+end

data/spec/unit/file_content_management/deploy/mv_unix_spec.rb

@@ -1,101 +1,101 @@
-#
-# Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
-# 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"
-
-describe Chef::FileContentManagement::Deploy::MvUnix do
-
-  let(:content_deployer) { described_class.new }
-  let(:target_file_path) { "/etc/my_app.conf" }
-
-  describe "creating the file" do
-
-    it "touches the file to create it" do
-      expect(FileUtils).to receive(:touch).with(target_file_path)
-      content_deployer.create(target_file_path)
-    end
-  end
-
-  describe "updating the file" do
-
-    let(:staging_file_path) { "/tmp/random-dir/staging-file.tmp" }
-
-    let(:target_file_mode) { 0644 }
-    let(:target_file_stat) do
-      double "File::Stat struct for target file",
-           :mode => target_file_mode,
-           :uid => target_file_uid,
-           :gid => target_file_gid
-    end
-
-    before do
-      expect(File).to receive(:stat).with(target_file_path).and_return(target_file_stat)
-      expect(File).to receive(:chmod).with(target_file_mode, staging_file_path).and_return(1)
-      expect(FileUtils).to receive(:mv).with(staging_file_path, target_file_path)
-    end
-
-    # This context represents the case where:
-    # * Chef runs as root
-    # * The owner and group of the target file match the owner and group of the
-    #   staging file.
-    context "when the user has permissions to set file ownership" do
-
-      # For the purposes of this test, the uid/gid can be anything. These
-      # values are just chosen because (assuming chef-client's euid == 1001 and
-      # egid == 1001), the `chown` call is allowed by the OS. See the
-      # description of `EPERM` in `man 2 chown` for reference.
-      let(:target_file_uid) { 1001 }
-      let(:target_file_gid) { 1001 }
-
-      before do
-        expect(File).to receive(:chown).with(target_file_uid, nil, staging_file_path).and_return(1)
-        expect(File).to receive(:chown).with(nil, target_file_gid, staging_file_path).and_return(1)
-      end
-
-      it "fixes up permissions and moves the file into place" do
-        content_deployer.deploy(staging_file_path, target_file_path)
-      end
-
-    end
-
-    context "when the user does not have permissions to set file ownership" do
-
-      # The test code does not care what these values are. These values are
-      # chosen because they're representitive of the case that chef-client is
-      # running as non-root and is managing a file that got ownership set to
-      # root somehow. In this example, gid==20 is something like "staff" which
-      # the user running chef-client is a member of (but it's not that user's
-      # primary group).
-      let(:target_file_uid) { 0 }
-      let(:target_file_gid) { 20 }
-
-      before do
-        expect(File).to receive(:chown).with(target_file_uid, nil, staging_file_path).and_raise(Errno::EPERM)
-        expect(File).to receive(:chown).with(nil, target_file_gid, staging_file_path).and_raise(Errno::EPERM)
-
-        expect(Chef::Log).to receive(:warn).with(/^Could not set uid/)
-        expect(Chef::Log).to receive(:warn).with(/^Could not set gid/)
-      end
-
-      it "fixes up permissions and moves the file into place" do
-        content_deployer.deploy(staging_file_path, target_file_path)
-      end
-    end
-
-  end
-end
+#
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# 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"
+
+describe Chef::FileContentManagement::Deploy::MvUnix do
+
+  let(:content_deployer) { described_class.new }
+  let(:target_file_path) { "/etc/my_app.conf" }
+
+  describe "creating the file" do
+
+    it "touches the file to create it" do
+      expect(FileUtils).to receive(:touch).with(target_file_path)
+      content_deployer.create(target_file_path)
+    end
+  end
+
+  describe "updating the file" do
+
+    let(:staging_file_path) { "/tmp/random-dir/staging-file.tmp" }
+
+    let(:target_file_mode) { 0644 }
+    let(:target_file_stat) do
+      double "File::Stat struct for target file",
+           :mode => target_file_mode,
+           :uid => target_file_uid,
+           :gid => target_file_gid
+    end
+
+    before do
+      expect(File).to receive(:stat).with(target_file_path).and_return(target_file_stat)
+      expect(File).to receive(:chmod).with(target_file_mode, staging_file_path).and_return(1)
+      expect(FileUtils).to receive(:mv).with(staging_file_path, target_file_path)
+    end
+
+    # This context represents the case where:
+    # * Chef runs as root
+    # * The owner and group of the target file match the owner and group of the
+    #   staging file.
+    context "when the user has permissions to set file ownership" do
+
+      # For the purposes of this test, the uid/gid can be anything. These
+      # values are just chosen because (assuming chef-client's euid == 1001 and
+      # egid == 1001), the `chown` call is allowed by the OS. See the
+      # description of `EPERM` in `man 2 chown` for reference.
+      let(:target_file_uid) { 1001 }
+      let(:target_file_gid) { 1001 }
+
+      before do
+        expect(File).to receive(:chown).with(target_file_uid, nil, staging_file_path).and_return(1)
+        expect(File).to receive(:chown).with(nil, target_file_gid, staging_file_path).and_return(1)
+      end
+
+      it "fixes up permissions and moves the file into place" do
+        content_deployer.deploy(staging_file_path, target_file_path)
+      end
+
+    end
+
+    context "when the user does not have permissions to set file ownership" do
+
+      # The test code does not care what these values are. These values are
+      # chosen because they're representitive of the case that chef-client is
+      # running as non-root and is managing a file that got ownership set to
+      # root somehow. In this example, gid==20 is something like "staff" which
+      # the user running chef-client is a member of (but it's not that user's
+      # primary group).
+      let(:target_file_uid) { 0 }
+      let(:target_file_gid) { 20 }
+
+      before do
+        expect(File).to receive(:chown).with(target_file_uid, nil, staging_file_path).and_raise(Errno::EPERM)
+        expect(File).to receive(:chown).with(nil, target_file_gid, staging_file_path).and_raise(Errno::EPERM)
+
+        expect(Chef::Log).to receive(:warn).with(/^Could not set uid/)
+        expect(Chef::Log).to receive(:warn).with(/^Could not set gid/)
+      end
+
+      it "fixes up permissions and moves the file into place" do
+        content_deployer.deploy(staging_file_path, target_file_path)
+      end
+    end
+
+  end
+end