ohai 8.19.2 → 8.20.0

data/spec/unit/plugins/linux/platform_spec.rb

@@ -699,7 +699,7 @@ CISCO_RELEASE
     end
   end
 
-  describe '#read_os_release_info' do
+  describe "#read_os_release_info" do
     let(:file_contents) { "COW=MOO\nDOG=\"BARK\"" }
     it "returns nil if the file does not exist" do
       allow(File).to receive(:exist?).with("/etc/test-release").and_return(false)
@@ -716,7 +716,7 @@ CISCO_RELEASE
     end
   end
 
-  describe '#os_release_info' do
+  describe "#os_release_info" do
     context "when CISCO_RELEASE_INFO is not populated" do
       let(:release_info) { { "ID" => "os_id" } }
 

data/spec/unit/plugins/linux/virtualization_spec.rb

@@ -38,6 +38,8 @@ describe Ohai::System, "Linux virtualization platform" do
     allow(File).to receive(:exist?).with("/.dockerinit").and_return(false)
     allow(File).to receive(:exist?).with("/proc/bus/pci/devices").and_return(false)
     allow(File).to receive(:exist?).with("/sys/devices/virtual/misc/kvm").and_return(false)
+    allow(File).to receive(:exist?).with("/dev/lxd/sock").and_return(false)
+    allow(File).to receive(:exist?).with("/var/lib/lxd/devlxd").and_return(false)
 
     # default the which wrappers to nil
     allow(plugin).to receive(:lxc_version_exists?).and_return(false)
@@ -464,6 +466,24 @@ OUTPUT
     end
   end
 
+  describe "when we are checking for lxd" do
+    it "sets lxc guest if /dev/lxd/sock exists" do
+      expect(File).to receive(:exist?).with("/dev/lxd/sock").and_return(true)
+
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("lxd")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+    end
+
+    it "setx lxd host if /var/lib/lxd/devlxd exists" do
+      expect(File).to receive(:exist?).with("/var/lib/lxd/devlxd").and_return(true)
+
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("lxd")
+      expect(plugin[:virtualization][:role]).to eq("host")
+    end
+  end
+
   describe "when we are checking for lxc" do
     it "sets lxc guest if /proc/self/cgroup exist and there are /lxc/<hexadecimal> mounts" do
       self_cgroup = <<-CGROUP

data/spec/unit/plugins/ruby_spec.rb

@@ -47,8 +47,9 @@ describe Ohai::System, "plugin ruby" do
     :host_os => ::RbConfig::CONFIG["host_os"],
     :host_vendor => ::RbConfig::CONFIG["host_vendor"],
     :gems_dir => `#{ruby_bin} #{::RbConfig::CONFIG["bindir"]}/gem env gemdir`.chomp,
-    :gem_bin => [ ::Gem.default_exec_format % "gem", "gem" ].map {|bin| "#{::RbConfig::CONFIG['bindir']}/#{bin}"
-    }.find { |bin| ::File.exists? bin },
+    :gem_bin => [ ::Gem.default_exec_format % "gem", "gem" ].map do |bin|
+      "#{::RbConfig::CONFIG['bindir']}/#{bin}"
+    end.find { |bin| ::File.exists? bin },
     :ruby_bin => ruby_bin,
   }.each do |attribute, value|
     it "should have #{attribute} set to #{value.inspect}" do

data/spec/unit/plugins/solaris2/kernel_spec.rb

@@ -139,6 +139,29 @@ describe Ohai::System, "Solaris2.X kernel plugin" do
     allow(@plugin).to receive(:init_kernel).and_return({})
     allow(@plugin).to receive(:shell_out).with("uname -s").and_return(mock_shell_out(0, "SunOS\n", ""))
     allow(@plugin).to receive(:shell_out).with("modinfo").and_return(mock_shell_out(0, MODINFO, ""))
+    @release = StringIO.new("                   Oracle Solaris 10 1/13 s10s_u11wos_24a SPARC\n Assembled 17 January 2013")
+    allow(File).to receive(:open).with("/etc/release").and_yield(@release)
+  end
+
+  it "should give the Solaris update version information" do
+    @release = StringIO.new("                      Solaris 10 10/08 s10s_u6wos_07b SPARC\n Use is subject to license terms.\n Assembled 27 October 2008")
+    allow(File).to receive(:open).with("/etc/release").and_yield(@release)
+    @plugin.run
+    expect(@plugin[:kernel][:update]).to eq("10 10/08 s10s_u6wos_07")
+  end
+
+  it "should give the Oracle Solaris update version information" do
+    @release = StringIO.new("                   Oracle Solaris 10 1/13 s10s_u11wos_24a SPARC\n Assembled 17 January 2013")
+    allow(File).to receive(:open).with("/etc/release").and_yield(@release)
+    @plugin.run
+    expect(@plugin[:kernel][:update]).to eq("10 1/13 s10s_u11wos_24")
+  end
+
+  it "should give the Solaris 11 update version information" do
+    @release = StringIO.new("                            Oracle Solaris 11.3 SPARC\n Assembled 25 July 2016")
+    allow(File).to receive(:open).with("/etc/release").and_yield(@release)
+    @plugin.run
+    expect(@plugin[:kernel][:update]).to eq("11.3")
   end
 
   it_should_check_from_deep_mash("solaris2::kernel", "kernel", "os", "uname -s", [0, "SunOS\n", ""])

data/spec/unit/runner_spec.rb

@@ -101,15 +101,15 @@ describe Ohai::Runner, "run_plugin" do
   end
 
   describe "when running a plugin with no dependencies, Ohai::Runner" do
-    let(:plugin) {
-      klass = Ohai.plugin(:Test) {
+    let(:plugin) do
+      klass = Ohai.plugin(:Test) do
         provides("thing")
-        collect_data {
+        collect_data do
           thing(Mash.new)
-        }
-      }
+        end
+      end
       klass.new(@ohai.data)
-    }
+    end
 
     it "should run the plugin" do
       @runner.run_plugin(plugin)
@@ -126,13 +126,13 @@ describe Ohai::Runner, "run_plugin" do
   describe "when running a plugin with one dependency" do
     describe "when the dependency does not exist" do
       before(:each) do
-        klass = Ohai.plugin(:Test) {
+        klass = Ohai.plugin(:Test) do
           provides("thing")
           depends("other_thing")
-          collect_data {
+          collect_data do
             thing(other_thing)
-          }
-        }
+          end
+        end
         @plugin = klass.new(@ohai.data)
       end
 
@@ -148,19 +148,19 @@ describe Ohai::Runner, "run_plugin" do
 
     describe "when the dependency has a single provider" do
       before(:each) do
-        klass1 = Ohai.plugin(:Thing) {
+        klass1 = Ohai.plugin(:Thing) do
           provides("thing")
-          collect_data {
+          collect_data do
             thing("thang")
-          }
-        }
-        klass2 = Ohai.plugin(:Other) {
+          end
+        end
+        klass2 = Ohai.plugin(:Other) do
           provides("other")
           depends("thing")
-          collect_data {
+          collect_data do
             other(thing)
-          }
-        }
+          end
+        end
 
         @plugins = []
         [klass1, klass2].each do |klass|
@@ -181,19 +181,19 @@ describe Ohai::Runner, "run_plugin" do
 
     describe "when the dependency has multiple providers" do
       before(:each) do
-        klass1 = Ohai.plugin(:Thing) {
+        klass1 = Ohai.plugin(:Thing) do
           provides("thing")
-          collect_data {
+          collect_data do
             thing(Mash.new)
-          }
-        }
-        klass2 = Ohai.plugin(:Other) {
+          end
+        end
+        klass2 = Ohai.plugin(:Other) do
           provides("other")
           depends("thing")
-          collect_data {
+          collect_data do
             other(thing)
-          }
-        }
+          end
+        end
 
         @plugins = []
         [klass1, klass1, klass2].each do |klass|
@@ -219,25 +219,25 @@ describe Ohai::Runner, "run_plugin" do
       @ohai = Ohai::System.new
       @runner = Ohai::Runner.new(@ohai, true)
 
-      klass1 = Ohai.plugin(:One) {
+      klass1 = Ohai.plugin(:One) do
         provides("one")
-        collect_data {
+        collect_data do
           one(1)
-        }
-      }
-      klass2 = Ohai.plugin(:Two) {
+        end
+      end
+      klass2 = Ohai.plugin(:Two) do
         provides("two")
-        collect_data {
+        collect_data do
           two(2)
-        }
-      }
-      klass3 = Ohai.plugin(:Three) {
+        end
+      end
+      klass3 = Ohai.plugin(:Three) do
         provides("three")
         depends("one", "two")
-        collect_data {
+        collect_data do
           three(3)
-        }
-      }
+        end
+      end
 
       @plugins = []
       [klass1, klass2, klass3].each do |klass|
@@ -282,20 +282,20 @@ describe Ohai::Runner, "run_plugin" do
 
     context "when there is one edge in the cycle (A->B and B->A)" do
       before(:each) do
-        klass1 = Ohai.plugin(:Thing) {
+        klass1 = Ohai.plugin(:Thing) do
           provides("thing")
           depends("other")
-          collect_data {
+          collect_data do
             thing(other)
-          }
-        }
-        klass2 = Ohai.plugin(:Other) {
+          end
+        end
+        klass2 = Ohai.plugin(:Other) do
           provides("other")
           depends("thing")
-          collect_data {
+          collect_data do
             other(thing)
-          }
-        }
+          end
+        end
 
         @plugins = []
         [klass1, klass2].each_with_index do |klass, idx|
@@ -319,35 +319,35 @@ describe Ohai::Runner, "run_plugin" do
       @ohai = Ohai::System.new
       @runner = Ohai::Runner.new(@ohai, true)
 
-      klassA = Ohai.plugin(:A) {
+      klass_a = Ohai.plugin(:A) do
         provides("A")
         depends("B", "C")
         collect_data {}
-      }
-      klassB = Ohai.plugin(:B) {
+      end
+      klass_b = Ohai.plugin(:B) do
         provides("B")
         depends("C")
         collect_data {}
-      }
-      klassC = Ohai.plugin(:C) {
+      end
+      klass_c = Ohai.plugin(:C) do
         provides("C")
         collect_data {}
-      }
+      end
 
       @plugins = []
-      [klassA, klassB, klassC].each do |klass|
+      [klass_a, klass_b, klass_c].each do |klass|
         @plugins << klass.new(@ohai.data)
       end
-      @pluginA, @pluginB, @pluginC = @plugins
+      @plugin_a, @plugin_b, @plugin_c = @plugins
     end
 
     it "should not detect a cycle when B is the first provider returned" do
-      @ohai.provides_map.set_providers_for(@pluginA, ["A"])
-      @ohai.provides_map.set_providers_for(@pluginB, ["B"])
-      @ohai.provides_map.set_providers_for(@pluginC, ["C"])
+      @ohai.provides_map.set_providers_for(@plugin_a, ["A"])
+      @ohai.provides_map.set_providers_for(@plugin_b, ["B"])
+      @ohai.provides_map.set_providers_for(@plugin_c, ["C"])
 
       expect(Ohai::Log).not_to receive(:error).with(/DependencyCycleError/)
-      @runner.run_plugin(@pluginA)
+      @runner.run_plugin(@plugin_a)
 
       @plugins.each do |plugin|
         expect(plugin.has_run?).to be true
@@ -355,12 +355,12 @@ describe Ohai::Runner, "run_plugin" do
     end
 
     it "should not detect a cycle when C is the first provider returned" do
-      @ohai.provides_map.set_providers_for(@pluginA, ["A"])
-      @ohai.provides_map.set_providers_for(@pluginC, ["C"])
-      @ohai.provides_map.set_providers_for(@pluginB, ["B"])
+      @ohai.provides_map.set_providers_for(@plugin_a, ["A"])
+      @ohai.provides_map.set_providers_for(@plugin_c, ["C"])
+      @ohai.provides_map.set_providers_for(@plugin_b, ["B"])
 
       expect(Ohai::Log).not_to receive(:error).with(/DependencyCycleError/)
-      @runner.run_plugin(@pluginA)
+      @runner.run_plugin(@plugin_a)
 
       @plugins.each do |plugin|
         expect(plugin.has_run?).to be true
@@ -414,27 +414,27 @@ describe Ohai::Runner, "#get_cycle" do
     @ohai = Ohai::System.new
     @runner = Ohai::Runner.new(@ohai, true)
 
-    klass1 = Ohai.plugin(:One) {
+    klass1 = Ohai.plugin(:One) do
       provides("one")
       depends("two")
-      collect_data {
+      collect_data do
         one(two)
-      }
-    }
-    klass2 = Ohai.plugin(:Two) {
+      end
+    end
+    klass2 = Ohai.plugin(:Two) do
       provides("two")
       depends("one")
-      collect_data {
+      collect_data do
         two(one)
-      }
-    }
-    klass3 = Ohai.plugin(:Three) {
+      end
+    end
+    klass3 = Ohai.plugin(:Three) do
       provides("three")
       depends("two")
-      collect_data {
+      collect_data do
         three(two)
-      }
-    }
+      end
+    end
 
     plugins = []
     [klass1, klass2, klass3].each_with_index do |klass, idx|

data/spec/unit/util/ip_helper_spec.rb

@@ -78,12 +78,12 @@ describe "Ohai::Util::IpHelper" do
       allow(ip_helper).to receive(:private_address?)
     end
 
-    it 'should call #private_address?' do
+    it "should call #private_address?" do
       expect(ip_helper).to receive(:private_address?)
       ip_helper.public_address?(address)
     end
 
-    it 'should return the inverse of #private_address?' do
+    it "should return the inverse of #private_address?" do
       expect(ip_helper.public_address?(address)).to equal !ip_helper.private_address?(address)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.19.2
+  version: 8.20.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -390,7 +390,9 @@ files:
 - lib/ohai/plugins/linux/filesystem.rb
 - lib/ohai/plugins/linux/filesystem2.rb
 - lib/ohai/plugins/linux/fips.rb
+- lib/ohai/plugins/linux/hostnamectl.rb
 - lib/ohai/plugins/linux/lsb.rb
+- lib/ohai/plugins/linux/machineid.rb
 - lib/ohai/plugins/linux/mdadm.rb
 - lib/ohai/plugins/linux/memory.rb
 - lib/ohai/plugins/linux/network.rb
@@ -571,8 +573,10 @@ files:
 - spec/unit/plugins/linux/filesystem_spec.rb
 - spec/unit/plugins/linux/fips_spec.rb
 - spec/unit/plugins/linux/hostname_spec.rb
+- spec/unit/plugins/linux/hostnamectl_spec.rb
 - spec/unit/plugins/linux/kernel_spec.rb
 - spec/unit/plugins/linux/lsb_spec.rb
+- spec/unit/plugins/linux/machineid_spec.rb
 - spec/unit/plugins/linux/mdadm_spec.rb
 - spec/unit/plugins/linux/memory_spec.rb
 - spec/unit/plugins/linux/network_spec.rb
@@ -652,7 +656,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON