chef 11.8.4.ohai7.0 → 11.10.0.alpha.1

data/spec/unit/rest/auth_credentials_spec.rb

@@ -135,7 +135,10 @@ describe Chef::REST::RESTRequest do
     @auth_credentials = Chef::REST::AuthCredentials.new("client-name", CHEF_SPEC_DATA + '/ssl/private_key.pem')
     @url = URI.parse("http://chef.example.com:4000/?q=chef_is_awesome")
     @req_body = '{"json_data":"as_a_string"}'
-    @headers = {"Content-type" =>"application/json", "Accept"=>"application/json", "Accept-Encoding" => Chef::REST::RESTRequest::ENCODING_GZIP_DEFLATE}
+    @headers = { "Content-type" =>"application/json",
+                 "Accept"=>"application/json",
+                 "Accept-Encoding" => Chef::REST::RESTRequest::ENCODING_GZIP_DEFLATE,
+                 "Host" => "chef.example.com:4000" }
     @request = Chef::REST::RESTRequest.new(:POST, @url, @req_body, @headers)
   end
 

data/spec/unit/rest_spec.rb

@@ -212,6 +212,8 @@ describe Chef::REST do
       Chef::Config[:ssl_client_key]  = nil
       @url = URI.parse("https://one:80/?foo=bar")
 
+      @host_header = "one:80"
+
       @http_response = Net::HTTPSuccess.new("1.1", "200", "successful rest req")
       @http_response.stub(:read_body)
       @http_response.stub(:body).and_return("ninja")
@@ -240,7 +242,10 @@ describe Chef::REST do
       end
 
       it "should build a new HTTP GET request without the application/json accept header" do
-        expected_headers = {'Accept' => "*/*", 'X-Chef-Version' => Chef::VERSION, 'Accept-Encoding' => Chef::REST::RESTRequest::ENCODING_GZIP_DEFLATE}
+        expected_headers = {'Accept' => "*/*",
+                            'X-Chef-Version' => Chef::VERSION,
+                            'Accept-Encoding' => Chef::REST::RESTRequest::ENCODING_GZIP_DEFLATE,
+                            'Host' => @host_header}
         Net::HTTP::Get.should_receive(:new).with("/?foo=bar", expected_headers).and_return(@request_mock)
         @rest.streaming_request(@url, {})
       end
@@ -286,7 +291,8 @@ describe Chef::REST do
 
         @base_headers = {"Accept" => "application/json",
           "X-Chef-Version" => Chef::VERSION,
-          "Accept-Encoding" => Chef::REST::RESTRequest::ENCODING_GZIP_DEFLATE
+          "Accept-Encoding" => Chef::REST::RESTRequest::ENCODING_GZIP_DEFLATE,
+          "Host" => @host_header
         }
       end
 
@@ -485,7 +491,10 @@ describe Chef::REST do
       end
 
       it " build a new HTTP GET request without the application/json accept header" do
-        expected_headers = {'Accept' => "*/*", 'X-Chef-Version' => Chef::VERSION, 'Accept-Encoding' => Chef::REST::RESTRequest::ENCODING_GZIP_DEFLATE}
+        expected_headers = {'Accept' => "*/*",
+                            'X-Chef-Version' => Chef::VERSION,
+                            'Accept-Encoding' => Chef::REST::RESTRequest::ENCODING_GZIP_DEFLATE,
+                            'Host' => @host_header}
         Net::HTTP::Get.should_receive(:new).with("/?foo=bar", expected_headers).and_return(@request_mock)
         @rest.streaming_request(@url, {})
       end

metadata

@@ -1,20 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.8.4.ohai7.0
-  prerelease: 7
+  version: 11.10.0.alpha.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-authentication
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,25 +97,22 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
     - - <
@@ -121,9 +121,8 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
     - - <
@@ -132,7 +131,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -140,7 +138,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -148,9 +145,8 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
     - - <=
@@ -159,9 +155,8 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
     - - <=
@@ -170,7 +165,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -178,7 +172,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -186,7 +179,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -194,7 +186,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -202,45 +193,40 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh-multi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.9
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -248,7 +234,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -256,51 +241,46 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ! '>='
+        version: '1.7'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ! '>='
+        version: '1.7'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -308,7 +288,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -316,7 +295,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -324,7 +302,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -332,87 +309,76 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -420,7 +386,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -428,7 +393,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -436,7 +400,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -444,7 +407,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -452,7 +414,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -706,6 +667,12 @@ files:
 - lib/chef/dsl/recipe.rb
 - lib/chef/dsl/registry_helper.rb
 - lib/chef/dsl.rb
+- lib/chef/encrypted_data_bag_item/decryption_failure.rb
+- lib/chef/encrypted_data_bag_item/decryptor.rb
+- lib/chef/encrypted_data_bag_item/encryptor.rb
+- lib/chef/encrypted_data_bag_item/unacceptable_encrypted_data_bag_item_format.rb
+- lib/chef/encrypted_data_bag_item/unsupported_cipher.rb
+- lib/chef/encrypted_data_bag_item/unsupported_encrypted_data_bag_item_format.rb
 - lib/chef/encrypted_data_bag_item.rb
 - lib/chef/environment.rb
 - lib/chef/event_dispatch/base.rb
@@ -807,6 +774,7 @@ files:
 - lib/chef/knife/diff.rb
 - lib/chef/knife/download.rb
 - lib/chef/knife/edit.rb
+- lib/chef/knife/environment_compare.rb
 - lib/chef/knife/environment_create.rb
 - lib/chef/knife/environment_delete.rb
 - lib/chef/knife/environment_edit.rb
@@ -890,6 +858,7 @@ files:
 - lib/chef/monkey_patches/securerandom.rb
 - lib/chef/monkey_patches/string.rb
 - lib/chef/monkey_patches/tempfile.rb
+- lib/chef/monkey_patches/uri.rb
 - lib/chef/monologger.rb
 - lib/chef/nil_argument.rb
 - lib/chef/node/attribute.rb
@@ -998,6 +967,7 @@ files:
 - lib/chef/provider/user/useradd.rb
 - lib/chef/provider/user/windows.rb
 - lib/chef/provider/user.rb
+- lib/chef/provider/whyrun_safe_ruby_block.rb
 - lib/chef/provider/windows_script.rb
 - lib/chef/provider.rb
 - lib/chef/providers.rb
@@ -1059,6 +1029,7 @@ files:
 - lib/chef/resource/template.rb
 - lib/chef/resource/timestamped_deploy.rb
 - lib/chef/resource/user.rb
+- lib/chef/resource/whyrun_safe_ruby_block.rb
 - lib/chef/resource/windows_script.rb
 - lib/chef/resource/yum_package.rb
 - lib/chef/resource.rb
@@ -1402,7 +1373,6 @@ files:
 - spec/functional/resource/ifconfig_spec.rb
 - spec/functional/resource/link_spec.rb
 - spec/functional/resource/mount_spec.rb
-- spec/functional/resource/ohai_spec.rb
 - spec/functional/resource/package_spec.rb
 - spec/functional/resource/powershell_spec.rb
 - spec/functional/resource/registry_spec.rb
@@ -1420,11 +1390,13 @@ files:
 - spec/functional/win32/service_manager_spec.rb
 - spec/functional/win32/versions_spec.rb
 - spec/integration/client/client_spec.rb
+- spec/integration/client/ipv6_spec.rb
 - spec/integration/knife/chef_fs_data_store_spec.rb
 - spec/integration/knife/chef_repo_path_spec.rb
 - spec/integration/knife/chef_repository_file_system_spec.rb
 - spec/integration/knife/chefignore_spec.rb
 - spec/integration/knife/common_options_spec.rb
+- spec/integration/knife/cookbook_api_ipv6_spec.rb
 - spec/integration/knife/delete_spec.rb
 - spec/integration/knife/deps_spec.rb
 - spec/integration/knife/diff_spec.rb
@@ -1436,6 +1408,7 @@ files:
 - spec/integration/knife/upload_spec.rb
 - spec/integration/solo/solo_spec.rb
 - spec/rcov.opts
+- spec/scripts/ssl-serve.rb
 - spec/spec_helper.rb
 - spec/stress/win32/file_spec.rb
 - spec/stress/win32/memory_spec.rb
@@ -1561,6 +1534,7 @@ files:
 - spec/unit/knife/data_bag_edit_spec.rb
 - spec/unit/knife/data_bag_from_file_spec.rb
 - spec/unit/knife/data_bag_show_spec.rb
+- spec/unit/knife/environment_compare_spec.rb
 - spec/unit/knife/environment_create_spec.rb
 - spec/unit/knife/environment_delete_spec.rb
 - spec/unit/knife/environment_edit_spec.rb
@@ -1613,6 +1587,7 @@ files:
 - spec/unit/mixin/windows_architecture_helper_spec.rb
 - spec/unit/mixin/xml_escape_spec.rb
 - spec/unit/monkey_patches/string_spec.rb
+- spec/unit/monkey_patches/uri_spec.rb
 - spec/unit/node/attribute_spec.rb
 - spec/unit/node/immutable_collections_spec.rb
 - spec/unit/node_spec.rb
@@ -1706,6 +1681,7 @@ files:
 - spec/unit/provider/user/useradd_spec.rb
 - spec/unit/provider/user/windows_spec.rb
 - spec/unit/provider/user_spec.rb
+- spec/unit/provider/whyrun_safe_ruby_block_spec.rb
 - spec/unit/provider_spec.rb
 - spec/unit/recipe_spec.rb
 - spec/unit/registry_helper_spec.rb
@@ -1808,30 +1784,26 @@ files:
 - bin/chef-service-manager
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3862901366851738946
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration
   management to your entire infrastructure.
 test_files: []