chef 10.28.2 → 10.30.0.rc.0

data/spec/unit/provider/group/usermod_spec.rb

@@ -25,6 +25,7 @@ describe Chef::Provider::Group::Usermod do
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource = Chef::Resource::Group.new("wheel")
     @new_resource.members [ "all", "your", "base" ]
+    @new_resource.excluded_members [ ]
     @provider = Chef::Provider::Group::Usermod.new(@new_resource, @run_context)
     @provider.stub!(:run_command)
   end
@@ -33,11 +34,12 @@ describe Chef::Provider::Group::Usermod do
   
     describe "with an empty members array" do
       before do
+        @new_resource.stub!(:append).and_return(true)
         @new_resource.stub!(:members).and_return([])
       end
     
       it "should log an appropriate message" do
-        Chef::Log.should_receive(:debug).with("group[wheel] not changing group members, the group has no members")
+        @provider.should_not_receive(:shell_out!)
         @provider.modify_group_members
       end
     end
@@ -61,14 +63,27 @@ describe Chef::Provider::Group::Usermod do
         @provider.action = :modify 
         lambda { @provider.run_action(@provider.process_resource_requirements) }.should raise_error(Chef::Exceptions::Group, "setting group members directly is not supported by #{@provider.to_s}, must set append true in group")
       end
-    
+
+      it "should raise an error when excluded_members are set" do
+        @provider.define_resource_requirements
+        @provider.load_current_resource
+        @provider.instance_variable_set("@group_exists", true)
+        @provider.action = :modify
+        @new_resource.stub!(:append).and_return(true)
+        @new_resource.stub!(:excluded_members).and_return(["someone"])
+        lambda { @provider.run_action(@provider.process_resource_requirements) }.should raise_error(Chef::Exceptions::Group, "excluded_members is not supported by #{@provider.to_s}")
+      end
+
       platforms.each do |platform, flags|
         it "should usermod each user when the append option is set on #{platform}" do
-          @node[:platform] = platform
+          current_resource = @new_resource.dup
+          current_resource.members([ ])
+          @provider.current_resource = current_resource
+          @node.automatic_attrs[:platform] = platform
           @new_resource.stub!(:append).and_return(true)
-          @provider.should_receive(:run_command).with({:command => "usermod #{flags} wheel all"})
-          @provider.should_receive(:run_command).with({:command => "usermod #{flags} wheel your"})
-          @provider.should_receive(:run_command).with({:command => "usermod #{flags} wheel base"})
+          @provider.should_receive(:shell_out!).with("usermod #{flags} wheel all")
+          @provider.should_receive(:shell_out!).with("usermod #{flags} wheel your")
+          @provider.should_receive(:shell_out!).with("usermod #{flags} wheel base")
           @provider.modify_group_members
         end
       end

data/spec/unit/provider/group/windows_spec.rb

@@ -70,14 +70,6 @@ describe Chef::Provider::Group::Windows do
       @provider.manage_group
     end
 
-    it "should call @net_group.local_set_members if append fails" do
-      @new_resource.stub!(:append).and_return(true)
-      @net_group.stub!(:local_add_members).and_raise(ArgumentError)
-      @net_group.should_receive(:local_add_members).with(@new_resource.members)
-      @net_group.should_receive(:local_set_members).with(@new_resource.members + @current_resource.members)
-      @provider.manage_group
-    end
-
   end
 
   describe "remove_group" do

data/spec/unit/provider/group_spec.rb

@@ -108,6 +108,19 @@ describe Chef::Provider::User do
       @provider.compare_group.should be_true
     end
 
+    it "should return false if append is true and excluded_members include a non existing member" do
+      @new_resource.excluded_members << "extra_user"
+      @new_resource.stub!(:append).and_return(true)
+      @provider.compare_group.should be_false
+    end
+
+    it "should return true if the append is true and excluded_members include an existing user" do
+      @new_resource.members.each {|m| @new_resource.excluded_members << m }
+      @new_resource.members.clear
+      @new_resource.stub!(:append).and_return(true)
+      @provider.compare_group.should be_true
+    end
+
   end
 
   describe "when creating a group" do
@@ -127,6 +140,7 @@ describe Chef::Provider::User do
     it "should check to see if the group has mismatched attributes if the group exists" do
       @provider.group_exists = true
       @provider.stub!(:compare_group).and_return(false)
+      @provider.stub!(:change_desc).and_return([ ])
       @provider.run_action(:create)
       @provider.new_resource.should_not be_updated
     end
@@ -134,6 +148,7 @@ describe Chef::Provider::User do
     it "should call manage_group if the group exists and has mismatched attributes" do
       @provider.group_exists = true
       @provider.stub!(:compare_group).and_return(true)
+      @provider.stub!(:change_desc).and_return([ ])
       @provider.should_receive(:manage_group).and_return(true)
       @provider.run_action(:create)
     end
@@ -141,6 +156,7 @@ describe Chef::Provider::User do
     it "should set the new_resources updated flag when it creates the group if we call manage_group" do
       @provider.group_exists = true
       @provider.stub!(:compare_group).and_return(true)
+      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
       @provider.stub!(:manage_group).and_return(true)
       @provider.run_action(:create)
       @new_resource.should be_updated
@@ -172,12 +188,14 @@ describe Chef::Provider::User do
  
     it "should run manage_group if the group exists and has mismatched attributes" do
       @provider.should_receive(:compare_group).and_return(true)
+      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
       @provider.should_receive(:manage_group).and_return(true)
       @provider.run_action(:manage)
     end
   
     it "should set the new resources updated flag to true if manage_group is called" do
       @provider.stub!(:compare_group).and_return(true)
+      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
       @provider.stub!(:manage_group).and_return(true)
       @provider.run_action(:manage)
       @new_resource.should be_updated
@@ -191,6 +209,7 @@ describe Chef::Provider::User do
     
     it "should not run manage_group if the group exists but has no differing attributes" do
       @provider.should_receive(:compare_group).and_return(false)
+      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
       @provider.should_not_receive(:manage_group)
       @provider.run_action(:manage)
     end
@@ -204,12 +223,14 @@ describe Chef::Provider::User do
  
     it "should run manage_group if the group exists and has mismatched attributes" do
       @provider.should_receive(:compare_group).and_return(true)
+      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
       @provider.should_receive(:manage_group).and_return(true)
       @provider.run_action(:modify)
     end
   
     it "should set the new resources updated flag to true if manage_group is called" do
       @provider.stub!(:compare_group).and_return(true)
+      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
       @provider.stub!(:manage_group).and_return(true)
       @provider.run_action(:modify)
       @new_resource.should be_updated
@@ -217,6 +238,7 @@ describe Chef::Provider::User do
   
     it "should not run manage_group if the group exists but has no differing attributes" do
       @provider.should_receive(:compare_group).and_return(false)
+      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
       @provider.should_not_receive(:manage_group)
       @provider.run_action(:modify)
     end
@@ -233,26 +255,26 @@ describe Chef::Provider::User do
        @new_resource.members << "user2" 
        @new_resource.stub!(:append).and_return true
        @provider.compare_group.should be_true
-       @provider.change_desc.should == "add missing member(s): user1, user2"
+       @provider.change_desc.should == [ "add missing member(s): user1, user2" ]
     end
 
     it "should report that the group members will be overwritten if not appending" do
        @new_resource.members << "user1"
        @new_resource.stub!(:append).and_return false 
        @provider.compare_group.should be_true
-       @provider.change_desc.should == "replace group members with new list of members"
+       @provider.change_desc.should == [ "replace group members with new list of members" ]
     end
 
     it "should report the gid will be changed when it does not match" do
       @current_resource.stub!(:gid).and_return("BADF00D")
       @provider.compare_group.should be_true
-      @provider.change_desc.should == "change gid #{@current_resource.gid} to #{@new_resource.gid}"
+      @provider.change_desc.should == [ "change gid #{@current_resource.gid} to #{@new_resource.gid}" ]
 
     end
 
     it "should report no change reason when no change is required" do
       @provider.compare_group.should be_false
-      @provider.change_desc.should == nil
+      @provider.change_desc.should == [ ]
     end
   end
 

data/spec/unit/provider/user/useradd_spec.rb

@@ -315,6 +315,27 @@ describe Chef::Provider::User::Useradd do
         lambda { @provider.check_lock }.should raise_error(Chef::Exceptions::User)
       end
     end
+
+    context "when in why run mode" do
+      before do
+        @stdout.stub!(:gets).and_return(nil)
+        @stderr.stub!(:gets).and_return("passwd: user 'chef-test' does not exist")
+        @provider.should_receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+        Chef::Config[:why_run] = true
+      end
+  
+      after do
+        Chef::Config[:why_run] = false
+      end
+
+      it "should return false if the user does not exist" do
+        @provider.check_lock.should eql(false)
+      end
+
+      it "should not raise an error if the user does not exist" do
+        lambda { @provider.check_lock }.should_not raise_error
+      end
+    end
   end
 
   describe "when locking the user" do

data/spec/unit/provider/whyrun_safe_ruby_block_spec.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Phil Dibowitz (<phild@fb.com>)
+# Copyright:: Copyright (c) 2013 Facebook
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+describe Chef::Provider::WhyrunSafeRubyBlock, "initialize" do
+  before(:each) do
+    $evil_global_evil_laugh = :wahwah
+    @node = Chef::Node.new
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, {}, @events)
+    @new_resource = Chef::Resource::WhyrunSafeRubyBlock.new("bloc party")
+    @new_resource.block { $evil_global_evil_laugh = :mwahahaha}
+    @provider = Chef::Provider::WhyrunSafeRubyBlock.new(@new_resource, @run_context)
+  end
+
+  it "should call the block and flag the resource as updated" do
+    @provider.run_action(:create)
+    $evil_global_evil_laugh.should == :mwahahaha
+    @new_resource.should be_updated
+  end
+
+  it "should call the block and flat the resource as updated - even in whyrun" do
+    Chef::Config[:why_run] = true
+    @provider.run_action(:create)
+    $evil_global_evil_laugh.should == :mwahahaha
+    @new_resource.should be_updated
+    Chef::Config[:why_run] = false
+  end
+
+end
+

data/spec/unit/rest_spec.rb

@@ -278,9 +278,11 @@ describe Chef::REST do
 
       describe "streaming downloads to a tempfile" do
         before do
-          @tempfile = Tempfile.open("chef-rspec-rest_spec-line-#{__LINE__}--")
-          Tempfile.stub!(:new).with("chef-rest").and_return(@tempfile)
-          Tempfile.stub!(:open).and_return(@tempfile)
+          @tempfile = StringIO.new
+          @tempfile.stub(:close!)
+          @tempfile.stub(:path).and_return("/tmp/this-is-a-stringio-not-a-real-file")
+          Tempfile.stub(:new).with("chef-rest").and_return(@tempfile)
+          Tempfile.stub(:open).and_return(@tempfile)
 
           @request_mock = {}
           Net::HTTP::Get.stub!(:new).and_return(@request_mock)
@@ -288,11 +290,6 @@ describe Chef::REST do
           @http_response_mock = mock("Net::HTTP Response mock")
         end
 
-        after do
-          @tempfile.rspec_reset
-          @tempfile.close!
-        end
-
         it "should build a new HTTP GET request without the application/json accept header" do
           expected_headers = {'X-Chef-Version' => Chef::VERSION, 'Accept-Encoding' => Chef::REST::RESTRequest::ENCODING_GZIP_DEFLATE}
           Net::HTTP::Get.should_receive(:new).with("/?foo=bar", expected_headers).and_return(@request_mock)
@@ -309,9 +306,9 @@ describe Chef::REST do
         end
 
         it "should populate the tempfile with the value of the raw request" do
-          @http_response_mock.stub!(:read_body).and_yield("ninja")
-          @tempfile.should_receive(:write).with("ninja").once.and_return(true)
+          @http_response.should_receive(:read_body).and_yield("ninja")
           @rest.run_request(:GET, @url, {}, false, nil, true)
+          @tempfile.string.should include("ninja")
         end
 
         it "should close the tempfile if we're doing a raw request" do
@@ -426,19 +423,55 @@ describe Chef::REST do
         @rest.api_request(:GET, @url, {}).should == {"ohai2u"=>"json_api"}
       end
 
-      %w[ HTTPFound HTTPMovedPermanently HTTPSeeOther HTTPUseProxy HTTPTemporaryRedirect HTTPMultipleChoice ].each do |resp_name|
-        it "should call api_request again on a #{resp_name} response" do
-          resp_cls  = Net.const_get(resp_name)
+      describe "when the server returns a redirect response" do
+        let(:redirected_url) { "https://chef.example.com:8443/foo" }
+        let(:redirected_uri) { URI.parse(redirected_url) }
+
+        def redirect_with(response_name)
+          resp_cls  = Net.const_get(response_name)
           resp_code = Net::HTTPResponse::CODE_TO_OBJ.keys.detect { |k| Net::HTTPResponse::CODE_TO_OBJ[k] == resp_cls }
-          http_response = Net::HTTPFound.new("1.1", resp_code, "bob is somewhere else again")
-          http_response.add_field("location", @url.path)
-          http_response.stub!(:read_body)
+          redirect = Net::HTTPFound.new("1.1", resp_code, "bob is somewhere else again")
+          redirect.add_field("location", redirected_url)
+          redirect.stub!(:read_body).and_return('')
+          redirect
+        end
 
-          @http_client.stub!(:request).and_yield(http_response).and_return(http_response)
+        %w[ HTTPFound HTTPMovedPermanently HTTPSeeOther HTTPUseProxy HTTPTemporaryRedirect HTTPMultipleChoice ].each do |response_name|
+
+          it "should call api_request again on a #{response_name} response" do
+            redirect = redirect_with(response_name)
 
-          lambda { @rest.api_request(:GET, @url) }.should raise_error(Chef::Exceptions::RedirectLimitExceeded)
+            headers = { "X-Auth-Header" => "foo" }
+            auto_headers = {"Accept"=>"application/json", "Accept-Encoding"=>"gzip;q=1.0,deflate;q=0.6,identity;q=0.3"}
+            expected_headers = auto_headers.merge(headers)
+
+            success = Net::HTTPSuccess.new("1.1",200, "it-works")
+            success.stub!(:read_body).and_return('{"foo": "bar"}')
+            success['content-type'] = "application/json"
+
+            @http_client.should_receive(:request).and_yield(redirect).and_return(redirect)
+            @http_client.should_receive(:request).and_yield(success).and_return(success)
+
+            # CHEF-1848: verify that headers get passed to redirects
+            @rest.should_receive(:retriable_rest_request).with(:GET, @url, nil, expected_headers).and_call_original
+            @rest.should_receive(:retriable_rest_request).with(:GET, redirected_uri, nil, expected_headers).and_call_original
+
+            @rest.api_request(:GET, @url, headers).should == {"foo" => "bar"}
+          end
+
+          context "when making a request for a method other than GET" do
+
+            [:PUT, :POST, :DELETE].each do |method|
+              it "raises an error" do
+                redirect = redirect_with(response_name)
+                @http_client.should_receive(:request).and_yield(redirect).and_return(redirect)
+                lambda { @rest.api_request(method, @url) }.should raise_error(Chef::Exceptions::InvalidRedirect)
+              end
+            end
+          end
         end
-       end
+
+      end
 
       it "should show the JSON error message on an unsuccessful request" do
         http_response = Net::HTTPServerError.new("1.1", "500", "drooling from inside of mouth")
@@ -490,7 +523,6 @@ describe Chef::REST do
       end
 
       after do
-        @tempfile.rspec_reset
         @tempfile.close!
       end
 
@@ -557,7 +589,6 @@ describe Chef::REST do
       end
 
       it "closes and unlinks the tempfile when the response is a redirect" do
-        Tempfile.rspec_reset
         tempfile = mock("die", :path => "/tmp/ragefist", :close => true, :binmode => nil)
         tempfile.should_receive(:close!).at_least(2).times
         Tempfile.stub!(:new).with("chef-rest").and_return(tempfile)
@@ -571,7 +602,9 @@ describe Chef::REST do
       end
 
       it "passes the original block to the redirected request" do
-        Tempfile.rspec_reset
+        tempfile = mock("die", :path => "/tmp/ragefist", :close => true, :binmode => nil)
+        tempfile.should_receive(:close!).at_least(2).times
+        Tempfile.stub!(:new).with("chef-rest").and_return(tempfile)
 
         http_response = Net::HTTPFound.new("1.1", "302", "bob is taking care of that one for me today")
         http_response.add_field("location","/that-thing-is-here-now")

metadata

@@ -1,20 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 10.28.2
+  version: 10.30.0.rc.0
+  prerelease: 8
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-11-22 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: 1.1.2
     - - ~>
@@ -23,8 +25,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.2
     - - ~>
@@ -33,6 +36,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -40,6 +44,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,6 +52,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,6 +60,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -61,6 +68,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-authentication
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -68,6 +76,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -75,22 +84,25 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.3.0.rc.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.3.0.rc.0
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
     - - <
@@ -99,8 +111,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
     - - <
@@ -109,8 +122,9 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
     - - <
@@ -119,18 +133,36 @@ dependencies:
   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: bunny
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
     - - <
@@ -139,8 +171,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
     - - <
@@ -149,8 +182,9 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
     - - <=
@@ -159,8 +193,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
     - - <=
@@ -169,6 +204,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -176,6 +212,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -183,6 +220,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -190,6 +228,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -197,6 +236,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -204,6 +244,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -211,6 +252,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh-multi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -218,6 +260,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -225,8 +268,9 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.9
     - - ~>
@@ -235,8 +279,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.9
     - - ~>
@@ -245,6 +290,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -252,6 +298,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -259,143 +306,163 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !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
-        version: 2.8.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.12.0
 description: A systems integration framework, built to bring the benefits of configuration
   management to your entire infrastructure.
 email: adam@opscode.com
@@ -713,6 +780,7 @@ files:
 - lib/chef/monkey_patches/regexp.rb
 - lib/chef/monkey_patches/string.rb
 - lib/chef/monkey_patches/tempfile.rb
+- lib/chef/monkey_patches/uri.rb
 - lib/chef/nil_argument.rb
 - lib/chef/node/attribute.rb
 - lib/chef/node.rb
@@ -796,6 +864,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.rb
 - lib/chef/providers.rb
 - lib/chef/recipe.rb
@@ -850,6 +919,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/yum_package.rb
 - lib/chef/resource.rb
 - lib/chef/resource_collection/stepable_iterator.rb
@@ -1052,10 +1122,12 @@ files:
 - spec/functional/knife/cookbook_delete_spec.rb
 - spec/functional/knife/exec_spec.rb
 - spec/functional/knife/ssh_spec.rb
+- spec/functional/resource/base.rb
 - spec/functional/resource/cookbook_file_spec.rb
 - spec/functional/resource/deploy_revision_spec.rb
 - spec/functional/resource/directory_spec.rb
 - spec/functional/resource/file_spec.rb
+- spec/functional/resource/group_spec.rb
 - spec/functional/resource/link_spec.rb
 - spec/functional/resource/remote_directory_spec.rb
 - spec/functional/resource/remote_file_spec.rb
@@ -1205,6 +1277,7 @@ files:
 - spec/unit/mixin/template_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_spec.rb
 - spec/unit/openid_registration_spec.rb
@@ -1282,6 +1355,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/resource/apt_package_spec.rb
@@ -1369,26 +1443,27 @@ files:
 - bin/shef
 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 1.8.23
 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: []