kanrisuru 0.8.1 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb2d3362a0cb76eee232056937ae6d81c0d40c24d0a1bbafed6f78cbbfeda880
-  data.tar.gz: 3f8ddb4ed3d24ad2741f619bd3f12553ddd26181f42301dbe8c165ade253c006
+  metadata.gz: e165b21ec0ad68281ccbb6dd27277d5fe77833d9c27382f8c5233dc93c128ba8
+  data.tar.gz: 2ab686965334402864a17586c1e45724d3163a4ed84833f4b904dc0834e1bb68
 SHA512:
-  metadata.gz: c6e633ff0d3008cd8bd3ba003bf5c2bf0a5892e9e44c1eb0aeefe2435c4a5f7703ae088cede78a80ac01aa8aef11e6733f1a9926dac646f3d51f943e3a4be1e9
-  data.tar.gz: a163204d160ab1dff741f18f02a013b5a7cb3a274fc2fa7dd3c00ca9115809fbf64794ec4a075bfb4609019d81ab63fdf90385424a05aeaff2cfb959c2b2916d
+  metadata.gz: 88820369f4d9f10dbe9d4200cecc4804aff4ddb29322cd4c7dd399c1739b2f2736ac6e2346666717e5949a3bbac0cbcf12a2e681706f591c93d9da4144b4c035
+  data.tar.gz: 6f1eadc3de432097d35dbf5f42b3fc3a9d9b6eabf3cc697551ea71f9b6547875f36407d821e61ec9bfc257d76f96f4e7dcd2d0ae2c65baab03b32f34f2618411

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Kanrisuru 0.8.5 (August 20, 2021) ##
+* Add `summarize` option to `du` command. This will only output a total disk usage size for the entire directory versus disk usage for each file individually.
+
+## 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. 
 

data/lib/kanrisuru/core/disk.rb

@@ -26,22 +26,26 @@ module Kanrisuru
       )
 
       def du(opts = {})
-        path    = opts[:path]
-        convert = opts[:convert]
+        path      = opts[:path]
+        summarize = opts[:summarize]
+        convert   = opts[:convert]
 
         command = Kanrisuru::Command.new('du')
-        command.append_arg('-s', path)
-        command | "awk '{print $1, $2}'"
+        command.append_flag('-s', summarize)
 
-        execute(command)
+        command << path if Kanrisuru::Util.present?(path)
+
+        command | "awk '{print \\$1, \\$2}'"
+
+        execute_shell(command)
 
         Kanrisuru::Result.new(command) do |cmd|
-          string = cmd.to_s
-          rows = string.split("\n")
+          lines = cmd.to_a
 
-          rows.map do |row|
-            values = row.split
-            size = convert ? Kanrisuru::Util::Bits.convert_bytes(values[0], :byte, convert) : values[0]
+          lines.map do |line|
+            values = line.split
+            size = values[0].to_i
+            size = convert ? Kanrisuru::Util::Bits.convert_bytes(size, :byte, convert) : size
 
             DiskUsage.new(size, values[1])
           end
@@ -244,8 +248,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 +285,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.1'
+  VERSION = '0.8.5'
 end

data/spec/functional/core/disk_spec.rb

@@ -59,12 +59,25 @@ RSpec.describe Kanrisuru::Core::Disk do
         )
       end
 
-      it 'gets disk usage' do
-        result = host.du(path: "#{host_json['home']}/.bashrc")
-        expect(result.success?).to eq(true)
+      it 'gets summarize disk usage' do
+        result = host.du(path: "#{host_json['home']}/.bashrc", summarize: true)
+        expect(result).to be_success
         expect(result[0].path).to eq("#{host_json['home']}/.bashrc")
       end
 
+      it 'gets all disk usage' do
+        result = host.du(path: host_json['home'])
+        expect(result).to be_success
+        expect(result.data.length).to be >= 2
+      end
+
+      it 'gets summarized disk usage root user' do
+        host.su('root')
+        result = host.du(path: '/etc', summarize: true)
+        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.1
+  version: 0.8.5
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec