kanrisuru 0.8.4 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7548306bf7e81fd29f475dfef82c4b8f0973448f22f3cb8882518ace8e70389
-  data.tar.gz: c069633d4408c38333cd3dacfade92678f0309a1b53e435238d6f0814598ec73
+  metadata.gz: 389f21ebed2d778e05d949ab651e91e7fd959c4249c32d936355fa1f093802db
+  data.tar.gz: f83d7f3385b871890a856470a140d6ce2c2efc7ceefdc4f6fe8b9e2f7a454beb
 SHA512:
-  metadata.gz: fbd31bc19b021a3d904b8a9c3d167921a47c709ca05b0590fa1dab5d0032181d454b7da0572760cfebe36286456e3a10547bb14bd6fb60c71413de533daa48a8
-  data.tar.gz: '0710940fec60fab2802a9810d6b5a6bb48f575c8ef8661c2447fbe8dc445ac68a3fb174ed1dd6413689439303983ee229e2ebb08cc1b1c0e68007db3346c2219'
+  metadata.gz: '0185c24a3ff1bdbcc386999f63fb8544a18e8bf9c824e94d001be81785e6a10b7fb47cbcef421399e7e6b1bff805385d5dd4b253b8be7ce2b93fa94022d38596'
+  data.tar.gz: 74557bd5df7e1d10223a965d6c3e38fa8bed84f77ff4bfb75614abec344fd088299c7b4e92f9fb08b7aad1fa9630ee8c93d208dd40d3a4189ddf157bb048c694

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## Kanrisuru 0.8.8 (August 21, 2021) ##
+* Add shorthand notation for tar command actions, such as `x` for `extract`, `t` for `list`, and `c` for `create`. 
+
+## 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.
 

data/lib/kanrisuru/core/archive.rb

@@ -24,7 +24,7 @@ module Kanrisuru
         set_compression(command, compress) if compress
 
         case action
-        when 'list'
+        when 'list', 't'
           command.append_flag('-t')
           command.append_arg('--occurrence', opts[:occurrence])
           command.append_flag('--label', opts[:label])
@@ -38,9 +38,10 @@ module Kanrisuru
               FilePath.new(item)
             end
           end
-        when 'extract', 'get'
+        when 'extract', 'get', 'x'
           command.append_flag('-x')
           command.append_arg('--occurrence', opts[:occurrence])
+
           command.append_flag('--no-same-owner', opts[:no_same_owner])
           command.append_flag('--no-same-permissions', opts[:no_same_permissions])
           command.append_flag('--no-selinux', opts[:no_selinux])
@@ -64,7 +65,7 @@ module Kanrisuru
 
           execute_shell(command)
           Kanrisuru::Result.new(command)
-        when 'create'
+        when 'create', 'c'
           command.append_flag('-c')
           command.append_flag('--multi-volume', opts[:multi_volume])
 
@@ -81,7 +82,7 @@ module Kanrisuru
           execute_shell(command)
 
           Kanrisuru::Result.new(command)
-        when 'append'
+        when 'append', 'r'
           command.append_flag('-r')
 
           if Kanrisuru::Util.present?(paths)
@@ -91,7 +92,7 @@ module Kanrisuru
 
           execute_shell(command)
           Kanrisuru::Result.new(command)
-        when 'catenate', 'concat'
+        when 'catenate', 'concat', 'A'
           command.append_flag('-A')
 
           if Kanrisuru::Util.present?(paths)
@@ -101,7 +102,7 @@ module Kanrisuru
 
           execute_shell(command)
           Kanrisuru::Result.new(command)
-        when 'update'
+        when 'update', 'u'
           command.append_flag('-u')
 
           if Kanrisuru::Util.present?(paths)
@@ -111,7 +112,7 @@ module Kanrisuru
 
           execute_shell(command)
           Kanrisuru::Result.new(command)
-        when 'diff', 'compare'
+        when 'diff', 'compare', 'd'
           command.append_flag('-d')
           command.append_arg('--occurrence', opts[:occurrence])
 

data/lib/kanrisuru/core/disk.rb

@@ -22,27 +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
+          lines.map do |line|
+            values = line.split
             size = values[0].to_i
-            size = convert ? Kanrisuru::Util::Bits.convert_bytes(size, :byte, convert) : size 
+            size = convert ? Kanrisuru::Util::Bits.convert_bytes(size, :byte, convert) : size
 
             DiskUsage.new(size, values[1])
           end
@@ -98,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'
@@ -113,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)
@@ -188,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.4'
+  VERSION = '0.8.8'
 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.4
+  version: 0.8.8
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2021-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec