kanrisuru 0.8.0 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f5fe692ff53ac4de87ca38181765a63cf88f0beab4e44145c780ba9af934ede
-  data.tar.gz: 58acc02d34aff916670ab26c9659f7e40205d31492ec5f043ea51487df33cb62
+  metadata.gz: f7548306bf7e81fd29f475dfef82c4b8f0973448f22f3cb8882518ace8e70389
+  data.tar.gz: c069633d4408c38333cd3dacfade92678f0309a1b53e435238d6f0814598ec73
 SHA512:
-  metadata.gz: e2b8134ef2351a86f88286a7ed50a1f768510c75f65ecbf9d9684f376606b46ea023f1b78723ae550183c7606e230d7152614d263b19f1a31c6bf6fe0cfa2cc3
-  data.tar.gz: f7382ab716a20185ec071f96b6793afa7fcc1e11d32a0dd3174455cb7a5ba19d3fb61aa0fbb7d5574f26af36d983b3fae4ee9ec5757f16ef2a21edc43d5d83cd
+  metadata.gz: fbd31bc19b021a3d904b8a9c3d167921a47c709ca05b0590fa1dab5d0032181d454b7da0572760cfebe36286456e3a10547bb14bd6fb60c71413de533daa48a8
+  data.tar.gz: '0710940fec60fab2802a9810d6b5a6bb48f575c8ef8661c2447fbe8dc445ac68a3fb174ed1dd6413689439303983ee229e2ebb08cc1b1c0e68007db3346c2219'

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Kanrisuru 0.8.4 (August 20, 2021) ##
+* Convert `fsize` field to an `integer` for du disk module command.
+
+## Kanrisuru 0.8.3 (August 20, 2021) ##
+* Fix bug with disk usage, `du` command by escaping the awk variables in the command.
+* Update `du` command to execute with shell user.
+
+## Kanrisuru 0.8.2 (August 19, 2021) ##
+* Convert `major` and `minor` device field values to an `integer` in lsblk disk module.
+
+## Kanrisuru 0.8.1 (August 19, 2021) ##
+* Fix `nodeps` flag value for `lsblk` command in disk module. 
+
 ## Kanrisuru 0.8.0 (August 18, 2021) ##
 * Add last / lastb implementation in system core module. 
 

data/lib/kanrisuru/core/disk.rb

@@ -31,9 +31,9 @@ module Kanrisuru
 
         command = Kanrisuru::Command.new('du')
         command.append_arg('-s', path)
-        command | "awk '{print $1, $2}'"
+        command | "awk '{print \\$1, \\$2}'"
 
-        execute(command)
+        execute_shell(command)
 
         Kanrisuru::Result.new(command) do |cmd|
           string = cmd.to_s
@@ -41,7 +41,8 @@ module Kanrisuru
 
           rows.map do |row|
             values = row.split
-            size = convert ? Kanrisuru::Util::Bits.convert_bytes(values[0], :byte, convert) : values[0]
+            size = values[0].to_i
+            size = convert ? Kanrisuru::Util::Bits.convert_bytes(size, :byte, convert) : size 
 
             DiskUsage.new(size, values[1])
           end
@@ -144,7 +145,7 @@ module Kanrisuru
 
         command.append_flag('-a', all)
         command.append_flag('-p', paths)
-        command.append_flag('-p', nodeps)
+        command.append_flag('-d', nodeps)
 
         command.append_arg('-o', 'NAME,FSTYPE,MAJ:MIN,MOUNTPOINT,SIZE,UUID,RO,RM,OWNER,GROUP,MODE,TYPE')
         execute(command)
@@ -244,8 +245,8 @@ module Kanrisuru
               current_device.fs_type = value
             when 'MAJ:MIN'
               maj, min = value.split(':')
-              current_device.maj_dev = maj
-              current_device.min_dev = min
+              current_device.maj_dev = maj ? maj.to_i : nil
+              current_device.min_dev = min ? min.to_i : nil
             when 'MOUNTPOINT'
               current_device.mount_point = value
             when 'SIZE'
@@ -281,8 +282,8 @@ module Kanrisuru
 
           LsblkDevice.new(
             device['name'],
-            maj_min ? maj_min.split(':')[0] : nil,
-            maj_min ? maj_min.split(':')[1] : nil,
+            maj_min ? maj_min.split(':')[0].to_i : nil,
+            maj_min ? maj_min.split(':')[1].to_i : nil,
             device['rm'],
             device['ro'],
             device['owner'],

data/lib/kanrisuru/version.rb

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

data/spec/functional/core/disk_spec.rb

@@ -65,6 +65,13 @@ RSpec.describe Kanrisuru::Core::Disk do
         expect(result[0].path).to eq("#{host_json['home']}/.bashrc")
       end
 
+      it 'gets disk usage root' do
+        host.su('root')
+        result = host.du(path: '/etc')
+        expect(result).to be_success
+        expect(result[0].path).to eq("/etc")
+      end
+
       it 'gets disk free for system' do
         expect(host.df.data).to be_instance_of(Array)
         expect(host.df(inodes: true).data).to be_instance_of(Array)

metadata

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