ohai 8.21.0 → 8.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9adc486c591d6c788a28df54f4b3019649143fbf
-  data.tar.gz: 84178b71f088420c0f8aa6162bb8c16ab6ec117c
+  metadata.gz: 5450323d46bf0e6a5873dbd19775b0f4b7838c52
+  data.tar.gz: b7bc92127e595759e568f5fb9003d72ceecac6f2
 SHA512:
-  metadata.gz: ed8f9a5cc316288abffcde24a126b76de94e9160c4c1a4220881759700fdb60ee2a9cb8808f8bd621b8be903b881aa5d62d384e059c3e15b18d652a2f7060d3c
-  data.tar.gz: c8720f2368a29fab4f218f4035992d07a3b02370a6e121edd5cb0bf9198bf54e7e7c99aea6d1d0238b5e2905d1237ded01cba89d64f793cce6473b72562af432
+  metadata.gz: 632c0e8f303df696ab2fa0ce036e29f9b367c761098567e4ece04b1c8f6a886364a46b20fa0cd3e45d341987882acc204825d4e5005646ced30eed1c64a2c88d
+  data.tar.gz: 39559a677849038047b04e56eff44975d5d8710b429946926bdecad79a6d36ee4172d48a2d963ffb872f28967fa87113383a1ffd1a4998d9e7eeabb94e48f7d7

data/Gemfile

@@ -5,9 +5,17 @@ gemspec
 group :development do
   gem "sigar", :platform => "ruby"
 
-  gem "chefstyle", "= 0.4.0"
+  gem "chefstyle"
   gem "overcommit", ">= 0.34.1"
   gem "pry-byebug"
   gem "pry-stack_explorer"
   gem "rb-readline"
+  gem "rake", ">= 10.1.0", "< 12.0.0"
+  gem "rspec-core", "~> 3.0"
+  gem "rspec-expectations", "~> 3.0"
+  gem "rspec-mocks", "~> 3.0"
+  gem "rspec-collection_matchers", "~> 1.0"
+  gem "rspec_junit_formatter"
+  gem "github_changelog_generator", ">= 1.14"
+  gem "activesupport", "< 5.0" if RUBY_VERSION <= "2.2.2" # github_changelog_generator dep
 end

data/Rakefile

@@ -27,6 +27,8 @@ require "github_changelog_generator/task"
 
 GitHubChangelogGenerator::RakeTask.new :changelog do |config|
   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(",")

data/lib/ohai/dsl/plugin.rb

@@ -154,8 +154,19 @@ module Ohai
         end
       end
 
-      def set_attribute(name, *values)
-        @data[name] = Array18(*values)
+      def set_attribute(name, *attrs, value)
+        # Initialize the path in the @data Mash with new Mashes, if needed.
+        # Will raise a TypeError if we hit a subattribute that is not a
+        # Hash, Mash, or Array.
+        keys = [name] + attrs
+        attribute = keys[0..-2].inject(@data) do |attrs, key|
+          attrs[key] ||= Mash.new
+          attrs[key]
+        end
+
+        # Set the subattribute to the value.
+        attr_name = attrs.empty? ? name : attrs[-1]
+        attribute[attr_name] = value
         @data[name]
       end
 
@@ -198,12 +209,6 @@ module Ohai
         # NoMethodError occurs when trying to access a key on nil
         nil
       end
-
-      def Array18(*args)
-        return nil if args.empty?
-        return args.first if args.length == 1
-        return *args
-      end
     end
   end
 end

data/lib/ohai/plugins/haskell.rb

@@ -0,0 +1,95 @@
+# Author:: Chris Dituri (<csdituri@gmail.com>)
+# Copyright:: Copyright (c) 2016 Chris Dituri
+# 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.
+
+Ohai.plugin(:Haskell) do
+
+  provides "languages/haskell",
+           "languages/haskell/ghc",
+           "languages/haskell/ghci",
+           "languages/haskell/cabal",
+           "languages/haskell/stack"
+
+  depends "languages"
+
+  collect_data(:default) do
+    haskell = Mash.new
+
+    # Check for ghc
+    begin
+      so = shell_out("ghc --version")
+
+      # Sample output:
+      # The Glorious Glasgow Haskell Compilation System, version 7.6.3
+      if so.exitstatus == 0
+        haskell[:ghc] = Mash.new
+        haskell[:ghc][:version] = so.stdout.split[-1]
+        haskell[:ghc][:description] = so.stdout.chomp
+      end
+    rescue Ohai::Exceptions::Exec
+      Ohai::Log.debug('Haskell plugin: Could not shell_out "ghc --version". Skipping data')
+    end
+
+    # Check for ghci
+    begin
+      so = shell_out("ghci --version")
+
+      # Sample output:
+      # The Glorious Glasgow Haskell Compilation System, version 7.6.3
+      if so.exitstatus == 0
+        haskell[:ghci] = Mash.new
+        haskell[:ghci][:version] = so.stdout.split[-1]
+        haskell[:ghci][:description] = so.stdout.chomp
+      end
+    rescue Ohai::Exceptions::Exec
+      Ohai::Log.debug('Haskell plugin: Could not shell_out "ghci --version". Skipping data')
+    end
+
+    # Check for cabal
+    begin
+      so = shell_out("cabal --version")
+
+      # Sample output:
+      # cabal-install version 1.16.0.2
+      # using version 1.16.0 of the Cabal library
+      if so.exitstatus == 0
+        haskell[:cabal] = Mash.new
+        haskell[:cabal][:version] = so.stdout.split("\n")[0].split[-1]
+        haskell[:cabal][:description] = so.stdout.split("\n")[0].chomp
+      end
+    rescue Ohai::Exceptions::Exec
+      Ohai::Log.debug('Haskell plugin: Could not shell_out "cabal --version". Skipping data')
+    end
+
+    # Check for stack
+    begin
+      so = shell_out("stack --version")
+
+      # Sample output:
+      # Version 1.1.0, Git revision 0e9430aad55841b5ff2c6c2851f0548c16bce7cf (3540 commits) x86_64 hpack-0.13.0
+      # or
+      # Version 1.2.0 x86_64 hpack-0.14.0
+      if so.exitstatus == 0
+        haskell[:stack] = Mash.new
+        haskell[:stack][:version] = /Version ([^\s,]*)/.match(so.stdout)[1] rescue nil
+        haskell[:stack][:description] = so.stdout.chomp
+      end
+    rescue Ohai::Exceptions::Exec
+      Ohai::Log.debug('Haskell plugin: Could not shell_out "stack --version". Skipping data')
+    end
+
+    languages[:haskell] = haskell unless haskell.empty?
+  end
+end

data/lib/ohai/plugins/hostname.rb

@@ -105,13 +105,38 @@ Ohai.plugin(:Hostname) do
     collect_domain
   end
 
-  collect_data(:darwin, :netbsd, :openbsd, :dragonflybsd) do
+  collect_data(:netbsd, :openbsd, :dragonflybsd) do
     hostname from_cmd("hostname -s")
     fqdn resolve_fqdn
     machinename from_cmd("hostname")
     collect_domain
   end
 
+  collect_data(:darwin) do
+    hostname from_cmd("hostname -s")
+    machinename from_cmd("hostname")
+    begin
+      ourfqdn = resolve_fqdn
+      # Sometimes... very rarely, but sometimes, 'hostname --fqdn' falsely
+      # returns a blank string. WTF.
+      if ourfqdn.nil? || ourfqdn.empty?
+        Ohai::Log.debug("hostname returned an empty string, retrying once.")
+        ourfqdn = resolve_fqdn
+      end
+
+      if ourfqdn.nil? || ourfqdn.empty?
+        Ohai::Log.debug("hostname returned an empty string twice and will" +
+                        "not be set.")
+      else
+        fqdn ourfqdn
+      end
+    rescue
+      Ohai::Log.debug(
+        "hostname returned an error, probably no domain set")
+    end
+    domain collect_domain
+  end
+
   collect_data(:freebsd) do
     hostname from_cmd("hostname -s")
     machinename from_cmd("hostname")

data/lib/ohai/plugins/ip_scopes.rb

@@ -32,7 +32,7 @@ Ohai.plugin(:IpScopes) do
           begin
             attrs["ip_scope"] = address.to_ip.scope
 
-            if private_addr?(address) && !tunnel_iface?(interface)
+            if private_addr?(address) && !tunnel_iface?(interface) && !ppp_iface?(interface) && !docker_iface?(interface)
               privateaddress(address)
             end
           rescue ArgumentError
@@ -51,7 +51,15 @@ Ohai.plugin(:IpScopes) do
     address.to_ip.scope =~ /PRIVATE/
   end
 
-  def tunnel_iface?(interface)
+  def ppp_iface?(interface)
     interface["type"] == "ppp"
   end
+
+  def tunnel_iface?(interface)
+    interface["type"] == "tunl"
+  end
+
+  def docker_iface?(interface)
+    interface["type"] == "docker"
+  end
 end

data/lib/ohai/plugins/joyent.rb

@@ -25,23 +25,18 @@ Ohai.plugin(:Joyent) do
   depends "os", "platform", "virtualization"
 
   def collect_product_file
-    lines = []
-    if ::File.exists?("/etc/product")
-      ::File.open("/etc/product") do |file|
-        while line = file.gets
-          lines << line
-        end
-      end
+    data = ::File.read("/etc/product") rescue nil
+    if data
+      data.strip.split("\n")
+    else
+      []
     end
-    lines
   end
 
   def collect_pkgsrc
-    if File.exist?("/opt/local/etc/pkg_install.conf")
-      sm_pkgsrc = ::File.read("/opt/local/etc/pkg_install.conf").split("=")
-      sm_pkgsrc[1].chomp
-    else
-      nil
+    data = ::File.read("/opt/local/etc/pkg_install.conf") rescue nil
+    if data
+      /PKG_PATH=(.*)/.match(data)[1] rescue nil
     end
   end
 
@@ -76,7 +71,7 @@ Ohai.plugin(:Joyent) do
       end
 
       ## retrieve pkgsrc
-      joyent[:sm_pkgsrc] = collect_pkgsrc if collect_pkgsrc
+      joyent[:sm_pkgsrc] = collect_pkgsrc
     end
   end
 end

data/lib/ohai/plugins/linux/lsb.rb

@@ -22,21 +22,8 @@ Ohai.plugin(:LSB) do
   collect_data(:linux) do
     lsb Mash.new
 
-    if File.exists?("/etc/lsb-release")
-      File.open("/etc/lsb-release").each do |line|
-        case line
-        when /^DISTRIB_ID=["']?(.+?)["']?$/
-          lsb[:id] = $1
-        when /^DISTRIB_RELEASE=["']?(.+?)["']?$/
-          lsb[:release] = $1
-        when /^DISTRIB_CODENAME=["']?(.+?)["']?$/
-          lsb[:codename] = $1
-        when /^DISTRIB_DESCRIPTION=["']?(.+?)["']?$/
-          lsb[:description] = $1
-        end
-      end
-    elsif File.exists?("/usr/bin/lsb_release")
-      # Fedora/Redhat, requires redhat-lsb package
+    if File.exists?("/usr/bin/lsb_release")
+      # From package redhat-lsb on Fedora/Redhat, lsb-release on Debian/Ubuntu
       so = shell_out("lsb_release -a")
       so.stdout.lines do |line|
         case line
@@ -52,6 +39,20 @@ Ohai.plugin(:LSB) do
           lsb[:id] = line
         end
       end
+    elsif File.exists?("/etc/lsb-release")
+      # Old, non-standard Debian support
+      File.open("/etc/lsb-release").each do |line|
+        case line
+        when /^DISTRIB_ID=["']?(.+?)["']?$/
+          lsb[:id] = $1
+        when /^DISTRIB_RELEASE=["']?(.+?)["']?$/
+          lsb[:release] = $1
+        when /^DISTRIB_CODENAME=["']?(.+?)["']?$/
+          lsb[:codename] = $1
+        when /^DISTRIB_DESCRIPTION=["']?(.+?)["']?$/
+          lsb[:description] = $1
+        end
+      end
     else
       Ohai::Log.debug("Skipping LSB, cannot find /etc/lsb-release or /usr/bin/lsb_release")
     end

data/lib/ohai/plugins/solaris2/virtualization.rb

@@ -74,7 +74,11 @@ Ohai.plugin(:Virtualization) do
 
       if zones.length == 1
         first_zone = zones.keys[0]
-        unless first_zone == "global"
+        if first_zone == "global"
+          virtualization[:system] = "zone"
+          virtualization[:role] = "host"
+          virtualization[:systems][:zone] = "host"
+        else
           virtualization[:system] = "zone"
           virtualization[:role] = "guest"
           virtualization[:systems][:zone] = "guest"

data/lib/ohai/version.rb

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

data/ohai.gemspec

@@ -35,18 +35,6 @@ Gem::Specification.new do |s|
   # Chef 13 starts, otherwise builds will break.
   s.add_dependency "chef-config", ">= 12.5.0.alpha.1", "< 13"
 
-  s.add_development_dependency "rake", ">= 10.1.0", "< 12.0.0"
-  s.add_development_dependency "rspec-core", "~> 3.0"
-  s.add_development_dependency "rspec-expectations", "~> 3.0"
-  s.add_development_dependency "rspec-mocks", "~> 3.0"
-  s.add_development_dependency "rspec-collection_matchers", "~> 1.0"
-  s.add_development_dependency "rspec_junit_formatter"
-  s.add_development_dependency "github_changelog_generator", "1.13.1"
-
-  # github_changelog_generator -> github-api -> oauth2 -> rack
-  # rack being unconstrained breaks Ruby 2.1 installs
-  s.add_development_dependency "rack", "~> 1.0"
-
   s.bindir = "bin"
   s.executables = %w{ohai}
 

data/spec/spec_helper.rb

@@ -109,8 +109,6 @@ RSpec.configure do |config|
 
   config.filter_run_excluding :windows_only => true unless windows?
   config.filter_run_excluding :unix_only => true unless unix?
-  config.filter_run_excluding :ruby_18_only => true unless ruby_18?
-  config.filter_run_excluding :ruby_19_only => true unless ruby_19?
   config.filter_run_excluding :requires_root => true unless ENV["USER"] == "root"
   config.filter_run_excluding :requires_unprivileged_user => true if ENV["USER"] == "root"
 

data/spec/support/platform_helpers.rb

@@ -1,17 +1,7 @@
-def ruby_19?
-  !!(RUBY_VERSION =~ /^1.9/)
-end
-
-def ruby_18?
-  !!(RUBY_VERSION =~ /^1.8/)
-end
-
 def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 
-# def jruby?
-
 def unix?
   !windows?
 end

data/spec/unit/dsl/plugin_spec.rb

@@ -90,11 +90,68 @@ shared_examples "Ohai::DSL::Plugin" do
     end
   end
 
-  context "when setting attributes" do
+  describe "set_attribute" do
+    it "raises an ArgumentError when given one argument" do
+      expect { plugin.set_attribute(:tea) }.to raise_error(ArgumentError)
+    end
+
     it "lets you set an attribute" do
       plugin.set_attribute(:tea, "is soothing")
       expect(plugin.data["tea"]).to eql("is soothing")
     end
+
+    it "lets you set an attribute to an empty array" do
+      plugin.set_attribute(:tea, [])
+      expect(plugin.data["tea"]).to eql([])
+    end
+
+    it "lets you set an attribute to an empty Mash" do
+      plugin.set_attribute(:tea, {})
+      expect(plugin.data["tea"]).to eql({})
+    end
+
+    it "lets you modify an attribute" do
+      plugin.data["tea"] = "is soothing"
+      plugin.set_attribute(:tea, "tastes like plants")
+      expect(plugin.data["tea"]).to eql("tastes like plants")
+    end
+
+    it "lets you set a subattribute" do
+      plugin.data["tea"] = Mash.new
+      plugin.set_attribute(:tea, :green, "tastes like green")
+      expect(plugin.data["tea"]["green"]).to eql("tastes like green")
+    end
+
+    it "lets you set a subattribute to an empty array" do
+      plugin.set_attribute(:tea, :green, [])
+      expect(plugin.data["tea"]["green"]).to eql([])
+    end
+
+    it "lets you set a subattribute to an empty Mash" do
+      plugin.set_attribute(:tea, :green, {})
+      expect(plugin.data["tea"]["green"]).to eql({})
+    end
+
+    it "lets you modify a subattribute" do
+      plugin.data["tea"] = Mash.new
+      plugin.data["tea"]["green"] = "tastes like green"
+      plugin.set_attribute(:tea, :green, "made from leaves")
+      expect(plugin.data["tea"]["green"]).to eql("made from leaves")
+    end
+
+    it "raises a TypeError when modifying an attribute that is not a Mash" do
+      plugin.data["tea"] = Mash.new
+      plugin.data["tea"] = "is soothing"
+      expect { plugin.set_attribute(:tea, :green, "tastes like green") }.to raise_error(TypeError)
+    end
+
+    it "lets you modify a subattribute with an array" do
+      green = { flavor: "tastes like green" }
+      black = { flavor: "tastes like black" }
+      plugin.data[:tea] = [green, black]
+      plugin.set_attribute(:tea, 0, :source, "made from leaves")
+      expect(plugin.data[:tea][0][:source]).to eq("made from leaves")
+    end
   end
 
   context "when getting attributes" do

data/spec/unit/plugins/haskell_spec.rb

@@ -0,0 +1,231 @@
+# Author:: Chris Dituri (<csdituri@gmail.com>)
+# Copyright:: Copyright (c) 2016 Chris Dituri
+# 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 File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+
+describe Ohai::System, "plugin haskell" do
+
+  let(:plugin) do
+    plugin = get_plugin("haskell").tap do |plugin|
+      plugin[:languages] = Mash.new
+    end
+  end
+
+  let(:ghc_out) { "The Glorious Glasgow Haskell Compilation System, version 7.6.3" }
+  let(:ghci_out) { "The Glorious Glasgow Haskell Compilation System, version 7.6.3" }
+  let(:cabal_out) { "cabal-install version 1.16.0.2\nusing version 1.16.0 of the Cabal library" }
+  let(:stack_out) { "Version 1.2.0 x86_64 hpack-0.14.0" }
+  let(:stack_out_git) { "Version 1.1.0, Git revision 0e9430aad55841b5ff2c6c2851f0548c16bce7cf (3540 commits) x86_64 hpack-0.13.0" }
+
+  def setup_plugin
+    allow(plugin).to receive(:shell_out)
+      .with("ghc --version")
+      .and_return(mock_shell_out(0, ghc_out, ""))
+    allow(plugin).to receive(:shell_out)
+      .with("ghci --version")
+      .and_return(mock_shell_out(0, ghci_out, ""))
+    allow(plugin).to receive(:shell_out)
+      .with("cabal --version")
+      .and_return(mock_shell_out(0, cabal_out, ""))
+    allow(plugin).to receive(:shell_out)
+      .with("stack --version")
+      .and_return(mock_shell_out(0, stack_out, ""))
+  end
+
+  context "if haskell/ghc is installed" do
+
+    before(:each) do
+      setup_plugin
+      plugin.run
+    end
+
+    it "set languages[:haskell][:ghc][:version]" do
+      expect(plugin[:languages][:haskell][:ghc][:version]).to eql("7.6.3")
+    end
+
+    it "set languages[:haskell][:ghc][:description]" do
+      expect(plugin[:languages][:haskell][:ghc][:description]).to eql(ghc_out)
+    end
+  end
+
+  context "if haskell/ghci is installed" do
+
+    before(:each) do
+      setup_plugin
+      plugin.run
+    end
+
+    it "set languages[:haskell][:ghci][:version]" do
+      expect(plugin[:languages][:haskell][:ghci][:version]).to eql("7.6.3")
+    end
+
+    it "set languages[:haskell][:ghci][:description]" do
+      expect(plugin[:languages][:haskell][:ghci][:description]).to eql(ghci_out)
+    end
+  end
+
+  context "if haskell/cabal is installed" do
+
+    before(:each) do
+      setup_plugin
+      plugin.run
+    end
+
+    it "set languages[:haskell][:cabal][:version]" do
+      expect(plugin[:languages][:haskell][:cabal][:version]).to eql("1.16.0.2")
+    end
+
+    it "set languages[:haskell][:cabal][:description]" do
+      expect(plugin[:languages][:haskell][:cabal][:description]).to eql(cabal_out.split("\n")[0].chomp)
+    end
+  end
+
+  context "if haskell/stack is installed" do
+
+    before(:each) do
+      setup_plugin
+      plugin.run
+    end
+
+    it "set languages[:haskell][:stack][:version]" do
+      expect(plugin[:languages][:haskell][:stack][:version]).to eql("1.2.0")
+    end
+
+    it "set languages[:haskell][:stack][:description]" do
+      expect(plugin[:languages][:haskell][:stack][:description]).to eql(stack_out)
+    end
+  end
+
+  context "if haskell/stack prerelease is installed" do
+
+    before(:each) do
+      setup_plugin
+      allow(plugin).to receive(:shell_out)
+        .with("stack --version")
+        .and_return(mock_shell_out(0, stack_out_git, ""))
+      plugin.run
+    end
+
+    it "set languages[:haskell][:stack][:version]" do
+      expect(plugin[:languages][:haskell][:stack][:version]).to eql("1.1.0")
+    end
+
+    it "set languages[:haskell][:stack][:description]" do
+      expect(plugin[:languages][:haskell][:stack][:description]).to eql(stack_out_git)
+    end
+  end
+
+  context "if haskell is NOT installed" do
+
+    before(:each) do
+      allow(plugin).to receive(:shell_out)
+        .and_raise( Ohai::Exceptions::Exec )
+      plugin.run
+    end
+
+    it "do NOT set languages[:haskell]" do
+      expect(plugin[:languages]).not_to have_key(:haskell)
+    end
+  end
+
+  context "if haskell/ghc is NOT installed" do
+    before(:each) do
+      allow(plugin).to receive(:shell_out)
+        .with("ghc --version")
+        .and_raise( Ohai::Exceptions::Exec )
+      allow(plugin).to receive(:shell_out)
+        .with("ghci --version")
+        .and_return(mock_shell_out(0, ghci_out, ""))
+      allow(plugin).to receive(:shell_out)
+        .with("cabal --version")
+        .and_return(mock_shell_out(0, cabal_out, ""))
+      allow(plugin).to receive(:shell_out)
+        .with("stack --version")
+        .and_return(mock_shell_out(0, stack_out, ""))
+      plugin.run
+    end
+
+    it "do NOT set languages[:haskell][:ghc]" do
+      expect(plugin[:languages][:haskell]).not_to have_key(:ghc)
+    end
+  end
+
+  context "if haskell/ghci is NOT installed" do
+    before(:each) do
+      allow(plugin).to receive(:shell_out)
+        .with("ghc --version")
+        .and_return(mock_shell_out(0, ghc_out, ""))
+      allow(plugin).to receive(:shell_out)
+        .with("ghci --version")
+        .and_raise( Ohai::Exceptions::Exec )
+      allow(plugin).to receive(:shell_out)
+        .with("cabal --version")
+        .and_return(mock_shell_out(0, cabal_out, ""))
+      allow(plugin).to receive(:shell_out)
+        .with("stack --version")
+        .and_return(mock_shell_out(0, stack_out, ""))
+      plugin.run
+    end
+
+    it "do NOT set languages[:haskell][:ghci]" do
+      expect(plugin[:languages][:haskell]).not_to have_key(:ghci)
+    end
+  end
+
+  context "if haskell/cabal is NOT installed" do
+    before(:each) do
+      allow(plugin).to receive(:shell_out)
+        .with("ghc --version")
+        .and_return(mock_shell_out(0, ghc_out, ""))
+      allow(plugin).to receive(:shell_out)
+        .with("ghci --version")
+        .and_return(mock_shell_out(0, ghci_out, ""))
+      allow(plugin).to receive(:shell_out)
+        .with("cabal --version")
+        .and_raise( Ohai::Exceptions::Exec )
+      allow(plugin).to receive(:shell_out)
+        .with("stack --version")
+        .and_return(mock_shell_out(0, stack_out, ""))
+      plugin.run
+    end
+
+    it "do NOT set languages[:haskell][:cabal]" do
+      expect(plugin[:languages][:haskell]).not_to have_key(:cabal)
+    end
+  end
+
+  context "if haskell/stack is NOT installed" do
+    before(:each) do
+      allow(plugin).to receive(:shell_out)
+        .with("ghc --version")
+        .and_return(mock_shell_out(0, ghc_out, ""))
+      allow(plugin).to receive(:shell_out)
+        .with("ghci --version")
+        .and_return(mock_shell_out(0, ghci_out, ""))
+      allow(plugin).to receive(:shell_out)
+        .with("cabal --version")
+        .and_return(mock_shell_out(0, cabal_out, ""))
+      allow(plugin).to receive(:shell_out)
+        .with("stack --version")
+        .and_raise( Ohai::Exceptions::Exec )
+      plugin.run
+    end
+
+    it "do NOT set languages[:haskell][:stack]" do
+      expect(plugin[:languages][:haskell]).not_to have_key(:stack)
+    end
+  end
+end

data/spec/unit/plugins/ip_scopes_spec.rb

@@ -11,13 +11,17 @@ describe Ohai::System, "plugin ip_scopes" do
   let(:interfaces) do
     Hash[
       interface1, { :addresses => addresses1, :type => interface1_type },
-      interface2, { :addresses => addresses2, :type => interface2_type }] end
+      interface2, { :addresses => addresses2, :type => interface2_type },
+      interface3, { :addresses => addresses3, :type => interface3_type }] end
   let(:interface1) { :eth0 }
   let(:interface2) { :eth1 }
+  let(:interface3) { :eth2 }
   let(:addresses1) { {} }
   let(:addresses2) { {} }
+  let(:addresses3) { {} }
   let(:interface1_type) { "eth" }
   let(:interface2_type) { "eth" }
+  let(:interface3_type) { "eth" }
 
   before { plugin[:network] = network }
 
@@ -62,11 +66,36 @@ describe Ohai::System, "plugin ip_scopes" do
           end
         end
 
+        context "when host has tunl" do
+          let(:ip1) { "10.0.0.1" }
+          let(:ip2) { "192.168.1.1" }
+          let(:interface1_type) { "eth" }
+          let(:interface2_type) { "tunl" }
+
+          it "picks the non-virtual address" do
+            expect(plugin[:privateaddress]).to eq("10.0.0.1")
+          end
+        end
+
+        context "when host has docker" do
+          let(:ip1) { "10.0.0.1" }
+          let(:ip2) { "192.168.1.1" }
+          let(:interface1_type) { "eth" }
+          let(:interface2_type) { "docker" }
+
+          it "picks the non-virtual address" do
+            expect(plugin[:privateaddress]).to eq("10.0.0.1")
+          end
+        end
+
         context "when host only has virtual RFC1918 addresses" do
           let(:ip1) { "10.0.0.1" }
           let(:ip2) { "192.168.1.1" }
+          let(:ip3) { "172.16.1.1" }
+
           let(:interface1_type) { "ppp" }
-          let(:interface2_type) { "ppp" }
+          let(:interface2_type) { "tunl" }
+          let(:interface3_type) { "docker" }
 
           it "ignores them" do
             expect(plugin[:privateaddress]).to be nil

data/spec/unit/plugins/joyent_spec.rb

@@ -1,71 +1,83 @@
-require "spec_helper"
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
 
 describe Ohai::System, "plugin joyent" do
-  before(:each) do
-    @plugin = get_plugin("joyent")
-  end
+  let(:plugin) { get_plugin("joyent") }
 
   describe "without joyent" do
     before(:each) do
-      allow(@plugin).to receive(:is_smartos?).and_return(false)
+      allow(plugin).to receive(:is_smartos?).and_return(false)
     end
 
-    it "should NOT create joyent" do
-      @plugin.run
-      expect(@plugin[:joyent]).to be_nil
+    it "DOES NOT create joyent mash" do
+      plugin.run
+      expect(plugin[:joyent]).to be_nil
     end
   end
 
   describe "with joyent" do
     before(:each) do
-      allow(@plugin).to receive(:is_smartos?).and_return(true)
-      @plugin[:virtualization] = Mash.new
-      @plugin[:virtualization][:guest_uuid] = "global"
+      allow(plugin).to receive(:is_smartos?).and_return(true)
+      plugin[:virtualization] = Mash.new
+      plugin[:virtualization][:guest_uuid] = "global"
     end
 
-    it "should create joyent" do
-      @plugin.run
-      expect(@plugin[:joyent]).not_to be_nil
+    it "creates joyent mash" do
+      plugin.run
+      expect(plugin[:joyent]).not_to be_nil
     end
 
     describe "under global zone" do
       before(:each) do
-        @plugin.run
+        plugin.run
       end
 
-      it "should ditect global zone" do
-        expect(@plugin[:joyent][:sm_uuid]).to eql "global"
+      it "detects global zone" do
+        expect(plugin[:joyent][:sm_uuid]).to eql "global"
       end
 
-      it "should NOT create sm_id" do
-        expect(@plugin[:joyent][:sm_id]).to be_nil
+      it "DOES NOT create sm_id" do
+        expect(plugin[:joyent][:sm_id]).to be_nil
       end
     end
 
     describe "under smartmachine" do
       before(:each) do
-        @plugin[:virtualization][:guest_uuid] = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
-        @plugin[:virtualization][:guest_id] = "30"
-        allow(@plugin).to receive(:collect_product_file).and_return(["Name: Joyent Instance", "Image: base64 13.4.2", "Documentation: http://wiki.joyent.com/jpc2/SmartMachine+Base"])
-        allow(@plugin).to receive(:collect_pkgsrc).and_return("http://pkgsrc.joyent.com/packages/SmartOS/2013Q4/x86_64/All")
-        @plugin.run
+        plugin[:virtualization][:guest_uuid] = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
+        plugin[:virtualization][:guest_id] = "30"
+
+        etc_product = <<-EOS
+Name: Joyent Instance
+Image: pkgbuild 16.3.1
+Documentation: https://docs.joyent.com/images/smartos/pkgbuild
+      EOS
+
+        pkg_install_conf = <<-EOS
+GPG_KEYRING_VERIFY=/opt/local/etc/gnupg/pkgsrc.gpg
+GPG_KEYRING_PKGVULN=/opt/local/share/gnupg/pkgsrc-security.gpg
+PKG_PATH=https://pkgsrc.joyent.com/packages/SmartOS/2016Q3/x86_64/All
+VERIFIED_INSTALLATION=trusted
+      EOS
+
+        allow(::File).to receive(:read).with("/etc/product").and_return(etc_product)
+        allow(::File).to receive(:read).with("/opt/local/etc/pkg_install.conf").and_return(pkg_install_conf)
+        plugin.run
       end
 
-      it "should retrive zone uuid" do
-        expect(@plugin[:joyent][:sm_uuid]).to eql "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
+      it "retrieves zone uuid" do
+        expect(plugin[:joyent][:sm_uuid]).to eql "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
       end
 
-      it "should collect sm_id" do
-        expect(@plugin[:joyent][:sm_id]).to eql "30"
+      it "collects sm_id" do
+        expect(plugin[:joyent][:sm_id]).to eql "30"
       end
 
-      it "should collect images" do
-        expect(@plugin[:joyent][:sm_image_id]).not_to be_nil
-        expect(@plugin[:joyent][:sm_image_ver]).not_to be_nil
+      it "collects images" do
+        expect(plugin[:joyent][:sm_image_id]).to eql "pkgbuild"
+        expect(plugin[:joyent][:sm_image_ver]).to eql "16.3.1"
       end
 
-      it "should collect pkgsrc" do
-        expect(@plugin[:joyent][:sm_pkgsrc]).to eql "http://pkgsrc.joyent.com/packages/SmartOS/2013Q4/x86_64/All"
+      it "collects pkgsrc" do
+        expect(plugin[:joyent][:sm_pkgsrc]).to eql "https://pkgsrc.joyent.com/packages/SmartOS/2016Q3/x86_64/All"
       end
     end
   end

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

@@ -35,6 +35,7 @@ describe Ohai::System, "Linux lsb plugin" do
         and_yield("DISTRIB_CODENAME=hardy").
         and_yield('DISTRIB_DESCRIPTION="Ubuntu 8.04"')
       allow(File).to receive(:open).with("/etc/lsb-release").and_return(@double_file)
+      allow(File).to receive(:exists?).with("/usr/bin/lsb_release").and_return(false)
       allow(File).to receive(:exists?).with("/etc/lsb-release").and_return(true)
     end
 
@@ -61,7 +62,6 @@ describe Ohai::System, "Linux lsb plugin" do
 
   describe "on systems with /usr/bin/lsb_release" do
     before(:each) do
-      allow(File).to receive(:exists?).with("/etc/lsb-release").and_return(false)
       allow(File).to receive(:exists?).with("/usr/bin/lsb_release").and_return(true)
 
       @stdin = double("STDIN", { :close => true })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.21.0
+  version: 8.22.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -176,124 +176,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '13'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 12.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 12.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-collection_matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !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.13.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.13.1
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Ohai profiles your system and emits JSON
 email: adam@chef.io
 executables:
@@ -376,6 +258,7 @@ files:
 - lib/ohai/plugins/gce.rb
 - lib/ohai/plugins/go.rb
 - lib/ohai/plugins/groovy.rb
+- lib/ohai/plugins/haskell.rb
 - lib/ohai/plugins/hostname.rb
 - lib/ohai/plugins/init_package.rb
 - lib/ohai/plugins/ip_scopes.rb
@@ -562,6 +445,7 @@ files:
 - spec/unit/plugins/gce_spec.rb
 - spec/unit/plugins/go_spec.rb
 - spec/unit/plugins/groovy_spec.rb
+- spec/unit/plugins/haskell_spec.rb
 - spec/unit/plugins/hostname_spec.rb
 - spec/unit/plugins/init_package_spec.rb
 - spec/unit/plugins/ip_scopes_spec.rb
@@ -660,7 +544,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON