ohai 13.0.0 → 13.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 436fe05bd654044a382621b353229fc436bc3a4c
-  data.tar.gz: a785069184b37a9a057e061da997d47d55c1e161
+  metadata.gz: bc03fe6ff6ba0d982a2aa2f46478ef5a9591aedb
+  data.tar.gz: 060eee8013d65b8225ae6d430c694b6356d9584f
 SHA512:
-  metadata.gz: 334239f6d9138eda450ad1fac4bb8da0439b290dfa1d2551377bf37dcd082778f121cbdb5f4398a936bb98670cb030bbe22bea952cd8fa4216bba06a0b18360e
-  data.tar.gz: ea555c1670d775894b74c3b3b5a677e4b69c9097b121e518d1c50c5b7c3dc3dc2a4134bba7f28e1894137865131decf22f4d443d7adfa6b6207ec8301dfd19ac
+  metadata.gz: 50cb72595109dd4e3a7d2b0bd573dfe7eca8624a9d6ec398ec14e60b0085050f6ca9cf0438123d53b928d5f86a9696610d4931be2b1f6450d0b0f25d3a41ee65
+  data.tar.gz: 1d0ad0f6f97869c6875e5b71d83c2bb64f5dcf5db5e41d99c18da40e9667fe0cc3654338623ff885b76be270513775aee51ed7289e82410c0c15dfe9fe3e8d32

data/Gemfile

@@ -14,6 +14,6 @@ group :development do
   gem "rspec-mocks", "~> 3.0"
   gem "rspec-collection_matchers", "~> 1.0"
   gem "rspec_junit_formatter"
-  gem "github_changelog_generator", git: "https://github.com/tduffield/github-changelog-generator", branch: "adjust-tag-section-mapping"
+  gem "github_changelog_generator", git: "https://github.com/chef/github-changelog-generator"
   gem "ipaddr_extensions"
 end

data/Rakefile

@@ -30,9 +30,6 @@ begin
     config.future_release = Ohai::VERSION
     config.max_issues = 0
     config.add_issues_wo_labels = false
-    config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
-    config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
-    config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion".split(",")
   end
 rescue LoadError
 end

data/lib/ohai/plugins/eucalyptus.rb

@@ -19,9 +19,11 @@
 
 # eucalyptus metadata service is compatible with the ec2 service calls
 require "ohai/mixin/ec2_metadata"
+require "ohai/mixin/http_helper"
 
 Ohai.plugin(:Eucalyptus) do
   include Ohai::Mixin::Ec2Metadata
+  include Ohai::Mixin::HttpHelper
 
   provides "eucalyptus"
   depends "network/interfaces"
@@ -53,7 +55,7 @@ Ohai.plugin(:Eucalyptus) do
   def looks_like_euca?
     # Try non-blocking connect so we don't "block" if
     # the metadata service doesn't respond
-    hint?("eucalyptus") || has_euca_mac? && can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
+    hint?("eucalyptus") || has_euca_mac? && can_socket_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
   end
 
   collect_data do

data/lib/ohai/plugins/openstack.rb

@@ -17,9 +17,11 @@
 # limitations under the License.
 
 require "ohai/mixin/ec2_metadata"
+require "ohai/mixin/http_helper"
 
 Ohai.plugin(:Openstack) do
   include Ohai::Mixin::Ec2Metadata
+  include Ohai::Mixin::HttpHelper
 
   provides "openstack"
   depends "dmi"
@@ -61,7 +63,7 @@ Ohai.plugin(:Openstack) do
       openstack[:provider] = openstack_provider
 
       # fetch the metadata if we can do a simple socket connect first
-      if can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
+      if can_socket_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
         fetch_metadata.each do |k, v|
           openstack[k] = v
         end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "13.0.0"
+  VERSION = "13.0.1"
 end

data/spec/unit/plugins/openstack_spec.rb

@@ -37,7 +37,7 @@ describe Ohai::System, "plugin openstack" do
   context "when DMI data is Openstack" do
     context "and the metadata service is not available" do
       before do
-        allow(plugin).to receive(:can_metadata_connect?).
+        allow(plugin).to receive(:can_socket_connect?).
           with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80).
           and_return(false)
         plugin[:dmi] = { :system => { :all_records => [ { :Manufacturer => "OpenStack Foundation" } ] } }
@@ -57,7 +57,7 @@ describe Ohai::System, "plugin openstack" do
   context "when running on dreamhost" do
     it "sets openstack provider attribute to dreamhost" do
       plugin["etc"] = { "passwd" => { "dhc-user" => {} } }
-      allow(plugin).to receive(:can_metadata_connect?).
+      allow(plugin).to receive(:can_socket_connect?).
         with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80).
         and_return(false)
       plugin[:dmi] = { :system => { :all_records => [ { :Manufacturer => "OpenStack Foundation" } ] } }
@@ -69,7 +69,7 @@ describe Ohai::System, "plugin openstack" do
   context "when the hint is present" do
     context "and the metadata service is not available" do
       before do
-        allow(plugin).to receive(:can_metadata_connect?).
+        allow(plugin).to receive(:can_socket_connect?).
           with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80).
           and_return(false)
         allow(plugin).to receive(:hint?).with("openstack").and_return(true)
@@ -176,7 +176,7 @@ EOM
 
       before do
         allow(plugin).to receive(:hint?).with("openstack").and_return(true)
-        allow(plugin).to receive(:can_metadata_connect?).
+        allow(plugin).to receive(:can_socket_connect?).
           with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80).
           and_return(true)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 13.0.0
+  version: 13.0.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu