ohai 8.0.1 → 8.1.0

data/spec/unit/plugins/rust_spec.rb

@@ -0,0 +1,43 @@
+# Author:: Christopher M Luciano (<cmlucian@us.ibm.com>)
+# 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 rust" do
+  let(:stdout) {"rustc 1.0.0-nightly (29bd9a06e 2015-01-20 23:03:09 +0000)"}
+  let (:plugin) do
+    plugin = get_plugin("rust")
+    plugin[:languages] = Mash.new
+    allow(plugin).to receive(:shell_out).with("rustc --version").and_return(mock_shell_out(0, stdout, ""))
+    plugin
+  end
+
+  it "should get the rust version" do
+    expect(plugin).to receive(:shell_out).with("rustc --version").and_return(mock_shell_out(0, stdout, ""))
+    plugin.run
+  end
+
+  it "should set languages[:rust][:version]" do
+    plugin.run
+    expect(plugin.languages[:rust][:version]).to eql("1.0.0-nightly")
+  end
+
+  it "should not set the languages[:rust] if rust command fails" do
+    allow(plugin).to receive(:shell_out).with("rustc --version").and_return(mock_shell_out(1, stdout, ""))
+    plugin.run
+    expect(plugin.languages).not_to have_key(:rust)
+  end
+end

data/spec/unit/plugins/ssh_host_keys_spec.rb

@@ -30,6 +30,7 @@ describe Ohai::System, "ssh_host_key plugin" do
     allow(File).to receive(:exists?).with("/etc/ssh/ssh_host_dsa_key.pub").and_return(true)
     allow(File).to receive(:exists?).with("/etc/ssh/ssh_host_rsa_key.pub").and_return(true)
     allow(File).to receive(:exists?).with("/etc/ssh/ssh_host_ecdsa_key.pub").and_return(true)
+    allow(File).to receive(:exists?).with("/etc/ssh/ssh_host_ed25519_key.pub").and_return(true)
 
     # Ensure we can still use IO.read
     io_read = IO.method(:read)
@@ -39,9 +40,11 @@ describe Ohai::System, "ssh_host_key plugin" do
     @dsa_key = "ssh-dss AAAAB3NzaC1kc3MAAACBAMHlT02xN8kietxPfhcb98xHueTzKCOTz6dZlP/dmKILHrQOAExuSEeNiA2uvmhHNVQvs/cBsRiDxgSKux3ie2q8+MB6vHCiSpSkoPjrL75iT57YDilCB4/sytt6IJpj+H42wRDWTX0/QRybMHUvmnmEL0cwZXykSvrIum0BKB6hAAAAFQDsi6WUCClhtZIiTY9uh8eAre+SbQAAAIEAgNnuw0uEuqtcVif+AYd/bCZvL9FPqg7DrmTkamNEcVinhUGwsPGJTLJf+o5ens1X4RzQoi1R6Y6zCTL2FN/hZgINJNO0z9BN402wWrZmQd+Vb1U5DyDtveuvipqyQS+fm9neRwdLuv36Fc9f9nkZ7YHpkGPJp+yJpG4OoeREhwgAAACBAIf9kKLf2XiXnlByzlJ2Naa55d/hp2E059VKCRsBS++xFKYKvSqjnDQBFiMtAUhb8EdTyBGyalqOgqogDQVtwHfTZWZwqHAhry9aM06y92Eu/xSey4tWjKeknOsnRe640KC4zmKDBRTrjjkuAdrKPN9k3jl+OCc669JHlIfo6kqf oppa"
     @rsa_key = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuhcVXV+nNapkyUC5p4TH1ymRxUjtMBKqYWmwyI29gVFnUNeHkKFHWon0KFeGJP2Rm8BfTiZa9ER9e8pRr4Nd+z1C1o0kVoxEEfB9tpSdTlpk1GG83D94l57fij8THRVIwuCEosViUlg1gDgC4SpxbqfdBkUN2qyf6JDOh7t2QpYh7berpDEWeBpb7BKdLEDT57uw7ijKzSNyaXqq8KkB9I+UFrRwpuos4W7ilX+PQ+mWLi2ZZJfTYZMxxVS+qJwiDtNxGCRwTOQZG03kI7eLBZG+igupr0uD4o6qeftPOr0kxgjoPU4nEKvYiGq8Rqd2vYrhiaJHLk9QB6xStQvS3Q== oppa"
     @ecdsa_key = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBx8VgvxmHxs/sIn/ATh0iUcuz1I2Xc0e1ejXCGHBMZ98IE3FBt1ezlqCpNMcHVV2skQQ8vyLbKxzweyZuNSDU8= oppa"
+    @ed25519_key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFYGnIM5K5JaRxbMCqz8cPMmLp57ZoJQvA5Tlj18EO6H djb"
     allow(IO).to receive(:read).with("/etc/ssh/ssh_host_dsa_key.pub").and_return(@dsa_key)
     allow(IO).to receive(:read).with("/etc/ssh/ssh_host_rsa_key.pub").and_return(@rsa_key)
     allow(IO).to receive(:read).with("/etc/ssh/ssh_host_ecdsa_key.pub").and_return(@ecdsa_key)
+    allow(IO).to receive(:read).with("/etc/ssh/ssh_host_ed25519_key.pub").and_return(@ed25519_key)
   end
 
   shared_examples "loads keys" do
@@ -62,6 +65,12 @@ describe Ohai::System, "ssh_host_key plugin" do
       expect(@plugin[:keys][:ssh][:host_ecdsa_public]).to eql(@ecdsa_key.split[1])
       expect(@plugin[:keys][:ssh][:host_ecdsa_type]).to eql(@ecdsa_key.split[0])
     end
+
+    it "reads the key and sets the ed25519 attribute correctly" do
+      @plugin.run
+      expect(@plugin[:keys][:ssh][:host_ed25519_public]).to eql(@ed25519_key.split[1])
+      expect(@plugin[:keys][:ssh][:host_ed25519_type]).to be_nil
+    end
   end
 
   context "when an sshd_config exists" do
@@ -71,6 +80,7 @@ describe Ohai::System, "ssh_host_key plugin" do
 HostKey /etc/ssh/ssh_host_rsa_key
 HostKey /etc/ssh/ssh_host_dsa_key
 HostKey /etc/ssh/ssh_host_ecdsa_key
+HostKey /etc/ssh/ssh_host_ed25519_key
 EOS
     end
     it_behaves_like "loads keys"
@@ -83,6 +93,7 @@ EOS
 #HostKey /etc/ssh/ssh_host_rsa_key
 #HostKey /etc/ssh/ssh_host_dsa_key
 #HostKey /etc/ssh/ssh_host_ecdsa_key
+#HostKey /etc/ssh/ssh_host_ed25519_key
 EOS
     end
     it_behaves_like "loads keys"

data/spec/unit/util/ip_helper_spec.rb

@@ -0,0 +1,128 @@
+#
+# Author:: Stafford Brunk (<stafford.brunk@gmail.com>)
+# 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 'ipaddress'
+require 'spec_helper'
+require 'ohai/util/ip_helper'
+
+class IpHelperMock
+  include Ohai::Util::IpHelper
+end
+
+describe "Ohai::Util::IpHelper" do
+  let(:ip_helper) { IpHelperMock.new }
+
+  shared_examples 'ip address types' do
+    context 'with an IPv4 address' do
+      context 'that is private' do
+        let(:address) { '10.128.142.89' }
+
+        it 'identifies the address as private' do
+          expect(ip_helper.private_address?(address)).to be_truthy
+        end
+      end
+
+      context 'that is public' do
+        let(:address) { '74.125.224.72' }
+
+        it 'identifies the address as public' do
+          expect(ip_helper.private_address?(address)).to be_falsey
+        end
+      end
+    end
+
+    context 'with an IPv6 address' do
+      context 'that is an RFC 4193 unique local address' do
+        let(:address) { 'fdf8:f53b:82e4::53' }
+
+        it 'identifies the address as a unique local address' do
+          expect(ip_helper.private_address?(address)).to be_truthy
+        end
+      end
+
+      context 'that is a non RFC 4193 unique local address' do
+        let(:address) { 'FE80::0202:B3FF:FE1E:8329' }
+
+        it 'does not identify the address as a unique local address' do
+          expect(ip_helper.private_address?(address)).to be_falsey
+        end
+      end
+    end
+  end
+
+  describe 'private_address?' do
+    include_examples 'ip address types'
+  end 
+
+  describe 'unique_local_address?' do
+    include_examples 'ip address types'
+  end
+
+  describe 'public_address?' do
+    let(:address) { '10.128.142.89' }
+
+    before do
+      allow(ip_helper).to receive(:private_address?)
+    end
+
+    it 'should call #private_address?' do
+      expect(ip_helper).to receive(:private_address?)
+      ip_helper.public_address?(address)
+    end
+
+    it 'should return the inverse of #private_address?' do
+      expect(ip_helper.public_address?(address)).to equal !ip_helper.private_address?(address)
+    end
+  end
+
+  describe 'loopback?' do
+    context 'with an IPv4 address' do
+      context 'that is a loopback address' do
+        let(:address) { '127.0.0.1' }
+
+        it 'should identify the address as a loopback address' do
+          expect(ip_helper.loopback?(address)).to be_truthy
+        end
+      end
+
+      context 'that is not a loopback address' do
+        let(:address) { '1.2.3.4' }
+
+        it 'should not identify the address as a loopback address' do
+          expect(ip_helper.loopback?(address)).to be_falsey
+        end
+      end
+    end
+
+    context 'with an IPv6 address' do
+      context 'that is a loopback address' do
+        let(:address) { '0:0:0:0:0:0:0:1' }
+
+        it 'should identify the address as a loopback address' do
+          expect(ip_helper.loopback?(address)).to be_truthy
+        end
+      end
+
+      context 'that is not a loopback address' do
+        let(:address) { '2400:6180:0000:00D0:0000:0000:0009:7001' }
+
+        it 'should not identify the address as a loopback address' do
+          expect(ip_helper.loopback?(address)).to be_falsey
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,251 +1,251 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.1.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.4
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-dhcp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wmi-lite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 - !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: chef
   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'
 description: Ohai profiles your system and emits JSON
@@ -303,8 +303,10 @@ files:
 - lib/ohai/plugins/darwin/network.rb
 - lib/ohai/plugins/darwin/platform.rb
 - lib/ohai/plugins/darwin/system_profiler.rb
+- lib/ohai/plugins/digital_ocean.rb
 - lib/ohai/plugins/dmi.rb
 - lib/ohai/plugins/ec2.rb
+- lib/ohai/plugins/elixir.rb
 - lib/ohai/plugins/erlang.rb
 - lib/ohai/plugins/eucalyptus.rb
 - lib/ohai/plugins/freebsd/cpu.rb
@@ -366,6 +368,7 @@ files:
 - lib/ohai/plugins/rackspace.rb
 - lib/ohai/plugins/root_group.rb
 - lib/ohai/plugins/ruby.rb
+- lib/ohai/plugins/rust.rb
 - lib/ohai/plugins/sigar/cpu.rb
 - lib/ohai/plugins/sigar/filesystem.rb
 - lib/ohai/plugins/sigar/memory.rb
@@ -391,6 +394,7 @@ files:
 - lib/ohai/runner.rb
 - lib/ohai/system.rb
 - lib/ohai/util/file_helper.rb
+- lib/ohai/util/ip_helper.rb
 - lib/ohai/util/win32.rb
 - lib/ohai/util/win32/group_helper.rb
 - lib/ohai/version.rb
@@ -451,8 +455,10 @@ files:
 - spec/unit/plugins/darwin/platform_spec.rb
 - spec/unit/plugins/darwin/system_profiler_output.rb
 - spec/unit/plugins/darwin/system_profiler_spec.rb
+- spec/unit/plugins/digital_ocean_spec.rb
 - spec/unit/plugins/dmi_spec.rb
 - spec/unit/plugins/ec2_spec.rb
+- spec/unit/plugins/elixir_spec.rb
 - spec/unit/plugins/erlang_spec.rb
 - spec/unit/plugins/eucalyptus_spec.rb
 - spec/unit/plugins/fail_spec.rb
@@ -505,6 +511,7 @@ files:
 - spec/unit/plugins/rackspace_spec.rb
 - spec/unit/plugins/root_group_spec.rb
 - spec/unit/plugins/ruby_spec.rb
+- spec/unit/plugins/rust_spec.rb
 - spec/unit/plugins/sigar/network_route_spec.rb
 - spec/unit/plugins/solaris2/cpu_spec.rb
 - spec/unit/plugins/solaris2/hostname_spec.rb
@@ -519,6 +526,7 @@ files:
 - spec/unit/runner_spec.rb
 - spec/unit/system_spec.rb
 - spec/unit/util/file_helper_spec.rb
+- spec/unit/util/ip_helper_spec.rb
 homepage: https://docs.getchef.com/ohai.html
 licenses:
 - Apache-2.0
@@ -529,17 +537,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON