kanrisuru 0.2.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0be09a32fde3ad8b5856c2e4b215d20201a6de1d890f1ede3cf27e471dfd50fd
-  data.tar.gz: 3573e66a75ce2fc88939e72bda7b915a7469506da713f19f8b80522a35849f58
+  metadata.gz: 5d0fc79a97a3eebddc661982ea4a728af94aded3dbcf5bd5d7d8b0c03e9f5aaf
+  data.tar.gz: a37a3d8a00941a4842f3ce0502a1e88fe9ff50343c095f55094dc528f4bddfa4
 SHA512:
-  metadata.gz: '08780b59675a42aeea9f523e253c23d393fa745bc66e73a5c79c6c3d6d6fa0462fa3e4ddf388b56668c32f80708671a1d2b9dbd6a9b918d4cecdfae37404a0f9'
-  data.tar.gz: 07fd46b83cf7b0391ba4729ad16cdcc88e73b2aacc1c7457855833c60ac4b55defd22914fba9f9cbe48bf5df42cad1bf34d2ddefc6db0918d651710cbbe549d2
+  metadata.gz: 34521c6c7ed22da194e55037a4c9653717176e1b6526e79c272107fe57c711e5ffbd8a377c48df8008492910297bbe102d21713c41e5c33635264f32c3c5c231
+  data.tar.gz: f620bb3a94944cee7c08f0634d43c7b00a4bf00e9c3b64ac13a0934cf8afe01af3439b67dd2d563cecb5134084b2eb9b8845835e22959d00a3639251ffb15f1e

data/lib/kanrisuru/command.rb

@@ -6,12 +6,13 @@ module Kanrisuru
     attr_writer :remote_user, :remote_shell, :remote_path, :remote_env
 
     def initialize(command)
+      @valid_exit_codes = [0]
       @raw_command = command
       @raw_result = []
     end
 
     def success?
-      @exit_status&.zero?
+      @valid_exit_codes.include?(@exit_status)
     end
 
     def failure?
@@ -45,8 +46,7 @@ module Kanrisuru
                     end
 
         env = @remote_env && !@remote_env.empty? ? "#{@remote_env} " : ''
-
-        "#{env}sudo -u #{@remote_user} #{@remote_shell} -c -l \"#{evaluate}\""
+        "#{env}sudo -u #{@remote_user} #{@remote_shell} -c \"#{evaluate}\""
       else
         @raw_command
       end
@@ -95,5 +95,10 @@ module Kanrisuru
     def append_flag(arg, boolean = 'true')
       @raw_command = Kanrisuru::Util.present?(boolean) ? "#{@raw_command} #{arg}" : @raw_command
     end
+
+    def append_valid_exit_code(code)
+      @valid_exit_codes << code if code.instance_of?(Integer)
+      @valid_exit_codes.concat(code) if code.instance_of?(Array)
+    end
   end
 end

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/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/remote/cpu.rb

@@ -28,27 +28,79 @@ 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 flags
+        @cpu_architecture.flags
       end
 
       def hyperthreading?
@@ -58,10 +110,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/host.rb

@@ -16,7 +16,7 @@ module Kanrisuru
         @username = opts[:username]
         @login_user = @username
 
-        @port     = opts[:port]
+        @port     = opts[:port] || 22
         @password = opts[:password] if opts[:password]
         @keys     = opts[:keys] if opts[:keys]
         @shell    = opts[:shell] || '/bin/bash'
@@ -84,7 +84,7 @@ module Kanrisuru
       end
 
       def ssh
-        @ssh ||= Net::SSH.start(@host, @username, keys: @keys, password: @password)
+        @ssh ||= Net::SSH.start(@host, @username, keys: @keys, password: @password, port: @port)
       end
 
       def ping?

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.9'
+  VERSION = '0.4.0'
 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/os_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe Kanrisuru::Remote::Os do
 
         case os_name
         when 'opensuse'
-          expect(host.os.release).to eq('opensuse-leap')
+          expect(host.os.release).to eq('opensuse_leap')
         else
           expect(host.os.release).to eq(os_name)
         end

metadata

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