kanrisuru 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c8f6cf4fd27ca458feef7d89dd49617d3e4aba1058b203c297c0206bf5d91f0
-  data.tar.gz: c0f03db6bee208f1bcd6ed667f3e50db85e56482ded88023e91efa0025c2a7ad
+  metadata.gz: c43790286bec139248aba8b0830bf7d8220638b3ceb8316f635dd64eb2510566
+  data.tar.gz: bfc7136bdbd706dd5bd23b81509334e150a1616ec6ef9f8d27b36c84d730490f
 SHA512:
-  metadata.gz: 004c36ab67130dcb5a2bc8ff3dd60a28a15ef9c48b64a523b6386ee05a656f92f8af9492cc75400b16c5c26006c9ba9134c8605c6b3f87c185a79624ccf5af93
-  data.tar.gz: a2c3d25e09d91bc8da26198e9bfffe986270671f6e81ace0f11710a328cada0ac341d5e40d097cf204a93b091d7c3d400c9caf8b160064ca087da9dcdddec4b7
+  metadata.gz: ece5c057b9f5b0ba612cadb5173381de9469a5b58fb19fd6d79332198b3f2a006c16384ca2e93da6deb94fca76b54f5d017402c9a3ca11aaa1de814827b37758
+  data.tar.gz: 553c0f121bd3f9822b05342f5159abdac8e3792e8dd10c9d360360089c7861eaa2767f7cc20f4fda6a87ac4295a4ce0ded478f37489a0deaa6cf542c15edc480

data/kanrisuru.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'simplecov-cobertura', '~> 2.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.add_runtime_dependency 'net-scp', '~> 4.1'
+  gem.add_runtime_dependency 'net-ssh', '~> 7.3'
   gem.add_runtime_dependency 'net-ssh-gateway', '~> 2.0'
 
   gem.files         = `git ls-files`.split("\n")

data/lib/kanrisuru/core/disk/commands/df.rb

@@ -13,7 +13,9 @@ module Kanrisuru
         command.append_flag('-i', inodes)
 
         command << path if Kanrisuru::Util.present?(path)
-        command | "awk '{print $1, $2, $3, $5, $6, $7}'"
+        
+        # Filesystem, Type, 1024 Blocks, Used, Available, Capacity, Mounted
+        command | "awk '{print $1, $2, $3, $4, $5, $6, $7}'"
 
         execute(command)
 

data/lib/kanrisuru/core/disk/parsers/df.rb

@@ -20,9 +20,11 @@ module Kanrisuru
                   values[2].to_i,
                   values[3].to_i,
                   values[4].to_i,
-                  values[5]
+                  values[5].to_i,
+                  values[6]
                 )
               end
+              
               items
             end
           end

data/lib/kanrisuru/core/disk/types.rb

@@ -4,7 +4,7 @@ module Kanrisuru
   module Core
     module Disk
       DiskUsage = Struct.new(:fsize, :path)
-      DiskFree = Struct.new(:file_system, :type, :total, :used, :capacity, :mount)
+      DiskFree = Struct.new(:file_system, :type, :total, :used, :available, :capacity, :mount)
       LsblkDevice = Struct.new(
         :name, :maj_dev, :min_dev, :removable_device, :readonly_device, :owner, :group,
         :mode, :fsize, :type, :mount_point, :fs_type, :uuid, :children

data/lib/kanrisuru/core/system/commands/free.rb

@@ -5,6 +5,7 @@ module Kanrisuru
     module System
       def free(type)
         conversions = {
+          available: 'MemAvailable',
           total: 'MemTotal',
           free: 'MemFree',
           swap: 'SwapTotal',

data/lib/kanrisuru/remote/memory.rb

@@ -7,7 +7,7 @@ module Kanrisuru
         @host = host
       end
 
-      method_names = %w[total free swap swap_free]
+      method_names = %w[total available free swap swap_free]
       method_names.each do |method_name|
         define_method(method_name.to_s) do |metric = :kb|
           value = @host.free(method_name).to_i

data/lib/kanrisuru/version.rb

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

data/spec/functional/core/disk_spec.rb

@@ -28,9 +28,9 @@ RSpec.describe Kanrisuru::Core::Disk do
   end
 
   it 'prepares df command' do
-    expect_command(host.df, "df -PT | awk '{print $1, $2, $3, $5, $6, $7}'")
+    expect_command(host.df, "df -PT | awk '{print $1, $2, $3, $4, $5, $6, $7}'")
     expect_command(host.df(inodes: true, path: '/dev/vda1'),
-                   "df -PT -i /dev/vda1 | awk '{print $1, $2, $3, $5, $6, $7}'")
+                   "df -PT -i /dev/vda1 | awk '{print $1, $2, $3, $4, $5, $6, $7}'")
   end
 
   it 'prepares du command' do

data/spec/functional/core/system_spec.rb

@@ -33,6 +33,7 @@ RSpec.describe Kanrisuru::Core::System do
   end
 
   it 'prepares free command' do
+    expect_command(host.free('available'), "cat /proc/meminfo | grep -i '^MemAvailable' | awk '{print $2}'")
     expect_command(host.free('total'), "cat /proc/meminfo | grep -i '^MemTotal' | awk '{print $2}'")
     expect_command(host.free('free'), "cat /proc/meminfo | grep -i '^MemFree' | awk '{print $2}'")
     expect_command(host.free('swap'), "cat /proc/meminfo | grep -i '^SwapTotal' | awk '{print $2}'")

data/spec/unit/core/disk_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe Kanrisuru::Core::Disk do
   it 'responds to disk fields' do
     expect(Kanrisuru::Core::Disk::DiskUsage.new).to respond_to(:fsize, :path)
     expect(Kanrisuru::Core::Disk::DiskFree.new).to respond_to(
-      :file_system, :type, :total, :used, :capacity, :mount
+      :file_system, :type, :total, :used, :available, :capacity, :mount
     )
     expect(Kanrisuru::Core::Disk::LsblkDevice.new).to respond_to(
       :name, :maj_dev, :min_dev, :removable_device, :readonly_device, :owner, :group,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2025-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.3'
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
   requirement: !ruby/object:Gem::Requirement
@@ -728,7 +728,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Manage remote servers over ssh with ruby.