kanrisuru 0.2.8 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34a295375b187db49db38cccaa4fdd155d706378b1615d58744aa62f9172cada
-  data.tar.gz: ed2e0995c40b0fa3902100377bb275e1413d98caf13bbd60b04bceb122d81301
+  metadata.gz: 11e237cfa6bdcf5f231733fab93be901be7a6d53ed673eb2feeb54ae4baf2b14
+  data.tar.gz: 79e61aafc54f47534a79600ac60a93ec0b9dd82033a2875f84d6ee339ae8fec1
 SHA512:
-  metadata.gz: df90e5eca434eb978f0396919571f08c976aed094f096b62988368fcc93b2a1177c46e947aceb732273f420cd28d7ebd8ccf4db532398ddbdd87e7d4ccf8afc6
-  data.tar.gz: 8c0b99e559e4f50610532dc57ef5ff0bb544259deac214cf03edcab3463f904e5935bcc4e6cdf041a4b231a44476df51084d3ba7570d8d4978dae14c31ca31d8
+  metadata.gz: f762e2d07da08086f33ff878652d3f459a5cfcc7e76fdaeebfbfc0c37d827953ba20536bb6e714b751809505961ebd657716bde47af6d2c0975852d5772d6f03
+  data.tar.gz: b4a05943b967a4ddddcc0b29c2036a50997463279dee649831efb64f775aabdf0fa384f03732fa06d0cbcb07e061f59c9046b4e812b1e8faed218a12677b36ad

data/kanrisuru.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.description = 'Manage remote servers over ssh with ruby.'
   gem.homepage    = 'https://github.com/avamia/kanrisuru'
 
-  gem.required_ruby_version     = '>= 2.5.0'
+  gem.required_ruby_version = '>= 2.5.0'
 
   gem.add_development_dependency 'rspec', '~> 3.10'
   gem.add_development_dependency 'rubocop', '~> 1.12'

data/lib/kanrisuru/core.rb

@@ -16,7 +16,6 @@ require_relative 'core/ip'
 require_relative 'core/socket'
 require_relative 'core/apt'
 require_relative 'core/yum'
-require_relative 'core/zypper'
 
 module Kanrisuru
   module Remote
@@ -37,7 +36,6 @@ module Kanrisuru
       os_include Kanrisuru::Core::Socket
       os_include Kanrisuru::Core::Apt
       os_include Kanrisuru::Core::Yum
-      os_include Kanrisuru::Core::Zypper
     end
 
     class Cluster
@@ -56,7 +54,6 @@ module Kanrisuru
       os_collection Kanrisuru::Core::Socket
       os_collection Kanrisuru::Core::Apt
       os_collection Kanrisuru::Core::Yum
-      os_collection Kanrisuru::Core::Zypper
     end
   end
 end

data/lib/kanrisuru/core/path.rb

@@ -44,6 +44,7 @@ module Kanrisuru
             date = DateTime.parse("#{values[6]} #{values[7]} #{values[8]}")
 
             type = values[1].include?('d') ? 'directory' : 'file'
+
             items <<
               if id
                 FileInfoId.new(

data/lib/kanrisuru/core/system.rb

@@ -9,6 +9,7 @@ module Kanrisuru
 
       os_define :linux, :load_env
       os_define :linux, :cpu_info
+      os_define :linux, :lscpu
       os_define :linux, :load_average
       os_define :linux, :free
       os_define :linux, :ps
@@ -22,6 +23,43 @@ module Kanrisuru
       os_define :linux, :reboot
       os_define :linux, :poweroff
 
+      CPUArchitectureVulnerability = Struct.new(
+        :name,
+        :data
+      )
+
+      CPUArchitecture = Struct.new(
+        :architecture,
+        :cores,
+        :byte_order,
+        :address_sizes,
+        :operation_modes,
+        :online_cpus,
+        :threads_per_core,
+        :cores_per_socket,
+        :sockets,
+        :numa_mode,
+        :vendor_id,
+        :cpu_family,
+        :model,
+        :model_name,
+        :stepping,
+        :cpu_mhz,
+        :cpu_max_mhz,
+        :cpu_min_mhz,
+        :bogo_mips,
+        :virtualization,
+        :hypervisor_vendor,
+        :virtualization_type,
+        :l1d_cache,
+        :l1i_cache,
+        :l2_cache,
+        :l3_cache,
+        :numa_nodes,
+        :vulnerabilities,
+        :flags
+      )
+
       ProcessInfo = Struct.new(
         :uid, :user, :gid, :group, :ppid, :pid,
         :cpu_usage, :memory_usage, :stat, :priority,
@@ -52,6 +90,91 @@ module Kanrisuru
         end
       end
 
+      def lscpu
+        command = Kanrisuru::Command.new('lscpu')
+
+        execute_shell(command)
+
+        Kanrisuru::Result.new(command) do |cmd|
+          lines = cmd.to_a
+
+          result = CPUArchitecture.new
+          result.vulnerabilities = []
+          result.numa_nodes = []
+
+          lines.each do |line|
+            values = line.split(': ', 2)
+
+            field = values[0].strip
+            data = values[1].strip
+
+            case field
+            when 'Architecture'
+              result.architecture = data
+            when 'CPU op-mode(s)'
+              result.operation_modes = data.split(', ')
+            when 'Byte Order'
+              result.byte_order = data
+            when 'Address sizes'
+              result.address_sizes = data.split(', ')
+            when 'CPU(s)'
+              result.cores = data.to_i
+            when 'On-line CPU(s) list'
+              result.online_cpus = data.to_i
+            when 'Thread(s) per core'
+              result.threads_per_core = data.to_i
+            when 'Core(s) per socket'
+              result.cores_per_socket = data.to_i
+            when 'Socket(s)'
+              result.sockets = data.to_i
+            when 'NUMA node(s)'
+              result.numa_nodes = data.to_i
+            when 'Vendor ID'
+              result.vendor_id = data
+            when 'CPU family'
+              result.cpu_family = data.to_i
+            when 'Model'
+              result.model = data.to_i
+            when 'Model name'
+              result.model_name = data
+            when 'Stepping'
+              result.stepping = data.to_i
+            when 'CPU MHz'
+              result.cpu_mhz = data.to_f
+            when 'CPU max MHz'
+              result.cpu_max_mhz = data.to_f
+            when 'CPU min MHz'
+              result.cpu_min_mhz = data.to_f
+            when 'CPUBogoMIPS'
+              result.bogo_mips = data.to_f
+            when 'Virtualization'
+              result.virtualization = data
+            when 'Hypervisor vendor'
+              result.hypervisor_vendor = data
+            when 'Virtualization type'
+              result.virtualization_type = data
+            when 'L1d cache'
+              result.l1d_cache = data
+            when 'L1i cache'
+              result.l1i_cache = data
+            when 'L2 cache'
+              result.l2_cache = data
+            when 'L3 cache'
+              result.l3_cache = data
+            when /^Numa node/
+              result.numa_nodes << data.split(',')
+            when /^Vulnerability/
+              name = field.split('Vulnerability ')[1]
+              result.vulnerabilities << CPUArchitectureVulnerability.new(name, data)
+            when 'Flags'
+              result.flags = data.split
+            end
+          end
+
+          result
+        end
+      end
+
       def cpu_info(spec)
         name =
           case spec

data/lib/kanrisuru/core/yum.rb

@@ -345,7 +345,7 @@ module Kanrisuru
             current_row.description = description.strip
             rows << current_row
           end
-          
+
           rows
         end
       end

data/lib/kanrisuru/remote/cpu.rb

@@ -28,27 +28,75 @@ module Kanrisuru
       end
 
       def sockets
-        @sockets_count
+        @cpu_architecture.sockets
       end
 
       def cores
-        @logical_cores_count
+        @cpu_architecture.cores
       end
 
       def total
-        @logical_cores_count
+        @cpu_architecture.cores
       end
 
       def count
-        @logical_cores_count
+        @cpu_architecture.cores
       end
 
       def threads_per_core
-        @threads_per_core_count
+        @cpu_architecture.threads_per_core
       end
 
       def cores_per_socket
-        @cores_per_socket_count
+        @cpu_architecture.cores_per_socket
+      end
+
+      def numa_nodes
+        @cpu_architecture.numa_nodes
+      end
+
+      def vendor_id
+        @cpu_architecture.vendor_id
+      end
+
+      def cpu_family
+        @cpu_architecture.cpu_family
+      end
+
+      def model
+        @cpu_architecture.model
+      end
+
+      def model_name
+        @cpu_architecture.model_name
+      end
+
+      def byte_order
+        @cpu_architecture.byte_order
+      end
+
+      def address_size
+        @cpu_architecture.address_size
+      end
+
+      def cpu_mhz
+        @cpu_architecture.cpu_mhz
+      end
+
+      def cpu_max_mhz
+        @cpu_architecture.cpu_max_mhz
+      end
+
+      def cpu_min_mhz
+        @cpu_architecture.cpu_min_mhz
+      end
+
+      def hypervisor
+        @cpu_architecture.hypervisor_vendor
+      end
+
+      def virtualization_type
+        @cpu_architecture.virtualization_type
       end
 
       def hyperthreading?
@@ -58,10 +106,7 @@ module Kanrisuru
       private
 
       def initialize_linux
-        @sockets_count          = @host.cpu_info('sockets').to_i
-        @cores_per_socket_count = @host.cpu_info('cores_per_socket').to_i
-        @threads_per_core_count = @host.cpu_info('threads').to_i
-        @logical_cores_count    = @host.cpu_info('cores').to_i
+        @cpu_architecture = @host.lscpu.data
       end
     end
   end

data/lib/kanrisuru/remote/fstab.rb

@@ -67,7 +67,7 @@ module Kanrisuru
       def append_file!
         @file.append do |f|
           @entries.each do |_, entry|
-            f << entry.to_s if entry[:new]
+            f << entry[:entry].to_s if entry[:new]
           end
         end
 
@@ -78,13 +78,22 @@ module Kanrisuru
       def write_file!
         @file.write do |f|
           @entries.each do |_, entry|
-            f << entry.to_s
+            f << entry[:entry].to_s
           end
         end
 
         reload!
       end
 
+      def to_s
+        lines = []
+        @entries.each do |_, entry|
+          lines << entry[:entry].to_s
+        end
+
+        lines.join("\n")
+      end
+
       def reload!
         init_from_os
       end

data/lib/kanrisuru/util/bits.rb

@@ -13,11 +13,11 @@ module Kanrisuru
         case unit.downcase
         when 'b'
           Kanrisuru::Util::Bits.convert_bytes(size, :byte, :kilobyte)
-        when 'kb', 'k', 'kib'
+        when 'kb', 'k'
           size
-        when 'mb', 'm', 'mib'
+        when 'mb', 'm'
           Kanrisuru::Util::Bits.convert_from_mb(size, :kilobyte).to_i
-        when 'gb', 'g', 'gib'
+        when 'gb', 'g'
           Kanrisuru::Util::Bits.convert_from_gb(size, :kilobyte).to_i
         end
       end

data/lib/kanrisuru/util/signal.rb

@@ -136,7 +136,7 @@ module Kanrisuru
       def self.[](signal)
         return unless valid?(signal)
 
-        if key.instance_of?(Integer)
+        if signal.instance_of?(Integer)
           @linux_inverted[signal]
         else
           @linux[translate(signal)]

data/lib/kanrisuru/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanrisuru
-  VERSION = '0.2.8'
+  VERSION = '0.3.2'
 end

data/spec/functional/core/system_spec.rb

@@ -18,6 +18,12 @@ RSpec.describe Kanrisuru::Core::System do
         host.disconnect
       end
 
+      it 'gets cpu details' do
+        result = host.lscpu
+        expect(result).to be_success
+        expect(result.data).to be_instance_of(Kanrisuru::Core::System::CPUArchitecture)
+      end
+
       it 'gets environment variables' do
         result = host.load_env
 

data/spec/functional/remote/fstab_spec.rb

@@ -16,6 +16,22 @@ RSpec.describe Kanrisuru::Remote::Fstab do
         host.disconnect
       end
 
+      it 'outputs string version of fstab' do
+        host.su('root')
+
+        result = host.cat('/etc/fstab')
+        expect(result).to be_success
+        raw_file_lines = []
+        result.each do |line|
+          next if line.match(/^#/) || line == ''
+
+          raw_file_lines << line.split.join(' ')
+        end
+
+        raw_file_output = raw_file_lines.join("\n")
+        expect(raw_file_output).to eq(host.fstab.to_s)
+      end
+
       it 'parses fstab' do
         host.su('root')
         fstab = host.fstab

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.2
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec