chef 10.16.4 → 10.16.6.rc.0

data/Rakefile

@@ -21,7 +21,7 @@ require File.dirname(__FILE__) + '/lib/chef/version'
 
 require 'rubygems'
 require 'rubygems/package_task'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require './tasks/rspec.rb'
 
 GEM_NAME = "chef"

data/lib/chef/monkey_patches/fileutils.rb

@@ -0,0 +1,65 @@
+#
+# Author:: Stephen Delano (<stephen@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, 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.
+#
+
+# == FileUtils::Entry_ (Patch)
+# On Ruby 1.9.3 and earlier, FileUtils.cp_r(foo, bar, :preserve => true) fails
+# when attempting to copy a directory containing symlinks. This has been
+# patched in the trunk of Ruby, and this is a monkey patch of the offending
+# code.
+
+unless RUBY_VERSION =~ /^2/
+  require 'fileutils'
+
+  class FileUtils::Entry_
+    def copy_metadata(path)
+      st = lstat()
+      if !st.symlink?
+        File.utime st.atime, st.mtime, path
+      end
+      begin
+        if st.symlink?
+          begin
+            File.lchown st.uid, st.gid, path
+          rescue NotImplementedError
+          end
+        else
+          File.chown st.uid, st.gid, path
+        end
+      rescue Errno::EPERM
+        # clear setuid/setgid
+        if st.symlink?
+          begin
+            File.lchmod st.mode & 01777, path
+          rescue NotImplementedError
+          end
+        else
+          File.chmod st.mode & 01777, path
+        end
+      else
+        if st.symlink?
+          begin
+            File.lchmod st.mode, path
+          rescue NotImplementedError
+          end
+        else
+          File.chmod st.mode, path
+        end
+      end
+    end
+  end
+end

data/lib/chef/provider/deploy.rb

@@ -18,6 +18,7 @@
 
 require "chef/mixin/command"
 require "chef/mixin/from_file"
+require "chef/monkey_patches/fileutils"
 require "chef/provider/git"
 require "chef/provider/subversion"
 
@@ -262,7 +263,7 @@ class Chef
         target_dir_path = @new_resource.deploy_to + "/releases"
         converge_by("deploy from repo to #{@target_dir_path} ") do
           FileUtils.mkdir_p(target_dir_path)
-          run_command(:command => "cp -RPp #{::File.join(@new_resource.destination, ".")} #{release_path}")
+          FileUtils.cp_r(::File.join(@new_resource.destination, "."), release_path, :preserve => true)
           Chef::Log.info "#{@new_resource} copied the cached checkout to #{release_path}"
           release_created(release_path)
         end

data/lib/chef/provider/template.rb

@@ -61,7 +61,7 @@ class Chef
             description << diff_current(rendered_template.path)
             converge_by(description) do
               backup
-              FileUtils.mv(rendered_template.path, @new_resource.path)
+              FileUtils.cp(rendered_template.path, @new_resource.path)
               Chef::Log.info("#{@new_resource} updated content")
               access_controls.set_all!
               stat = ::File.stat(@new_resource.path)

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '10.16.4'
+  VERSION = '10.16.6.rc.0'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/functional/knife/cookbook_delete_spec.rb

@@ -23,8 +23,6 @@ describe Chef::Knife::CookbookDelete do
   before(:all) do
     @original_config = Chef::Config.hash_dup
 
-    Thin::Logging.silent = true
-
     @server = TinyServer::Manager.new
     @server.start
   end

data/spec/functional/knife/exec_spec.rb

@@ -6,9 +6,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.
@@ -23,8 +23,6 @@ describe Chef::Knife::Exec do
   before(:all) do
     @original_config = Chef::Config.hash_dup
 
-    Thin::Logging.silent = false
-
     @server = TinyServer::Manager.new#(:debug => true)
     @server.start
   end

data/spec/functional/knife/ssh_spec.rb

@@ -24,7 +24,6 @@ describe Chef::Knife::Ssh do
   before(:all) do
     @original_config = Chef::Config.hash_dup
     Chef::Knife::Ssh.load_deps
-    Thin::Logging.silent = true
     @server = TinyServer::Manager.new
     @server.start
   end

data/spec/functional/resource/cookbook_file_spec.rb

@@ -24,7 +24,13 @@ describe Chef::Resource::CookbookFile do
   let(:file_base) { 'cookbook_file_spec' }
   let(:source) { 'java.response' }
   let(:cookbook_name) { 'java' }
-  let(:expected_content) { IO.read(File.join(CHEF_SPEC_DATA, 'cookbooks', 'java', 'files', 'default', 'java.response')) }
+  let(:expected_content) do
+    content = File.open(File.join(CHEF_SPEC_DATA, 'cookbooks', 'java', 'files', 'default', 'java.response'), "rb") do |f|
+      f.read
+    end
+    content.force_encoding(Encoding::BINARY) if content.respond_to?(:force_encoding)
+    content
+  end
 
   def create_resource
     # set up cookbook collection for this run to use, based on our

data/spec/functional/resource/deploy_revision_spec.rb

@@ -69,16 +69,20 @@ describe Chef::Resource::DeployRevision, :unix_only => true do
 
   let(:git_bundle_with_in_repo_callbacks) { File.expand_path("git_bundles/sinatra-test-app-with-callback-files.gitbundle", CHEF_SPEC_DATA) }
 
+  let(:git_bundle_with_in_repo_symlinks) { File.expand_path("git_bundles/sinatra-test-app-with-symlinks.gitbundle", CHEF_SPEC_DATA) }
+
   # This is the fourth version
   let(:latest_rev) { "3eb5ca6c353c83d9179dd3b29347539829b401f3" }
 
   # This is the third version
   let(:previous_rev) { "6d19a6dbecc8e37f5b2277345885c0c783eb8fb1" }
 
-
   # This is the sixth version, it is on the "with-deploy-scripts" branch
   let(:rev_with_in_repo_callbacks) { "2404d015882659754bdb93ad6e4b4d3d02691a82" }
 
+  # This is the fifth version in the "with-symlinks" branch
+  let(:rev_with_in_repo_symlinks) { "5a4748c52aaea8250b4346a9b8ede95ee3755e28" }
+
   # Read values from the +observe_order_file+ and split each line. This way you
   # can see in which order things really happened.
   def actual_operations_order
@@ -494,6 +498,18 @@ describe Chef::Resource::DeployRevision, :unix_only => true do
     end
   end
 
+  context "when deploying an app with in-repo symlinks" do
+    let(:deploy_with_in_repo_symlinks) do
+      basic_deploy_resource.dup.tap do |r|
+        r.repo git_bundle_with_in_repo_symlinks
+        r.revision rev_with_in_repo_symlinks
+      end
+    end
+
+    it "should not raise an exception calling File.utime on symlinks" do
+      lambda { deploy_with_in_repo_symlinks.run_action(:deploy) }.should_not raise_error
+    end
+  end
 end
 
 

data/spec/functional/resource/link_spec.rb

@@ -22,7 +22,7 @@ if windows?
   require 'chef/win32/file' #probably need this in spec_helper
 end
 
-describe Chef::Resource::Link do
+describe Chef::Resource::Link, :not_supported_on_win2k3 do
   let(:file_base) { "file_spec" }
 
   let(:base_dir) do

data/spec/functional/resource/remote_file_spec.rb

@@ -24,7 +24,13 @@ describe Chef::Resource::RemoteFile do
 
   let(:file_base) { "remote_file_spec" }
   let(:source) { 'http://localhost:9000/nyan_cat.png' }
-  let(:expected_content) { IO.read(File.join(CHEF_SPEC_DATA, 'remote_file', '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
@@ -40,13 +46,14 @@ describe Chef::Resource::RemoteFile do
   end
 
   before(:all) do
-    Thin::Logging.silent = false
     @server = TinyServer::Manager.new
     @server.start
     @api = TinyServer::API.instance
     @api.clear
     @api.get("/nyan_cat.png", 200) {
-      IO.read(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png'))
+      File.open(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png'), "rb") do |f|
+        f.read
+      end
     }
   end
 

data/spec/functional/tiny_server_spec.rb

@@ -37,15 +37,16 @@ describe TinyServer::API do
 
   it "creates a route for a GET request" do
     @api.get('/foo/bar', 200, 'hello foobar')
-    response = @api.call("REQUEST_METHOD" => "GET", "REQUEST_URI" => '/foo/bar')
-    response.should == [200, {'Content-Type' => 'application/json'}, 'hello foobar']
+    # WEBrick gives you the full URI with host, Thin only gave the part after scheme+host+port
+    response = @api.call("REQUEST_METHOD" => "GET", "REQUEST_URI" => 'http://localhost:1974/foo/bar')
+    response.should == [200, {'Content-Type' => 'application/json'}, [ 'hello foobar' ]]
   end
 
   it "creates a route for a request with a block" do
     block_called = false
     @api.get('/bar/baz', 200) { block_called = true; 'hello barbaz' }
-    response = @api.call("REQUEST_METHOD" => "GET", "REQUEST_URI" => '/bar/baz')
-    response.should == [200, {'Content-Type' => 'application/json'}, 'hello barbaz']
+    response = @api.call("REQUEST_METHOD" => "GET", "REQUEST_URI" => 'http://localhost:1974/bar/baz')
+    response.should == [200, {'Content-Type' => 'application/json'}, [ 'hello barbaz' ]]
     block_called.should be_true
   end
 

data/spec/spec_helper.rb

@@ -66,11 +66,13 @@ RSpec.configure do |config|
 
   # Add jruby filters here
   config.filter_run_excluding :windows_only => true unless windows?
+  config.filter_run_excluding :not_supported_on_win2k3 => true if windows_win2k3?
   config.filter_run_excluding :unix_only => true unless unix?
   config.filter_run_excluding :ruby_18_only => true unless ruby_18?
   config.filter_run_excluding :ruby_19_only => true unless ruby_19?
   config.filter_run_excluding :requires_root => true unless ENV['USER'] == 'root'
   config.filter_run_excluding :requires_unprivileged_user => true if ENV['USER'] == 'root'
+  config.filter_run_excluding :uses_diff => true unless has_diff?
 
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true

data/spec/support/chef_helpers.rb

@@ -50,3 +50,16 @@ def make_tmpname(prefix_suffix, n)
   path << "-#{n}" if n
   path << suffix
 end
+
+# NOTE:
+# This is a temporary fix to get tests passing on systems that have no `diff`
+# until we can replace shelling out to `diff` with ruby diff-lcs
+def has_diff?
+  begin
+    diff_cmd = Mixlib::ShellOut.new("diff -v")
+    diff_cmd.run_command
+    true
+  rescue Errno::ENOENT
+    false
+  end
+end

data/spec/support/platform_helpers.rb

@@ -10,6 +10,14 @@ def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 
+def windows_win2k3?
+  return false unless windows?
+  require 'ruby-wmi'
+
+  host = WMI::Win32_OperatingSystem.find(:first)
+  (host.version && host.version.start_with?("5.2"))
+end
+
 # def jruby?
 
 def unix?

data/spec/support/shared/functional/file_resource.rb

@@ -78,6 +78,14 @@ shared_examples_for "a file resource" do
    # note the stripping of the drive letter from the tmpdir on windows
   let(:backup_glob) { File.join(CHEF_SPEC_BACKUP_PATH, Dir.tmpdir.sub(/^([A-Za-z]:)/, ""), "#{file_base}*") }
 
+  def binread(file)
+    content = File.open(file, "rb") do |f|
+      f.read
+    end
+    content.force_encoding(Encoding::BINARY) if "".respond_to?(:force_encoding)
+    content
+  end
+
   context "when the target file does not exist" do
     it "creates the file when the :create action is run" do
       resource.run_action(:create)
@@ -86,12 +94,12 @@ shared_examples_for "a file resource" do
 
     it "creates the file with the correct content when the :create action is run" do
       resource.run_action(:create)
-      IO.read(path).should == expected_content
+      binread(path).should == expected_content
     end
 
     it "creates the file with the correct content when the :create_if_missing action is run" do
       resource.run_action(:create_if_missing)
-      IO.read(path).should == expected_content
+      binread(path).should == expected_content
     end
 
     it "deletes the file when the :delete action is run" do
@@ -112,7 +120,7 @@ shared_examples_for "a file resource" do
 
   context "when the target file has the wrong content" do
     before(:each) do
-      File.open(path, "w") { |f| f.print "This is so wrong!!!" }
+      File.open(path, "wb") { |f| f.print "This is so wrong!!!" }
       @expected_mtime = File.stat(path).mtime
       @expected_checksum = sha256_checksum(path)
     end
@@ -136,7 +144,7 @@ shared_examples_for "a file resource" do
 
   context "when the target file has the correct content" do
     before(:each) do
-      File.open(path, "w") { |f| f.print expected_content }
+      File.open(path, "wb") { |f| f.print expected_content }
       @expected_mtime = File.stat(path).mtime
       @expected_atime = File.stat(path).atime
       @expected_checksum = sha256_checksum(path)

data/spec/support/shared/functional/securable_resource.rb

@@ -29,12 +29,16 @@ shared_context "setup correct permissions" do
       before :each do
         File.chown(Etc.getpwnam('nobody').uid, 1337, path)
         File.chmod(0776, path)
+        now = Time.now.to_i
+        File.utime(now - 9000, now - 9000, path)
       end
     end
 
     context "without root", :requires_unprivileged_user do
       before :each do
         File.chmod(0776, path)
+        now = Time.now.to_i
+        File.utime(now - 9000, now - 9000, path)
       end
     end
   end

data/spec/tiny_server.rb

@@ -17,11 +17,13 @@
 #
 
 require 'rubygems'
+require 'webrick'
 require 'rack'
-require 'thin'
+#require 'thin'
 require 'singleton'
 require 'chef/json_compat'
 require 'open-uri'
+require 'chef/config'
 
 module TinyServer
 
@@ -29,30 +31,42 @@ module TinyServer
 
     attr_writer :app
 
-    def self.run(options=nil, &block)
+    def self.setup(options=nil, &block)
       tiny_app = new(options)
       app_code = Rack::Builder.new(&block).to_app
       tiny_app.app = app_code
-      tiny_app.start
+      tiny_app
+    end
+
+    def shutdown
+      server.shutdown
     end
   end
 
   class Manager
 
-    DEFAULT_OPTIONS = {:server => 'thin', :Port => 9000, :Host => 'localhost', :environment => :none}
+    # 5 == debug, 3 == warning
+    LOGGER = WEBrick::Log.new(STDOUT, 3)
+    DEFAULT_OPTIONS = {
+      :server => 'webrick',
+      :Port => 9000,
+      :Host => 'localhost',
+      :environment => :none,
+      :Logger => LOGGER,
+      :AccessLog => [] # Remove this option to enable the access log when debugging.
+    }
 
     def initialize(options=nil)
       @options = options ? DEFAULT_OPTIONS.merge(options) : DEFAULT_OPTIONS
       @creator = caller.first
-
-      Thin::Logging.silent = !@options[:debug]
     end
 
     def start
       @server_thread = Thread.new do
-        @server = Server.run(@options) do
+        @server = Server.setup(@options) do
           run API.instance
         end
+        @server.start
       end
       block_until_started
     end
@@ -63,7 +77,10 @@ module TinyServer
 
     def block_until_started
       200.times do
-        return true if started?
+        if started?
+          raise "ivar weirdness" if @server.nil?
+          return true
+        end
       end
       raise "TinyServer failed to boot :/"
     end
@@ -84,6 +101,7 @@ module TinyServer
 
     def stop
       # yes, this is terrible.
+      @server.shutdown
       @server_thread.kill
       @server_thread.join
       @server_thread = nil
@@ -132,7 +150,7 @@ module TinyServer
         debug_info = {:message => "no data matches the request for #{env['REQUEST_URI']}",
                       :available_routes => @routes, :request => env}
         # Uncomment me for glorious debugging
-        #pp :not_found => debug_info
+        # pp :not_found => debug_info
         [404, {'Content-Type' => 'application/json'}, debug_info.to_json]
       end
     end
@@ -152,6 +170,7 @@ module TinyServer
     end
 
     def matches_request?(uri)
+      uri = URI.parse(uri).request_uri
       @path_spec === uri
     end
 
@@ -171,7 +190,7 @@ module TinyServer
 
     def call
       data = @data || @block.call
-      [@response_code, HEADERS, data]
+      [@response_code, HEADERS, Array(data)]
     end
 
     def to_s