genesis_collector 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0fbdafc98930083ecc42e3fd607e215cdb17843
-  data.tar.gz: 9073a58f0c2937840056caa65553ebd0050bc7da
+  metadata.gz: 208f4ec96b38ba5d57e06c70ec9cf0771b566da9
+  data.tar.gz: 08e9f2d38f9a0df9bbf83080dfb086b499c3cb5d
 SHA512:
-  metadata.gz: 7ead4f71b8b42e17d485743bcedc8d9fcaa21a7d1fab6196a17ae3113bfc9f7caeb742e1d4bbb81378b29ec4b0c5178283860a9c9eba082976bcd2283f950148
-  data.tar.gz: 492ba07a9f96535fb86ccdbaed21b6e6af6bc21dec9e044e3084284a86f7bd6fc31df079357e6835545bac0c0d2f5e91f304eaa47d4806e4fa766f56afdb87a2
+  metadata.gz: 786aa2d00b95c9bd341adc132166346c1e764a25ea8051d0d9373b6b52e1a2898dbe83cef3fad4d8765045e48546a3e4d39ec9c66208f583fe7e0092cbb4fc49
+  data.tar.gz: 12c5f4036cf0908efaded80a491143ef29f9e15ed98d9d27b2520bb70ab02d0862300075220335f0640030d737b78c20e95ed62c282aef46d85521875bda0bd6

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+sudo: false
+rvm:
+  - 1.9
+  - 2.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+
+matrix:
+  allow_failures:
+    - rvm: 1.9
+    - rvm: 2.0

data/Rakefile

@@ -1,2 +1,4 @@
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 task default: :spec

data/genesis_collector.gemspec

@@ -18,9 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'nokogiri'
-
-  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'webmock', '~> 1.22'

data/lib/genesis_collector/collector.rb

@@ -5,8 +5,8 @@ require 'genesis_collector/simple_http'
 require 'genesis_collector/network_interfaces'
 require 'genesis_collector/chef'
 require 'genesis_collector/ipmi'
-require 'genesis_collector/lshw'
 require 'genesis_collector/disks'
+require 'genesis_collector/dmidecode'
 require 'English'
 
 module GenesisCollector
@@ -16,8 +16,8 @@ module GenesisCollector
     include GenesisCollector::NetworkInterfaces
     include GenesisCollector::Chef
     include GenesisCollector::IPMI
-    include GenesisCollector::Lshw
     include GenesisCollector::Disks
+    include GenesisCollector::DmiDecode
 
     def initialize(config = {})
       @chef_node = config.delete(:chef_node)
@@ -71,11 +71,30 @@ module GenesisCollector
     end
 
     def collect_cpus
-      @payload[:cpus] = get_lshw_data.cpus
+      @payload[:cpus] = get_dmi_data['processor'].map do |p|
+        {
+          description: p['version'],
+          cores: p['core_count'].to_i,
+          threads: p['thread_count'].to_i,
+          speed: p['current_speed'],
+          vendor_name: p['manufacturer'],
+          physid: p['socket_designation']
+        }
+      end
     end
 
     def collect_memories
-      @payload[:memories] = get_lshw_data.memories
+      @payload[:memories] = get_dmi_data['memory'].map do |m|
+        empty = m['size'] == 'No Module Installed'
+        {
+          size: m['size'].to_i * 1000000,
+          description: empty ? "Empty #{m['form_factor']}" : "#{m['form_factor']} #{m['type_detail']} #{m['speed']}",
+          bank: m['bank_locator'],
+          slot: m['locator'],
+          product: empty ? nil : m['part_number'],
+          vendor_name: empty ? nil : m['manufacturer']
+        }
+      end
     end
 
     private

data/lib/genesis_collector/dmidecode.rb

@@ -0,0 +1,41 @@
+module GenesisCollector
+  module DmiDecode
+
+    def get_dmi_data
+      @dmi_data ||= parse_dmidecode(shellout_with_timeout('dmidecode --type processor --type memory'))
+    end
+
+    def parse_dmidecode(data)
+      dict={}
+      handle = 0
+      current_title = nil
+
+      data.lines.each do |line|
+        case line
+        when /^End Of Table/, /^\s+$/, /^\# dmidecode/, /^SMBIOS/, /structures occupying/, /^Table at/
+          next
+        when /^Handle\s+(.*?),\s+/
+          handle = $1.to_i(16)
+        when /(.*)\s+Information\n$/, /(.*)\s+Device\n$/, /(.*)\s+Device Mapped Address\n$/, /(.*)\s+Array Mapped Address\n$/
+          title = standardize_dmi_key($1)
+          current_title = title
+          dict[title] ||= []
+          dict[title] << {'handle' => handle}
+        else
+          raw_data = line.strip.split(':')
+          if raw_data.is_a?(Array) && raw_data.length == 2
+            k, v = raw_data
+            dict[current_title].last[standardize_dmi_key(k)] = v.strip
+          end
+        end
+      end
+      dict
+    end
+
+    private
+
+    def standardize_dmi_key(k)
+      k.downcase.gsub(/\s+/,'_')
+    end
+  end
+end

data/lib/genesis_collector/network_interfaces.rb

@@ -17,17 +17,14 @@ module GenesisCollector
       end
       @payload[:network_interfaces] = interfaces.reduce([]) { |memo, (k, v)| memo << v.merge(name: k) }
       @payload[:network_interfaces].each do |i|
-        lshw_interface = get_lshw_data.network_interfaces.select { |lshw_i| lshw_i[:name] == i[:name] }[0]
         i[:status] = read_interface_info(i[:name], 'operstate')
         i[:mac_address] = read_mac_address(i[:name])
-        i[:product] = lshw_interface.try(:[], :product)
         if i[:status] == 'up'
           i[:speed] = get_interface_speed(i[:name])
           i[:duplex] = read_interface_info(i[:name], 'duplex')
         end
-        i[:vendor_name] = lshw_interface.try(:[], :vendor_name)
-        i[:link_type] = lshw_interface.try(:[], :link_type)
         i[:neighbor] = get_network_neighbor(i[:name])
+        i.merge!(get_lspci_data(i[:name])) unless i[:name].include?('bond')
         i.merge!(get_interface_driver(i[:name]))
       end
     end
@@ -91,5 +88,20 @@ module GenesisCollector
       data
     end
 
+    def get_lspci_data(interface)
+      slot = File.basename(File.readlink("/sys/class/net/#{interface}/device"))
+      raw_data = shellout_with_timeout("lspci -v -mm -s #{slot}")
+      data = {}
+      raw_data.each_line do |line|
+        if line.match(/^Vendor:(.*)$/)
+          data[:vendor_name] = $1.strip
+        end
+        if line.match(/^Device:(.*)$/)
+          data[:product] = $1.strip
+        end
+      end
+      data
+    end
+
   end
 end

data/lib/genesis_collector/version.rb

@@ -1,3 +1,3 @@
 module GenesisCollector
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: genesis_collector
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - David Radcliffe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +76,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,14 +87,12 @@ files:
 - exe/genesis_collector
 - genesis_collector.gemspec
 - lib/chef/handler/genesis.rb
-- lib/core_ext/try.rb
 - lib/genesis_collector.rb
 - lib/genesis_collector/chef.rb
 - lib/genesis_collector/collector.rb
 - lib/genesis_collector/disks.rb
+- lib/genesis_collector/dmidecode.rb
 - lib/genesis_collector/ipmi.rb
-- lib/genesis_collector/lshw.rb
-- lib/genesis_collector/lshw_parser.rb
 - lib/genesis_collector/network_interfaces.rb
 - lib/genesis_collector/simple_http.rb
 - lib/genesis_collector/version.rb

data/lib/core_ext/try.rb

@@ -1,102 +0,0 @@
-# https://github.com/rails/rails/blob/ff7d37d5884be3939833fb52b58a95017369eda5/activesupport/lib/active_support/core_ext/object/try.rb
-
-class Object
-  # Invokes the public method whose name goes as first argument just like
-  # +public_send+ does, except that if the receiver does not respond to it the
-  # call returns +nil+ rather than raising an exception.
-  #
-  # This method is defined to be able to write
-  #
-  #   @person.try(:name)
-  #
-  # instead of
-  #
-  #   @person.name if @person
-  #
-  # +try+ calls can be chained:
-  #
-  #   @person.try(:spouse).try(:name)
-  #
-  # instead of
-  #
-  #   @person.spouse.name if @person && @person.spouse
-  #
-  # +try+ will also return +nil+ if the receiver does not respond to the method:
-  #
-  #   @person.try(:non_existing_method) #=> nil
-  #
-  # instead of
-  #
-  #   @person.non_existing_method if @person.respond_to?(:non_existing_method) #=> nil
-  #
-  # +try+ returns +nil+ when called on +nil+ regardless of whether it responds
-  # to the method:
-  #
-  #   nil.try(:to_i) # => nil, rather than 0
-  #
-  # Arguments and blocks are forwarded to the method if invoked:
-  #
-  #   @posts.try(:each_slice, 2) do |a, b|
-  #     ...
-  #   end
-  #
-  # The number of arguments in the signature must match. If the object responds
-  # to the method the call is attempted and +ArgumentError+ is still raised
-  # in case of argument mismatch.
-  #
-  # If +try+ is called without arguments it yields the receiver to a given
-  # block unless it is +nil+:
-  #
-  #   @person.try do |p|
-  #     ...
-  #   end
-  #
-  # You can also call try with a block without accepting an argument, and the block
-  # will be instance_eval'ed instead:
-  #
-  #   @person.try { upcase.truncate(50) }
-  #
-  # Please also note that +try+ is defined on +Object+. Therefore, it won't work
-  # with instances of classes that do not have +Object+ among their ancestors,
-  # like direct subclasses of +BasicObject+. For example, using +try+ with
-  # +SimpleDelegator+ will delegate +try+ to the target instead of calling it on
-  # the delegator itself.
-  def try(*a, &b)
-    try!(*a, &b) if a.empty? || respond_to?(a.first)
-  end
-
-  # Same as #try, but will raise a NoMethodError exception if the receiver is not +nil+ and
-  # does not implement the tried method.
-
-  def try!(*a, &b)
-    if a.empty? && block_given?
-      if b.arity == 0
-        instance_eval(&b)
-      else
-        yield self
-      end
-    else
-      public_send(*a, &b)
-    end
-  end
-end
-
-class NilClass
-  # Calling +try+ on +nil+ always returns +nil+.
-  # It becomes especially helpful when navigating through associations that may return +nil+.
-  #
-  #   nil.try(:name) # => nil
-  #
-  # Without +try+
-  #   @person && @person.children.any? && @person.children.first.name
-  #
-  # With +try+
-  #   @person.try(:children).try(:first).try(:name)
-  def try(*args)
-    nil
-  end
-
-  def try!(*args)
-    nil
-  end
-end

data/lib/genesis_collector/lshw.rb

@@ -1,11 +0,0 @@
-require 'genesis_collector/lshw_parser'
-
-module GenesisCollector
-  module Lshw
-
-    def get_lshw_data
-      @lshw_data ||= GenesisCollector::LshwParser.new(shellout_with_timeout('lshw -xml', 40).strip)
-    end
-
-  end
-end

data/lib/genesis_collector/lshw_parser.rb

@@ -1,55 +0,0 @@
-require 'nokogiri'
-require 'core_ext/try'
-
-module GenesisCollector
-  class LshwParser
-    attr_reader :doc
-
-    def initialize(doc)
-      @doc = Nokogiri::XML(doc)
-    end
-
-    def cpus
-      @cpus ||= doc.xpath("//node[@class='processor']").map do |cpu|
-        {
-          description: cpu.at_xpath('.//product').try(:text) || cpu.at_xpath('.//description').try(:text),
-          cores: cpu.at_xpath(".//configuration/setting[@id='cores']/@value").try(:value).try(:to_i),
-          threads: cpu.at_xpath(".//configuration/setting[@id='threads']/@value").try(:value).try(:to_i),
-          speed: cpu.at_xpath('.//size').try(:text).try(:to_i),
-          vendor_name: cpu.at_xpath('.//vendor').try(:text),
-          physid: cpu.at_xpath('.//physid').try(:text).try(:to_i)
-        }
-      end
-    end
-
-    def memories
-      @memories ||= doc.xpath("//node[@class='memory']/*[@id]").map do |memory|
-        mem_size = memory.at_xpath('.//size')
-        {
-          size: mem_size.nil? ? 0 : mem_size.text.to_i,
-          description: memory.at_xpath('.//description').text,
-          bank: memory.at_xpath('.//physid').text.to_i,
-          slot: memory.at_xpath('.//slot').try(:text),
-          product: memory.at_xpath('.//product').try(:text),
-          vendor_name: memory.at_xpath('.//vendor').try(:text)
-        }
-      end
-    end
-
-    def network_interfaces
-      @network_interfaces ||= doc.xpath("//node[@class='network']").map do |network_interface|
-        {
-          name: network_interface.at_xpath('.//logicalname').try(:text),
-          description: network_interface.at_xpath('.//description').try(:text),
-          mac_address: network_interface.at_xpath('.//serial').try(:text),
-          product: network_interface.at_xpath('.//product').try(:text),
-          vendor_name: network_interface.at_xpath('.//vendor').try(:text),
-          driver: network_interface.at_xpath(".//configuration//setting[@id='driver']/@value").try(:text),
-          driver_version: network_interface.at_xpath(".//configuration//setting[@id='driverversion']/@value").try(:text),
-          duplex: network_interface.at_xpath(".//configuration//setting[@id='duplex']/@value").try(:text),
-          link_type: network_interface.at_xpath(".//configuration//setting[@id='port']/@value").try(:text)
-        }
-      end
-    end
-  end
-end