ohai 7.0.0 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01efe8796a57251ebbcf16774f01e20ca60fa7e8
-  data.tar.gz: fa4468d7b1b40b8dd2d4ae8bc3210e468017e8ad
+  metadata.gz: d5000ad010af950e34ca83e38bc47a3ea02b15c5
+  data.tar.gz: 9b606e4475a7a3fcdd35d315fa121a19f1df43f5
 SHA512:
-  metadata.gz: d88c7d2ca3c573f6b7ea4e0f62e59a5457f413908eab0b6d1dcb3e3226a4f112697b67a38a9bd155689d29f6d73344ecadcabb362da04962bdf7735991935ba8
-  data.tar.gz: 2751ea3765a1ab857ab6a966d926217209ecf34add0ab32eef44578495978365c653cefcefe3d143b83958cbbe354f8b0ba59659c1a2139a0571bdbb3af0fffc
+  metadata.gz: 6a070ccd2fe321b8fdc9f76fbea5917dc77262d959c8e44ac911bafa7170a95282e0d11af545e1a16d813460323dbf6f4829af93cbb4e4197fc65637f4acf319
+  data.tar.gz: 58dfa08849444ad98bea48f0172c9082237017406ec41466b556e278f915c50c2f5df7d3032df3e06e42b318eaf23da552147585e001560319a11d83c177b869

data/lib/ohai/system.rb

@@ -83,6 +83,13 @@ module Ohai
         @runner.run_plugin(v6plugin)
       end
 
+      # Users who are migrating from ohai 6 may give one or more Ohai 6 plugin
+      # names as the +attribute_filter+. In this case we return early because
+      # the v7 plugin provides map will not have an entry for this plugin.
+      if attribute_filter and Array(attribute_filter).all? {|filter_item| have_v6_plugin?(filter_item) }
+        return true
+      end
+
       # Then run all the version 7 plugins
       begin
         @provides_map.all_plugins(attribute_filter).each { |plugin|
@@ -94,6 +101,10 @@ module Ohai
       end
     end
 
+    def have_v6_plugin?(name)
+      @v6_dependency_solver.values.any? {|v6plugin| v6plugin.name == name }
+    end
+
     def pathify_v6_plugin(plugin_name)
       path_components = plugin_name.split("::")
       File.join(path_components) + ".rb"

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '7.0.0'
+  VERSION = '7.0.2'
 end

data/spec/unit/system_spec.rb

@@ -517,6 +517,29 @@ EOF
   end
 
   describe "when Chef OHAI resource executes :reload action" do
+
+    when_plugins_directory "contains a v6 plugin" do
+      with_plugin("a_v6plugin.rb", <<-E)
+        plugin_data Mash.new
+        plugin_data[:foo] = :bar
+      E
+
+      before do
+        @original_config = Ohai::Config[:plugin_path]
+        Ohai::Config[:plugin_path] = [ path_to(".") ]
+      end
+
+      after do
+        Ohai::Config[:plugin_path] = @original_config
+      end
+
+      it "reloads only the v6 plugin when given a specific plugin to load" do
+        ohai.all_plugins
+        lambda { ohai.all_plugins("a_v6plugin") }.should_not raise_error
+      end
+
+    end
+
     when_plugins_directory "contains a random plugin" do
       with_plugin("random.rb", <<-E)
         Ohai.plugin(:Random) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.2
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types