kanrisuru 0.8.3 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7986958e7a5a32bb79f6f8cd225b73e996f68329e9adb95c324ad898efaa8bdc
-  data.tar.gz: '02279420cd5ff6017234d4058847173f3be44810267e57c59cb2b09be8f9dadc'
+  metadata.gz: 401e4f3fbff30e96891e65a0cb9d1916d022f1128c3667de554776c775ea0b19
+  data.tar.gz: 7e560e7e8c6e217fab2bf8b5afbe9c57224e488bac510cc58305d990880b0a7e
 SHA512:
-  metadata.gz: 7fedbd06614d36213c5d7df56c22e1f88ecb5b41732704a02b41eff1272559db3f8dc22eaa1112188cd5b0204f4c81f40e1d7f66689c41ca2d34ef0c125fbd9e
-  data.tar.gz: a451f3c5c4cb26ff0bf733371175c99f148ccd9531bcf0366b08d063b4ac495b1fdd3aafe47ff40b4a2cbd9df94b2de3c7dff8e0afa1f9717b3e54271a4ef75b
+  metadata.gz: 715a07d652de292cdc587b49b4a5b43b373e5eac5c225439c5fb15a464a860a8cdee43a13c5a2e2439c13f21d2afb0d8000deaf3146148febb7b2b0fb9114c21
+  data.tar.gz: f1ff0104249a8524d3d8d6c8bf7730af8ad0a55e84ef5a1c9ec75926c8f922c11aa7e46e9086dda36c2a0e6373008649e279182a1cc0aa8e74187bbab3f52e57

data/CHANGELOG.md

@@ -1,9 +1,21 @@
+## Kanrisuru 0.8.7 (August 21, 2021) ##
+* Fix `FileInfo` field for ls command. Was set to `memory_blocks`, but was incorrect, corrected this to `hard_links`.
+
+## 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. 
+* 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.append_flag('-s', summarize)
+        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
@@ -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/core/path.rb

@@ -15,8 +15,8 @@ module Kanrisuru
       os_define :linux, :which
 
       FilePath = Struct.new(:path)
-      FileInfoId = Struct.new(:inode, :mode, :memory_blocks, :uid, :gid, :fsize, :date, :path, :type)
-      FileInfo = Struct.new(:inode, :mode, :memory_blocks, :owner, :group, :fsize, :date, :path, :type)
+      FileInfoId = Struct.new(:inode, :mode, :hard_links, :uid, :gid, :fsize, :date, :path, :type)
+      FileInfo = Struct.new(:inode, :mode, :hard_links, :owner, :group, :fsize, :date, :path, :type)
       UserName = Struct.new(:user)
 
       def ls(opts = {})

data/lib/kanrisuru/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanrisuru
-  VERSION = '0.8.3'
+  VERSION = '0.8.7'
 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,17 +60,23 @@ 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 disk usage root' do
+      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')
+        result = host.du(path: '/etc', summarize: true)
         expect(result).to be_success
-        expect(result[0].path).to eq("/etc")
+        expect(result[0].path).to eq('/etc')
       end
 
       it 'gets disk free for system' do

data/spec/functional/core/path_spec.rb

@@ -29,13 +29,13 @@ RSpec.describe Kanrisuru::Core::Path do
         expect(result.data).to be_instance_of(Array)
 
         file = result.find { |f| f.path == '.bashrc' }
-        expect(file.uid).to eq(1000)
+        expect(file.owner).to eq(1000)
 
         case os_name
         when 'opensuse', 'sles'
-          expect(file.gid).to eq(100)
+          expect(file.group).to eq(100)
         else
-          expect(file.gid).to eq(1000)
+          expect(file.group).to eq(1000)
         end
       end
 

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

data/spec/unit/core/path_spec.rb

@@ -6,10 +6,10 @@ RSpec.describe Kanrisuru::Core::Path do
   it 'responds to path fields' do
     expect(Kanrisuru::Core::Path::FilePath.new).to respond_to(:path)
     expect(Kanrisuru::Core::Path::FileInfoId.new).to respond_to(
-      :inode, :mode, :memory_blocks, :uid, :gid, :fsize, :date, :path, :type
+      :inode, :mode, :hard_links, :uid, :gid, :fsize, :date, :path, :type
     )
     expect(Kanrisuru::Core::Path::FileInfo.new).to respond_to(
-      :inode, :mode, :memory_blocks, :owner, :group, :fsize, :date, :path, :type
+      :inode, :mode, :hard_links, :owner, :group, :fsize, :date, :path, :type
     )
     expect(Kanrisuru::Core::Path::UserName.new).to respond_to(:user)
   end

metadata

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