chef 12.0.0.alpha.0 → 12.0.0.alpha.1

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

@@ -19,6 +19,7 @@
 #
 
 require 'spec_helper'
+require 'chef/provider/user/useradd'
 
 describe Chef::Provider::User::Useradd do
 

data/spec/unit/recipe_spec.rb

@@ -182,7 +182,48 @@ describe Chef::Recipe do
         zm_resource # force let binding evaluation
         run_context.resource_collection.resources(:zen_master => "klopp").should == zm_resource
       end
+    end
+
+    describe "creating a resource with short name" do
+      # zen_follower resource has this:
+      # provides :follower, :on_platforms => ["zen"]
+      before do
+        node.stub(:[]) do |key|
+          case key
+          when :platform
+            :zen
+          when :platform_version
+            "1.0.0"
+          else
+            nil
+          end
+        end
+      end
+
+      let(:resource_follower) do
+        recipe.declare_resource(:follower, "srst") do
+          master "none"
+        end
+      end
 
+      it "defines the resource using the declaration name with short name" do
+        resource_follower
+        run_context.resource_collection.lookup("follower[srst]").should_not be_nil
+      end
+    end
+
+    describe "creating a resource with a long name" do
+      let(:resource_zn_follower) do
+        recipe.declare_resource(:zen_follower, "srst") do
+          master "none"
+        end
+      end
+
+
+      it "defines the resource using the declaration name with long name" do
+        resource_zn_follower
+        run_context.resource_collection.lookup("zen_follower[srst]").should_not be_nil
+      end
     end
 
     describe "when attempting to create a resource of an invalid type" do

data/spec/unit/resource/scm_spec.rb

@@ -147,6 +147,10 @@ describe Chef::Resource::Scm do
     @resource.ssh_wrapper.should be_nil
   end
 
+  it "defaults to nil for the environment" do
+    @resource.environment.should be_nil
+  end
+
   describe "when it has a timeout attribute" do
     let(:ten_seconds) { 10 }
     before { @resource.timeout(ten_seconds) }
@@ -179,4 +183,11 @@ describe Chef::Resource::Scm do
     end
   end
 
+  describe "when it has a environment attribute" do
+    let(:test_environment) { {'CHEF_ENV' => '/tmp' } }
+    before { @resource.environment(test_environment) }
+    it "stores this environment" do
+      @resource.environment.should == test_environment
+    end
+  end
 end

data/spec/unit/resource/user_spec.rb

@@ -54,6 +54,10 @@ describe Chef::Resource::User, "initialize" do
     @resource.supports[:non_unique].should eql(false)
   end
 
+  it "should set force to false" do
+    @resource.force.should eql(false)
+  end
+
   %w{create remove modify manage lock unlock}.each do |action|
     it "should allow action #{action}" do
       @resource.allowed_actions.detect { |a| a == action.to_sym }.should eql(action.to_sym)

data/spec/unit/resource/windows_service_spec.rb

@@ -0,0 +1,46 @@
+#
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# 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::Resource::WindowsService, "initialize", :windows_only do
+
+  let(:resource) { Chef::Resource::WindowsService.new("BITS") }
+
+  it "returns a Chef::Resource::WindowsService" do
+    expect(resource).to be_a_kind_of(Chef::Resource::WindowsService)
+  end
+
+  it "sets the resource_name to :windows_service" do
+    expect(resource.resource_name).to eql(:windows_service)
+  end
+
+  it "sets the provider to Chef::Provider::Service::Windows" do
+    expect(resource.provider).to eql(Chef::Provider::Service::Windows)
+  end
+
+  it "supports setting startup_type" do
+    resource.startup_type(:manual)
+    expect(resource.startup_type).to eql(:manual)
+  end
+
+  it "allows the action to be 'configure_startup'" do
+    resource.action :configure_startup
+    resource.action.should == [:configure_startup]
+  end
+end

data/spec/unit/resource_collection_spec.rb

@@ -88,6 +88,39 @@ describe Chef::ResourceCollection do
     end
   end
 
+  describe "insert_at" do
+    it "should accept only Chef::Resources" do
+      lambda { @rc.insert_at(0, @resource, @resource) }.should_not raise_error
+      lambda { @rc.insert_at(0, "string") }.should raise_error
+      lambda { @rc.insert_at(0, @resource, "string") }.should raise_error
+    end
+
+    it "should toss an error if it receives a bad index" do
+      @rc.insert_at(10, @resource)
+    end
+
+    it "should insert resources at the beginning when asked" do
+      @rc.insert(Chef::Resource::ZenMaster.new('1'))
+      @rc.insert(Chef::Resource::ZenMaster.new('2'))
+      @rc.insert_at(0, Chef::Resource::ZenMaster.new('X'))
+      @rc.all_resources.map { |r| r.name }.should == [ 'X', '1', '2' ]
+    end
+
+    it "should insert resources in the middle when asked" do
+      @rc.insert(Chef::Resource::ZenMaster.new('1'))
+      @rc.insert(Chef::Resource::ZenMaster.new('2'))
+      @rc.insert_at(1, Chef::Resource::ZenMaster.new('X'))
+      @rc.all_resources.map { |r| r.name }.should == [ '1', 'X', '2' ]
+    end
+
+    it "should insert resources at the end when asked" do
+      @rc.insert(Chef::Resource::ZenMaster.new('1'))
+      @rc.insert(Chef::Resource::ZenMaster.new('2'))
+      @rc.insert_at(2, Chef::Resource::ZenMaster.new('X'))
+      @rc.all_resources.map { |r| r.name }.should == [ '1', '2', 'X' ]
+    end
+  end
+
   describe "each" do
     it "should allow you to iterate over every resource in the collection" do
       load_up_resources

data/spec/unit/resource_reporter_spec.rb

@@ -21,6 +21,7 @@
 
 require File.expand_path("../../spec_helper", __FILE__)
 require 'chef/resource_reporter'
+require 'socket'
 
 describe Chef::ResourceReporter do
   before(:all) do
@@ -707,5 +708,52 @@ describe Chef::ResourceReporter do
         @resource_reporter.run_completed(@node)
       end
     end
+
+    context "when data report post is enabled and the server response fails" do
+      before do
+        @enable_reporting_url_fatals = Chef::Config[:enable_reporting_url_fatals]
+        Chef::Config[:enable_reporting_url_fatals] = true
+        # this call doesn't matter for this context
+        @rest_client.stub(:create_url)
+      end
+
+      after do
+        Chef::Config[:enable_reporting_url_fatals] = @enable_reporting_url_fatals
+      end
+
+      it "should log 4xx errors" do
+        response = Net::HTTPClientError.new("forbidden", "403", "Forbidden")
+        error = Net::HTTPServerException.new("403 message", response)
+        @rest_client.stub(:raw_http_request).and_raise(error)
+        Chef::Log.should_receive(:error).with(/403/)
+
+        @resource_reporter.post_reporting_data
+      end
+
+      it "should log error 5xx errors" do
+        response = Net::HTTPServerError.new("internal error", "500", "Internal Server Error")
+        error = Net::HTTPFatalError.new("500 message", response)
+        @rest_client.stub(:raw_http_request).and_raise(error)
+        Chef::Log.should_receive(:error).with(/500/)
+
+        @resource_reporter.post_reporting_data
+      end
+
+      it "should log if a socket error happens" do
+        @rest_client.stub(:raw_http_request).and_raise(SocketError.new("test socket error"))
+        Chef::Log.should_receive(:error).with(/test socket error/)
+
+        @resource_reporter.post_reporting_data
+
+      end
+
+      it "should raise if an unkwown error happens" do
+        @rest_client.stub(:raw_http_request).and_raise(Exception.new)
+
+        lambda {
+          @resource_reporter.post_reporting_data
+        }.should raise_error(Exception)
+      end
+    end
   end
 end

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, :sensitive ]
       (hash.keys - expected_keys).should == []
       (expected_keys - hash.keys).should == []
@@ -527,6 +527,13 @@ describe Chef::Resource do
       snitch_var2.should be_false
     end
 
+    it "reports 0 elapsed time if actual elapsed time is < 0" do
+      expected = Time.now
+      Time.stub(:now).and_return(expected, expected - 1)
+      @resource.run_action(:purr)
+      @resource.elapsed_time.should == 0
+    end
+
     describe "guard_interpreter attribute" do
       let(:resource) { @resource }
 
@@ -788,7 +795,7 @@ describe Chef::Resource do
     before(:each) do
        @resource_file = Chef::Resource::File.new("/nonexistent/CHEF-5098/file", @run_context)
        @action = :create
-    end 
+    end
 
     def compiled_resource_data(resource, action, err)
       error_inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(resource, action, err)

data/spec/unit/role_spec.rb

@@ -296,6 +296,12 @@ EOR
       File.should_not_receive(:exists?)
       lambda {@role.class.from_disk("lolcat")}.should raise_error(Chef::Exceptions::DuplicateRole)
     end
+
+    it "should not raise an exception if two files exist with a similar name" do
+      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes/lolcat.rb", "#{Chef::Config[:role_path]}/super_lolcat.rb"])
+      File.should_not_receive(:exists?)
+      lambda {@role.class.from_disk("lolcat")}.should_not raise_error(Chef::Exceptions::DuplicateRole)
+    end    
   end
 
   describe "when loading from disk and role_path is an array" do

data/spec/unit/version_constraint_spec.rb

@@ -148,4 +148,32 @@ describe Chef::VersionConstraint do
       vc.should_not include "0.3.0"
     end
   end
+
+  describe 'to_s' do
+    it 'shows a patch-level if one is given' do
+      vc = Chef::VersionConstraint.new '~> 1.2.0'
+
+      vc.to_s.should == '~> 1.2.0'
+    end
+
+    it 'shows no patch-level if one is not given' do
+      vc = Chef::VersionConstraint.new '~> 1.2'
+
+      vc.to_s.should == '~> 1.2'
+    end
+  end
+
+  describe 'inspect' do
+    it 'shows a patch-level if one is given' do
+      vc = Chef::VersionConstraint.new '~> 1.2.0'
+
+      vc.inspect.should == '(~> 1.2.0)'
+    end
+
+    it 'shows no patch-level if one is not given' do
+      vc = Chef::VersionConstraint.new '~> 1.2'
+
+      vc.inspect.should == '(~> 1.2)'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 12.0.0.alpha.0
+  version: 12.0.0.alpha.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
@@ -101,6 +101,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,6 +111,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +224,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -642,8 +662,11 @@ files:
 - lib/chef/dsl/recipe.rb
 - lib/chef/dsl/registry_helper.rb
 - lib/chef/encrypted_data_bag_item.rb
+- lib/chef/encrypted_data_bag_item/assertions.rb
 - lib/chef/encrypted_data_bag_item/decryption_failure.rb
 - lib/chef/encrypted_data_bag_item/decryptor.rb
+- lib/chef/encrypted_data_bag_item/encrypted_data_bag_item_assertions.rb
+- lib/chef/encrypted_data_bag_item/encryption_failure.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
@@ -961,6 +984,7 @@ files:
 - lib/chef/provider/template/content.rb
 - lib/chef/provider/template_finder.rb
 - lib/chef/provider/user.rb
+- lib/chef/provider/user/aix.rb
 - lib/chef/provider/user/dscl.rb
 - lib/chef/provider/user/pw.rb
 - lib/chef/provider/user/solaris.rb
@@ -1033,6 +1057,7 @@ files:
 - lib/chef/resource/whyrun_safe_ruby_block.rb
 - lib/chef/resource/windows_package.rb
 - lib/chef/resource/windows_script.rb
+- lib/chef/resource/windows_service.rb
 - lib/chef/resource/yum_package.rb
 - lib/chef/resource_collection.rb
 - lib/chef/resource_collection/stepable_iterator.rb
@@ -1184,15 +1209,23 @@ files:
 - spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-x2d6j9-0
 - spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-xi0l6h-0
 - spec/data/config.rb
+- spec/data/cookbooks/angrybash/metadata.rb
 - spec/data/cookbooks/angrybash/recipes/default.rb
 - spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl
+- spec/data/cookbooks/apache2/metadata.rb
 - spec/data/cookbooks/apache2/recipes/default.rb
+- spec/data/cookbooks/borken/metadata.rb
 - spec/data/cookbooks/borken/recipes/default.rb
 - spec/data/cookbooks/borken/templates/default/borken.erb
 - spec/data/cookbooks/chefignore
+- spec/data/cookbooks/ignorken/metadata.rb
 - spec/data/cookbooks/ignorken/recipes/default.rb
 - spec/data/cookbooks/ignorken/recipes/ignoreme.rb
 - spec/data/cookbooks/java/files/default/java.response
+- spec/data/cookbooks/java/metadata.rb
+- spec/data/cookbooks/name-mismatch-versionnumber/README.md
+- spec/data/cookbooks/name-mismatch-versionnumber/metadata.rb
+- spec/data/cookbooks/name-mismatch-versionnumber/recipes/default.rb
 - spec/data/cookbooks/openldap/attributes/default.rb
 - spec/data/cookbooks/openldap/attributes/smokey.rb
 - spec/data/cookbooks/openldap/definitions/client.rb
@@ -1200,6 +1233,7 @@ files:
 - spec/data/cookbooks/openldap/files/default/.dotfile
 - spec/data/cookbooks/openldap/files/default/.ssh/id_rsa
 - spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir
+- spec/data/cookbooks/openldap/files/default/remotedir/not_a_template.erb
 - spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt
 - spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt
 - spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile
@@ -1221,6 +1255,7 @@ files:
 - spec/data/cookbooks/openldap/templates/default/test.erb
 - spec/data/cookbooks/preseed/files/default/preseed-file.seed
 - spec/data/cookbooks/preseed/files/default/preseed-template.seed
+- spec/data/cookbooks/preseed/metadata.rb
 - spec/data/cookbooks/preseed/templates/default/preseed-template-variables.seed
 - spec/data/cookbooks/preseed/templates/default/preseed-template.seed
 - spec/data/definitions/test.rb
@@ -1233,6 +1268,12 @@ files:
 - spec/data/git_bundles/sinatra-test-app-with-callback-files.gitbundle
 - spec/data/git_bundles/sinatra-test-app-with-symlinks.gitbundle
 - spec/data/git_bundles/sinatra-test-app.gitbundle
+- spec/data/incomplete-metadata-chef-repo/incomplete-metadata/README.md
+- spec/data/incomplete-metadata-chef-repo/incomplete-metadata/metadata.rb
+- spec/data/incomplete-metadata-chef-repo/incomplete-metadata/recipes/default.rb
+- spec/data/invalid-metadata-chef-repo/invalid-metadata/README.md
+- spec/data/invalid-metadata-chef-repo/invalid-metadata/metadata.rb
+- spec/data/invalid-metadata-chef-repo/invalid-metadata/recipes/default.rb
 - spec/data/kitchen/chefignore
 - spec/data/kitchen/openldap/attributes/default.rb
 - spec/data/kitchen/openldap/attributes/robinson.rb
@@ -1259,6 +1300,14 @@ files:
 - spec/data/lwrp_const_scoping/resources/conflict.rb
 - spec/data/lwrp_override/providers/buck_passer.rb
 - spec/data/lwrp_override/resources/foo.rb
+- spec/data/mac_users/10.7-8.plist.xml
+- spec/data/mac_users/10.7-8.shadow.xml
+- spec/data/mac_users/10.7.plist.xml
+- spec/data/mac_users/10.7.shadow.xml
+- spec/data/mac_users/10.8.plist.xml
+- spec/data/mac_users/10.8.shadow.xml
+- spec/data/mac_users/10.9.plist.xml
+- spec/data/mac_users/10.9.shadow.xml
 - spec/data/metadata/quick_start/metadata.rb
 - spec/data/nodes/default.rb
 - spec/data/nodes/test.example.com.rb
@@ -1382,6 +1431,7 @@ files:
 - spec/functional/resource/cron_spec.rb
 - spec/functional/resource/deploy_revision_spec.rb
 - spec/functional/resource/directory_spec.rb
+- spec/functional/resource/env_spec.rb
 - spec/functional/resource/file_spec.rb
 - spec/functional/resource/git_spec.rb
 - spec/functional/resource/group_spec.rb
@@ -1396,7 +1446,8 @@ files:
 - spec/functional/resource/remote_file_spec.rb
 - spec/functional/resource/rpm_spec.rb
 - spec/functional/resource/template_spec.rb
-- spec/functional/resource/user_spec.rb
+- spec/functional/resource/user/dscl_spec.rb
+- spec/functional/resource/user/useradd_spec.rb
 - spec/functional/rest_spec.rb
 - spec/functional/run_lock_spec.rb
 - spec/functional/shell_spec.rb
@@ -1438,6 +1489,7 @@ files:
 - spec/support/lib/chef/resource/cat.rb
 - spec/support/lib/chef/resource/one_two_three_four.rb
 - spec/support/lib/chef/resource/with_state.rb
+- spec/support/lib/chef/resource/zen_follower.rb
 - spec/support/lib/chef/resource/zen_master.rb
 - spec/support/lib/library_load_order.rb
 - spec/support/matchers/leak.rb
@@ -1460,6 +1512,7 @@ files:
 - 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/chef_zero_support.rb
 - spec/support/shared/integration/integration_helper.rb
 - spec/support/shared/integration/knife_support.rb
 - spec/support/shared/matchers.rb
@@ -1491,13 +1544,14 @@ files:
 - spec/unit/config_fetcher_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/cookbook/chefignore_spec.rb
+- spec/unit/cookbook/cookbook_version_loader_spec.rb
 - spec/unit/cookbook/file_vendor_spec.rb
 - spec/unit/cookbook/metadata_spec.rb
 - spec/unit/cookbook/synchronizer_spec.rb
 - spec/unit/cookbook/syntax_check_spec.rb
 - spec/unit/cookbook_loader_spec.rb
 - spec/unit/cookbook_manifest_spec.rb
-- spec/unit/cookbook_site_streaming_uploader.rb
+- spec/unit/cookbook_site_streaming_uploader_spec.rb
 - spec/unit/cookbook_spec.rb
 - spec/unit/cookbook_uploader_spec.rb
 - spec/unit/cookbook_version_spec.rb
@@ -1519,6 +1573,7 @@ files:
 - spec/unit/file_content_management/deploy/cp_spec.rb
 - spec/unit/file_content_management/deploy/mv_unix_spec.rb
 - spec/unit/file_content_management/deploy/mv_windows_spec.rb
+- spec/unit/formatters/base_spec.rb
 - spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb
 - spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb
 - spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb
@@ -1596,6 +1651,7 @@ files:
 - spec/unit/knife/role_edit_spec.rb
 - spec/unit/knife/role_from_file_spec.rb
 - spec/unit/knife/role_list_spec.rb
+- spec/unit/knife/role_show_spec.rb
 - spec/unit/knife/ssh_spec.rb
 - spec/unit/knife/ssl_check_spec.rb
 - spec/unit/knife/ssl_fetch_spec.rb
@@ -1793,6 +1849,7 @@ files:
 - spec/unit/resource/timestamped_deploy_spec.rb
 - spec/unit/resource/user_spec.rb
 - spec/unit/resource/windows_package_spec.rb
+- spec/unit/resource/windows_service_spec.rb
 - spec/unit/resource/yum_package_spec.rb
 - spec/unit/resource_collection/stepable_iterator_spec.rb
 - spec/unit/resource_collection_spec.rb