kanrisuru 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 596f187f09116db8bd36b6eb7a0864f440afdf9e34d784c6215793a5e335f4cd
-  data.tar.gz: 0056efd85ffcc42a36bf9086961c3f7438d5716f0cee580587fa48c60af3cfa5
+  metadata.gz: 32ef1fec88bcaf4f6be97051f73a7b2056a18bde09c782044efa79c5e7f322e0
+  data.tar.gz: bf6ec2b44a5c7967d3a836421fe1ce787d4c7afe5a6f1665fce987a7721a441f
 SHA512:
-  metadata.gz: f232ff04685236d29e2e8c5c2652ffb7b93e57ca36a7179158787df70553865d7516045e718d03c1bd8e3257a08c793b82941a4cbcb247c39beea667788d57df
-  data.tar.gz: af237e0803c4229b008f8ff9b3defae4df00d17af4dab9b51fe3f23797c8af406f4844befe43ed678b99685338a8d2c6e19d7c1e3fea919ccd2082e6059e8576
+  metadata.gz: 0ba1a8a90c07f1e783b43f0f5ddcf7280b895ab48a3badc889006591474ce5250ed48f8479a3f302392a6a489b27b202703ecda0fa58cb7e4c9b1610edfb7941
+  data.tar.gz: 0a81ae9c65d740212c9cac4024ac8fc1b5a1edb3b82a3b72d3f22f27352edf1bf0bea2e3a7d72f046d7db635fd920f833b0c904621a7b0dac1af3807bd1856da

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/path.rb

@@ -44,7 +44,6 @@ 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/socket.rb

@@ -82,18 +82,18 @@ module Kanrisuru
             next if values.length < 5
 
             socket_stats = SocketStatistics.new
-
-            socket_stats.netid = if headers.include?('Netid')
-                                   values.shift
-                                 elsif opts[:tcp]
-                                   'tcp'
-                                 elsif opts[:udp]
-                                   'udp'
-                                 elsif opts[:raw]
-                                   'raw'
-                                 else
-                                   ''
-                                 end
+            socket_stats.netid =
+              if headers.include?('Netid')
+                values.shift
+              elsif opts[:tcp]
+                'tcp'
+              elsif opts[:udp]
+                'udp'
+              elsif opts[:raw]
+                'raw'
+              else
+                ''
+              end
 
             socket_stats.state = if headers.include?('State')
                                    TCP_STATE_ABBR[values.shift]

data/lib/kanrisuru/core/system.rb

@@ -15,6 +15,8 @@ module Kanrisuru
       os_define :linux, :ps
       os_define :linux, :kill
 
+      os_define :linux, :kernel_statistics
+
       os_define :linux, :uptime
 
       os_define :linux, :w
@@ -60,6 +62,33 @@ module Kanrisuru
         :flags
       )
 
+      KernelStatisticCpu = Struct.new(
+        :user,
+        :nice,
+        :system,
+        :idle,
+        :iowait,
+        :irq,
+        :softirq,
+        :steal,
+        :guest,
+        :guest_nice
+      )
+
+      KernelStatistic = Struct.new(
+        :cpu_total,
+        :cpus,
+        :interrupt_total,
+        :interrupts,
+        :ctxt,
+        :btime,
+        :processes,
+        :procs_running,
+        :procs_blocked,
+        :softirq_total,
+        :softirqs,
+      )
+
       ProcessInfo = Struct.new(
         :uid, :user, :gid, :group, :ppid, :pid,
         :cpu_usage, :memory_usage, :stat, :priority,
@@ -272,6 +301,65 @@ module Kanrisuru
         Kanrisuru::Result.new(command)
       end
 
+      def kernel_statistics
+        command = Kanrisuru::Command.new('cat /proc/stat') 
+
+        execute_shell(command)
+
+        Kanrisuru::Result.new(command) do |cmd|
+          lines = cmd.to_a
+
+          result = KernelStatistic.new
+          result.cpus = []
+
+          lines.each do |line|
+            values = line.split
+            field = values[0]
+            values = values[1..-1].map(&:to_i)
+
+            case field
+            when /^cpu$/
+              result.cpu_total = KernelStatisticCpu.new
+
+              result.cpu_total.user = values[0]
+              result.cpu_total.nice = values[1]
+              result.cpu_total.system = values[2]
+              result.cpu_total.idle = values[3]
+              result.cpu_total.iowait = values[4]
+              result.cpu_total.irq = values[5]
+              result.cpu_total.softirq = values[6]
+              result.cpu_total.steal = values[7]
+              result.cpu_total.guest = values[8]
+              result.cpu_total.guest_nice = values[9]
+            when /^cpu\d/
+              cpu_stat = KernelStatisticCpu.new
+              cpu_stat.user = values[0]
+              cpu_stat.nice = values[1]
+              cpu_stat.system = values[2]
+              cpu_stat.idle = values[3]
+              cpu_stat.iowait = values[4]
+              cpu_stat.irq = values[5]
+              cpu_stat.softirq = values[6]
+              cpu_stat.steal = values[7]
+              cpu_stat.guest = values[8]
+              cpu_stat.guest_nice = values[9]
+
+              result.cpus << cpu_stat
+            when 'intr'
+              result.interrupt_total = values[0]
+              result.interrupts = values[1..-1]
+            when 'softirq'
+              result.softirq_total = values[0]
+              result.softirqs = values[1..-1]
+            else
+              result[field] = values[0]
+            end
+          end
+
+          result
+        end
+      end
+
       def uptime
         ## Ported from https://github.com/djberg96/sys-uptime
         command = Kanrisuru::Command.new('cat /proc/uptime')

data/lib/kanrisuru/remote/cpu.rb

@@ -76,7 +76,19 @@ module Kanrisuru
       end
 
       def address_size
-        @cpu_architecture.byte_order
+        @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
@@ -87,6 +99,10 @@ module Kanrisuru
         @cpu_architecture.virtualization_type
       end
 
+      def flags
+        @cpu_architecture.flags
+      end
+
       def hyperthreading?
         threads_per_core > 1
       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/os_family.rb

@@ -186,7 +186,7 @@ module Kanrisuru
           model: 'open_source',
           state: 'current',
           type: 'distribution'
-        },
+        }
       }
 
       def self.family_include_distribution?(family, dist)

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.3.0'
+  VERSION = '0.4.1'
 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
 
@@ -63,6 +69,27 @@ RSpec.describe Kanrisuru::Core::System do
         expect(process).to be_empty
       end
 
+      it 'gets kernel statistics' do
+        result = host.kernel_statistics
+        expect(result).to be_success
+
+        expect(result.data).to respond_to(
+          :cpu_total,
+          :cpus,
+          :interrupt_total,
+          :interrupts,
+          :ctxt,
+          :btime,
+          :processes,
+          :procs_running,
+          :procs_blocked,
+          :softirq_total,
+          :softirqs,
+        )
+
+        expect(result.cpus.length).to eq(host.cpu.cores)
+      end
+
       it 'gets process details' do
         result = host.ps
 

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.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec