chef 11.14.0.alpha.4 → 11.14.0.rc.2

data/spec/unit/rest_spec.rb

@@ -247,9 +247,9 @@ describe Chef::REST do
       http_response
     end
 
-    let(:host_header) { "one:80" }
+    let(:host_header) { "one" }
 
-    let(:url) { URI.parse("https://one:80/?foo=bar") }
+    let(:url) { URI.parse("http://one:80/?foo=bar") }
 
     let(:base_url) { "http://chef.example.com:4000" }
 

data/spec/unit/role_spec.rb

@@ -256,26 +256,46 @@ EOR
     end
 
     it "should return a Chef::Role object from JSON" do
-      File.should_receive(:exists?).with(File.join(Chef::Config[:role_path], 'lolcat.json')).exactly(1).times.and_return(true)
-      IO.should_receive(:read).with(File.join(Chef::Config[:role_path], 'lolcat.json')).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
+      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.json"])
+      file_path = File.join(Chef::Config[:role_path], 'memes/lolcat.json')
+      File.should_receive(:exists?).with(file_path).exactly(1).times.and_return(true)
+      IO.should_receive(:read).with(file_path).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
       @role.should be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should return a Chef::Role object from a Ruby DSL" do
-      File.should_receive(:exists?).with(File.join(Chef::Config[:role_path], 'lolcat.json')).exactly(1).times.and_return(false)
-      File.should_receive(:exists?).with(File.join(Chef::Config[:role_path], 'lolcat.rb')).exactly(2).times.and_return(true)
-      File.should_receive(:readable?).with(File.join(Chef::Config[:role_path], 'lolcat.rb')).exactly(1).times.and_return(true)
-      IO.should_receive(:read).with(File.join(Chef::Config[:role_path], 'lolcat.rb')).and_return(ROLE_DSL)
+      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.rb"])
+      rb_path = File.join(Chef::Config[:role_path], 'memes/lolcat.rb')
+      File.should_receive(:exists?).with(rb_path).exactly(2).times.and_return(true)
+      File.should_receive(:readable?).with(rb_path).exactly(1).times.and_return(true)
+      IO.should_receive(:read).with(rb_path).and_return(ROLE_DSL)
+      @role.should be_a_kind_of(Chef::Role)
+      @role.class.from_disk("lolcat")
+    end
+
+    it "should prefer a Chef::Role Object from JSON over one from a Ruby DSL" do
+      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.json", "#{Chef::Config[:role_path]}/memes/lolcat.rb"])
+      js_path = File.join(Chef::Config[:role_path], 'memes/lolcat.json')
+      rb_path = File.join(Chef::Config[:role_path], 'memes/lolcat.rb')
+      File.should_receive(:exists?).with(js_path).exactly(1).times.and_return(true)
+      File.should_not_receive(:exists?).with(rb_path)
+      IO.should_receive(:read).with(js_path).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
       @role.should be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should raise an exception if the file does not exist" do
-      File.should_receive(:exists?).with(File.join(Chef::Config[:role_path], 'lolcat.json')).exactly(1).times.and_return(false)
-      File.should_receive(:exists?).with(File.join(Chef::Config[:role_path], 'lolcat.rb')).exactly(1).times.and_return(false)
+      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/meme.rb"])
+      File.should_not_receive(:exists?)
       lambda {@role.class.from_disk("lolcat")}.should raise_error(Chef::Exceptions::RoleNotFound)
     end
+
+    it "should raise an exception if two files exist with the same name" do
+      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes/lolcat.rb", "#{Chef::Config[:role_path]}/lolcat.rb"])
+      File.should_not_receive(:exists?)
+      lambda {@role.class.from_disk("lolcat")}.should raise_error(Chef::Exceptions::DuplicateRole)
+    end
   end
 
   describe "when loading from disk and role_path is an array" do
@@ -285,46 +305,44 @@ EOR
     end
 
     it "should return a Chef::Role object from JSON" do
-      File.should_receive(:exists?).with(File.join('/path1', 'lolcat.json')).exactly(1).times.and_return(true)
-      IO.should_receive(:read).with(File.join('/path1', 'lolcat.json')).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
+      Dir.should_receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return(['/path1/lolcat.json'])
+      File.should_receive(:exists?).with('/path1/lolcat.json').exactly(1).times.and_return(true)
+      IO.should_receive(:read).with('/path1/lolcat.json').and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
       @role.should be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should return a Chef::Role object from JSON when role is in the second path" do
-      File.should_receive(:exists?).with(File.join('/path1', 'lolcat.json')).exactly(1).times.and_return(false)
-      File.should_receive(:exists?).with(File.join('/path1', 'lolcat.rb')).exactly(1).times.and_return(false)
-      File.should_receive(:exists?).with(File.join('/path/path2', 'lolcat.json')).exactly(1).times.and_return(true)
-      IO.should_receive(:read).with(File.join('/path/path2', 'lolcat.json')).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
+      Dir.should_receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return([])
+      Dir.should_receive(:glob).with(File.join('/path/path2', '**', '**')).exactly(1).times.and_return(['/path/path2/lolcat.json'])
+      File.should_receive(:exists?).with('/path/path2/lolcat.json').exactly(1).times.and_return(true)
+      IO.should_receive(:read).with('/path/path2/lolcat.json').and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
       @role.should be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should return a Chef::Role object from a Ruby DSL" do
-      File.should_receive(:exists?).with(File.join('/path1', 'lolcat.json')).exactly(1).times.and_return(false)
-      File.should_receive(:exists?).with(File.join('/path1', 'lolcat.rb')).exactly(2).times.and_return(true)
-      File.should_receive(:readable?).with(File.join('/path1', 'lolcat.rb')).exactly(1).times.and_return(true)
-      IO.should_receive(:read).with(File.join('/path1', 'lolcat.rb')).and_return(ROLE_DSL)
+      Dir.should_receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return(['/path1/lolcat.rb'])
+      File.should_receive(:exists?).with('/path1/lolcat.rb').exactly(2).times.and_return(true)
+      File.should_receive(:readable?).with('/path1/lolcat.rb').and_return(true)
+      IO.should_receive(:read).with('/path1/lolcat.rb').exactly(1).times.and_return(ROLE_DSL)
       @role.should be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should return a Chef::Role object from a Ruby DSL when role is in the second path" do
-      File.should_receive(:exists?).with(File.join('/path1', 'lolcat.json')).exactly(1).times.and_return(false)
-      File.should_receive(:exists?).with(File.join('/path1', 'lolcat.rb')).exactly(1).times.and_return(false)
-      File.should_receive(:exists?).with(File.join('/path/path2', 'lolcat.json')).exactly(1).times.and_return(false)
-      File.should_receive(:exists?).with(File.join('/path/path2', 'lolcat.rb')).exactly(2).times.and_return(true)
-      File.should_receive(:readable?).with(File.join('/path/path2', 'lolcat.rb')).exactly(1).times.and_return(true)
-      IO.should_receive(:read).with(File.join('/path/path2', 'lolcat.rb')).and_return(ROLE_DSL)
+      Dir.should_receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return([])
+      Dir.should_receive(:glob).with(File.join('/path/path2', '**', '**')).exactly(1).times.and_return(['/path/path2/lolcat.rb'])
+      File.should_receive(:exists?).with('/path/path2/lolcat.rb').exactly(2).times.and_return(true)
+      File.should_receive(:readable?).with('/path/path2/lolcat.rb').and_return(true)
+      IO.should_receive(:read).with('/path/path2/lolcat.rb').exactly(1).times.and_return(ROLE_DSL)
       @role.should be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should raise an exception if the file does not exist" do
-      File.should_receive(:exists?).with(File.join('/path1', 'lolcat.json')).exactly(1).times.and_return(false)
-      File.should_receive(:exists?).with(File.join('/path1', 'lolcat.rb')).exactly(1).times.and_return(false)
-      File.should_receive(:exists?).with(File.join('/path/path2', 'lolcat.json')).exactly(1).times.and_return(false)
-      File.should_receive(:exists?).with(File.join('/path/path2', 'lolcat.rb')).exactly(1).times.and_return(false)
+      Dir.should_receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return([])
+      Dir.should_receive(:glob).with(File.join('/path/path2', '**', '**')).exactly(1).times.and_return([])
       lambda {@role.class.from_disk("lolcat")}.should raise_error(Chef::Exceptions::RoleNotFound)
     end
 

data/spec/unit/shell/shell_session_spec.rb

@@ -48,20 +48,37 @@ describe Shell::ShellSession do
 end
 
 describe Shell::ClientSession do
-  it "builds the node's run_context with the proper environment" do
+  before do
+    Chef::Config[:shell_config] = { :override_runlist => [Chef::RunList::RunListItem.new('shell::override')] }
     @session = Shell::ClientSession.instance
     @node = Chef::Node.build("foo")
     @session.node = @node
-    @session.instance_variable_set(:@client, double(:sync_cookbooks => {}))
+    @client = double("Chef::Client.new",
+                     :run_ohai => true,
+                     :load_node => true,
+                     :build_node => true,
+                     :register => true,
+                     :sync_cookbooks => {})
+  end
+
+  it "builds the node's run_context with the proper environment" do
+    @session.instance_variable_set(:@client, @client)
     @expansion = Chef::RunList::RunListExpansion.new(@node.chef_environment, [])
 
     @node.run_list.should_receive(:expand).with(@node.chef_environment).and_return(@expansion)
     @session.rebuild_context
   end
+
+  it "passes the shell CLI args to the client" do
+    Chef::Client.should_receive(:new).with(nil, Chef::Config[:shell_config]).and_return(@client)
+    @session.send(:rebuild_node)
+  end
+
 end
 
 describe Shell::StandAloneSession do
   before do
+    Chef::Config[:shell_config] = { :override_runlist => [Chef::RunList::RunListItem.new('shell::override')] }
     @session = Shell::StandAloneSession.instance
     @node = @session.node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
@@ -97,10 +114,22 @@ describe Shell::StandAloneSession do
     @recipe.run_chef.should == :converged
   end
 
+  it "passes the shell CLI args to the client" do
+    @client = double("Chef::Client.new",
+                     :run_ohai => true,
+                     :load_node => true,
+                     :build_node => true,
+                     :register => true,
+                     :sync_cookbooks => {})
+    Chef::Client.should_receive(:new).with(nil, Chef::Config[:shell_config]).and_return(@client)
+    @session.send(:rebuild_node)
+  end
+
 end
 
 describe Shell::SoloSession do
   before do
+    Chef::Config[:shell_config] = { :override_runlist => [Chef::RunList::RunListItem.new('shell::override')] }
     Chef::Config[:shell_solo] = true
     @session = Shell::SoloSession.instance
     @node = Chef::Node.new
@@ -151,4 +180,15 @@ describe Shell::SoloSession do
     @recipe.run_chef.should == :converged
   end
 
+  it "passes the shell CLI args to the client" do
+    @client = double("Chef::Client.new",
+                     :run_ohai => true,
+                     :load_node => true,
+                     :build_node => true,
+                     :register => true,
+                     :sync_cookbooks => {})
+    Chef::Client.should_receive(:new).with(nil, Chef::Config[:shell_config]).and_return(@client)
+    @session.send(:rebuild_node)
+  end
+
 end

data/spec/unit/shell_spec.rb

@@ -72,7 +72,7 @@ describe Shell do
       conf.prompt_i.should      == "chef > "
       conf.prompt_n.should      == "chef ?> "
       conf.prompt_s.should      == "chef%l> "
-
+      conf.use_tracer.should    == false
     end
 
     it "has a prompt like ``chef:recipe > '' in recipe context" do

data/spec/unit/user_spec.rb

@@ -205,6 +205,8 @@ describe Chef::User do
         Chef::Config[:chef_server_url] = "http://www.example.com"
         @osc_response = { "admin" => "http://www.example.com/users/admin"}
         @ohc_response = [ { "user" => { "username" => "admin" }} ]
+        Chef::User.stub(:load).with("admin").and_return(@user)
+        @osc_inflated_response = { "admin" => @user }
       end
 
       it "lists all clients on an OSC server" do
@@ -212,12 +214,22 @@ describe Chef::User do
         Chef::User.list.should == @osc_response
       end
 
+      it "inflate all clients on an OSC server" do
+        @http_client.stub(:get_rest).with("users").and_return(@osc_response)
+        Chef::User.list(true).should == @osc_inflated_response
+      end
+
       it "lists all clients on an OHC/OPC server" do
         @http_client.stub(:get_rest).with("users").and_return(@ohc_response)
         # We expect that Chef::User.list will give a consistent response
         # so OHC API responses should be transformed to OSC-style output.
         Chef::User.list.should == @osc_response
       end
+
+      it "inflate all clients on an OHC/OPC server" do
+        @http_client.stub(:get_rest).with("users").and_return(@ohc_response)
+        Chef::User.list(true).should == @osc_inflated_response
+      end
     end
 
     describe "create" do

data/spec/unit/util/selinux_spec.rb

@@ -114,7 +114,7 @@ describe Chef::Util::Selinux do
   end
 
   describe "when restorecon binary exists on the system" do
-    let (:path) { "/path/to/awesome" }
+    let (:path) { "/path/to/awesome directory" }
 
     before do
       @restorecon_enabled_path = File.join("/sbin", "restorecon")
@@ -125,7 +125,7 @@ describe Chef::Util::Selinux do
     end
 
     it "should call restorecon non-recursive by default" do
-      restorecon_command = "#{@restorecon_enabled_path} -R #{path}"
+      restorecon_command = "#{@restorecon_enabled_path} -R \"#{path}\""
       @test_instance.should_receive(:shell_out!).twice.with(restorecon_command)
       @test_instance.restore_security_context(path)
       File.should_not_receive(:executable?)
@@ -133,7 +133,7 @@ describe Chef::Util::Selinux do
     end
 
     it "should call restorecon recursive when recursive is set" do
-      restorecon_command = "#{@restorecon_enabled_path} -R -r #{path}"
+      restorecon_command = "#{@restorecon_enabled_path} -R -r \"#{path}\""
       @test_instance.should_receive(:shell_out!).twice.with(restorecon_command)
       @test_instance.restore_security_context(path, true)
       File.should_not_receive(:executable?)
@@ -141,7 +141,7 @@ describe Chef::Util::Selinux do
     end
 
     it "should call restorecon non-recursive when recursive is not set" do
-      restorecon_command = "#{@restorecon_enabled_path} -R #{path}"
+      restorecon_command = "#{@restorecon_enabled_path} -R \"#{path}\""
       @test_instance.should_receive(:shell_out!).twice.with(restorecon_command)
       @test_instance.restore_security_context(path)
       File.should_not_receive(:executable?)

data/spec/unit/version_constraint_spec.rb

@@ -20,8 +20,8 @@ require 'chef/version_constraint'
 
 describe Chef::VersionConstraint do
   describe "validation" do
-    bad_version = ["> >", ">= 1.2.z", "> 1.2.3 < 5.0", "> 1.2.3, < 5.0"]
-    bad_op = ["<3.0.1", ">$ 1.2.3", "! 3.4"]
+    bad_version = [">= 1.2.z", "> 1.2.3 < 5.0", "> 1.2.3, < 5.0"]
+    bad_op = ["> >", ">$ 1.2.3", "! 3.4"]
     o_error = Chef::Exceptions::InvalidVersionConstraint
     v_error = Chef::Exceptions::InvalidCookbookVersion
     bad_version.each do |s|
@@ -64,6 +64,18 @@ describe Chef::VersionConstraint do
     vc.version.should be_an_instance_of(Chef::Version)
   end
 
+  it "should allow ops without space separator" do
+    Chef::VersionConstraint.new("=1.2.3").should eql(Chef::VersionConstraint.new("= 1.2.3"))
+    Chef::VersionConstraint.new(">1.2.3").should eql(Chef::VersionConstraint.new("> 1.2.3"))
+    Chef::VersionConstraint.new("<1.2.3").should eql(Chef::VersionConstraint.new("< 1.2.3"))
+    Chef::VersionConstraint.new(">=1.2.3").should eql(Chef::VersionConstraint.new(">= 1.2.3"))
+    Chef::VersionConstraint.new("<=1.2.3").should eql(Chef::VersionConstraint.new("<= 1.2.3"))
+  end
+
+  it "should allow ops with multiple spaces" do
+    Chef::VersionConstraint.new("=  1.2.3").should eql(Chef::VersionConstraint.new("= 1.2.3"))
+  end
+
   describe "include?" do
     describe "handles various input data types" do
       before do

metadata

@@ -1,365 +1,390 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.14.0.alpha.4
+  version: 11.14.0.rc.2
+  prerelease: 8
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mixlib-authentication
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.0.alpha.0
+        version: 7.2.0.rc.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.0.alpha.0
+        version: 7.2.0.rc.2
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     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
+    none: false
     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
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     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'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: net-ssh-multi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         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
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
 - !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: '2.1'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !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: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
 description: A systems integration framework, built to bring the benefits of configuration
@@ -379,18 +404,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
@@ -501,7 +518,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,6 +539,7 @@ files:
 - distro/common/man/man1/knife-recipe-list.1
 - distro/common/man/man1/knife-role.1
 - distro/common/man/man1/knife-search.1
+- distro/common/man/man1/knife-serve.1
 - distro/common/man/man1/knife-show.1
 - distro/common/man/man1/knife-ssh.1
 - distro/common/man/man1/knife-ssl-check.1
@@ -533,9 +550,9 @@ files:
 - 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
@@ -560,21 +577,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
@@ -591,10 +610,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
@@ -602,8 +619,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/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
@@ -619,7 +636,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
@@ -659,11 +675,13 @@ 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/parallelizer/flatten_enumerable.rb
 - lib/chef/chef_fs/parallelizer/parallel_enumerable.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
@@ -690,7 +708,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
@@ -698,32 +715,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
@@ -732,15 +749,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
@@ -755,18 +772,18 @@ 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-aix.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
@@ -864,12 +881,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
@@ -905,37 +923,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
@@ -945,22 +961,22 @@ 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/solaris.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
@@ -972,31 +988,32 @@ files:
 - lib/chef/provider/package/ips.rb
 - lib/chef/provider/package/macports.rb
 - lib/chef/provider/package/pacman.rb
+- lib/chef/provider/package/paludis.rb
 - lib/chef/provider/package/portage.rb
 - lib/chef/provider/package/rpm.rb
 - 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
@@ -1011,23 +1028,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
@@ -1064,6 +1082,7 @@ files:
 - lib/chef/resource/ohai.rb
 - lib/chef/resource/package.rb
 - lib/chef/resource/pacman_package.rb
+- lib/chef/resource/paludis_package.rb
 - lib/chef/resource/perl.rb
 - lib/chef/resource/portage_package.rb
 - lib/chef/resource/powershell_script.rb
@@ -1088,8 +1107,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
@@ -1097,12 +1117,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
@@ -1111,11 +1131,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
@@ -1127,18 +1147,17 @@ files:
 - lib/chef/util/path_helper.rb
 - lib/chef/util/selinux.rb
 - lib/chef/util/threaded_job_queue.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/version_constraint.rb
 - lib/chef/whitelist.rb
-- lib/chef/win32/api.rb
 - lib/chef/win32/api/error.rb
 - lib/chef/win32/api/file.rb
 - lib/chef/win32/api/installer.rb
@@ -1149,23 +1168,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
@@ -1195,11 +1217,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
@@ -1210,12 +1232,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
@@ -1368,6 +1390,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
@@ -1383,16 +1415,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
@@ -1402,8 +1424,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
@@ -1412,12 +1434,12 @@ files:
 - spec/data/trusted_certs/opscode.pem
 - spec/data/trusted_certs/root.pem
 - spec/functional/application_spec.rb
-- 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
@@ -1580,6 +1602,7 @@ files:
 - spec/unit/handler/json_file_spec.rb
 - spec/unit/handler_spec.rb
 - spec/unit/http/basic_client_spec.rb
+- spec/unit/http/http_request_spec.rb
 - spec/unit/http/simple_spec.rb
 - spec/unit/http/ssl_policies_spec.rb
 - spec/unit/http/validate_content_length_spec.rb
@@ -1733,6 +1756,7 @@ files:
 - spec/unit/provider/package/ips_spec.rb
 - spec/unit/provider/package/macports_spec.rb
 - spec/unit/provider/package/pacman_spec.rb
+- spec/unit/provider/package/paludis_spec.rb
 - spec/unit/provider/package/portage_spec.rb
 - spec/unit/provider/package/rpm_spec.rb
 - spec/unit/provider/package/rubygems_spec.rb
@@ -1879,29 +1903,39 @@ 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: {}
 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: 1503652227548245970
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">"
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A systems integration framework, built to bring the benefits of configuration
   management to your entire infrastructure.
 test_files: []