chef 11.6.0 → 11.6.2

data/spec/functional/resource/user_spec.rb

@@ -20,14 +20,14 @@
 require 'spec_helper'
 require 'chef/mixin/shell_out'
 
-describe Chef::Resource::User, :unix_only, :requires_root do
+metadata = { :unix_only => true,
+  :requires_root => true,
+  :provider => {:user => Chef::Provider::User::Useradd}
+}
 
-  include Chef::Mixin::ShellOut
+describe Chef::Resource::User, metadata do
 
-  # User provider is platform-dependent, we need platform ohai data:
-  OHAI_SYSTEM = Ohai::System.new
-  OHAI_SYSTEM.require_plugin("os")
-  OHAI_SYSTEM.require_plugin("platform")
+  include Chef::Mixin::ShellOut
 
 
   # Utility code for /etc/passwd interaction, avoid any caching of user records:
@@ -56,14 +56,6 @@ describe Chef::Resource::User, :unix_only, :requires_root do
   before do
     # Silence shell_out live stream
     Chef::Log.level = :warn
-
-    # Tests only implemented for a subset of platforms currently.
-    user_provider = Chef::Platform.find_provider(OHAI_SYSTEM["platform"],
-                                                 OHAI_SYSTEM["platform_version"],
-                                                 :user)
-    unless user_provider == Chef::Provider::User::Useradd
-      pending "Only the useradd provider is supported at this time"
-    end
   end
 
   after do

data/spec/spec_helper.rb

@@ -83,6 +83,13 @@ Dir["spec/support/**/*.rb"].
   map { |f| f.gsub(%r[spec/], '')}.
   each { |f| require f }
 
+
+OHAI_SYSTEM = Ohai::System.new
+OHAI_SYSTEM.require_plugin("os")
+OHAI_SYSTEM.require_plugin("platform")
+TEST_PLATFORM = OHAI_SYSTEM["platform"].dup.freeze
+TEST_PLATFORM_VERSION = OHAI_SYSTEM["platform_version"].dup.freeze
+
 RSpec.configure do |config|
   config.include(Matchers)
   config.filter_run :focus => true
@@ -111,6 +118,28 @@ RSpec.configure do |config|
   config.filter_run_excluding :requires_unprivileged_user => true if ENV['USER'] == 'root'
   config.filter_run_excluding :uses_diff => true unless has_diff?
 
+  running_platform_arch = `uname -m`.strip
+
+  config.filter_run_excluding :arch => lambda {|target_arch|
+    running_platform_arch != target_arch
+  }
+
+  # Functional Resource tests that are provider-specific:
+  # context "on platforms that use useradd", :provider => {:user => Chef::Provider::User::Useradd}} do #...
+  config.filter_run_excluding :provider => lambda {|criteria|
+    type, target_provider = criteria.first
+
+    platform = TEST_PLATFORM.dup
+    platform_version = TEST_PLATFORM_VERSION.dup
+
+    begin
+      provider_for_running_platform = Chef::Platform.find_provider(platform, platform_version, type)
+      provider_for_running_platform != target_provider
+    rescue ArgumentError # no provider for platform
+      true
+    end
+  }
+
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
 end

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

@@ -895,6 +895,43 @@ shared_examples_for "a configured file resource" do
     end
   end
 
+  # Regression test for http://tickets.opscode.com/browse/CHEF-4419
+  context "when the path starts with '/' and target file exists", :windows_only do
+    let(:path) do
+      File.join(test_file_dir[2..test_file_dir.length], make_tmpname(file_base))
+    end
+
+    before do
+      File.open(path, "wb") { |f| f.print expected_content }
+      now = Time.now.to_i
+      File.utime(now - 9000, now - 9000, path)
+
+      @expected_mtime = File.stat(path).mtime
+      @expected_checksum = sha256_checksum(path)
+    end
+
+    describe ":create action should run without any updates" do
+      before do
+        # Assert starting state is as expected
+        File.should exist(path)
+        sha256_checksum(path).should == @expected_checksum
+        resource.run_action(:create)
+      end
+
+      it "does not overwrite the original when the :create action is run" do
+        sha256_checksum(path).should == @expected_checksum
+      end
+
+      it "does not update the mtime of the file when the :create action is run" do
+        File.stat(path).mtime.should == @expected_mtime
+      end
+
+      it "is not marked as updated by last action" do
+        resource.should_not be_updated_by_last_action
+      end
+    end
+  end
+
 end
 
 shared_context Chef::Resource::File  do

data/spec/unit/provider/package/rubygems_spec.rb

@@ -256,7 +256,7 @@ describe Chef::Provider::Package::Rubygems::AlternateGemEnvironment do
   it "determines the installed versions of gems from the source index (part2: the unmockening)" do
     $stdout.stub!(:write)
     path_to_gem = if windows?
-      `where gem`.split[-1]
+      `where gem`.split[1]
     else
       `which gem`.strip
     end

data/spec/unit/provider/remote_file/cache_control_data_spec.rb

@@ -19,6 +19,15 @@
 require 'spec_helper'
 require 'uri'
 
+CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH = 64
+CACHE_FILE_MD5_HEX_LENGTH = 32
+CACHE_FILE_JSON_FILE_EXTENSION_LENGTH = 5
+CACHE_FILE_PATH_LIMIT =
+  CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH +
+  1 +
+  CACHE_FILE_MD5_HEX_LENGTH +
+  CACHE_FILE_JSON_FILE_EXTENSION_LENGTH # {friendly}-{md5hex}.json == 102
+
 describe Chef::Provider::RemoteFile::CacheControlData do
 
   let(:uri) { URI.parse("http://www.google.com/robots.txt") }
@@ -164,6 +173,38 @@ describe Chef::Provider::RemoteFile::CacheControlData do
         cache_control_data.save
       end
     end
+
+    # Cover the very long remote file path case -- see CHEF-4422 where
+    # local cache file names generated from the long uri exceeded
+    # local file system path limits resulting in exceptions from
+    # file system API's on both Windows and Unix systems.
+    context "and the URI results in a file cache path that exceeds #{CACHE_FILE_PATH_LIMIT} characters in length" do
+      let(:long_remote_path) { "http://www.bing.com/" +  ('0' * (CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH * 2 )) }
+      let(:uri) { URI.parse(long_remote_path) }
+      let(:truncated_remote_uri) { URI.parse(long_remote_path[0...CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH]) }
+      let(:truncated_file_cache_path) do
+        cache_control_data_truncated = Chef::Provider::RemoteFile::CacheControlData.load_and_validate(truncated_remote_uri, current_file_checksum)
+        cache_control_data_truncated.send('sanitized_cache_file_basename')[0...CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH]
+      end
+
+      it "truncates the file cache path to 102 characters" do
+        normalized_cache_path = cache_control_data.send('sanitized_cache_file_basename')
+
+        Chef::FileCache.should_receive(:store).with("remote_file/" + normalized_cache_path, cache_control_data.json_data)              
+
+        cache_control_data.save
+
+        normalized_cache_path.length.should == CACHE_FILE_PATH_LIMIT
+      end
+
+      it "uses a file cache path that starts with the first #{CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH} characters of the URI" do
+        normalized_cache_path = cache_control_data.send('sanitized_cache_file_basename')
+
+        truncated_file_cache_path.length.should == CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH
+        normalized_cache_path.start_with?(truncated_file_cache_path).should == true
+      end
+    end
+
   end
 
 end

metadata

@@ -1,104 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.6.0
+  version: 11.6.2
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.2
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.2
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mixlib-authentication
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
     - - <
@@ -108,7 +120,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
     - - <
@@ -118,7 +130,7 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
     - - <=
@@ -128,7 +140,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
     - - <=
@@ -180,98 +192,104 @@ dependencies:
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.9
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.9
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -996,6 +1014,42 @@ files:
 - lib/chef/win32/version.rb
 - lib/chef.rb
 - tasks/rspec.rb
+- spec/data/apt/chef-integration-test-1.0/debian/changelog
+- spec/data/apt/chef-integration-test-1.0/debian/compat
+- spec/data/apt/chef-integration-test-1.0/debian/control
+- spec/data/apt/chef-integration-test-1.0/debian/copyright
+- spec/data/apt/chef-integration-test-1.0/debian/files
+- spec/data/apt/chef-integration-test-1.0/debian/rules
+- spec/data/apt/chef-integration-test-1.0/debian/source/format
+- spec/data/apt/chef-integration-test-1.1/debian/changelog
+- spec/data/apt/chef-integration-test-1.1/debian/compat
+- spec/data/apt/chef-integration-test-1.1/debian/control
+- spec/data/apt/chef-integration-test-1.1/debian/copyright
+- spec/data/apt/chef-integration-test-1.1/debian/files
+- spec/data/apt/chef-integration-test-1.1/debian/rules
+- spec/data/apt/chef-integration-test-1.1/debian/source/format
+- spec/data/apt/chef-integration-test_1.0-1_amd64.changes
+- spec/data/apt/chef-integration-test_1.0-1_amd64.deb
+- spec/data/apt/chef-integration-test_1.0.orig.tar.gz
+- spec/data/apt/chef-integration-test_1.1-1_amd64.changes
+- spec/data/apt/chef-integration-test_1.1-1_amd64.deb
+- spec/data/apt/chef-integration-test_1.1.orig.tar.gz
+- spec/data/apt/var/www/apt/conf/distributions
+- spec/data/apt/var/www/apt/conf/incoming
+- spec/data/apt/var/www/apt/conf/pulls
+- spec/data/apt/var/www/apt/db/checksums.db
+- spec/data/apt/var/www/apt/db/contents.cache.db
+- spec/data/apt/var/www/apt/db/packages.db
+- spec/data/apt/var/www/apt/db/references.db
+- spec/data/apt/var/www/apt/db/release.caches.db
+- spec/data/apt/var/www/apt/db/version
+- spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages
+- spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages.gz
+- spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Release
+- spec/data/apt/var/www/apt/dists/sid/main/binary-i386/Packages
+- spec/data/apt/var/www/apt/dists/sid/Release
+- spec/data/apt/var/www/apt/pool/main/c/chef-integration-test/chef-integration-test_1.0-1_amd64.deb
+- spec/data/apt/var/www/apt/pool/main/c/chef-integration-test/chef-integration-test_1.1-1_amd64.deb
 - spec/data/bad-config.rb
 - spec/data/big_json.json
 - spec/data/big_json_plus_one.json
@@ -1064,6 +1118,8 @@ files:
 - spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb
 - spec/data/cookbooks/openldap/templates/default/some_windows_line_endings.erb
 - spec/data/cookbooks/openldap/templates/default/test.erb
+- spec/data/cookbooks/preseed/files/default/preseed-file.seed
+- spec/data/cookbooks/preseed/templates/default/preseed-template.seed
 - spec/data/definitions/test.rb
 - spec/data/environment-config.rb
 - spec/data/file-providers-method-snapshot-chef-11-4.json
@@ -1196,6 +1252,7 @@ files:
 - spec/functional/knife/exec_spec.rb
 - spec/functional/knife/smoke_test.rb
 - spec/functional/knife/ssh_spec.rb
+- spec/functional/provider/remote_file/cache_control_data_spec.rb
 - spec/functional/resource/batch_spec.rb
 - spec/functional/resource/cookbook_file_spec.rb
 - spec/functional/resource/deploy_revision_spec.rb
@@ -1203,6 +1260,7 @@ files:
 - spec/functional/resource/file_spec.rb
 - spec/functional/resource/git_spec.rb
 - spec/functional/resource/link_spec.rb
+- spec/functional/resource/package_spec.rb
 - spec/functional/resource/powershell_spec.rb
 - spec/functional/resource/registry_spec.rb
 - spec/functional/resource/remote_directory_spec.rb
@@ -1597,17 +1655,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration