chef 11.8.2 → 11.8.4.ohai7.0

data/lib/chef/provider/ohai.rb

@@ -33,11 +33,12 @@ class Chef
       def action_reload
         converge_by("re-run ohai and merge results into node attributes") do
           ohai = ::Ohai::System.new
-          if @new_resource.plugin
-            ohai.require_plugin @new_resource.plugin
-          else
-            ohai.all_plugins
-          end
+
+          # If @new_resource.plugin is nil, ohai will reload all the plugins
+          # Otherwise it will only reload the specified plugin
+          # Note that any changes to plugins, or new plugins placed on
+          # the path are picked up by ohai.
+          ohai.all_plugins @new_resource.plugin
           node.automatic_attrs.merge! ohai.data
           Chef::Log.info("#{@new_resource} reloaded")
         end

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '11.8.2'
+  VERSION = '11.8.4.ohai7.0'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/functional/resource/base.rb

@@ -22,9 +22,7 @@ def ohai
   # provider is platform-dependent, we need platform ohai data:
   @OHAI_SYSTEM ||= begin
     ohai = Ohai::System.new
-    ohai.require_plugin("os")
-    ohai.require_plugin("platform")
-    ohai.require_plugin("passwd")
+    ohai.all_plugins("platform")
     ohai
   end
 end

data/spec/functional/resource/deploy_revision_spec.rb

@@ -45,7 +45,7 @@ describe Chef::Resource::DeployRevision, :unix_only => true do
 
   before(:all) do
     @ohai = Ohai::System.new
-    @ohai.require_plugin("os")
+    @ohai.all_plugins("os")
   end
 
   let(:node) do

data/spec/functional/resource/git_spec.rb

@@ -92,7 +92,7 @@ E
 
   before(:all) do
     @ohai = Ohai::System.new
-    @ohai.require_plugin("os")
+    @ohai.all_plugins("os")
   end
 
   context "working with pathes with special characters" do

data/spec/functional/resource/ohai_spec.rb

@@ -0,0 +1,65 @@
+#
+# Author:: Serdar Sutay (<serdar@opscode.com>)
+# Copyright:: Copyright (c) 2014 Opscode, 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::Ohai do
+  let(:ohai) {
+    o = Ohai::System.new
+    o.all_plugins
+    o
+  }
+
+  let(:node) { Chef::Node.new }
+
+  let(:run_context) {
+    node.default[:platform] = ohai[:platform]
+    node.default[:platform_version] = ohai[:platform_version]
+    events = Chef::EventDispatch::Dispatcher.new
+    Chef::RunContext.new(node, {}, events)
+  }
+
+  shared_examples_for "reloaded :uptime" do
+    it "should reload :uptime" do
+      initial_uptime = ohai[:uptime]
+
+      # Sleep for a second so the uptime gets updated.
+      sleep 1
+
+      ohai_resource.run_action(:reload)
+      node[:uptime].should_not == initial_uptime
+    end
+  end
+
+  describe "when reloading all plugins" do
+    let(:ohai_resource) { Chef::Resource::Ohai.new("reload all", run_context)}
+
+    it_behaves_like "reloaded :uptime"
+  end
+
+  describe "when reloading only uptime" do
+    let(:ohai_resource) {
+      r = Chef::Resource::Ohai.new("reload all", run_context)
+      r.plugin("uptime")
+      r
+    }
+
+
+    it_behaves_like "reloaded :uptime"
+  end
+end

data/spec/spec_helper.rb

@@ -87,8 +87,7 @@ Dir["spec/support/**/*.rb"].
 
 
 OHAI_SYSTEM = Ohai::System.new
-OHAI_SYSTEM.require_plugin("os")
-OHAI_SYSTEM.require_plugin("platform")
+OHAI_SYSTEM.all_plugins("platform")
 TEST_PLATFORM = OHAI_SYSTEM["platform"].dup.freeze
 TEST_PLATFORM_VERSION = OHAI_SYSTEM["platform_version"].dup.freeze
 

data/spec/support/shared/functional/windows_script.rb

@@ -23,8 +23,7 @@ shared_context Chef::Resource::WindowsScript do
   before(:all) do
 
     ohai_reader = Ohai::System.new
-    ohai_reader.require_plugin("os")
-    ohai_reader.require_plugin("windows::platform")
+    ohai_reader.all_plugins("platform")
 
     new_node = Chef::Node.new
     new_node.consume_external_attrs(ohai_reader.data,{})

data/spec/unit/provider/ohai_spec.rb

@@ -42,7 +42,6 @@ describe Chef::Provider::Ohai do
       }
     }
     mock_ohai.stub!(:all_plugins).and_return(true)
-    mock_ohai.stub!(:require_plugin).and_return(true)
     mock_ohai.stub!(:data).and_return(mock_ohai[:data],
                                       mock_ohai[:data2])
     Ohai::System.stub!(:new).and_return(mock_ohai)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.8.2
-  prerelease: 
+  version: 11.8.4.ohai7.0
+  prerelease: 7
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
@@ -96,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.0.rc.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.0.rc.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -1402,6 +1402,7 @@ files:
 - spec/functional/resource/ifconfig_spec.rb
 - spec/functional/resource/link_spec.rb
 - spec/functional/resource/mount_spec.rb
+- spec/functional/resource/ohai_spec.rb
 - spec/functional/resource/package_spec.rb
 - spec/functional/resource/powershell_spec.rb
 - spec/functional/resource/registry_spec.rb
@@ -1817,12 +1818,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3862901366851738946
 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: 1.8.23