chef 11.12.0.alpha.1 → 11.12.0.rc.1

data/spec/unit/resource_spec.rb

@@ -344,7 +344,7 @@ describe Chef::Resource do
       expected_keys = [ :allowed_actions, :params, :provider, :updated,
         :updated_by_last_action, :before, :supports,
         :noop, :ignore_failure, :name, :source_line,
-        :action, :retries, :retry_delay, :elapsed_time]
+        :action, :retries, :retry_delay, :elapsed_time, :guard_interpreter]
       (hash.keys - expected_keys).should == []
       (expected_keys - hash.keys).should == []
       hash[:name].should eql("funk")
@@ -526,6 +526,28 @@ describe Chef::Resource do
       snitch_var2.should be_false
     end
 
+    describe "guard_interpreter attribute" do
+      let(:resource) { @resource }
+
+      it "should be set to :default by default" do
+        resource.guard_interpreter.should == :default
+      end
+
+      it "if set to :default should return :default when read" do
+        resource.guard_interpreter(:default)
+        resource.guard_interpreter.should == :default
+      end
+
+      it "should raise Chef::Exceptions::ValidationFailed on an attempt to set the guard_interpreter attribute to something other than a Symbol" do
+        expect { resource.guard_interpreter('command_dot_com') }.to raise_error(Chef::Exceptions::ValidationFailed)
+      end
+
+      it "should not raise an exception when setting the guard interpreter attribute to a Symbol" do
+        Chef::GuardInterpreter::ResourceGuardInterpreter.stub(:new).and_return(nil)
+        expect { resource.guard_interpreter(:command_dot_com) }.not_to raise_error
+      end
+    end
+
   end
 
   describe "should_skip?" do

data/spec/unit/rest_spec.rb

@@ -76,6 +76,21 @@ describe Chef::REST do
     Chef::Log.init(log_stringio)
   end
 
+  it "should have content length validation middleware after compressor middleware" do
+    middlewares = rest.instance_variable_get(:@middlewares)
+    content_length = middlewares.find_index { |e| e.is_a? Chef::HTTP::ValidateContentLength }
+    decompressor = middlewares.find_index { |e| e.is_a? Chef::HTTP::Decompressor }
+
+    content_length.should_not be_nil
+    decompressor.should_not be_nil
+    (decompressor < content_length).should be_true
+  end
+
+  it "should allow the options hash to be frozen" do
+    options = {}.freeze
+    # should not raise any exception
+    Chef::REST.new(base_url, nil, nil, options)
+  end
 
   describe "calling an HTTP verb on a path or absolute URL" do
     it "adds a relative URL to the base url it was initialized with" do

data/spec/unit/run_context/cookbook_compiler_spec.rb

@@ -170,5 +170,17 @@ describe Chef::RunContext::CookbookCompiler do
                                          :"circular-dep1",
                                          :"test-with-circular-deps"]
     end
+
+    it "determines if a cookbook is in the list of cookbooks reachable by dependency" do
+      node.run_list("test-with-deps::default", "test-with-deps::server")
+      compiler.cookbook_order.should == [:dependency1, :dependency2, :"test-with-deps"]
+      compiler.unreachable_cookbook?(:dependency1).should be_false
+      compiler.unreachable_cookbook?(:dependency2).should be_false
+      compiler.unreachable_cookbook?(:'test-with-deps').should be_false
+      compiler.unreachable_cookbook?(:'circular-dep1').should be_true
+      compiler.unreachable_cookbook?(:'circular-dep2').should be_true
+    end
+
+
   end
 end

data/spec/unit/run_context_spec.rb

@@ -79,6 +79,13 @@ describe Chef::RunContext do
       @node.include_attribute("test::george")
     end
 
+    it "raises an error when attempting to include_recipe from a cookbook not reachable by run list or dependencies" do
+      @node.should_receive(:loaded_recipe).with(:ancient, "aliens")
+      lambda do
+        @run_context.include_recipe("ancient::aliens")
+      # In CHEF-5120, this becomes a Chef::Exceptions::MissingCookbookDependency error:
+      end.should raise_error(Chef::Exceptions::CookbookNotFound)
+    end
 
   end
 

data/spec/unit/util/editor_spec.rb

@@ -0,0 +1,152 @@
+require 'spec_helper'
+require 'chef/util/editor'
+
+describe Chef::Util::Editor do
+  describe '#initialize' do
+    it 'takes an Enumerable of lines' do
+      editor = described_class.new(File.open(__FILE__))
+      expect(editor.lines).to be == IO.readlines(__FILE__)
+    end
+
+    it 'makes a copy of an Array' do
+      array = Array.new
+      editor = described_class.new(array)
+      expect(editor.lines).to_not be(array)
+    end
+  end
+
+  subject(:editor) { described_class.new(input_lines) }
+  let(:input_lines) { ['one', 'two', 'two', 'three'] }
+
+  describe '#append_line_after' do
+    context 'when there is no match' do
+      subject(:execute) { editor.append_line_after('missing', 'new') }
+
+      it('returns the number of added lines') { should be == 0 }
+      it 'does not add any lines' do
+        expect { execute }.to_not change { editor.lines }
+      end
+    end
+
+    context 'when there is a match' do
+      subject(:execute) { editor.append_line_after('two', 'new') }
+
+      it('returns the number of added lines') { should be == 2 }
+      it 'adds a line after each match' do
+        execute
+        expect(editor.lines).to be == ['one', 'two', 'new', 'two', 'new', 'three']
+      end
+    end
+
+    it 'matches a Regexp' do
+      expect(editor.append_line_after(/^ee/, 'new')).to be == 0
+      expect(editor.append_line_after(/ee$/, 'new')).to be == 1
+    end
+  end
+
+  describe '#append_line_if_missing' do
+    context 'when there is no match' do
+      subject(:execute) { editor.append_line_if_missing('missing', 'new') }
+
+      it('returns the number of added lines') { should be == 1 }
+      it 'adds a line to the end' do
+        execute
+        expect(editor.lines).to be == ['one', 'two', 'two', 'three', 'new']
+      end
+    end
+
+    context 'when there is a match' do
+      subject(:execute) { editor.append_line_if_missing('one', 'new') }
+
+      it('returns the number of added lines') { should be == 0 }
+      it 'does not add any lines' do
+        expect { execute }.to_not change { editor.lines }
+      end
+    end
+
+    it 'matches a Regexp' do
+      expect(editor.append_line_if_missing(/ee$/, 'new')).to be == 0
+      expect(editor.append_line_if_missing(/^ee/, 'new')).to be == 1
+    end
+  end
+
+  describe '#remove_lines' do
+    context 'when there is no match' do
+      subject(:execute) { editor.remove_lines('missing') }
+
+      it('returns the number of removed lines') { should be == 0 }
+      it 'does not remove any lines' do
+        expect { execute }.to_not change { editor.lines }
+      end
+    end
+
+    context 'when there is a match' do
+      subject(:execute) { editor.remove_lines('two') }
+
+      it('returns the number of removed lines') { should be == 2 }
+      it 'removes the matching lines' do
+        execute
+        expect(editor.lines).to be == ['one', 'three']
+      end
+    end
+
+    it 'matches a Regexp' do
+      expect(editor.remove_lines(/^ee/)).to be == 0
+      expect(editor.remove_lines(/ee$/)).to be == 1
+    end
+  end
+
+  describe '#replace' do
+    context 'when there is no match' do
+      subject(:execute) { editor.replace('missing', 'new') }
+
+      it('returns the number of changed lines') { should be == 0 }
+      it 'does not change any lines' do
+        expect { execute }.to_not change { editor.lines }
+      end
+    end
+
+    context 'when there is a match' do
+      subject(:execute) { editor.replace('two', 'new') }
+
+      it('returns the number of changed lines') { should be == 2 }
+      it 'replaces the matching portions' do
+        execute
+        expect(editor.lines).to be == ['one', 'new', 'new', 'three']
+      end
+    end
+
+    it 'matches a Regexp' do
+      expect(editor.replace(/^ee/, 'new')).to be == 0
+      expect(editor.replace(/ee$/, 'new')).to be == 1
+      expect(editor.lines).to be == ['one', 'two', 'two', 'thrnew']
+    end
+  end
+
+  describe '#replace_lines' do
+    context 'when there is no match' do
+      subject(:execute) { editor.replace_lines('missing', 'new') }
+
+      it('returns the number of changed lines') { should be == 0 }
+      it 'does not change any lines' do
+        expect { execute }.to_not change { editor.lines }
+      end
+    end
+
+    context 'when there is a match' do
+      subject(:execute) { editor.replace_lines('two', 'new') }
+
+      it('returns the number of replaced lines') { should be == 2 }
+      it 'replaces the matching line' do
+        execute
+        expect(editor.lines).to be == ['one', 'new', 'new', 'three']
+      end
+    end
+
+    it 'matches a Regexp' do
+      expect(editor.replace_lines(/^ee/, 'new')).to be == 0
+      expect(editor.replace_lines(/ee$/, 'new')).to be == 1
+      expect(editor.lines).to be == ['one', 'two', 'two', 'new']
+    end
+  end
+end

data/spec/unit/util/file_edit_spec.rb

@@ -17,6 +17,7 @@
 #
 
 require 'spec_helper'
+require 'tempfile'
 
 describe Chef::Util::FileEdit do
 
@@ -80,6 +81,17 @@ new line inserted
     EOF
   end
 
+  let(:append_twice) do
+    <<-EOF
+127.0.0.1       localhost
+255.255.255.255 broadcasthost
+::1             localhost
+fe80::1%lo0     localhost
+once
+twice
+    EOF
+  end
+
   let(:target_file) do
     f = Tempfile.open('file_edit_spec')
     f.write(starting_content)
@@ -104,7 +116,7 @@ new line inserted
 
     # CHEF-5018: people have monkey patched this and it has accidentally been broken
     it "should read the contents into memory as an array" do
-      expect(fedit.send(:contents)).to be_instance_of(Array)
+      expect(fedit.send(:editor).lines).to be_instance_of(Array)
     end
   end
 
@@ -123,18 +135,21 @@ new line inserted
   describe "search_file_replace" do
     it "should accept regex passed in as a string (not Regexp object) and replace the match if there is one" do
       fedit.search_file_replace("localhost", "replacement")
+      fedit.unwritten_changes?.should be_true
       fedit.write_file
       expect(edited_file_contents).to eq(localhost_replaced)
     end
 
     it "should accept regex passed in as a Regexp object and replace the match if there is one" do
       fedit.search_file_replace(/localhost/, "replacement")
+      fedit.unwritten_changes?.should be_true
       fedit.write_file
       expect(edited_file_contents).to eq(localhost_replaced)
     end
 
     it "should do nothing if there isn't a match" do
       fedit.search_file_replace(/pattern/, "replacement")
+      fedit.unwritten_changes?.should be_false
       fedit.write_file
       expect(edited_file_contents).to eq(starting_content)
     end
@@ -143,6 +158,7 @@ new line inserted
   describe "search_file_replace_line" do
     it "should search for match and replace the whole line" do
       fedit.search_file_replace_line(/localhost/, "replacement line")
+      fedit.unwritten_changes?.should be_true
       fedit.write_file
       expect(edited_file_contents).to eq(localhost_line_replaced)
     end
@@ -151,6 +167,7 @@ new line inserted
   describe "search_file_delete" do
     it "should search for match and delete the match" do
       fedit.search_file_delete(/localhost/)
+      fedit.unwritten_changes?.should be_true
       fedit.write_file
       expect(edited_file_contents).to eq(localhost_deleted)
     end
@@ -159,6 +176,7 @@ new line inserted
   describe "search_file_delete_line" do
     it "should search for match and delete the matching line" do
       fedit.search_file_delete_line(/localhost/)
+      fedit.unwritten_changes?.should be_true
       fedit.write_file
       expect(edited_file_contents).to eq(localhost_line_deleted)
     end
@@ -167,6 +185,7 @@ new line inserted
   describe "insert_line_after_match" do
     it "should search for match and insert the given line after the matching line" do
       fedit.insert_line_after_match(/localhost/, "new line inserted")
+      fedit.unwritten_changes?.should be_true
       fedit.write_file
       expect(edited_file_contents).to eq(append_after_all_localhost)
     end
@@ -175,14 +194,31 @@ new line inserted
   describe "insert_line_if_no_match" do
     it "should search for match and insert the given line if no line match" do
       fedit.insert_line_if_no_match(/pattern/, "new line inserted")
+      fedit.unwritten_changes?.should be_true
       fedit.write_file
       expect(edited_file_contents).to eq(append_after_content)
     end
 
     it "should do nothing if there is a match" do
       fedit.insert_line_if_no_match(/localhost/, "replacement")
+      fedit.unwritten_changes?.should be_false
       fedit.write_file
       expect(edited_file_contents).to eq(starting_content)
     end
+
+    it "should work more than once" do
+      fedit.insert_line_if_no_match(/missing/, "once")
+      fedit.insert_line_if_no_match(/missing/, "twice")
+      fedit.write_file
+      expect(edited_file_contents).to eq(append_twice)
+    end
+  end
+
+  describe "file_edited" do
+    it "should return true if a file got edited" do
+      fedit.insert_line_if_no_match(/pattern/, "new line inserted")
+      fedit.write_file
+      expect(fedit.file_edited?).to be_true
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.12.0.alpha.1
+  version: 11.12.0.rc.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
@@ -70,30 +70,30 @@ dependencies:
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.4.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.4.0.rc.1
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc.0
+        version: 7.0.0.rc.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc.0
+        version: 7.0.0.rc.2
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -250,34 +250,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -296,16 +282,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -743,6 +729,8 @@ files:
 - lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb
 - lib/chef/formatters/error_mapper.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
@@ -853,6 +841,8 @@ files:
 - lib/chef/knife/search.rb
 - lib/chef/knife/show.rb
 - lib/chef/knife/ssh.rb
+- lib/chef/knife/ssl_check.rb
+- lib/chef/knife/ssl_fetch.rb
 - lib/chef/knife/status.rb
 - lib/chef/knife/tag_create.rb
 - lib/chef/knife/tag_delete.rb
@@ -973,6 +963,8 @@ 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/yum-dump.py
 - lib/chef/provider/package/yum.rb
 - lib/chef/provider/package/zypper.rb
@@ -1079,6 +1071,7 @@ files:
 - lib/chef/resource/timestamped_deploy.rb
 - lib/chef/resource/user.rb
 - lib/chef/resource/whyrun_safe_ruby_block.rb
+- lib/chef/resource/windows_package.rb
 - lib/chef/resource/windows_script.rb
 - lib/chef/resource/yum_package.rb
 - lib/chef/resource_collection.rb
@@ -1115,6 +1108,7 @@ files:
 - lib/chef/user.rb
 - lib/chef/util/backup.rb
 - lib/chef/util/diff.rb
+- lib/chef/util/editor.rb
 - lib/chef/util/file_edit.rb
 - lib/chef/util/selinux.rb
 - lib/chef/util/windows.rb
@@ -1130,6 +1124,7 @@ files:
 - lib/chef/win32/api.rb
 - lib/chef/win32/api/error.rb
 - lib/chef/win32/api/file.rb
+- lib/chef/win32/api/installer.rb
 - lib/chef/win32/api/memory.rb
 - lib/chef/win32/api/process.rb
 - lib/chef/win32/api/psapi.rb
@@ -1389,6 +1384,10 @@ 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/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
 - spec/data/trusted_certs/example.crt
 - spec/data/trusted_certs/intermediate.pem
@@ -1484,6 +1483,7 @@ files:
 - spec/support/shared/functional/securable_resource.rb
 - spec/support/shared/functional/securable_resource_with_reporting.rb
 - spec/support/shared/functional/windows_script.rb
+- spec/support/shared/integration/app_server_support.rb
 - spec/support/shared/integration/integration_helper.rb
 - spec/support/shared/integration/knife_support.rb
 - spec/support/shared/unit/api_error_inspector.rb
@@ -1547,9 +1547,12 @@ files:
 - spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb
 - spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb
 - spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb
+- spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb
 - spec/unit/handler/json_file_spec.rb
 - spec/unit/handler_spec.rb
+- spec/unit/http/simple_spec.rb
 - spec/unit/http/ssl_policies_spec.rb
+- spec/unit/http/validate_content_length_spec.rb
 - spec/unit/http_spec.rb
 - spec/unit/json_compat_spec.rb
 - spec/unit/knife/bootstrap_spec.rb
@@ -1611,6 +1614,8 @@ files:
 - spec/unit/knife/role_from_file_spec.rb
 - spec/unit/knife/role_list_spec.rb
 - spec/unit/knife/ssh_spec.rb
+- spec/unit/knife/ssl_check_spec.rb
+- spec/unit/knife/ssl_fetch_spec.rb
 - spec/unit/knife/status_spec.rb
 - spec/unit/knife/tag_create_spec.rb
 - spec/unit/knife/tag_delete_spec.rb
@@ -1644,6 +1649,7 @@ files:
 - spec/unit/node/attribute_spec.rb
 - spec/unit/node/immutable_collections_spec.rb
 - spec/unit/node_spec.rb
+- spec/unit/platform/query_helpers_spec.rb
 - spec/unit/platform_spec.rb
 - spec/unit/policy_builder/expand_node_object_spec.rb
 - spec/unit/policy_builder/policyfile_spec.rb
@@ -1697,6 +1703,8 @@ files:
 - spec/unit/provider/package/rubygems_spec.rb
 - spec/unit/provider/package/smartos_spec.rb
 - spec/unit/provider/package/solaris_spec.rb
+- spec/unit/provider/package/windows/msi_spec.rb
+- spec/unit/provider/package/windows_spec.rb
 - spec/unit/provider/package/yum_spec.rb
 - spec/unit/provider/package/zypper_spec.rb
 - spec/unit/provider/package_spec.rb
@@ -1739,6 +1747,7 @@ files:
 - spec/unit/provider/user_spec.rb
 - spec/unit/provider/whyrun_safe_ruby_block_spec.rb
 - spec/unit/provider_spec.rb
+- spec/unit/pure_application_spec.rb
 - spec/unit/recipe_spec.rb
 - spec/unit/registry_helper_spec.rb
 - spec/unit/resource/apt_package_spec.rb
@@ -1795,6 +1804,7 @@ files:
 - spec/unit/resource/template_spec.rb
 - spec/unit/resource/timestamped_deploy_spec.rb
 - spec/unit/resource/user_spec.rb
+- spec/unit/resource/windows_package_spec.rb
 - spec/unit/resource/yum_package_spec.rb
 - spec/unit/resource_collection/stepable_iterator_spec.rb
 - spec/unit/resource_collection_spec.rb
@@ -1824,6 +1834,7 @@ files:
 - spec/unit/user_spec.rb
 - spec/unit/util/backup_spec.rb
 - spec/unit/util/diff_spec.rb
+- spec/unit/util/editor_spec.rb
 - spec/unit/util/file_edit_spec.rb
 - spec/unit/util/selinux_spec.rb
 - spec/unit/version/platform_spec.rb