kanrisuru 0.8.2 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce41108c8201af2a48ac2453f8dc3fb993869e9264a8754d603a11d09ffe1cb5
-  data.tar.gz: 542d34622a949d0eb5ddddc1d7403f13e9e37dfb39cb88b589c7655a2a34a3e4
+  metadata.gz: 3cf097324010e600d653651749e4269d4befe7e2b6ccc1b17cc2b31ee53d1991
+  data.tar.gz: febb4bc33e7a1a1810c00d1deddd5c39a30ae961f74204245277984274b2d2b7
 SHA512:
-  metadata.gz: 7aea2688091ff8449f21eb11cd2fdcb51d71563538fd9c9e38a484770adb8745663a3132314b0001d9e6206dbd57533fe2626af1c59e2ada6d0ea394e2fdd113
-  data.tar.gz: 054a8612edecb94b79bd6b7488096ae12d4fee790d17cf295d4a04f397282ae2c9f5e4a977a37145bd4fc37bf0896a2a9bbd43098762ff65496de29804aa6a0b
+  metadata.gz: bccf90abb47b07d52bcf2e791830e38380e009ef19fad30f896d979325f6133c5531676b3d3e79555c9090624f15794ec8884d9c889e57c1a150258107b39e3a
+  data.tar.gz: d5f17fc9c9a6f80257d5bf54ee1d2e28aa48d9de0859b7abda2f8ed695b1003aff98c3f2ee75b3dc5317eb7b9d8c947b205133b9b92f0d8af727f9d827ed4b45

data/CHANGELOG.md

@@ -1,5 +1,18 @@
+## Kanrisuru 0.8.6 (August 21, 2021) ##
+* Add `minimum_io_size`, `physical_sector_size`, and `logical_sector_size` to the blkid low level disk probe for devices.
+
+## 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 system module.
+* 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

@@ -22,26 +22,29 @@ module Kanrisuru
       BlkidDevice = Struct.new(
         :name, :label, :uuid, :type, :uuid_sub, :label_fatboot, :version, :usage,
         :part_uuid, :part_entry_scheme, :part_entry_uuid, :part_entry_type,
-        :part_entry_number, :part_entry_offset, :part_entry_size, :part_entry_disk
+        :part_entry_number, :part_entry_offset, :part_entry_size, :part_entry_disk,
+        :minimum_io_size, :physical_sector_size, :logical_sector_size, 
       )
 
       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)
+        command << path if Kanrisuru::Util.present?(path)
+        command | "awk '{print \\$1, \\$2}'"
 
-        execute(command)
+        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
@@ -97,7 +100,7 @@ module Kanrisuru
           command.append_arg('-U', opts[:uuid])
         elsif Kanrisuru::Util.present?(device)
           mode = 'device'
-          command.append_arg('-po', 'export')
+          command.append_arg('-pio', 'export')
           command << device
         else
           mode = 'list'
@@ -112,10 +115,7 @@ module Kanrisuru
             cmd.to_s
           when 'device'
             lines = cmd.to_a
-
-            ## Only gets 1 device
-            devices = blkid_devices(lines)
-            devices[0]
+            blkid_devices(lines)
           else
             lines = cmd.to_a
             blkid_devices(lines)
@@ -187,6 +187,12 @@ module Kanrisuru
             current_device.usage = value
           elsif line =~ /^VERSION=/
             current_device.version = value.to_f
+          elsif line =~ /^MINIMUM_IO_SIZE=/
+            current_device.minimum_io_size = value.to_i
+          elsif line =~ /^PHYSICAL_SECTOR_SIZE=/
+            current_device.physical_sector_size = value.to_i
+          elsif line =~ /^LOGICAL_SECTOR_SIZE=/
+            current_device.logical_sector_size = value.to_i
           elsif line =~ /^PART_ENTRY_SCHEME=/
             current_device.part_entry_scheme = value
           elsif line =~ /^PART_ENTRY_UUID=/

data/lib/kanrisuru/version.rb

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

data/spec/functional/core/disk_spec.rb

@@ -37,10 +37,11 @@ RSpec.describe Kanrisuru::Core::Disk do
         # puts device.name
         # puts result.inspect
         expect(result.success?).to eq(true)
-        expect(result.data).to respond_to(
+        expect(result.data[0]).to respond_to(
           :name, :label, :uuid, :type, :uuid_sub, :label_fatboot, :version, :usage,
           :part_uuid, :part_entry_scheme, :part_entry_uuid, :part_entry_type,
-          :part_entry_number, :part_entry_offset, :part_entry_size, :part_entry_disk
+          :part_entry_number, :part_entry_offset, :part_entry_size, :part_entry_disk,
+          :minimum_io_size, :physical_sector_size, :logical_sector_size,
         )
       end
 
@@ -59,12 +60,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)

data/spec/unit/core/disk_spec.rb

@@ -15,7 +15,8 @@ RSpec.describe Kanrisuru::Core::Disk do
     expect(Kanrisuru::Core::Disk::BlkidDevice.new).to respond_to(
       :name, :label, :uuid, :type, :uuid_sub, :label_fatboot, :version, :usage,
       :part_uuid, :part_entry_scheme, :part_entry_uuid, :part_entry_type,
-      :part_entry_number, :part_entry_offset, :part_entry_size, :part_entry_disk
+      :part_entry_number, :part_entry_offset, :part_entry_size, :part_entry_disk,
+      :minimum_io_size, :physical_sector_size, :logical_sector_size
     )
   end
 end

metadata

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