ohai 7.0.0.rc.0 → 7.0.0.rc.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 87c20193b00541eb3fa82ee6c3bcd45c78636a73
+  data.tar.gz: fdc15bb6c846111f6208a280d1c0b6a0dd38e347
+SHA512:
+  metadata.gz: 6ae37b1d6f17e5b02669d1f511e2af2f7292c6a3a985c938fd498899131a267758a3c9feea5ddb94feb60c9ae70fe83bc3af05717546f9110063557bb23d29cd
+  data.tar.gz: c940b03c17459ecb3190c1b801144017d888e38941512b5929d1ffab8bc78018d9067e9cb619d4987c6b92d7d20a0b56d972e1dc96e8bee60888a9cdfa662630

data/docs/man/man1/ohai.1

@@ -1,4 +1,4 @@
-.TH "OHAI" "1" "Ohai 6.20.0" "" "ohai"
+.TH "OHAI" "1" "Ohai 7.0.0" "" "ohai"
 .SH NAME
 ohai \- The man page for the ohai command line tool.
 .
@@ -31,12 +31,14 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" Man page generated from reStructuredText.
 .
 .sp
-Ohai is a tool that is used to detect attributes on a node, and then provide these attributes to the chef\-client at the start of every chef\-client run. Ohai is required by the chef\-client and must be present on a node. The types of attributes Ohai collects include:
+Ohai is a tool that is used to detect attributes on a node, and then provide these attributes to the chef\-client at the start of every chef\-client run. Ohai is required by the chef\-client and must be present on a node. (Ohai is installed on a node as part of the chef\-client install process.)
+.sp
+The types of attributes Ohai collects include (but are not limited to):
 .INDENT 0.0
 .IP \(bu 2
 Platform details
 .IP \(bu 2
-Networking usage
+Network usage
 .IP \(bu 2
 Memory usage
 .IP \(bu 2
@@ -67,17 +69,17 @@ ohai OPTION
 This tool has the following options:
 .INDENT 0.0
 .TP
+.B \fBATTRIBUTE_NAME ATTRIBUTE NAME ...\fP
+Use to have Ohai show only output for named attributes.
+.TP
 .B \fB\-d PATH\fP, \fB\-\-directory PATH\fP
 The directory in which Ohai plugins are located. For example: \fB/etc/ohai/plugins\fP.
 .TP
-.B \fB\-f FILE_NAME\fP, \fB\-\-file FILE_NAME\fP
-The file against which Ohai will run.
-.TP
 .B \fB\-h\fP, \fB\-\-help\fP
 Shows help for the command.
 .TP
 .B \fB\-l LEVEL\fP, \fB\-\-log_level LEVEL\fP
-The level of logging that will be stored in a log file: \fBdebug\fP, \fBinfo\fP, \fBwarn\fP, \fBerror\fP, or \fBfatal\fP.
+The level of logging that will be stored in a log file.
 .TP
 .B \fB\-L LOGLOCATION\fP, \fB\-\-logfile c\fP
 The location in which log file output files will be saved. If this location is set to something other than \fBSTDOUT\fP, standard output logging will still be performed (otherwise there would be no output other than to a file).

data/lib/ohai/plugins/darwin/cpu.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Nathan L Smith (<nlloyds@gmail.com>)
+# Author:: Tim Smith (<tsmith@limelight.com>)
 # Copyright:: Copyright (c) 2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -25,5 +26,19 @@ Ohai.plugin(:CPU) do
     cpu[:real] = so.stdout.to_i
     so = shell_out("sysctl -n hw.logicalcpu")
     cpu[:total] = so.stdout.to_i
+    so = shell_out("sysctl -n hw.cpufrequency")
+    cpu[:mhz] = so.stdout.to_i / 1000000
+    so = shell_out("sysctl -n machdep.cpu.vendor")
+    cpu[:vendor_id] = so.stdout
+    so = shell_out("sysctl -n machdep.cpu.brand_string")
+    cpu[:model_name] = so.stdout
+    so = shell_out("sysctl -n machdep.cpu.model")
+    cpu[:model] = so.stdout.to_i
+    so = shell_out("sysctl -n machdep.cpu.family")
+    cpu[:family] = so.stdout.to_i
+    so = shell_out("sysctl -n machdep.cpu.stepping")
+    cpu[:stepping] = so.stdout.to_i
+    so = shell_out("sysctl -n machdep.cpu.features")
+    cpu[:flags] = so.stdout.downcase.split(' ')
   end
 end

data/lib/ohai/plugins/hostname.rb

@@ -115,9 +115,24 @@ Ohai.plugin(:Hostname) do
     hostname from_cmd("hostname -s")
     machinename from_cmd("hostname")
     begin
-      fqdn from_cmd("hostname --fqdn")
+      ourfqdn = from_cmd("hostname --fqdn")
+      # Sometimes... very rarely, but sometimes, 'hostname --fqdn' falsely
+      # returns a blank string. WTF.
+      if ourfqdn.nil? || ourfqdn.empty?
+        Ohai::Log.debug("hostname --fqdn returned an empty string, retrying " +
+                        "once.")
+        ourfqdn = from_cmd("hostname --fqdn")
+      end
+
+      if ourfqdn.nil? || ourfqdn.empty?
+        Ohai::Log.debug("hostname --fqdn returned an empty string twice and " +
+                        "will not be set.")
+      else
+        fqdn ourfqdn
+      end
     rescue
-      Ohai::Log.debug("hostname -f returned an error, probably no domain is set")
+      Ohai::Log.debug(
+        "hostname --fqdn returned an error, probably no domain set")
     end
     domain collect_domain
   end

data/lib/ohai/plugins/init_package.rb

@@ -0,0 +1,31 @@
+#
+# Author:: Caleb Tennis (<caleb.tennis@gmail.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# 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(:InitPackage) do
+  provides "init_package"
+
+  collect_data(:linux) do
+    package_name = nil
+
+    if File.exists?("/proc/1/comm")
+      package_name = File.open("/proc/1/comm").gets.chomp
+    end
+
+    init_package package_name
+  end
+end

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

@@ -29,7 +29,7 @@ Ohai.plugin(:Platform) do
   end
 
   collect_data(:linux) do
-    # platform [ and platform_version ? ] should be lower case to avoid dealing with RedHat/Redhat/redhat matching 
+    # platform [ and platform_version ? ] should be lower case to avoid dealing with RedHat/Redhat/redhat matching
     if File.exists?("/etc/oracle-release")
       contents = File.read("/etc/oracle-release").chomp
       platform "oracle"
@@ -47,7 +47,7 @@ Ohai.plugin(:Platform) do
       elsif lsb[:id] =~ /LinuxMint/i
         platform "linuxmint"
         platform_version lsb[:release]
-      else 
+      else
         if File.exists?("/usr/bin/raspi-config")
           platform "raspbian"
         else
@@ -67,10 +67,15 @@ Ohai.plugin(:Platform) do
       platform "gentoo"
       platform_version File.read('/etc/gentoo-release').scan(/(\d+|\.+)/).join
     elsif File.exists?('/etc/SuSE-release')
-      platform "suse"
       suse_release = File.read("/etc/SuSE-release")
-      platform_version suse_release.scan(/VERSION = (\d+)\nPATCHLEVEL = (\d+)/).flatten.join(".")
-      platform_version suse_release.scan(/VERSION = ([\d\.]{2,})/).flatten.join(".") if platform_version == ""
+      suse_version = suse_release.scan(/VERSION = (\d+)\nPATCHLEVEL = (\d+)/).flatten.join(".")
+      suse_version = suse_release[/VERSION = ([\d\.]{2,})/, 1] if suse_version == ""
+      platform_version suse_version
+      if suse_release =~ /^openSUSE/
+        platform "opensuse"
+      else
+        platform "suse"
+      end
     elsif File.exists?('/etc/slackware-version')
       platform "slackware"
       platform_version File.read("/etc/slackware-version").scan(/(\d+|\.+)/).join
@@ -90,7 +95,7 @@ Ohai.plugin(:Platform) do
     elsif lsb[:id] =~ /XenServer/i
       platform "xenserver"
       platform_version lsb[:release]
-    elsif lsb[:id] # LSB can provide odd data that changes between releases, so we currently fall back on it rather than dealing with its subtleties 
+    elsif lsb[:id] # LSB can provide odd data that changes between releases, so we currently fall back on it rather than dealing with its subtleties
       platform lsb[:id].downcase
       platform_version lsb[:release]
     end
@@ -108,8 +113,8 @@ Ohai.plugin(:Platform) do
       platform_family "gentoo"
     when /slackware/
       platform_family "slackware"
-    when /arch/ 
-      platform_family "arch" 
+    when /arch/
+      platform_family "arch"
     end
   end
 end

data/lib/ohai/plugins/network.rb

@@ -79,7 +79,7 @@ Ohai.plugin(:NetworkAddresses) do
       elsif network[gw_attr] and
           network["interfaces"][network[int_attr]] and
           network["interfaces"][network[int_attr]]["addresses"]
-        if [ "0.0.0.0", "::" ].include? network[gw_attr]
+        if [ "0.0.0.0", "::", /^fe80:/ ].any? { |pat| pat === network[gw_attr] }
           # link level default route
           Ohai::Log.debug("link level default #{family} route, picking ip from #{network[gw_attr]}")
           r = gw_if_ips.first
@@ -156,7 +156,7 @@ Ohai.plugin(:NetworkAddresses) do
         end
       elsif family == "inet6" and ip6address.nil?
         if r["ip"].nil?
-          Ohai::Log.warn("unable to detect ip6address")
+          Ohai::Log.debug("unable to detect ip6address")
         else
           ip6address r["ip"]
           if r["mac"] and macaddress.nil? and ipaddress.nil?

data/lib/ohai/plugins/rackspace.rb

@@ -93,6 +93,28 @@ Ohai.plugin(:Rackspace) do
     Ohai::Log.debug("Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
   end
 
+  # Get the rackspace private networks
+  #
+  def get_private_networks()
+    so = shell_out('xenstore-ls vm-data/networking')
+    if so.exitstatus == 0
+      networks = []
+      so.stdout.split("\n").map{|l| l.split('=').first.strip }.map do |item|
+        _so = shell_out("xenstore-read vm-data/networking/#{item}")
+        if _so.exitstatus == 0
+          networks.push(Yajl::Parser.new.parse(_so.stdout))
+        else
+          raise Ohai::Exceptions::Exec
+        end
+      end
+      # these networks are already known to ohai, and are not 'private networks'
+      networks.delete_if { |hash| hash['label'] == 'private' }
+      networks.delete_if { |hash| hash['label'] == 'public' }
+    end
+  rescue Ohai::Exceptions::Exec
+    Ohai::Log.debug('Unable to capture custom private networking information for Rackspace cloud')
+  end
+
   collect_data do
     # Adds rackspace Mash
     if looks_like_rackspace?
@@ -109,6 +131,9 @@ Ohai.plugin(:Rackspace) do
       rackspace[:local_ipv4] = rackspace[:private_ip]
       get_global_ipv6_address(:local_ipv6, :eth1)
       rackspace[:local_hostname] = hostname
+      private_networks = get_private_networks
+      rackspace[:private_networks] = private_networks if private_networks
     end
   end
+
 end

data/lib/ohai/version.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -18,6 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '7.0.0.rc.0'
+  VERSION = '7.0.0.rc.1'
 end
-

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

@@ -6,9 +6,9 @@
 # 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.
@@ -23,17 +23,51 @@ describe Ohai::System, "Darwin cpu plugin" do
   before(:each) do
     @plugin = get_plugin("darwin/cpu")
     @plugin.stub(:collect_os).and_return(:darwin)
-    @plugin.stub(:shell_out).with("sysctl -n hw.physicalcpu").and_return(mock_shell_out(0, "1", ""))
-    @plugin.stub(:shell_out).with("sysctl -n hw.logicalcpu").and_return(mock_shell_out(0, "2", ""))
+    @plugin.stub(:shell_out).with("sysctl -n hw.physicalcpu").and_return(mock_shell_out(0, "4", ""))
+    @plugin.stub(:shell_out).with("sysctl -n hw.logicalcpu").and_return(mock_shell_out(0, "8", ""))
+    @plugin.stub(:shell_out).with("sysctl -n hw.cpufrequency").and_return(mock_shell_out(0, "2300000000", ""))
+    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.vendor").and_return(mock_shell_out(0, "GenuineIntel", ""))
+    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.brand_string").and_return(mock_shell_out(0, "Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz", ""))
+    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.model").and_return(mock_shell_out(0, "58", ""))
+    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.family").and_return(mock_shell_out(0, "6", ""))
+    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.stepping").and_return(mock_shell_out(0, "9", ""))
+    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.features").and_return(mock_shell_out(0, "FPU VME DE PSE TSC MSR PAE MCE CX8 APIC SEP MTRR PGE MCA CMOV PAT PSE36 CLFSH DS ACPI MMX FXSR SSE SSE2 SS HTT TM PBE SSE3 PCLMULQDQ DTES64 MON DSCPL VMX EST TM2 SSSE3 CX16 TPR PDCM SSE4.1 SSE4.2 x2APIC POPCNT AES PCID XSAVE OSXSAVE TSCTMR AVX1.0 RDRAND F16C", ""))
+    @plugin.run
   end
 
-  it "should set cpu[:total] to 2" do
-    @plugin.run
-    @plugin[:cpu][:total].should == 2
+  it "should set cpu[:total] to 8" do
+    @plugin[:cpu][:total].should == 8
   end
 
-  it "should set cpu[:real] to 1" do
-    @plugin.run
-    @plugin[:cpu][:real].should == 1
+  it "should set cpu[:real] to 4" do
+    @plugin[:cpu][:real].should == 4
+  end
+
+  it "should set cpu[:mhz] to 2300" do
+    @plugin[:cpu][:mhz].should == 2300
+  end
+
+  it "should set cpu[:vendor_id] to GenuineIntel" do
+    @plugin[:cpu][:vendor_id].should == "GenuineIntel"
+  end
+
+  it "should set cpu[:model_name] to Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz" do
+    @plugin[:cpu][:model_name].should == "Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz"
+  end
+
+  it "should set cpu[:model] to 58" do
+    @plugin[:cpu][:model].should == 58
+  end
+
+  it "should set cpu[:family] to 6" do
+    @plugin[:cpu][:family].should == 6
+  end
+
+  it "should set cpu[:stepping] to 9" do
+    @plugin[:cpu][:stepping].should == 9
+  end
+
+  it "should set cpu[:flags] to array of flags" do
+    @plugin[:cpu][:flags].should == ["fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "clfsh", "ds", "acpi", "mmx", "fxsr", "sse", "sse2", "ss", "htt", "tm", "pbe", "sse3", "pclmulqdq", "dtes64", "mon", "dscpl", "vmx", "est", "tm2", "ssse3", "cx16", "tpr", "pdcm", "sse4.1", "sse4.2", "x2apic", "popcnt", "aes", "pcid", "xsave", "osxsave", "tsctmr", "avx1.0", "rdrand", "f16c"]
   end
 end

data/spec/unit/plugins/hostname_spec.rb

@@ -71,4 +71,34 @@ describe Ohai::System, "hostname plugin" do
       @plugin[:hostname].should == "katie"
     end
   end
+
+  context "hostname --fqdn when it returns empty string" do
+    before(:each) do
+      @plugin.stub(:collect_os).and_return(:linux)
+      @plugin.stub(:shell_out).with("hostname -s").and_return(
+        mock_shell_out(0, "katie", ""))
+      @plugin.stub(:shell_out).with("hostname --fqdn").and_return(
+        mock_shell_out(0, "", ""), mock_shell_out(0, "katie.local", ""))
+    end
+
+    it "should be called twice" do
+      @plugin.run
+      @plugin[:fqdn].should == "katie.local"
+    end
+  end
+
+  context "hostname --fqdn when it works" do
+    before(:each) do
+      @plugin.stub(:collect_os).and_return(:linux)
+      @plugin.stub(:shell_out).with("hostname -s").and_return(
+        mock_shell_out(0, "katie", ""))
+      @plugin.stub(:shell_out).with("hostname --fqdn").and_return(
+        mock_shell_out(0, "katie.local", ""))
+    end
+
+    it "should be not be called twice" do
+      @plugin.run
+      @plugin[:fqdn].should == "katie.local"
+    end
+  end
 end

data/spec/unit/plugins/init_package_spec.rb

@@ -0,0 +1,50 @@
+#
+# Author:: Caleb Tennis (<caleb.tennis@gmail.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# 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, "Init package" do
+  let(:plugin) {
+    p = get_plugin("init_package")
+    p.stub(:collect_os).and_return("linux")
+    p
+  }
+
+  let(:proc1_content) { "init\n" }
+  let(:proc_1_file_path) { "/proc/1/comm" }
+  let(:proc_1_file) { double(proc_1_file_path, :gets => proc1_content) }
+
+  before(:each) do
+    File.stub(:exists?).with(proc_1_file_path).and_return(true)
+    File.stub(:open).with(proc_1_file_path).and_return(proc_1_file)
+  end
+
+  it "should set init_package to init" do
+    plugin.run
+    plugin[:init_package].should == "init"
+  end
+
+  describe "when init_package is systemd" do
+    let(:proc1_content) { "systemd\n" }
+
+    it "should set init_package to systemd" do
+      plugin.run
+      plugin[:init_package].should == "systemd"
+    end
+  end
+end

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

@@ -6,9 +6,9 @@
 # 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.
@@ -18,7 +18,7 @@
 
 
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb') 
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux plugin platform" do
   before(:each) do
@@ -42,12 +42,12 @@ describe Ohai::System, "Linux plugin platform" do
       @plugin[:lsb][:id] = "Ubuntu"
       @plugin[:lsb][:release] = "8.04"
     end
-    
+
     it "should set platform to lowercased lsb[:id]" do
-      @plugin.run        
+      @plugin.run
       @plugin[:platform].should == "ubuntu"
     end
-    
+
     it "should set platform_version to lsb[:release]" do
       @plugin.run
       @plugin[:platform_version].should == "8.04"
@@ -144,7 +144,7 @@ describe Ohai::System, "Linux plugin platform" do
       @plugin[:platform_family].should == "slackware"
     end
   end
-  
+
   describe "on arch" do
     before(:each) do
       @plugin.lsb = nil
@@ -158,7 +158,7 @@ describe Ohai::System, "Linux plugin platform" do
     end
 
   end
-  
+
   describe "on gentoo" do
     before(:each) do
       @plugin.lsb = nil
@@ -219,47 +219,47 @@ describe Ohai::System, "Linux plugin platform" do
 	@plugin[:platform_family].should == "rhel"
       end
     end
-  
+
     describe "without lsb_release results" do
       before(:each) do
         @plugin.lsb = nil
         File.should_receive(:exists?).with("/etc/redhat-release").and_return(true)
       end
-  
+
       it "should read the platform as centos and version as 5.3" do
         File.should_receive(:read).with("/etc/redhat-release").and_return("CentOS release 5.3")
         @plugin.run
         @plugin[:platform].should == "centos"
       end
-  
+
       it "may be that someone munged Red Hat to be RedHat" do
         File.should_receive(:read).with("/etc/redhat-release").and_return("RedHat release 5.3")
         @plugin.run
         @plugin[:platform].should == "redhat"
         @plugin[:platform_version].should == "5.3"
       end
-  
+
       it "should read the platform as redhat and version as 5.3" do
         File.should_receive(:read).with("/etc/redhat-release").and_return("Red Hat release 5.3")
         @plugin.run
         @plugin[:platform].should == "redhat"
         @plugin[:platform_version].should == "5.3"
       end
-  
+
       it "should read the platform as fedora and version as 13 (rawhide)" do
         File.should_receive(:read).with("/etc/redhat-release").and_return("Fedora release 13 (Rawhide)")
         @plugin.run
         @plugin[:platform].should == "fedora"
         @plugin[:platform_version].should == "13 (rawhide)"
       end
-      
+
       it "should read the platform as fedora and version as 10" do
         File.should_receive(:read).with("/etc/redhat-release").and_return("Fedora release 10")
         @plugin.run
         @plugin[:platform].should == "fedora"
         @plugin[:platform_version].should == "10"
       end
-  
+
       it "should read the platform as fedora and version as 13 using to_i" do
         File.should_receive(:read).with("/etc/redhat-release").and_return("Fedora release 13 (Rawhide)")
         @plugin.run
@@ -300,7 +300,7 @@ describe Ohai::System, "Linux plugin platform" do
       before(:each) do
         @plugin.lsb = nil
       end
- 
+
       it "should read the platform as oracle and version as 5" do
         File.stub(:exists?).with("/etc/redhat-release").and_return(true)
         File.stub(:read).with("/etc/redhat-release").and_return("Enterprise Linux Enterprise Linux Server release 5 (Carthage)")
@@ -340,7 +340,7 @@ describe Ohai::System, "Linux plugin platform" do
         @plugin[:platform].should == "oracle"
         @plugin[:platform_version].should == "6.0"
       end
-  
+
       it "should read the platform as oracle and version as 6.1" do
         File.stub(:exists?).with("/etc/redhat-release").and_return(true)
         File.stub(:read).with("/etc/redhat-release").and_return("Red Hat Enterprise Linux Server release 6.1 (Santiago)")
@@ -362,13 +362,12 @@ describe Ohai::System, "Linux plugin platform" do
       before(:each) do
         @plugin[:lsb][:id] = "SUSE LINUX"
       end
-      
-      it "should read the platform as suse" do
+
+      it "should read the platform as opensuse on openSUSE" do
         @plugin[:lsb][:release] = "12.1"
-        File.should_receive(:read).with("/etc/SuSE-release").exactly(1).times.and_return("openSUSE 12.1 (x86_64)\nVERSION = 12.1\nCODENAME = Asparagus\n")
+        File.should_receive(:read).with("/etc/SuSE-release").and_return("openSUSE 12.1 (x86_64)\nVERSION = 12.1\nCODENAME = Asparagus\n")
         @plugin.run
-        @plugin[:platform].should == "suse"
-        @plugin[:platform_version].should == "12.1"
+        @plugin[:platform].should == "opensuse"
         @plugin[:platform_family].should == "suse"
       end
     end
@@ -377,14 +376,14 @@ describe Ohai::System, "Linux plugin platform" do
       before(:each) do
         @plugin.lsb = nil
       end
-      
+
       it "should set platform and platform_family to suse and bogus verion to 10.0" do
         File.should_receive(:read).with("/etc/SuSE-release").at_least(:once).and_return("VERSION = 10.0")
         @plugin.run
         @plugin[:platform].should == "suse"
         @plugin[:platform_family].should == "suse"
       end
-      
+
       it "should read the version as 10.1 for bogus SLES 10" do
         File.should_receive(:read).with("/etc/SuSE-release").and_return("SUSE Linux Enterprise Server 10 (i586)\nVERSION = 10\nPATCHLEVEL = 1\n")
         @plugin.run
@@ -392,7 +391,7 @@ describe Ohai::System, "Linux plugin platform" do
         @plugin[:platform_version].should == "10.1"
         @plugin[:platform_family].should == "suse"
       end
-      
+
       it "should read the version as 11.2" do
         File.should_receive(:read).with("/etc/SuSE-release").and_return("SUSE Linux Enterprise Server 11.2 (i586)\nVERSION = 11\nPATCHLEVEL = 2\n")
         @plugin.run
@@ -400,15 +399,15 @@ describe Ohai::System, "Linux plugin platform" do
         @plugin[:platform_version].should == "11.2"
         @plugin[:platform_family].should == "suse"
       end
-      
+
       it "[OHAI-272] should read the version as 11.3" do
         File.should_receive(:read).with("/etc/SuSE-release").exactly(1).times.and_return("openSUSE 11.3 (x86_64)\nVERSION = 11.3")
         @plugin.run
-        @plugin[:platform].should == "suse"
+        @plugin[:platform].should == "opensuse"
         @plugin[:platform_version].should == "11.3"
         @plugin[:platform_family].should == "suse"
       end
-      
+
       it "[OHAI-272] should read the version as 9.1" do
         File.should_receive(:read).with("/etc/SuSE-release").exactly(1).times.and_return("SuSE Linux 9.1 (i586)\nVERSION = 9.1")
         @plugin.run
@@ -416,16 +415,22 @@ describe Ohai::System, "Linux plugin platform" do
         @plugin[:platform_version].should == "9.1"
         @plugin[:platform_family].should == "suse"
       end
-      
+
       it "[OHAI-272] should read the version as 11.4" do
         File.should_receive(:read).with("/etc/SuSE-release").exactly(1).times.and_return("openSUSE 11.4 (i586)\nVERSION = 11.4\nCODENAME = Celadon")
         @plugin.run
-        @plugin[:platform].should == "suse"
+        @plugin[:platform].should == "opensuse"
         @plugin[:platform_version].should == "11.4"
         @plugin[:platform_family].should == "suse"
       end
+
+      it "should read the platform as opensuse on openSUSE" do
+        File.should_receive(:read).with("/etc/SuSE-release").and_return("openSUSE 12.2 (x86_64)\nVERSION = 12.2\nCODENAME = Mantis\n")
+        @plugin.run
+        @plugin[:platform].should == "opensuse"
+        @plugin[:platform_family].should == "suse"
+      end
     end
   end
 
 end
-

data/spec/unit/plugins/network_spec.rb

@@ -419,7 +419,7 @@ describe Ohai::System, "Network Plugin" do
             Ohai::Log.should_receive(:warn).with(/^unable to detect ipaddress/).once
             Ohai::Log.should_receive(:warn).with(/^unable to detect macaddress/).once
             Ohai::Log.should_receive(:warn).with(/^\[inet\] no ip address on eth0/).once
-            Ohai::Log.should_receive(:warn).with(/^unable to detect ip6address/).once
+            Ohai::Log.should_receive(:debug).with(/^unable to detect ip6address/).once
             Ohai::Log.should_receive(:warn).with(/^\[inet6\] no ip address on eth0/).once
             @plugin.run
           end
@@ -449,7 +449,7 @@ describe Ohai::System, "Network Plugin" do
           it "should warn about it" do
             Ohai::Log.should_receive(:warn).with(/^unable to detect ipaddress/).once
             Ohai::Log.should_receive(:warn).with(/^unable to detect macaddress/).once
-            Ohai::Log.should_receive(:warn).with(/^unable to detect ip6address/).once
+            Ohai::Log.should_receive(:debug).with(/^unable to detect ip6address/).once
             @plugin.run
           end
         end
@@ -652,6 +652,19 @@ describe Ohai::System, "Network Plugin" do
           end
         end
 
+        describe "fe80::1 as a default gateway" do
+          before do
+            @plugin["network"]["default_inet6_gateway"] = "fe80::1"
+          end
+
+          it_does_not_fail
+
+          it "picks {ip,mac,ip6}address from the default interface" do
+            @plugin.run
+            @plugin["ip6address"].should == "3ffe:1111:2222::33"
+          end
+        end
+
         describe "can choose from addresses with different scopes" do
           before do
             @plugin["network"]["default_gateway"] = "0.0.0.0"

data/spec/unit/plugins/rackspace_spec.rb

@@ -58,7 +58,7 @@ describe Ohai::System, "plugin rackspace" do
     "40:40:F5:AB:28:36" => {
       "family"=> "lladdr"
     }
-    }}
+  }}
 
     # In olden days we could detect rackspace by a -rscloud suffix on the kernel
     # This is here to make #has_rackspace_kernel? fail until we remove that check
@@ -133,7 +133,7 @@ OUT
     describe 'with no public interfaces (empty eth0)' do
       before do
         # unset public (eth0) addresses
-        @plugin[:network][:interfaces][:eth0]['addresses'] = {} 
+        @plugin[:network][:interfaces][:eth0]['addresses'] = {}
       end
 
       it "should have all required attributes" do
@@ -149,7 +149,7 @@ OUT
         @plugin[:rackspace][:local_ipv6].should be_nil
         @plugin[:rackspace][:local_hostname].should_not be_nil
       end
-  
+
       it "should have correct values for all attributes" do
         @plugin.run
         @plugin[:rackspace][:private_ip].should == "5.6.7.8"
@@ -161,16 +161,16 @@ OUT
 
   describe "without cloud file" do
     it_should_behave_like "!rackspace"
-  
+
     before(:each) do
       File.stub(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(false)
       File.stub(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(false)
     end
   end
-  
+
   describe "with ec2 cloud file" do
     it_should_behave_like "!rackspace"
-  
+
     before(:each) do
       File.stub(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(true)
       File.stub(:read).with('/etc/chef/ohai/hints/ec2.json').and_return('')
@@ -199,4 +199,68 @@ OUT
       @plugin.stub(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
     end
   end
+
+  describe "does not have private networks" do
+    before do
+      stdout = 'BC764E20422B = "{"label": "public"}"\n'
+      @plugin.stub(:shell_out).with("xenstore-ls vm-data/networking").and_return(mock_shell_out(0, stdout, "" ))
+      stdout = '{"label": "public", "broadcast": "9.10.11.255", "ips": [{"ip": "9.10.11.12", "netmask": "255.255.255.0", "enabled": "1", "gateway": null}], "mac": "BC:76:4E:20:42:2B", "dns": ["69.20.0.164", "69.20.0.196"], "gateway": null}'
+      @plugin.stub(:shell_out).with("xenstore-read vm-data/networking/BC764E20422B").and_return(mock_shell_out(0, stdout, "" ))
+
+      File.stub(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(true)
+      File.stub(:read).with('/etc/chef/ohai/hints/rackspace.json').and_return('')
+      File.stub(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
+      File.stub(:read).with('C:\chef\ohai\hints/rackspace.json').and_return('')
+    end
+
+    it "should not have private_networks object" do
+      @plugin.run
+      @plugin[:rackspace][:private_networks].should == []
+    end
+  end
+
+  describe "has private networks" do
+    before do
+      @plugin[:network][:interfaces][:eth2] = {:addresses => {
+        "fe80::be76:4eff:fe20:422b" => {
+          "scope"=> "Link",
+          "prefixlen"=> "64",
+          "family"=> "inet6"
+       },
+        "9.10.11.12"=> {
+          "broadcast"=> "9.10.11.255",
+          "netmask"=> "255.255.255.0",
+          "family"=> "inet"
+        },
+        "BC:76:4E:20:42:2B" => {
+          "family"=> "lladdr"
+        }
+      }}
+      stdout = 'BC764E20422B = "{"label": "private-network"}"\n'
+      @plugin.stub(:shell_out).with("xenstore-ls vm-data/networking").and_return(mock_shell_out(0, stdout, "" ))
+      stdout = '{"label": "private-network", "broadcast": "9.10.11.255", "ips": [{"ip": "9.10.11.12", "netmask": "255.255.255.0", "enabled": "1", "gateway": null}], "mac": "BC:76:4E:20:42:2B", "dns": ["69.20.0.164", "69.20.0.196"], "gateway": null}'
+      @plugin.stub(:shell_out).with("xenstore-read vm-data/networking/BC764E20422B").and_return(mock_shell_out(0, stdout, "" ))
+
+      File.stub(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(true)
+      File.stub(:read).with('/etc/chef/ohai/hints/rackspace.json').and_return('')
+      File.stub(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
+      File.stub(:read).with('C:\chef\ohai\hints/rackspace.json').and_return('')
+    end
+
+    it "should private_networks object" do
+      @plugin.run
+      @plugin[:rackspace][:private_networks].should_not be_nil
+    end
+
+    it "should have correct values for all attributes" do
+      @plugin.run
+      @plugin[:rackspace][:private_networks][0][:label].should == "private-network"
+      @plugin[:rackspace][:private_networks][0][:broadcast].should == "9.10.11.255"
+      @plugin[:rackspace][:private_networks][0][:mac].should == "BC:76:4E:20:42:2B"
+    end
+
+  end
+
+
+
 end

metadata

@@ -1,238 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc.0
-  prerelease: 6
+  version: 7.0.0.rc.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.2
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ohai profiles your system and emits JSON
@@ -245,14 +216,16 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- bin/ohai
 - docs/man/man1/ohai.1
+- lib/ohai.rb
 - lib/ohai/application.rb
 - lib/ohai/common/dmi.rb
 - lib/ohai/config.rb
+- lib/ohai/dsl.rb
+- lib/ohai/dsl/plugin.rb
 - lib/ohai/dsl/plugin/versionvi.rb
 - lib/ohai/dsl/plugin/versionvii.rb
-- lib/ohai/dsl/plugin.rb
-- lib/ohai/dsl.rb
 - lib/ohai/exception.rb
 - lib/ohai/hints.rb
 - lib/ohai/loader.rb
@@ -296,6 +269,7 @@ files:
 - lib/ohai/plugins/gce.rb
 - lib/ohai/plugins/groovy.rb
 - lib/ohai/plugins/hostname.rb
+- lib/ohai/plugins/init_package.rb
 - lib/ohai/plugins/ip_scopes.rb
 - lib/ohai/plugins/java.rb
 - lib/ohai/plugins/kernel.rb
@@ -365,7 +339,6 @@ files:
 - lib/ohai/runner.rb
 - lib/ohai/system.rb
 - lib/ohai/version.rb
-- lib/ohai.rb
 - spec/data/plugins/___lib64___libc.so.6.output
 - spec/data/plugins/___lib___libc.so.6.output
 - spec/data/plugins/cc.output
@@ -428,6 +401,7 @@ files:
 - spec/unit/plugins/gce_spec.rb
 - spec/unit/plugins/groovy_spec.rb
 - spec/unit/plugins/hostname_spec.rb
+- spec/unit/plugins/init_package_spec.rb
 - spec/unit/plugins/ip_scopes_spec.rb
 - spec/unit/plugins/java_spec.rb
 - spec/unit/plugins/kernel_spec.rb
@@ -475,32 +449,27 @@ files:
 - spec/unit/provides_map_spec.rb
 - spec/unit/runner_spec.rb
 - spec/unit/system_spec.rb
-- bin/ohai
 homepage: http://wiki.opscode.com/display/chef/Ohai
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1337144685830584340
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ohai profiles your system and emits JSON
 test_files: []