kanrisuru 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8442dfb50e30ac79aacd58ed1dd80ac17858571c3d84790eed8d8efcad7e6f29
-  data.tar.gz: bab46330d7f3aca3dee667501d2a59a001f813665a071be8362b8a9a6b9e2a18
+  metadata.gz: 596f187f09116db8bd36b6eb7a0864f440afdf9e34d784c6215793a5e335f4cd
+  data.tar.gz: 0056efd85ffcc42a36bf9086961c3f7438d5716f0cee580587fa48c60af3cfa5
 SHA512:
-  metadata.gz: 852303708004d232098e85ad7ea762caa69bb65b450d4b9cda0eb208c573e85d47f46981a3a281de35cbd84830ca9a52f71126486848962ad980acbb6940d48b
-  data.tar.gz: a9c234d9e6c112ce682fb444b3c77eaa76619fbc46b3d64ab86914beebead28268e460fb5305a5642c9f662c318d22836e8b2b1b7c11891b531b9615c5f2a5e4
+  metadata.gz: f232ff04685236d29e2e8c5c2652ffb7b93e57ca36a7179158787df70553865d7516045e718d03c1bd8e3257a08c793b82941a4cbcb247c39beea667788d57df
+  data.tar.gz: af237e0803c4229b008f8ff9b3defae4df00d17af4dab9b51fe3f23797c8af406f4844befe43ed678b99685338a8d2c6e19d7c1e3fea919ccd2082e6059e8576

data/kanrisuru.gemspec

@@ -9,19 +9,19 @@ Gem::Specification.new do |gem|
   gem.email       = 'ryan@avamia.com'
   gem.license     = 'MIT'
   gem.summary     = 'Manage remote servers over ssh with ruby.'
+  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_rubygems_version = '>= 1.8.11'
+  gem.required_ruby_version = '>= 2.5.0'
 
-  gem.add_development_dependency 'rspec', '>= 3.10.0'
-  gem.add_development_dependency 'rubocop', '>= 1.12.1'
-  gem.add_development_dependency 'rubocop-rspec', '>= 2.2.0'
-  gem.add_development_dependency 'simplecov', '>= 0.21.2'
+  gem.add_development_dependency 'rspec', '~> 3.10'
+  gem.add_development_dependency 'rubocop', '~> 1.12'
+  gem.add_development_dependency 'rubocop-rspec', '~> 2.2'
+  gem.add_development_dependency 'simplecov', '~> 0.21'
 
-  gem.add_runtime_dependency 'net-ping', '>= 2.0.8'
-  gem.add_runtime_dependency 'net-scp', '>= 3.0.0'
-  gem.add_runtime_dependency 'net-ssh', '>= 6.1.0'
+  gem.add_runtime_dependency 'net-ping', '~> 2.0'
+  gem.add_runtime_dependency 'net-scp', '~> 3.0'
+  gem.add_runtime_dependency 'net-ssh', '~> 6.1'
 
   gem.files         = `git ls-files`.split("\n")
   gem.require_paths = ['lib']

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

@@ -341,8 +341,11 @@ module Kanrisuru
             end
           end
 
-          current_row.description = description.strip
-          rows << current_row
+          if current_row
+            current_row.description = description.strip
+            rows << current_row
+          end
+
           rows
         end
       end

data/lib/kanrisuru/remote/cpu.rb

@@ -28,27 +28,63 @@ 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.byte_order
+      end
+
+      def hypervisor
+        @cpu_architecture.hypervisor_vendor
+      end
+
+      def virtualization_type
+        @cpu_architecture.virtualization_type
       end
 
       def hyperthreading?
@@ -58,10 +94,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/os_family.rb

@@ -163,27 +163,30 @@ module Kanrisuru
           state: 'current',
           type: 'distribution'
         },
-        opensuse: {
-          name: 'openSUSE',
+        sles: {
+          name: 'SUSE Linux Enterprise Server',
           os_family: 'linux',
           upstream: 'linux',
-          model: 'open_source',
+          model: 'commercial',
           state: 'current',
           type: 'distribution'
         },
         opensuse_leap: {
           name: 'openSUSE Leap',
-          type: 'alias',
-          to: 'opensuse'
+          os_family: 'linux',
+          upstream: 'sles',
+          model: 'open_source',
+          state: 'current',
+          type: 'distribution'
         },
-        sles: {
-          name: 'SUSE Linux Enterprise Server',
+        opensuse: {
+          name: 'openSUSE',
           os_family: 'linux',
-          upstream: 'opensuse',
-          model: 'commercial',
+          upstream: 'linux',
+          model: 'open_source',
           state: 'current',
           type: 'distribution'
-        }
+        },
       }
 
       def self.family_include_distribution?(family, dist)

data/lib/kanrisuru/version.rb

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

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

data/spec/unit/util_spec.rb

@@ -59,6 +59,7 @@ RSpec.describe Kanrisuru::Util do
     expect(Kanrisuru::Util::OsFamily.upstream_include_distribution?('linux', 'linux_mint')).to eq(true)
 
     expect(Kanrisuru::Util::OsFamily.upstream_include_distribution?('fedora', 'redhat')).to eq(true)
+    expect(Kanrisuru::Util::OsFamily.upstream_include_distribution?('sles', 'opensuse_leap')).to eq(true)
     expect(Kanrisuru::Util::OsFamily.upstream_include_distribution?('fedora', 'centos')).to eq(true)
 
     expect(Kanrisuru::Util::OsFamily.upstream_include_distribution?('unix_like', 'linux_mint')).to eq(false)

metadata

@@ -1,114 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-17 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: net-ping
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
-description: 
+        version: '6.1'
+description: Manage remote servers over ssh with ruby.
 email: ryan@avamia.com
 executables: []
 extensions: []
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.11
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: