ohai 8.18.0 → 8.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b422d14afdb82f8fe3f07aa0aaa8dd82c30fa06
-  data.tar.gz: f99bb4675dcbfca6ffbb28420fbcae88072b55ff
+  metadata.gz: 960b61dc94f8f6d62b040dc3f8ae36f976d00568
+  data.tar.gz: e85dcae265af4dccee27befae6b9b735414c1294
 SHA512:
-  metadata.gz: 0755c29277022af57f5535a3ced25262ab34e190f8c25d2ed390e0b0324374511ed9ec9c2ca93848fcf2287dfd34d83a849a369ab3271a5e950c9268c8ab430f
-  data.tar.gz: 99d5e61254335f5e2274c2ef0f36cf401fa11c0b2ea69cfd3a5514025297e5fdca1d9546670a7364a1c765a434fc57979da777b39c9390391ce766ece3b3d270
+  metadata.gz: 30d967bdfab7ee71176a18e57149d8238acbb116fe9d374d403ed4833a65ea163a51efb4fb2f0878e607bda69051e43068dbed733860ff146c149f31fbe82346
+  data.tar.gz: 2326a86a86c4b5bac6315e1a8b7d2019488c2a0bcdaa90352d0aef2af0694dd8c5cf743458c4eb1bd43de0141afda10757aaefe5d9245e5ba42ad62c63fc6f15

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

@@ -153,6 +153,10 @@ Ohai.plugin(:Platform) do
     elsif File.exist?("/etc/alpine-release")
       platform "alpine"
       platform_version File.read("/etc/alpine-release").strip()
+    elsif File.exist?("/etc/Eos-release")
+      platform "arista_eos"
+      platform_version File.read("/etc/Eos-release").strip.split[-1]
+      platform_family "fedora"
     elsif os_release_file_is_cisco?
       raise "unknown Cisco /etc/os-release or /etc/cisco-release ID_LIKE field" if
         os_release_info["ID_LIKE"].nil? || ! os_release_info["ID_LIKE"].include?("wrlinux")

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

@@ -58,7 +58,7 @@ ETHERNET_ENCAPS = %w{ afe amd8111s arn atge ath bfe bge bnx bnxe ce cxgbe
                       dmfe e1000g efe elxl emlxs eri hermon hme hxge igb
                       iprb ipw iwh iwi iwk iwp ixgb ixgbe mwl mxfe myri10ge
                       nge ntxn nxge pcn platform qfe qlc ral rge rtls rtw rwd
-                      rwn sfe tavor vr wpi xge yge } unless defined?(ETHERNET_ENCAPS)
+                      rwn sfe tavor vr wpi xge yge aggr} unless defined?(ETHERNET_ENCAPS)
 
 Ohai.plugin(:Network) do
   provides "network", "network/interfaces"
@@ -101,7 +101,7 @@ Ohai.plugin(:Network) do
     cint = nil
 
     so.stdout.lines do |line|
-      if line =~ /^([0-9a-zA-Z\.\:\-]+): \S+ mtu (\d+) index (\d+)/
+      if line =~ /^([0-9a-zA-Z\.\:\-]+)\S/
         cint = $1
         iface[cint] = Mash.new unless iface[cint]
         iface[cint][:mtu] = $2

data/lib/ohai/version.rb

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

data/ohai.gemspec

@@ -41,7 +41,11 @@ Gem::Specification.new do |s|
   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.11.3"
+  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

@@ -1,4 +1,3 @@
-require "rspec"
 require "rspec/collection_matchers"
 
 # require 'pry-debugger'

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

@@ -26,6 +26,7 @@ describe Ohai::System, "Linux plugin platform" do
   let(:have_gentoo_release) { false }
   let(:have_exherbo_release) { false }
   let(:have_alpine_release) { false }
+  let(:have_eos_release) { false }
   let(:have_suse_release) { false }
   let(:have_arch_release) { false }
   let(:have_system_release) { false }
@@ -46,6 +47,7 @@ describe Ohai::System, "Linux plugin platform" do
     allow(File).to receive(:exist?).with("/etc/gentoo-release").and_return(have_gentoo_release)
     allow(File).to receive(:exist?).with("/etc/exherbo-release").and_return(have_exherbo_release)
     allow(File).to receive(:exist?).with("/etc/alpine-release").and_return(have_alpine_release)
+    allow(File).to receive(:exist?).with("/etc/Eos-release").and_return(have_eos_release)
     allow(File).to receive(:exist?).with("/etc/SuSE-release").and_return(have_suse_release)
     allow(File).to receive(:exist?).with("/etc/arch-release").and_return(have_arch_release)
     allow(File).to receive(:exist?).with("/etc/system-release").and_return(have_system_release)
@@ -246,6 +248,23 @@ describe Ohai::System, "Linux plugin platform" do
     end
   end
 
+  describe "on arista eos" do
+
+    let(:have_eos_release) { true }
+
+    before(:each) do
+      @plugin.lsb = nil
+    end
+
+    it "should set platform to arista_eos" do
+      expect(File).to receive(:read).with("/etc/Eos-release").and_return("Arista Networks EOS 4.16.7M")
+      @plugin.run
+      expect(@plugin[:platform]).to eq("arista_eos")
+      expect(@plugin[:platform_family]).to eq("fedora")
+      expect(@plugin[:platform_version]).to eq("4.16.7M")
+    end
+  end
+
   describe "on exherbo" do
 
     let(:have_exherbo_release) { true }

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

@@ -147,7 +147,7 @@ ROUTE_GET
     end
 
     it "detects the interfaces" do
-      expect(@plugin["network"]["interfaces"].keys.sort).to eq(["e1000g0:3", "e1000g2:1", "eri0", "ip.tun0", "ip.tun0:1", "lo0", "lo0:3", "net0", "net1:1", "qfe1"])
+      expect(@plugin["network"]["interfaces"].keys.sort).to eq(["e1000g0:3", "e1000g2:1", "eri0", "ip.tun0", "ip.tun0:1", "ip6.tun0", "lo0", "lo0:3", "net0", "net1:1", "qfe1", "vni0"])
     end
 
     it "detects the ip addresses of the interfaces" do
@@ -176,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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.18.0
+  version: 8.19.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -266,14 +266,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        version: 1.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        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: