ohai 6.20.0 → 6.22.0.rc.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e3872010f8bc963540ab72655b4dd162db4e3e59
+  data.tar.gz: 8447bce3ab96458b3d9273fa055cef1f29552c4a
+SHA512:
+  metadata.gz: 3260b0e87284e822bb5408d5525eb406b325cdb4c49b49b452cb0b775d9dcacad46d2da46c06685831606c8089c645f2eaafb1821da27771ee2756dc172ef4a6
+  data.tar.gz: cb88f272673036b3f28d10302685339917bcc9e0282c1485e6b4e8c474ddd8db5477359b61210c83838baa207bfc279e744df1c6ed92bdda44ddb9eef1ae320b

data/docs/man/man1/ohai.1

@@ -76,14 +76,14 @@ The file against which Ohai will run.
 .B \fB\-h\fP, \fB\-\-help\fP
 Shows help for the command.
 .TP
-.B \fB\-l LEVEL\fP, \fB\-\-log\-level LEVEL\fP
+.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.
 .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).
 .TP
 .B \fB\-v\fP, \fB\-\-version\fP
-The version of the chef\-client.
+The version of Ohai.
 .UNINDENT
 .SH AUTHOR
 Opscode

data/lib/ohai/plugins/hostname.rb

@@ -18,10 +18,11 @@
 
 provides "fqdn", "domain"
 
+require_plugin "os"
 require_plugin "#{os}::hostname"
 
 # Domain is everything after the first dot
 if fqdn
   fqdn =~ /.+?\.(.*)/
   domain $1 
-end
+end

data/lib/ohai/plugins/java.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.
@@ -22,8 +22,8 @@ require_plugin "languages"
 java = Mash.new
 
 status, stdout, stderr = nil
-if RUBY_PLATFORM.downcase.include?("darwin") 
-  if system("/usr/libexec/java_home 2>&1 >/dev/null")
+if RUBY_PLATFORM.downcase.include?("darwin")
+  if system("/usr/libexec/java_home >/dev/null 2>&1")
     status, stdout, stderr = run_command(:no_status_check => true, :command => "java -version")
   end
 else

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

@@ -20,7 +20,21 @@ provides "hostname", "fqdn"
 
 hostname from("hostname -s")
 begin
-  fqdn from("hostname --fqdn")
+  ourfqdn = from("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("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

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 = '6.20.0'
+  VERSION = '6.22.0.rc.0'
 end
-

data/spec/unit/plugins/hostname_spec.rb

@@ -35,5 +35,15 @@ describe Ohai::System, "hostname plugin" do
     @ohai._require_plugin("hostname")
     @ohai.domain.should == nil
   end
-    
+
+  it "should require the os plugin" do
+    @ohai.should_receive(:require_plugin).with("os").and_return(true)
+    @ohai._require_plugin("hostname")
+  end
+
+  it "should load a platform specific hostname plugin" do
+    @ohai[:os] = "linux"
+    @ohai.should_receive(:require_plugin).with("linux::hostname").and_return(true)
+    @ohai._require_plugin("hostname")
+  end
 end

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

@@ -45,8 +45,17 @@ describe Ohai::System, "Linux hostname plugin" do
       @ohai._require_plugin("linux::hostname")
       @ohai.fqdn.should == nil
     end
-
   end
-    
+
+  describe "when hostname --fqdn is emtpy" do
+    before(:each) do
+      @ohai.stub!(:from).with("hostname --fqdn").
+        and_return("", "katie.bethell")
+    end
+    it "should call it twice" do
+      @ohai._require_plugin("linux::hostname")
+      @ohai.fqdn.should == "katie.bethell"
+    end
+  end 
 end
 

metadata

@@ -1,206 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 6.20.0
-  prerelease: 
+  version: 6.22.0.rc.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !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: '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-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: '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: 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'
   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-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'
 description: Ohai profiles your system and emits JSON
@@ -213,7 +188,9 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- bin/ohai
 - docs/man/man1/ohai.1
+- lib/ohai.rb
 - lib/ohai/application.rb
 - lib/ohai/config.rb
 - lib/ohai/exception.rb
@@ -360,7 +337,6 @@ files:
 - lib/ohai/plugins/windows/uptime.rb
 - lib/ohai/system.rb
 - lib/ohai/version.rb
-- lib/ohai.rb
 - spec/ohai_spec.rb
 - spec/rcov.opts
 - spec/spec.opts
@@ -440,29 +416,27 @@ files:
 - spec/unit/plugins/solaris2/virtualization_spec.rb
 - spec/unit/plugins/ssh_host_keys_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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      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: []