ohai 8.10.0 → 8.11.1

data/spec/unit/runner_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper.rb")
 
 describe Ohai::Runner, "run_plugin" do
   let(:safe_run) { true }
@@ -137,11 +137,11 @@ describe Ohai::Runner, "run_plugin" do
       end
 
       it "should raise Ohai::Excpetions::AttributeNotFound" do
-        expect{ @runner.run_plugin(@plugin) }.to raise_error(Ohai::Exceptions::AttributeNotFound)
+        expect { @runner.run_plugin(@plugin) }.to raise_error(Ohai::Exceptions::AttributeNotFound)
       end
 
       it "should not run the plugin" do
-        expect{ @runner.run_plugin(@plugin) }.to raise_error(Ohai::Exceptions::AttributeNotFound)
+        expect { @runner.run_plugin(@plugin) }.to raise_error(Ohai::Exceptions::AttributeNotFound)
         expect(@plugin.has_run?).to be false
       end
     end
@@ -244,8 +244,8 @@ describe Ohai::Runner, "run_plugin" do
         @plugins << klass.new(@ohai.data)
       end
       @plugin1, @plugin2, @plugin3 = @plugins
-      @ohai.provides_map.set_providers_for(@plugin1, ["one", "two"])
-      @ohai.provides_map.set_providers_for(@plugin2, ["one", "two"])
+      @ohai.provides_map.set_providers_for(@plugin1, %w{one two})
+      @ohai.provides_map.set_providers_for(@plugin2, %w{one two})
     end
 
     it "should run the plugins" do
@@ -322,16 +322,16 @@ describe Ohai::Runner, "run_plugin" do
       klassA = Ohai.plugin(:A) {
         provides("A")
         depends("B", "C")
-        collect_data { }
+        collect_data {}
       }
       klassB = Ohai.plugin(:B) {
         provides("B")
         depends("C")
-        collect_data { }
+        collect_data {}
       }
       klassC = Ohai.plugin(:C) {
         provides("C")
-        collect_data { }
+        collect_data {}
       }
 
       @plugins = []
@@ -373,7 +373,7 @@ describe Ohai::Runner, "fetch_plugins" do
   before(:each) do
     @provides_map = Ohai::ProvidesMap.new
     @data = Mash.new
-    @ohai = double('Ohai::System', :data => @data, :provides_map => @provides_map)
+    @ohai = double("Ohai::System", :data => @data, :provides_map => @provides_map)
     @runner = Ohai::Runner.new(@ohai, true)
   end
 
@@ -397,7 +397,7 @@ describe Ohai::Runner, "fetch_plugins" do
     describe "and no parent attribute has providers" do
       it "should raise Ohai::Exceptions::AttributeNotFound exception" do
         # provides map is empty
-        expect{ @runner.fetch_plugins(["false/attribute"]) }.to raise_error(Ohai::Exceptions::AttributeNotFound, "No such attribute: 'false/attribute'")
+        expect { @runner.fetch_plugins(["false/attribute"]) }.to raise_error(Ohai::Exceptions::AttributeNotFound, "No such attribute: 'false/attribute'")
       end
     end
   end

data/spec/unit/system_spec.rb

@@ -17,8 +17,8 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
-require 'ohai/mixin/os'
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper.rb")
+require "ohai/mixin/os"
 
 describe "Ohai::System" do
   extend IntegrationSupport
@@ -38,7 +38,7 @@ describe "Ohai::System" do
       expect(ohai.v6_dependency_solver).to be_a_kind_of(Hash)
     end
 
-    it 'merges deprecated config settings into the ohai config context' do
+    it "merges deprecated config settings into the ohai config context" do
       expect(Ohai::Log).to receive(:warn).
         with(/Ohai::Config\[:disabled_plugins\] is deprecated/)
       Ohai::Config[:disabled_plugins] = [ :Foo, :Baz ]
@@ -48,10 +48,10 @@ describe "Ohai::System" do
       expect(Ohai.config[:disabled_plugins]).to eq([ :Foo, :Baz ])
     end
 
-    it 'merges provided configuration options into the ohai config context' do
+    it "merges provided configuration options into the ohai config context" do
       config = {
         disabled_plugins: [ :Foo, :Baz ],
-        directory: '/some/extra/plugins'
+        directory: "/some/extra/plugins",
       }
       allow(Ohai::Config).to receive(:merge_deprecated_config)
       expect(Ohai.config).to receive(:merge!).with(config).and_call_original
@@ -61,18 +61,18 @@ describe "Ohai::System" do
       end
     end
 
-    context 'when directory is configured' do
-      let(:directory) { '/some/fantastic/plugins' }
+    context "when directory is configured" do
+      let(:directory) { "/some/fantastic/plugins" }
 
-      it 'adds directory to plugin_path' do
+      it "adds directory to plugin_path" do
         Ohai.config[:directory] = directory
         Ohai::System.new
         expect(Ohai.config[:plugin_path]).to include(directory)
       end
     end
 
-    shared_examples_for 'appendable deprecated configuration option' do
-      it 'logs a warning and configures the option on the ohai config context' do
+    shared_examples_for "appendable deprecated configuration option" do
+      it "logs a warning and configures the option on the ohai config context" do
         Ohai::Config[option] << value
         expect(Ohai::Log).to receive(:warn).
           with(/Ohai::Config\[:#{option}\] is deprecated/)
@@ -81,21 +81,21 @@ describe "Ohai::System" do
       end
     end
 
-    context 'when a top-level hints_path is configured' do
-      include_examples 'appendable deprecated configuration option' do
+    context "when a top-level hints_path is configured" do
+      include_examples "appendable deprecated configuration option" do
         let(:option) { :hints_path }
-        let(:value) { '/path/to/hints' }
+        let(:value) { "/path/to/hints" }
       end
     end
 
-    context 'when a top-level plugin_path is configured' do
-      include_examples 'appendable deprecated configuration option' do
+    context "when a top-level plugin_path is configured" do
+      include_examples "appendable deprecated configuration option" do
         let(:option) { :plugin_path }
-        let(:value) { '/path/to/plugins' }
+        let(:value) { "/path/to/plugins" }
       end
     end
 
-    it 'configures logging' do
+    it "configures logging" do
       log_level = :debug
       Ohai.config[:log_level] = log_level
       expect(Ohai::Log).to receive(:init).with(Ohai.config[:log_location])
@@ -103,7 +103,7 @@ describe "Ohai::System" do
       Ohai::System.new
     end
 
-    it 'resolves log_level when set to :auto' do
+    it "resolves log_level when set to :auto" do
       expect(Ohai::Log).to receive(:level=).with(:info)
       Ohai::System.new
     end
@@ -394,7 +394,7 @@ EOF
 
       describe "when using :disabled_plugins" do
         before do
-          Ohai.config[:disabled_plugins] = [ :Zoo, 'my_plugins::park' ]
+          Ohai.config[:disabled_plugins] = [ :Zoo, "my_plugins::park" ]
         end
 
         after do

data/spec/unit/util/file_helper_spec.rb

@@ -16,14 +16,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'spec_helper'
-require 'ohai/util/file_helper'
+require "spec_helper"
+require "ohai/util/file_helper"
 
 class FileHelperMock
   include Ohai::Util::FileHelper
 end
 
-
 describe "Ohai::Util::FileHelper" do
   let(:file_helper) { FileHelperMock.new }
 
@@ -33,13 +32,13 @@ describe "Ohai::Util::FileHelper" do
 
   describe "which" do
     it "returns the path to an executable that is in the path" do
-      allow(File).to receive(:executable?).with('/usr/bin/skyhawk').and_return(true)
+      allow(File).to receive(:executable?).with("/usr/bin/skyhawk").and_return(true)
 
-      expect(file_helper.which('skyhawk')).to eql "/usr/bin/skyhawk"
+      expect(file_helper.which("skyhawk")).to eql "/usr/bin/skyhawk"
     end
 
     it "returns false if the executable is not in the path" do
-      expect(file_helper.which('the_cake')).to be false
+      expect(file_helper.which("the_cake")).to be false
     end
   end
 end

data/spec/unit/util/ip_helper_spec.rb

@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'ipaddress'
-require 'spec_helper'
-require 'ohai/util/ip_helper'
+require "ipaddress"
+require "spec_helper"
+require "ohai/util/ip_helper"
 
 class IpHelperMock
   include Ohai::Util::IpHelper
@@ -25,54 +25,54 @@ end
 describe "Ohai::Util::IpHelper" do
   let(:ip_helper) { IpHelperMock.new }
 
-  shared_examples 'ip address types' do
-    context 'with an IPv4 address' do
-      context 'that is private' do
-        let(:address) { '10.128.142.89' }
+  shared_examples "ip address types" do
+    context "with an IPv4 address" do
+      context "that is private" do
+        let(:address) { "10.128.142.89" }
 
-        it 'identifies the address as private' do
+        it "identifies the address as private" do
           expect(ip_helper.private_address?(address)).to be_truthy
         end
       end
 
-      context 'that is public' do
-        let(:address) { '74.125.224.72' }
+      context "that is public" do
+        let(:address) { "74.125.224.72" }
 
-        it 'identifies the address as public' do
+        it "identifies the address as public" do
           expect(ip_helper.private_address?(address)).to be_falsey
         end
       end
     end
 
-    context 'with an IPv6 address' do
-      context 'that is an RFC 4193 unique local address' do
-        let(:address) { 'fdf8:f53b:82e4::53' }
+    context "with an IPv6 address" do
+      context "that is an RFC 4193 unique local address" do
+        let(:address) { "fdf8:f53b:82e4::53" }
 
-        it 'identifies the address as a unique local address' do
+        it "identifies the address as a unique local address" do
           expect(ip_helper.private_address?(address)).to be_truthy
         end
       end
 
-      context 'that is a RFC 4291 Link-Local unicast address' do
-        let(:address) { 'FE80::0202:B3FF:FE1E:8329' }
+      context "that is a RFC 4291 Link-Local unicast address" do
+        let(:address) { "FE80::0202:B3FF:FE1E:8329" }
 
-        it 'does identify the address as a link-local address' do
+        it "does identify the address as a link-local address" do
           expect(ip_helper.private_address?(address)).to be_truthy
         end
       end
     end
   end
 
-  describe 'private_address?' do
-    include_examples 'ip address types'
+  describe "private_address?" do
+    include_examples "ip address types"
   end
 
-  describe 'unique_local_address?' do
-    include_examples 'ip address types'
+  describe "unique_local_address?" do
+    include_examples "ip address types"
   end
 
-  describe 'public_address?' do
-    let(:address) { '10.128.142.89' }
+  describe "public_address?" do
+    let(:address) { "10.128.142.89" }
 
     before do
       allow(ip_helper).to receive(:private_address?)
@@ -88,38 +88,38 @@ describe "Ohai::Util::IpHelper" do
     end
   end
 
-  describe 'loopback?' do
-    context 'with an IPv4 address' do
-      context 'that is a loopback address' do
-        let(:address) { '127.0.0.1' }
+  describe "loopback?" do
+    context "with an IPv4 address" do
+      context "that is a loopback address" do
+        let(:address) { "127.0.0.1" }
 
-        it 'should identify the address as a loopback address' do
+        it "should identify the address as a loopback address" do
           expect(ip_helper.loopback?(address)).to be_truthy
         end
       end
 
-      context 'that is not a loopback address' do
-        let(:address) { '1.2.3.4' }
+      context "that is not a loopback address" do
+        let(:address) { "1.2.3.4" }
 
-        it 'should not identify the address as a loopback address' do
+        it "should not identify the address as a loopback address" do
           expect(ip_helper.loopback?(address)).to be_falsey
         end
       end
     end
 
-    context 'with an IPv6 address' do
-      context 'that is a loopback address' do
-        let(:address) { '0:0:0:0:0:0:0:1' }
+    context "with an IPv6 address" do
+      context "that is a loopback address" do
+        let(:address) { "0:0:0:0:0:0:0:1" }
 
-        it 'should identify the address as a loopback address' do
+        it "should identify the address as a loopback address" do
           expect(ip_helper.loopback?(address)).to be_truthy
         end
       end
 
-      context 'that is not a loopback address' do
-        let(:address) { '2400:6180:0000:00D0:0000:0000:0009:7001' }
+      context "that is not a loopback address" do
+        let(:address) { "2400:6180:0000:00D0:0000:0000:0009:7001" }
 
-        it 'should not identify the address as a loopback address' do
+        it "should not identify the address as a loopback address" do
           expect(ip_helper.loopback?(address)).to be_falsey
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.10.0
+  version: 8.11.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
@@ -240,6 +254,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.3
 description: Ohai profiles your system and emits JSON
 email: adam@chef.io
 executables:
@@ -582,9 +610,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON
 test_files: []
-has_rdoc: