kurchatov 0.0.5.pre5 → 0.0.5

data/lib/ohai/plugins/os.rb

@@ -16,38 +16,38 @@
 # limitations under the License.
 #
 
-provides "os", "os_version"
+provides 'os', 'os_version'
 
 require 'rbconfig'
 
 require_plugin 'kernel'
 
 case ::RbConfig::CONFIG['host_os']
-when /aix(.+)$/
-  os "aix"
-when /darwin(.+)$/
-  os "darwin"
-when /hpux(.+)$/
-  os "hpux"
-when /linux/
-  os "linux"
-when /freebsd(.+)$/
-  os "freebsd"
-when /openbsd(.+)$/
-  os "openbsd"
-when /netbsd(.*)$/
-  os "netbsd"
-when /solaris2/
-  os "solaris2"
-when /mswin|mingw32|windows/
-  # After long discussion in IRC the "powers that be" have come to a concensus
-  # that there is no other Windows platforms exist that were not based on the
-  # Windows_NT kernel, so we herby decree that "windows" will refer to all
-  # platforms built upon the Windows_NT kernel and have access to win32 or win64
-  # subsystems.
-  os "windows"
-else
-  os ::RbConfig::CONFIG['host_os']
+  when /aix(.+)$/
+    os 'aix'
+  when /darwin(.+)$/
+    os 'darwin'
+  when /hpux(.+)$/
+    os 'hpux'
+  when /linux/
+    os 'linux'
+  when /freebsd(.+)$/
+    os 'freebsd'
+  when /openbsd(.+)$/
+    os 'openbsd'
+  when /netbsd(.*)$/
+    os 'netbsd'
+  when /solaris2/
+    os 'solaris2'
+  when /mswin|mingw32|windows/
+    # After long discussion in IRC the "powers that be" have come to a concensus
+    # that there is no other Windows platforms exist that were not based on the
+    # Windows_NT kernel, so we herby decree that "windows" will refer to all
+    # platforms built upon the Windows_NT kernel and have access to win32 or win64
+    # subsystems.
+    os 'windows'
+  else
+    os ::RbConfig::CONFIG['host_os']
 end
 
 os_version kernel[:release]

data/lib/ohai/plugins/platform.rb

@@ -16,13 +16,13 @@
 # limitations under the License.
 #
 
-provides "platform", "platform_version", "platform_family"
+provides 'platform', 'platform_version', 'platform_family'
 
 require_plugin "#{os}::platform"
 
-platform os unless attribute?("platform")
+platform os unless attribute?('platform')
 
-platform_version os_version unless attribute?("platform_version")
+platform_version os_version unless attribute?('platform_version')
 
-platform_family platform unless attribute?("platform_family")
+platform_family platform unless attribute?('platform_family')
 

data/lib/ohai/plugins/virtualization.rb

@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-provides "virtualization"
+provides 'virtualization'
 
 require_plugin "#{os}::virtualization"
 
-unless virtualization.nil? || !(virtualization[:role].eql?("host"))
+unless virtualization.nil? || !(virtualization[:role].eql?('host'))
   begin
     require 'libvirt'
     require 'hpricot'
@@ -32,50 +32,50 @@ unless virtualization.nil? || !(virtualization[:role].eql?("host"))
 
     virtualization[:uri] = virtconn.uri
     virtualization[:capabilities] = Mash.new
-    virtualization[:capabilities][:xml_desc] = (virtconn.capabilities.split("\n").collect {|line| line.strip}).join
+    virtualization[:capabilities][:xml_desc] = (virtconn.capabilities.split("\n").collect { |line| line.strip }).join
     #xdoc = Hpricot virtualization[:capabilities][:xml_desc]
-  
+
     virtualization[:nodeinfo] = Mash.new
     ni = virtconn.node_get_info
-    ['cores','cpus','memory','mhz','model','nodes','sockets','threads'].each {|a| virtualization[:nodeinfo][a] = ni.send(a)}
+    %w(cores cpus memory mhz model nodes sockets threads).each { |a| virtualization[:nodeinfo][a] = ni.send(a) }
 
     virtualization[:domains] = Mash.new
     virtconn.list_domains.each do |d|
       dv = virtconn.lookup_domain_by_id d
       virtualization[:domains][dv.name] = Mash.new
       virtualization[:domains][dv.name][:id] = d
-      virtualization[:domains][dv.name][:xml_desc] = (dv.xml_desc.split("\n").collect {|line| line.strip}).join
-      ['os_type','uuid'].each {|a| virtualization[:domains][dv.name][a] = dv.send(a)}
-      ['cpu_time','max_mem','memory','nr_virt_cpu','state'].each {|a| virtualization[:domains][dv.name][a] = dv.info.send(a)}
+      virtualization[:domains][dv.name][:xml_desc] = (dv.xml_desc.split("\n").collect { |line| line.strip }).join
+      %w(os_type uuid).each { |a| virtualization[:domains][dv.name][a] = dv.send(a) }
+      %w(cpu_time max_mem memory nr_virt_cpu state).each { |a| virtualization[:domains][dv.name][a] = dv.info.send(a) }
       #xdoc = Hpricot virtualization[:domains][dv.name][:xml_desc]
-    
+
     end
 
     virtualization[:networks] = Mash.new
     virtconn.list_networks.each do |n|
       nv = virtconn.lookup_network_by_name n
       virtualization[:networks][n] = Mash.new
-      virtualization[:networks][n][:xml_desc] = (nv.xml_desc.split("\n").collect {|line| line.strip}).join
-      ['bridge_name','uuid'].each {|a| virtualization[:networks][n][a] = nv.send(a)}
+      virtualization[:networks][n][:xml_desc] = (nv.xml_desc.split("\n").collect { |line| line.strip }).join
+      %w(bridge_name uuid).each { |a| virtualization[:networks][n][a] = nv.send(a) }
       #xdoc = Hpricot virtualization[:networks][n][:xml_desc]
-    
+
     end
 
     virtualization[:storage] = Mash.new
     virtconn.list_storage_pools.each do |pool|
       sp = virtconn.lookup_storage_pool_by_name pool
       virtualization[:storage][pool] = Mash.new
-      virtualization[:storage][pool][:xml_desc] = (sp.xml_desc.split("\n").collect {|line| line.strip}).join
-      ['autostart','uuid'].each {|a| virtualization[:storage][pool][a] = sp.send(a)}
-      ['allocation','available','capacity','state'].each {|a| virtualization[:storage][pool][a] = sp.info.send(a)}
+      virtualization[:storage][pool][:xml_desc] = (sp.xml_desc.split("\n").collect { |line| line.strip }).join
+      %w(autostart uuid).each { |a| virtualization[:storage][pool][a] = sp.send(a) }
+      %w(allocation available capacity state).each { |a| virtualization[:storage][pool][a] = sp.info.send(a) }
       #xdoc = Hpricot virtualization[:storage][pool][:xml_desc]
 
       virtualization[:storage][pool][:volumes] = Mash.new
       sp.list_volumes.each do |v|
         virtualization[:storage][pool][:volumes][v] = Mash.new
         sv = sp.lookup_volume_by_name v
-        ['key','name','path'].each {|a| virtualization[:storage][pool][:volumes][v][a] = sv.send(a)}
-        ['allocation','capacity','type'].each {|a| virtualization[:storage][pool][:volumes][v][a] = sv.info.send(a)}
+        %w(key name path).each { |a| virtualization[:storage][pool][:volumes][v][a] = sv.send(a) }
+        %w(allocation capacity type).each { |a| virtualization[:storage][pool][:volumes][v][a] = sv.info.send(a) }
       end
     end
 

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

@@ -18,7 +18,7 @@
 
 require 'ruby-wmi'
 
-provides "cpu"
+provides 'cpu'
 
 cpuinfo = Mash.new
 cpu_number = 0
@@ -40,22 +40,22 @@ WMI::Win32_Processor.find(:all).each do |processor|
     number_of_cores = processor.numberofcores
     cpu_number += number_of_cores
   rescue NoMethodError => e
-    Ohai::Log.info("Can not find numberofcores property on Win32_Processor. Consider applying this patch: http://support.microsoft.com/kb/932370")
+    Ohai::Log.info('Can not find numberofcores property on Win32_Processor. Consider applying this patch: http://support.microsoft.com/kb/932370')
   end
 
   current_cpu = index.to_s
   index += 1
   cpuinfo[current_cpu] = Mash.new
-  cpuinfo[current_cpu]["vendor_id"] = processor.manufacturer
-  cpuinfo[current_cpu]["family"] = processor.family.to_s
-  cpuinfo[current_cpu]["model"] = processor.revision.to_s
-  cpuinfo[current_cpu]["stepping"] = processor.stepping
-  cpuinfo[current_cpu]["physical_id"] = processor.deviceid
+  cpuinfo[current_cpu]['vendor_id'] = processor.manufacturer
+  cpuinfo[current_cpu]['family'] = processor.family.to_s
+  cpuinfo[current_cpu]['model'] = processor.revision.to_s
+  cpuinfo[current_cpu]['stepping'] = processor.stepping
+  cpuinfo[current_cpu]['physical_id'] = processor.deviceid
   #cpuinfo[current_cpu]["core_id"] = XXX
-  cpuinfo[current_cpu]["cores"] = number_of_cores
-  cpuinfo[current_cpu]["model_name"] = processor.description
-  cpuinfo[current_cpu]["mhz"] = processor.maxclockspeed.to_s
-  cpuinfo[current_cpu]["cache_size"] = "#{processor.l2cachesize} KB"
+  cpuinfo[current_cpu]['cores'] = number_of_cores
+  cpuinfo[current_cpu]['model_name'] = processor.description
+  cpuinfo[current_cpu]['mhz'] = processor.maxclockspeed.to_s
+  cpuinfo[current_cpu]['cache_size'] = "#{processor.l2cachesize} KB"
   #cpuinfo[current_cpu]["flags"] = XXX
 end
 

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

@@ -23,5 +23,5 @@
 # subsystems.
 platform os
 platform_version kernel['release']
-platform_family "windows"
+platform_family 'windows'
 

data/tests/run.sh

@@ -50,10 +50,10 @@ grep -q 'STDERR: ls: cannot access /notexists' ./tmp/testplugin.log
 bundle exec ./bin/kurchatov -d ./tmp/ -c ./tmp/config.yml --hosts 127.0.0.1 -l debug --stop-on-error --logfile ./tmp/loadplugins.log
 echo "Stdout loader"
 cat ./tmp/loadplugins.log
-grep  'Plugins to start' ./tmp/loadplugins.log | grep -q '@name="test_0"'
-grep  'Plugins to start' ./tmp/loadplugins.log | grep -q '@name="test_1"'
-grep  'Plugins to start' ./tmp/loadplugins.log | grep -q '@name="test2"'
-grep 'file command ls return: Gemfile' ./tmp/loadplugins.log
+grep  'Start plugins' ./tmp/loadplugins.log | grep -q '@name="test_0"'
+grep  'Start plugins' ./tmp/loadplugins.log | grep -q '@name="test_1"'
+grep  'Start plugins' ./tmp/loadplugins.log | grep -q '@name="test2"'
+grep 'file command ls return: CHANGELOG' ./tmp/loadplugins.log
 grep 'get size from http://google.com:' ./tmp/loadplugins.log
 grep 'get size from https://www.kernel.org' ./tmp/loadplugins.log
 grep 'get size from ./tests/run.sh' ./tmp/loadplugins.log

data/tests/server.rb

@@ -1,5 +1,5 @@
-require "socket"
-require "timeout"
+require 'socket'
+require 'timeout'
 
 server = TCPServer.new('127.0.0.1', 5555)
 Timeout::timeout(60) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.0.5.pre5
+  version: 0.0.5
 platform: ruby
 authors:
 - Vasiliev Dmitry
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +118,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -202,9 +217,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3