ohai 8.26.1 → 13.0.0

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "OpenBSD kernel plugin" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "OpenBSD plugin platform" do
   before(:each) do

data/spec/unit/plugins/openstack_spec.rb

@@ -16,10 +16,9 @@
 # limitations under the License.
 #
 
-require "spec_helper"
-require "ohai/plugins/openstack"
+require_relative "../../spec_helper.rb"
 
-describe "OpenStack Plugin" do
+describe Ohai::System, "plugin openstack" do
 
   let(:plugin) { get_plugin("openstack") }
 

data/spec/unit/plugins/os_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 ORIGINAL_CONFIG_HOST_OS = ::RbConfig::CONFIG["host_os"]
 

data/spec/unit/plugins/packages_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin packages" do
   context "on debian" do

data/spec/unit/plugins/passwd_spec.rb

@@ -1,4 +1,20 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+#
+# 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_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin etc", :unix_only do
   before(:each) do

data/spec/unit/plugins/perl_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin perl" do
   let(:plugin) { get_plugin("perl") }

data/spec/unit/plugins/php_spec.rb

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin php" do
   let(:plugin) { get_plugin("php") }

data/spec/unit/plugins/platform_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin platform" do
   before(:each) do

data/spec/unit/plugins/powershell_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin powershell" do
   let(:plugin) { get_plugin("powershell") }

data/spec/unit/plugins/python_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin python" do
   let(:stdout) { "2.5.2 (r252:60911, Jan  4 2009, 17:40:26)\n[GCC 4.3.2]\n" }

data/spec/unit/plugins/rackspace_spec.rb

@@ -16,8 +16,7 @@
 #
 
 require "resolv"
-
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin rackspace" do
   let(:plugin) { get_plugin("rackspace") }

data/spec/unit/plugins/root_group_spec.rb

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
-require File.expand_path(File.dirname(__FILE__) + "/../../../lib/ohai/util/win32/group_helper.rb")
+require_relative "../../spec_helper.rb"
+require "ohai/util/win32/group_helper"
 
 describe Ohai::System, "root_group" do
   before(:each) do

data/spec/unit/plugins/ruby_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 ruby_bin = File.join(::RbConfig::CONFIG["bindir"], ::RbConfig::CONFIG["ruby_install_name"])
 

data/spec/unit/plugins/rust_spec.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin rust" do
   let(:stdout) { "rustc 1.0.0-nightly (29bd9a06e 2015-01-20 23:03:09 +0000)" }

data/spec/unit/plugins/scala_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin scala" do
 
@@ -26,15 +26,11 @@ describe Ohai::System, "plugin scala" do
   end
 
   let(:scala_out) { "Scala code runner version 2.11.6 -- Copyright 2002-2013, LAMP/EPFL" }
-  let(:sbt_out) { "sbt launcher version 0.13.8" }
 
   def setup_plugin
     allow(plugin).to receive(:shell_out)
       .with("scala -version")
       .and_return(mock_shell_out(0, "", scala_out))
-    allow(plugin).to receive(:shell_out)
-      .with("sbt --version", { :timeout => 5 })
-      .and_return(mock_shell_out(0, sbt_out, ""))
   end
 
   context "if scala is installed" do
@@ -48,45 +44,15 @@ describe Ohai::System, "plugin scala" do
     end
   end
 
-  context "if sbt is installed" do
-
-    before(:each) do
-      setup_plugin
-      plugin.run
-    end
-
-    it "sets languages[:scala][:sbt][:version]" do
-      expect(plugin[:languages][:scala][:sbt][:version]).to eql("0.13.8")
-    end
-  end
-
-  context "if scala/sbt are not installed" do
-
+  context "if scala is not installed" do
     before(:each) do
       allow(plugin).to receive(:shell_out)
         .and_raise( Ohai::Exceptions::Exec )
       plugin.run
     end
 
-    it "does NOT set the languages[:scala] if scala/sbts commands fails" do
+    it "does NOT set the languages[:scala] if scala commands fails" do
       expect(plugin[:languages]).not_to have_key(:scala)
     end
   end
-
-  context "if sbt is not installed" do
-    before(:each) do
-      allow(plugin).to receive(:shell_out)
-        .with("scala -version")
-        .and_return(mock_shell_out(0, "", scala_out))
-
-      allow(plugin).to receive(:shell_out)
-        .with("sbt --version", { :timeout => 5 })
-        .and_raise( Ohai::Exceptions::Exec )
-      plugin.run
-    end
-
-    it "does NOT set the languages[:scala][:sbt] if sbt command fails" do
-      expect(plugin[:languages][:scala]).not_to have_key(:sbt)
-    end
-  end
 end

data/spec/unit/plugins/shard_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require "digest/md5"
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "shard plugin" do
   let(:plugin) { get_plugin("shard") }

data/spec/unit/plugins/shells_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin shells" do
   let(:plugin) { get_plugin("shells") }

data/spec/unit/plugins/softlayer_spec.rb

@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin softlayer" do
   let(:plugin) { get_plugin("softlayer") }

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

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Solaris2.X cpu plugin" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 SOLARIS_DMI_OUT = <<-EOS
 ID    SIZE TYPE

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Solaris2.X hostname plugin" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Solaris2.X kernel plugin" do
   # NOTE: Solaris will report the same module loaded multiple times

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

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Solaris2.X memory plugin" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 #  limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Solaris2.X network plugin" do
 
@@ -69,7 +69,9 @@ lo0: flags=1000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4> mtu 8232 index 1
 eri0: flags=1004843<UP,BROADCAST,RUNNING,MULTICAST,DHCP,IPv4> mtu 1500 \
 index 2
     inet 172.17.128.208 netmask ffffff00 broadcast 172.17.128.255
-ip6.tun0: flags=10008d1<UP,POINTOPOINT,RUNNING,NOARP,MULTICAST,IPv4> mtu 1460 index 3
+ip6.tun0: flags=10008d1<UP,POINTOPOINT,RUNNING,NOARP,MULTICAST,IPv4> \
+mtu 1460
+    index 3
     inet6 tunnel src fe80::1 tunnel dst fe80::2
     tunnel security settings  -->  use 'ipsecconf -ln -i ip.tun1'
     tunnel hop limit 60 tunnel encapsulation limit 4
@@ -78,7 +80,8 @@ qfe1: flags=2000841<UP,RUNNING,MULTICAST,IPv6> mtu 1500 index 3
  usesrc vni0
  inet6 fe80::203:baff:fe17:4be0/10
  ether 0:3:ba:17:4b:e0
-vni0: flags=2002210041<UP,RUNNING,NOXMIT,NONUD,IPv6,VIRTUAL> mtu 1460 index 5
+vni0: flags=2002210041<UP,RUNNING,NOXMIT,NONUD,IPv6,VIRTUAL> mtu 0
+ index 5
  srcof qfe1
  inet6 fe80::203:baff:fe17:4444/128
 ENDIFCONFIG
@@ -173,7 +176,7 @@ ROUTE_GET
     end
 
     it "finds the default interface for a solaris 11 zone" do
-      expect(@plugin[:network][:default_interface]).to eq("net1:1")
+      expect(@plugin[:network][:default_interface]).to eq("net1")
     end
   end
 

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Solaris plugin platform" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Solaris virtualization platform" do
   before(:each) do

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

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Solaris 2.x zpool plugin" do
   before(:each) do

data/spec/unit/plugins/ssh_host_keys_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "ssh_host_key plugin" do
 

data/spec/unit/plugins/sysconf_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "sysconf plugin", :unix_only do
   let(:plugin) { get_plugin("sysconf") }

data/spec/unit/plugins/timezone_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "timezone plugin" do
   before(:each) do

data/spec/unit/plugins/virtualbox_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+require_relative "../../spec_helper.rb"
 
 vbox_output = <<EOF
 Oracle VM VirtualBox Guest Additions Command Line Management Interface Version 5.0.2

data/spec/unit/plugins/vmware_spec.rb

@@ -14,7 +14,8 @@
 # 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 "spec_helper"
+
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "plugin vmware" do
   let(:plugin) { get_plugin("vmware") }