chef 11.12.2 → 11.12.4.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 449cee80fe86f7cf38cec91a1fa6fd5819e0dd8e
-  data.tar.gz: db2d1079c61c5729a797a2ff206d21f1d153a464
+  metadata.gz: c3f91d427e2c9bdfd5c793e2395141833b9b0a7c
+  data.tar.gz: 41696e378a4606f264e53fd44e1edd048aebf3bb
 SHA512:
-  metadata.gz: 4ea1b4d2a4000773b48e3fab9fa7cdf4c3c9d310dcc3ab7b00556de4e80d281c845c352fe4c9a4863fcf3c822daff1f3bd954e0913c1eade582838c855eb6f83
-  data.tar.gz: 0dac4b7f9168ec295bd427d3a701288fd1ed2692e08bc778c138419fbf98b884ba7f998286e6185e855af0d0f7d7665e54983ee2e1d659427bb3343c6f933c97
+  metadata.gz: c958aa132098b374c4b113974d965d59ca633c8e072e6aca92889191998574c7135f60975cdac85705244de5eb710d2237f71d1d1835d35f9fd6024bdad5495e
+  data.tar.gz: a997f28d05a3a7ffbef27bb041be4859ca5d7982d15e94b323a0a50a26e364a629da97d80791eb6d7e145aaf29eb13ce2219aa86cacec8dd47217753780a4306

data/lib/chef/knife/configure.rb

@@ -153,9 +153,10 @@ EOH
 
       def guess_servername
         o = Ohai::System.new
+        o.load_plugins
         o.require_plugin 'os'
         o.require_plugin 'hostname'
-        o[:fqdn] || 'localhost'
+        o[:fqdn] || o[:machinename] || o[:hostname] || 'localhost'
       end
 
       def config_file

data/lib/chef/provider/service/macosx.rb

@@ -59,7 +59,7 @@ class Chef
             a.failure_message Chef::Exceptions::Service, "Several plist files match service name. Please use full service name."
           end
 
-          requirements.assert(:all_actions) do |a|
+          requirements.assert(:enable, :disable) do |a|
             a.assertion { !@service_label.to_s.empty? }
             a.failure_message Chef::Exceptions::Service,
               "Could not find service's label in plist file '#{@plist}'!"
@@ -172,6 +172,10 @@ class Chef
       private
 
         def find_service_label
+          # CHEF-5223 "you can't glob for a file that hasn't been converged
+          # onto the node yet."
+          return nil if @plist.nil?
+
           # Most services have the same internal label as the name of the
           # plist file. However, there is no rule saying that *has* to be
           # the case, and some core services (notably, ssh) do not follow

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '11.12.2'
+  VERSION = '11.12.4.rc.2'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/functional/knife/configure_spec.rb

@@ -0,0 +1,38 @@
+#
+# 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'
+
+require 'chef/knife/configure'
+require 'ohai'
+
+describe "knife configure" do
+  let (:ohai) do
+    o = Ohai::System.new
+    o.load_plugins
+    o.require_plugin 'os'
+    o.require_plugin 'hostname'
+    o
+  end
+
+  it "loads the fqdn from Ohai" do
+    knife_configure = Chef::Knife::Configure.new
+    hostname_guess = ohai[:fqdn] || ohai[:machinename] || ohai[:hostname] || 'localhost'
+    expect(knife_configure.guess_servername).to eql(hostname_guess)
+  end
+end

data/spec/unit/knife/configure_spec.rb

@@ -28,6 +28,7 @@ describe Chef::Knife::Configure do
   let(:ohai) do
     o = {}
     o.stub(:require_plugin)
+    o.stub(:load_plugins)
     o[:fqdn] = fqdn
     o
   end

data/spec/unit/provider/service/macosx_spec.rb

@@ -81,6 +81,43 @@ XML
         let!(:current_resource) { Chef::Resource::Service.new(service_name) }
 
         describe "#load_current_resource" do
+
+          # CHEF-5223 "you can't glob for a file that hasn't been converged
+          # onto the node yet."
+          context "when the plist doesn't exist" do
+
+            def run_resource_setup_for_action(action)
+              new_resource.action(action)
+              provider.action = action
+              provider.load_current_resource
+              provider.define_resource_requirements
+              provider.process_resource_requirements
+            end
+
+            before do
+              Dir.stub(:glob).and_return([])
+              provider.stub(:shell_out!).
+                       with(/plutil -convert xml1 -o/).
+                       and_raise(Mixlib::ShellOut::ShellCommandFailed)
+            end
+
+            it "works for action :nothing" do
+              lambda { run_resource_setup_for_action(:nothing) }.should_not raise_error
+            end
+
+            it "works for action :start" do
+              lambda { run_resource_setup_for_action(:start) }.should_not raise_error
+            end
+
+            it "errors if action is :enable" do
+              lambda { run_resource_setup_for_action(:enable) }.should raise_error(Chef::Exceptions::Service)
+            end
+
+            it "errors if action is :disable" do
+              lambda { run_resource_setup_for_action(:disable) }.should raise_error(Chef::Exceptions::Service)
+            end
+          end
+
           context "when launchctl returns pid in service list" do
             let(:launchctl_stdout) { StringIO.new <<-SVC_LIST }
   12761 - 0x100114220.old.machinit.thing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.12.2
+  version: 11.12.4.rc.2
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
@@ -84,16 +84,16 @@ dependencies:
   name: ohai
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.0.4.rc.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.0.4.rc.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -1403,6 +1403,7 @@ files:
 - spec/functional/dsl/reboot_pending_spec.rb
 - spec/functional/dsl/registry_helper_spec.rb
 - spec/functional/file_content_management/deploy_strategies_spec.rb
+- spec/functional/knife/configure_spec.rb
 - spec/functional/knife/cookbook_delete_spec.rb
 - spec/functional/knife/exec_spec.rb
 - spec/functional/knife/smoke_test.rb
@@ -1858,9 +1859,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2