chef 11.12.8 → 11.14.0.alpha.2

data/spec/unit/run_lock_spec.rb

@@ -35,6 +35,104 @@ describe Chef::RunLock do
     end
   end
 
+  describe "acquire" do
+    let(:lockfile) { "/tmp/chef-client-running.pid" }
+    subject(:runlock) { Chef::RunLock.new(lockfile) }
+
+    def stub_unblocked_run
+      runlock.stub(:test).and_return(true)
+    end
+
+    def stub_blocked_run(duration)
+      runlock.stub(:test).and_return(false)
+      runlock.stub(:wait) { sleep(duration) }
+      runlock.stub(:runpid).and_return(666) # errors read blocking pid
+    end
+
+    describe "when Chef::Config[:run_lock_timeout] is not set (set to default)" do
+      describe "and the lockfile is not locked by another client run" do
+        it "should not wait" do
+          stub_unblocked_run
+          Chef::RunLock.any_instance.should_not_receive(:wait)
+          runlock.acquire
+        end
+      end
+
+      describe "and the lockfile is locked by another client run" do
+        it "should wait for the lock to be released" do
+          stub_blocked_run(0.001)
+          runlock.should_receive(:wait)
+          runlock.acquire
+        end
+      end
+    end
+
+    describe "when Chef::Config[:run_lock_timeout] is set to 0" do
+      before(:each) do
+        @default_timeout = Chef::Config[:run_lock_timeout]
+        Chef::Config[:run_lock_timeout] = 0
+      end
+
+      after(:each) do
+        Chef::Config[:run_lock_timeout] = @default_timeout
+      end
+
+      describe "and the lockfile is not locked by another client run" do
+        it "should acquire the lock" do
+          stub_unblocked_run
+          runlock.should_not_receive(:wait)
+          runlock.acquire
+        end
+      end
+
+      describe "and the lockfile is locked by another client run" do
+        it "should raise Chef::Exceptions::RunLockTimeout" do
+          stub_blocked_run(0.001)
+          runlock.should_not_receive(:wait)
+          expect{ runlock.acquire }.to raise_error(Chef::Exceptions::RunLockTimeout)
+        end
+      end
+    end
+
+    describe "when Chef::Config[:run_lock_timeout] is set to >0" do
+      before(:each) do
+        @default_timeout = Chef::Config[:run_lock_timeout]
+        @timeout = 0.1
+        Chef::Config[:run_lock_timeout] = @timeout
+      end
+
+      after(:each) do
+        Chef::Config[:run_lock_timeout] = @default_timeout
+      end
+
+      describe "and the lockfile is not locked by another client run" do
+        it "should acquire the lock" do
+          stub_unblocked_run
+          runlock.should_not_receive(:wait)
+          runlock.acquire
+        end
+      end
+
+      describe "and the lockfile is locked by another client run" do
+        describe "and the lock is released before the timeout expires" do
+          it "should acquire the lock" do
+            stub_blocked_run(@timeout/2.0)
+            runlock.should_receive(:wait)
+            expect{ runlock.acquire }.not_to raise_error
+          end
+        end
+
+        describe "and the lock is not released before the timeout expires" do
+          it "should raise a RunLockTimeout exception" do
+            stub_blocked_run(2.0)
+            runlock.should_receive(:wait)
+            expect{ runlock.acquire }.to raise_error(Chef::Exceptions::RunLockTimeout)
+          end
+        end
+      end
+    end
+  end
+
   # See also: spec/functional/run_lock_spec
 
 end

data/spec/unit/version_constraint_spec.rb

@@ -76,7 +76,7 @@ describe Chef::VersionConstraint do
         @vc.should include Chef::Version.new("1.4")
       end
       it "Chef::CookbookVersion" do
-        cv = Chef::CookbookVersion.new("alice")
+        cv = Chef::CookbookVersion.new("alice", '/tmp/blah.txt')
         cv.version = "1.4"
         @vc.should include cv
       end

metadata

@@ -1,365 +1,365 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.12.8
+  version: 11.14.0.alpha.2
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mixlib-authentication
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
-    - - "<="
+    - - <=
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
-    - - "<="
+    - - <=
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !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'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: net-ssh-multi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !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'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     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
     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
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     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
     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
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
-    - - "<"
+        version: '2.0'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
-    - - "<"
+        version: '2.0'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.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
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
 description: A systems integration framework, built to bring the benefits of configuration
@@ -379,18 +379,10 @@ extra_rdoc_files:
 - CONTRIBUTING.md
 - LICENSE
 files:
-- CONTRIBUTING.md
+- Rakefile
 - LICENSE
 - README.md
-- Rakefile
-- bin/chef-apply
-- bin/chef-client
-- bin/chef-service-manager
-- bin/chef-shell
-- bin/chef-solo
-- bin/knife
-- bin/shef
-- distro/README
+- CONTRIBUTING.md
 - distro/arch/etc/conf.d/chef-client.conf
 - distro/arch/etc/conf.d/chef-expander.conf
 - distro/arch/etc/conf.d/chef-server-webui.conf
@@ -430,6 +422,8 @@ files:
 - distro/common/html/_sources/knife_search.txt
 - distro/common/html/_sources/knife_show.txt
 - distro/common/html/_sources/knife_ssh.txt
+- distro/common/html/_sources/knife_ssl_check.txt
+- distro/common/html/_sources/knife_ssl_fetch.txt
 - distro/common/html/_sources/knife_status.txt
 - distro/common/html/_sources/knife_tag.txt
 - distro/common/html/_sources/knife_upload.txt
@@ -438,10 +432,8 @@ files:
 - distro/common/html/_sources/knife_xargs.txt
 - distro/common/html/_static/ajax-loader.gif
 - distro/common/html/_static/basic.css
-- distro/common/html/_static/chef.css
 - distro/common/html/_static/chef.ico
 - distro/common/html/_static/chef_html_logo.png
-- distro/common/html/_static/chef_logo.png
 - distro/common/html/_static/comment-bright.png
 - distro/common/html/_static/comment-close.png
 - distro/common/html/_static/comment.png
@@ -490,6 +482,8 @@ files:
 - distro/common/html/knife_search.html
 - distro/common/html/knife_show.html
 - distro/common/html/knife_ssh.html
+- distro/common/html/knife_ssl_check.html
+- distro/common/html/knife_ssl_fetch.html
 - distro/common/html/knife_status.html
 - distro/common/html/knife_tag.html
 - distro/common/html/knife_upload.html
@@ -499,7 +493,6 @@ files:
 - distro/common/html/objects.inv
 - distro/common/html/search.html
 - distro/common/html/searchindex.js
-- distro/common/man/man1/README.md
 - distro/common/man/man1/chef-shell.1
 - distro/common/man/man1/knife-bootstrap.1
 - distro/common/man/man1/knife-client.1
@@ -523,15 +516,17 @@ files:
 - distro/common/man/man1/knife-search.1
 - distro/common/man/man1/knife-show.1
 - distro/common/man/man1/knife-ssh.1
+- distro/common/man/man1/knife-ssl-check.1
+- distro/common/man/man1/knife-ssl-fetch.1
 - distro/common/man/man1/knife-status.1
 - distro/common/man/man1/knife-tag.1
 - distro/common/man/man1/knife-upload.1
 - distro/common/man/man1/knife-user.1
 - distro/common/man/man1/knife-xargs.1
 - distro/common/man/man1/knife.1
+- distro/common/man/man1/README.md
 - distro/common/man/man8/chef-client.8
 - distro/common/man/man8/chef-solo.8
-- distro/common/markdown/README
 - distro/common/markdown/man1/chef-shell.mkd
 - distro/common/markdown/man1/knife-bootstrap.mkd
 - distro/common/markdown/man1/knife-client.mkd
@@ -556,21 +551,23 @@ files:
 - distro/common/markdown/man8/chef-server.mkd
 - distro/common/markdown/man8/chef-solo.mkd
 - distro/common/markdown/man8/chef-solr.mkd
+- distro/common/markdown/README
 - distro/debian/etc/default/chef-client
 - distro/debian/etc/default/chef-expander
 - distro/debian/etc/default/chef-server
 - distro/debian/etc/default/chef-server-webui
 - distro/debian/etc/default/chef-solr
-- distro/debian/etc/init.d/chef-client
-- distro/debian/etc/init.d/chef-expander
-- distro/debian/etc/init.d/chef-server
-- distro/debian/etc/init.d/chef-server-webui
-- distro/debian/etc/init.d/chef-solr
 - distro/debian/etc/init/chef-client.conf
 - distro/debian/etc/init/chef-expander.conf
 - distro/debian/etc/init/chef-server-webui.conf
 - distro/debian/etc/init/chef-server.conf
 - distro/debian/etc/init/chef-solr.conf
+- distro/debian/etc/init.d/chef-client
+- distro/debian/etc/init.d/chef-expander
+- distro/debian/etc/init.d/chef-server
+- distro/debian/etc/init.d/chef-server-webui
+- distro/debian/etc/init.d/chef-solr
+- distro/README
 - distro/redhat/etc/init.d/chef-client
 - distro/redhat/etc/init.d/chef-expander
 - distro/redhat/etc/init.d/chef-server
@@ -587,10 +584,8 @@ files:
 - distro/redhat/etc/sysconfig/chef-server-webui
 - distro/redhat/etc/sysconfig/chef-solr
 - distro/windows/service_manager.rb
-- lib/chef.rb
-- lib/chef/api_client.rb
 - lib/chef/api_client/registration.rb
-- lib/chef/application.rb
+- lib/chef/api_client.rb
 - lib/chef/application/agent.rb
 - lib/chef/application/apply.rb
 - lib/chef/application/client.rb
@@ -598,10 +593,8 @@ files:
 - lib/chef/application/solo.rb
 - lib/chef/application/windows_service.rb
 - lib/chef/application/windows_service_manager.rb
+- lib/chef/application.rb
 - lib/chef/applications.rb
-- lib/chef/checksum/storage.rb
-- lib/chef/checksum/storage/filesystem.rb
-- lib/chef/chef_fs.rb
 - lib/chef/chef_fs/chef_fs_data_store.rb
 - lib/chef/chef_fs/command_line.rb
 - lib/chef/chef_fs/config.rb
@@ -617,7 +610,6 @@ files:
 - lib/chef/chef_fs/data_handler/role_data_handler.rb
 - lib/chef/chef_fs/data_handler/user_data_handler.rb
 - lib/chef/chef_fs/file_pattern.rb
-- lib/chef/chef_fs/file_system.rb
 - lib/chef/chef_fs/file_system/acl_dir.rb
 - lib/chef/chef_fs/file_system/acl_entry.rb
 - lib/chef/chef_fs/file_system/acls_dir.rb
@@ -657,9 +649,11 @@ files:
 - lib/chef/chef_fs/file_system/operation_not_allowed_error.rb
 - lib/chef/chef_fs/file_system/rest_list_dir.rb
 - lib/chef/chef_fs/file_system/rest_list_entry.rb
+- lib/chef/chef_fs/file_system.rb
 - lib/chef/chef_fs/knife.rb
 - lib/chef/chef_fs/parallelizer.rb
 - lib/chef/chef_fs/path_utils.rb
+- lib/chef/chef_fs.rb
 - lib/chef/client.rb
 - lib/chef/config.rb
 - lib/chef/config_fetcher.rb
@@ -686,7 +680,6 @@ files:
 - lib/chef/deprecation/provider/template.rb
 - lib/chef/deprecation/warnings.rb
 - lib/chef/digester.rb
-- lib/chef/dsl.rb
 - lib/chef/dsl/data_query.rb
 - lib/chef/dsl/include_attribute.rb
 - lib/chef/dsl/include_recipe.rb
@@ -694,31 +687,32 @@ files:
 - lib/chef/dsl/reboot_pending.rb
 - lib/chef/dsl/recipe.rb
 - lib/chef/dsl/registry_helper.rb
-- lib/chef/encrypted_data_bag_item.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
 - lib/chef/event_dispatch/dispatcher.rb
+- lib/chef/event_dispatch/events_output_stream.rb
 - lib/chef/exceptions.rb
-- lib/chef/file_access_control.rb
 - lib/chef/file_access_control/unix.rb
 - lib/chef/file_access_control/windows.rb
+- lib/chef/file_access_control.rb
 - lib/chef/file_cache.rb
 - lib/chef/file_content_management/content_base.rb
-- lib/chef/file_content_management/deploy.rb
 - lib/chef/file_content_management/deploy/cp.rb
 - lib/chef/file_content_management/deploy/mv_unix.rb
 - lib/chef/file_content_management/deploy/mv_windows.rb
+- lib/chef/file_content_management/deploy.rb
 - lib/chef/file_content_management/tempfile.rb
 - lib/chef/formatters/base.rb
 - lib/chef/formatters/doc.rb
 - lib/chef/formatters/error_descriptor.rb
-- lib/chef/formatters/error_inspectors.rb
 - lib/chef/formatters/error_inspectors/api_error_formatting.rb
 - lib/chef/formatters/error_inspectors/compile_error_inspector.rb
 - lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb
@@ -727,14 +721,15 @@ files:
 - lib/chef/formatters/error_inspectors/registration_error_inspector.rb
 - lib/chef/formatters/error_inspectors/resource_failure_inspector.rb
 - lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb
+- lib/chef/formatters/error_inspectors.rb
 - lib/chef/formatters/error_mapper.rb
+- lib/chef/formatters/indentable_output_stream.rb
 - lib/chef/formatters/minimal.rb
 - lib/chef/guard_interpreter/default_guard_interpreter.rb
 - lib/chef/guard_interpreter/resource_guard_interpreter.rb
-- lib/chef/handler.rb
 - lib/chef/handler/error_report.rb
 - lib/chef/handler/json_file.rb
-- lib/chef/http.rb
+- lib/chef/handler.rb
 - lib/chef/http/auth_credentials.rb
 - lib/chef/http/authenticator.rb
 - lib/chef/http/basic_client.rb
@@ -749,17 +744,17 @@ files:
 - lib/chef/http/simple.rb
 - lib/chef/http/ssl_policies.rb
 - lib/chef/http/validate_content_length.rb
+- lib/chef/http.rb
 - lib/chef/json_compat.rb
-- lib/chef/knife.rb
-- lib/chef/knife/bootstrap.rb
-- lib/chef/knife/bootstrap/README.md
 - lib/chef/knife/bootstrap/archlinux-gems.erb
 - lib/chef/knife/bootstrap/centos5-gems.erb
 - lib/chef/knife/bootstrap/chef-full.erb
 - lib/chef/knife/bootstrap/fedora13-gems.erb
+- lib/chef/knife/bootstrap/README.md
 - lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
 - lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
 - lib/chef/knife/bootstrap/ubuntu12.04-gems.erb
+- lib/chef/knife/bootstrap.rb
 - lib/chef/knife/client_bulk_delete.rb
 - lib/chef/knife/client_create.rb
 - lib/chef/knife/client_delete.rb
@@ -823,6 +818,7 @@ files:
 - lib/chef/knife/node_create.rb
 - lib/chef/knife/node_delete.rb
 - lib/chef/knife/node_edit.rb
+- lib/chef/knife/node_environment_set.rb
 - lib/chef/knife/node_from_file.rb
 - lib/chef/knife/node_list.rb
 - lib/chef/knife/node_run_list_add.rb
@@ -855,12 +851,13 @@ files:
 - lib/chef/knife/user_reregister.rb
 - lib/chef/knife/user_show.rb
 - lib/chef/knife/xargs.rb
+- lib/chef/knife.rb
 - lib/chef/log.rb
 - lib/chef/mash.rb
 - lib/chef/mixin/checksum.rb
-- lib/chef/mixin/command.rb
 - lib/chef/mixin/command/unix.rb
 - lib/chef/mixin/command/windows.rb
+- lib/chef/mixin/command.rb
 - lib/chef/mixin/convert_to_class_name.rb
 - lib/chef/mixin/create_path.rb
 - lib/chef/mixin/deep_merge.rb
@@ -888,6 +885,7 @@ files:
 - lib/chef/monkey_patches/net_http.rb
 - lib/chef/monkey_patches/numeric.rb
 - lib/chef/monkey_patches/object.rb
+- lib/chef/monkey_patches/pathname.rb
 - lib/chef/monkey_patches/regexp.rb
 - lib/chef/monkey_patches/securerandom.rb
 - lib/chef/monkey_patches/string.rb
@@ -895,37 +893,35 @@ files:
 - lib/chef/monkey_patches/uri.rb
 - lib/chef/monologger.rb
 - lib/chef/nil_argument.rb
-- lib/chef/node.rb
 - lib/chef/node/attribute.rb
 - lib/chef/node/attribute_collections.rb
 - lib/chef/node/immutable_collections.rb
-- lib/chef/platform.rb
+- lib/chef/node.rb
 - lib/chef/platform/provider_mapping.rb
 - lib/chef/platform/query_helpers.rb
-- lib/chef/policy_builder.rb
+- lib/chef/platform.rb
 - lib/chef/policy_builder/expand_node_object.rb
 - lib/chef/policy_builder/policyfile.rb
-- lib/chef/provider.rb
+- lib/chef/policy_builder.rb
 - lib/chef/provider/batch.rb
 - lib/chef/provider/breakpoint.rb
-- lib/chef/provider/cookbook_file.rb
 - lib/chef/provider/cookbook_file/content.rb
-- lib/chef/provider/cron.rb
+- lib/chef/provider/cookbook_file.rb
 - lib/chef/provider/cron/aix.rb
 - lib/chef/provider/cron/solaris.rb
 - lib/chef/provider/cron/unix.rb
-- lib/chef/provider/deploy.rb
+- lib/chef/provider/cron.rb
 - lib/chef/provider/deploy/revision.rb
 - lib/chef/provider/deploy/timestamped.rb
+- lib/chef/provider/deploy.rb
 - lib/chef/provider/directory.rb
-- lib/chef/provider/env.rb
 - lib/chef/provider/env/windows.rb
+- lib/chef/provider/env.rb
 - lib/chef/provider/erl_call.rb
 - lib/chef/provider/execute.rb
-- lib/chef/provider/file.rb
 - lib/chef/provider/file/content.rb
+- lib/chef/provider/file.rb
 - lib/chef/provider/git.rb
-- lib/chef/provider/group.rb
 - lib/chef/provider/group/aix.rb
 - lib/chef/provider/group/dscl.rb
 - lib/chef/provider/group/gpasswd.rb
@@ -935,21 +931,21 @@ files:
 - lib/chef/provider/group/suse.rb
 - lib/chef/provider/group/usermod.rb
 - lib/chef/provider/group/windows.rb
+- lib/chef/provider/group.rb
 - lib/chef/provider/http_request.rb
-- lib/chef/provider/ifconfig.rb
 - lib/chef/provider/ifconfig/aix.rb
 - lib/chef/provider/ifconfig/debian.rb
 - lib/chef/provider/ifconfig/redhat.rb
+- lib/chef/provider/ifconfig.rb
 - lib/chef/provider/link.rb
 - lib/chef/provider/log.rb
 - lib/chef/provider/lwrp_base.rb
 - lib/chef/provider/mdadm.rb
-- lib/chef/provider/mount.rb
 - lib/chef/provider/mount/aix.rb
 - lib/chef/provider/mount/mount.rb
 - lib/chef/provider/mount/windows.rb
+- lib/chef/provider/mount.rb
 - lib/chef/provider/ohai.rb
-- lib/chef/provider/package.rb
 - lib/chef/provider/package/aix.rb
 - lib/chef/provider/package/apt.rb
 - lib/chef/provider/package/dpkg.rb
@@ -963,26 +959,26 @@ files:
 - lib/chef/provider/package/rubygems.rb
 - lib/chef/provider/package/smartos.rb
 - lib/chef/provider/package/solaris.rb
-- lib/chef/provider/package/windows.rb
 - lib/chef/provider/package/windows/msi.rb
+- lib/chef/provider/package/windows.rb
 - lib/chef/provider/package/yum-dump.py
 - lib/chef/provider/package/yum.rb
 - lib/chef/provider/package/zypper.rb
+- lib/chef/provider/package.rb
 - lib/chef/provider/powershell_script.rb
 - lib/chef/provider/registry_key.rb
 - lib/chef/provider/remote_directory.rb
-- lib/chef/provider/remote_file.rb
 - lib/chef/provider/remote_file/cache_control_data.rb
 - lib/chef/provider/remote_file/content.rb
 - lib/chef/provider/remote_file/fetcher.rb
 - lib/chef/provider/remote_file/ftp.rb
 - lib/chef/provider/remote_file/http.rb
 - lib/chef/provider/remote_file/local_file.rb
+- lib/chef/provider/remote_file.rb
 - lib/chef/provider/resource_update.rb
 - lib/chef/provider/route.rb
 - lib/chef/provider/ruby_block.rb
 - lib/chef/provider/script.rb
-- lib/chef/provider/service.rb
 - lib/chef/provider/service/arch.rb
 - lib/chef/provider/service/debian.rb
 - lib/chef/provider/service/freebsd.rb
@@ -997,23 +993,24 @@ files:
 - lib/chef/provider/service/systemd.rb
 - lib/chef/provider/service/upstart.rb
 - lib/chef/provider/service/windows.rb
+- lib/chef/provider/service.rb
 - lib/chef/provider/subversion.rb
-- lib/chef/provider/template.rb
 - lib/chef/provider/template/content.rb
+- lib/chef/provider/template.rb
 - lib/chef/provider/template_finder.rb
-- lib/chef/provider/user.rb
 - lib/chef/provider/user/dscl.rb
 - lib/chef/provider/user/pw.rb
 - lib/chef/provider/user/solaris.rb
 - 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
 - lib/chef/recipe.rb
 - lib/chef/request_id.rb
 - lib/chef/reserved_names.rb
-- lib/chef/resource.rb
 - lib/chef/resource/apt_package.rb
 - lib/chef/resource/bash.rb
 - lib/chef/resource/batch.rb
@@ -1074,8 +1071,9 @@ files:
 - lib/chef/resource/windows_package.rb
 - lib/chef/resource/windows_script.rb
 - lib/chef/resource/yum_package.rb
-- lib/chef/resource_collection.rb
+- lib/chef/resource.rb
 - lib/chef/resource_collection/stepable_iterator.rb
+- lib/chef/resource_collection.rb
 - lib/chef/resource_definition.rb
 - lib/chef/resource_definition_list.rb
 - lib/chef/resource_platform_map.rb
@@ -1083,12 +1081,12 @@ files:
 - lib/chef/resources.rb
 - lib/chef/rest.rb
 - lib/chef/role.rb
-- lib/chef/run_context.rb
 - lib/chef/run_context/cookbook_compiler.rb
-- lib/chef/run_list.rb
+- lib/chef/run_context.rb
 - lib/chef/run_list/run_list_expansion.rb
 - lib/chef/run_list/run_list_item.rb
 - lib/chef/run_list/versioned_recipe_list.rb
+- lib/chef/run_list.rb
 - lib/chef/run_lock.rb
 - lib/chef/run_status.rb
 - lib/chef/runner.rb
@@ -1097,11 +1095,11 @@ files:
 - lib/chef/search/query.rb
 - lib/chef/server_api.rb
 - lib/chef/shef/ext.rb
-- lib/chef/shell.rb
 - lib/chef/shell/ext.rb
 - lib/chef/shell/model_wrapper.rb
 - lib/chef/shell/shell_rest.rb
 - lib/chef/shell/shell_session.rb
+- lib/chef/shell.rb
 - lib/chef/shell_out.rb
 - lib/chef/streaming_cookbook_uploader.rb
 - lib/chef/tasks/chef_repo.rake
@@ -1111,17 +1109,16 @@ files:
 - lib/chef/util/editor.rb
 - lib/chef/util/file_edit.rb
 - lib/chef/util/selinux.rb
-- lib/chef/util/windows.rb
 - lib/chef/util/windows/net_group.rb
 - lib/chef/util/windows/net_use.rb
 - lib/chef/util/windows/net_user.rb
 - lib/chef/util/windows/volume.rb
-- lib/chef/version.rb
+- lib/chef/util/windows.rb
 - lib/chef/version/platform.rb
+- lib/chef/version.rb
 - lib/chef/version_class.rb
-- lib/chef/version_constraint.rb
 - lib/chef/version_constraint/platform.rb
-- lib/chef/win32/api.rb
+- lib/chef/version_constraint.rb
 - lib/chef/win32/api/error.rb
 - lib/chef/win32/api/file.rb
 - lib/chef/win32/api/installer.rb
@@ -1132,23 +1129,26 @@ files:
 - lib/chef/win32/api/synchronization.rb
 - lib/chef/win32/api/system.rb
 - lib/chef/win32/api/unicode.rb
+- lib/chef/win32/api.rb
 - lib/chef/win32/error.rb
-- lib/chef/win32/file.rb
 - lib/chef/win32/file/info.rb
+- lib/chef/win32/file.rb
 - lib/chef/win32/handle.rb
 - lib/chef/win32/memory.rb
 - lib/chef/win32/mutex.rb
 - lib/chef/win32/process.rb
 - lib/chef/win32/registry.rb
-- lib/chef/win32/security.rb
 - lib/chef/win32/security/ace.rb
 - lib/chef/win32/security/acl.rb
 - lib/chef/win32/security/securable_object.rb
 - lib/chef/win32/security/security_descriptor.rb
 - lib/chef/win32/security/sid.rb
 - lib/chef/win32/security/token.rb
+- lib/chef/win32/security.rb
 - lib/chef/win32/unicode.rb
 - 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
@@ -1178,11 +1178,11 @@ files:
 - 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/Release
 - 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
@@ -1193,12 +1193,12 @@ files:
 - spec/data/bootstrap/secret.erb
 - spec/data/bootstrap/test-hints.erb
 - spec/data/bootstrap/test.erb
-- spec/data/cb_version_cookbooks/tatft/README.rdoc
 - spec/data/cb_version_cookbooks/tatft/attributes/default.rb
 - spec/data/cb_version_cookbooks/tatft/definitions/runit_service.rb
 - spec/data/cb_version_cookbooks/tatft/files/default/giant_blob.tgz
 - spec/data/cb_version_cookbooks/tatft/libraries/ownage.rb
 - spec/data/cb_version_cookbooks/tatft/providers/lwp.rb
+- spec/data/cb_version_cookbooks/tatft/README.rdoc
 - spec/data/cb_version_cookbooks/tatft/recipes/default.rb
 - spec/data/cb_version_cookbooks/tatft/resources/lwr.rb
 - spec/data/cb_version_cookbooks/tatft/templates/default/configuration.erb
@@ -1351,6 +1351,16 @@ files:
 - spec/data/run_context/cookbooks/no-default-attr/providers/provider.rb
 - spec/data/run_context/cookbooks/no-default-attr/recipes/default.rb
 - spec/data/run_context/cookbooks/no-default-attr/resources/resource.rb
+- spec/data/run_context/cookbooks/test/attributes/default.rb
+- spec/data/run_context/cookbooks/test/attributes/george.rb
+- spec/data/run_context/cookbooks/test/definitions/new_animals.rb
+- spec/data/run_context/cookbooks/test/definitions/new_cat.rb
+- spec/data/run_context/cookbooks/test/definitions/test_res.rb
+- spec/data/run_context/cookbooks/test/providers/provider.rb
+- spec/data/run_context/cookbooks/test/recipes/default.rb
+- spec/data/run_context/cookbooks/test/recipes/one.rb
+- spec/data/run_context/cookbooks/test/recipes/two.rb
+- spec/data/run_context/cookbooks/test/resources/resource.rb
 - spec/data/run_context/cookbooks/test-with-circular-deps/attributes/default.rb
 - spec/data/run_context/cookbooks/test-with-circular-deps/definitions/test_with-circular-deps_res.rb
 - spec/data/run_context/cookbooks/test-with-circular-deps/libraries/lib.rb
@@ -1366,16 +1376,6 @@ files:
 - spec/data/run_context/cookbooks/test-with-deps/recipes/default.rb
 - spec/data/run_context/cookbooks/test-with-deps/recipes/server.rb
 - spec/data/run_context/cookbooks/test-with-deps/resources/resource.rb
-- spec/data/run_context/cookbooks/test/attributes/default.rb
-- spec/data/run_context/cookbooks/test/attributes/george.rb
-- spec/data/run_context/cookbooks/test/definitions/new_animals.rb
-- spec/data/run_context/cookbooks/test/definitions/new_cat.rb
-- spec/data/run_context/cookbooks/test/definitions/test_res.rb
-- spec/data/run_context/cookbooks/test/providers/provider.rb
-- spec/data/run_context/cookbooks/test/recipes/default.rb
-- spec/data/run_context/cookbooks/test/recipes/one.rb
-- spec/data/run_context/cookbooks/test/recipes/two.rb
-- spec/data/run_context/cookbooks/test/resources/resource.rb
 - spec/data/run_context/nodes/run_context.rb
 - spec/data/search_queries_to_transform.txt
 - spec/data/shef-config.rb
@@ -1385,8 +1385,8 @@ files:
 - spec/data/ssl/key.pem
 - spec/data/ssl/private_key.pem
 - spec/data/ssl/private_key_with_whitespace.pem
-- spec/data/standalone_cookbook/Gemfile
 - spec/data/standalone_cookbook/chefignore
+- spec/data/standalone_cookbook/Gemfile
 - spec/data/standalone_cookbook/recipes/default.rb
 - spec/data/standalone_cookbook/vendor/bundle/ruby/2.0.0/gems/multi_json-1.9.0/lib/multi_json.rb
 - spec/data/templates/seattle.txt
@@ -1394,15 +1394,16 @@ files:
 - spec/data/trusted_certs/intermediate.pem
 - spec/data/trusted_certs/opscode.pem
 - spec/data/trusted_certs/root.pem
-- spec/functional/assets/PkgA.1.0.0.0.bff
-- spec/functional/assets/PkgA.2.0.0.0.bff
 - spec/functional/assets/dummy-1-0.aix6.1.noarch.rpm
 - spec/functional/assets/dummy-2-0.aix6.1.noarch.rpm
 - spec/functional/assets/mytest-1.0-1.noarch.rpm
 - spec/functional/assets/mytest-2.0-1.noarch.rpm
+- spec/functional/assets/PkgA.1.0.0.0.bff
+- spec/functional/assets/PkgA.2.0.0.0.bff
 - spec/functional/dsl/reboot_pending_spec.rb
 - spec/functional/dsl/registry_helper_spec.rb
 - spec/functional/file_content_management/deploy_strategies_spec.rb
+- spec/functional/http/simple_spec.rb
 - spec/functional/knife/configure_spec.rb
 - spec/functional/knife/cookbook_delete_spec.rb
 - spec/functional/knife/exec_spec.rb
@@ -1431,6 +1432,7 @@ files:
 - spec/functional/resource/rpm_spec.rb
 - spec/functional/resource/template_spec.rb
 - spec/functional/resource/user_spec.rb
+- spec/functional/rest_spec.rb
 - spec/functional/run_lock_spec.rb
 - spec/functional/shell_spec.rb
 - spec/functional/tiny_server_spec.rb
@@ -1456,6 +1458,7 @@ files:
 - spec/integration/knife/redirection_spec.rb
 - spec/integration/knife/show_spec.rb
 - spec/integration/knife/upload_spec.rb
+- spec/integration/recipes/lwrp_inline_resources_spec.rb
 - spec/integration/solo/solo_spec.rb
 - spec/rcov.opts
 - spec/scripts/ssl-serve.rb
@@ -1474,6 +1477,9 @@ files:
 - spec/support/matchers/leak.rb
 - spec/support/mock/constant.rb
 - spec/support/mock/platform.rb
+- spec/support/pedant/pedant_config.rb
+- spec/support/pedant/run_pedant.rb
+- spec/support/pedant/stickywicket.pem
 - spec/support/platform_helpers.rb
 - spec/support/platforms/prof/gc.rb
 - spec/support/platforms/prof/win32.rb
@@ -1481,6 +1487,7 @@ files:
 - spec/support/shared/functional/diff_disabled.rb
 - spec/support/shared/functional/directory_resource.rb
 - spec/support/shared/functional/file_resource.rb
+- spec/support/shared/functional/http.rb
 - spec/support/shared/functional/knife.rb
 - spec/support/shared/functional/securable_resource.rb
 - spec/support/shared/functional/securable_resource_with_reporting.rb
@@ -1506,7 +1513,6 @@ files:
 - spec/unit/application/server_spec.rb
 - spec/unit/application/solo_spec.rb
 - spec/unit/application_spec.rb
-- spec/unit/checksum/storage/filesystem_spec.rb
 - spec/unit/chef_fs/diff_spec.rb
 - spec/unit/chef_fs/file_pattern_spec.rb
 - spec/unit/chef_fs/file_system/operation_failed_error_spec.rb
@@ -1603,6 +1609,7 @@ files:
 - spec/unit/knife/node_bulk_delete_spec.rb
 - spec/unit/knife/node_delete_spec.rb
 - spec/unit/knife/node_edit_spec.rb
+- spec/unit/knife/node_environment_set_spec.rb
 - spec/unit/knife/node_from_file_spec.rb
 - spec/unit/knife/node_list_spec.rb
 - spec/unit/knife/node_run_list_add_spec.rb
@@ -1844,7 +1851,13 @@ files:
 - spec/unit/version_constraint/platform_spec.rb
 - spec/unit/version_constraint_spec.rb
 - spec/unit/windows_service_spec.rb
-- tasks/rspec.rb
+- bin/chef-client
+- bin/chef-solo
+- bin/knife
+- bin/chef-shell
+- bin/shef
+- bin/chef-apply
+- bin/chef-service-manager
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
 metadata: {}
@@ -1854,17 +1867,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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration