diskman 1.0.5 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc55f72e8adacb9143ad05cf5edc11c2db9d8be185569bb9263735efcbe54700
-  data.tar.gz: 28a1cfa67910767440b3f6293192ddd05be1194e3b9a7246ed304b3bdb33df3c
+  metadata.gz: 356141ac045d586f1d8dec632762474496de583c2cd1f9199b392ad273baf123
+  data.tar.gz: '09057fecdaa82c8fddac9a7ed21c2d172f0cc1e342331d226967f908e0330906'
 SHA512:
-  metadata.gz: b07d213e836deffc0998b14e57e68a4b41f509cf3ba7e7d60d488c6ee8a9f376c7032c90e34a1fb603bee553aaa81902145dfe2a83ca79d1bd976627e269c18d
-  data.tar.gz: 0f68a40ed3db1504f00b05765a646fd57e1e8686fb37e6d1b6e6a7af93303bbd2b4018dffafa9b9ab27a434be3a30b8d4ef5b96cee8f988a768fbddbd51f2729
+  metadata.gz: 1c5c298f9849ef5e25d952b8bc782749c2b98075ef9289f2379f708932c4041bb301cb22dcbe0fa90337fae41103af8b8f9c0079ba7a414935222094b621ffc7
+  data.tar.gz: e840f6c4bb49c3a6f8559494986c082515d3ff8f8c9b705d9d4f9a32bd9794308e21d6044296a03c5dd8305f34a626ce10d2aeb7cfb488491c1931bc9da9d4cb

data/bin/diskman

@@ -1,8 +1,18 @@
 #!/usr/bin/env ruby
 require_relative '../lib/diskman'
+require 'docopt'
+
 include Diskman
 
-require 'docopt'
+Params = Struct.new(
+    :version,
+    :list,
+    :write,
+    :fdisk,
+    :mkfs,
+    :file,
+    keyword_init: true,
+)
 
 class Main
     def initialize(opts)
@@ -14,30 +24,21 @@ class Main
     end
 
     def params
-        @params ||= OpenStruct.new({
+        @params ||= Params.new(
             version: @opts['--version'],
-            help: @opts['--help'],
             list: @opts['--list'],
             write: @opts['write'],
             fdisk: @opts['fdisk'],
             mkfs: @opts['mkfs'],
             file: @opts['<file>'],
-        })
-    end
-
-    def exit_usage
-        puts DOCS
-        exit 0
-    end
-
-    def exit_version
-        puts Diskman::VERSION
-        exit 0
+        )
     end
 
     def run
-        exit_version if params.version
-        exit_usage if params.help
+        if params.version
+            puts VERSION
+            exit
+        end
 
         if params.mkfs
             Command::Mkfs.new.run(list: params.list)
@@ -46,25 +47,25 @@ class Main
         elsif params.fdisk
             Command::Fdisk.new.run
         end
-    rescue Interrupt => e
+    rescue Interrupt # rubocop:disable Lint/SuppressedException
     end
 end
 
-docs = <<~EOF
-    #{'Usage:'.bold}
+usage = <<~EOF
+    Usage:
         #{File.basename($0)} write <file>
         #{File.basename($0)} fdisk
-        #{File.basename($0)} mkfs [ --list ]
+        #{File.basename($0)} mkfs [--list]
         #{File.basename($0)} ( --version | --help )
 
-    #{'Options:'.bold}
-        -v, --version  Show version
-        -h, --help     Show this help
+    Options:
+        -v, --version    Show version
+        -h, --help       Show this help
 EOF
 
 begin
-    Main.run(Docopt::docopt(docs, version: VERSION))
-rescue Docopt::Exit => e
-    puts e.message
-    exit 1
+    Main.run(Docopt.docopt(usage))
+rescue Docopt::Exit
+    puts usage
+    exit 2
 end

data/lib/diskman/chooser.rb

@@ -30,7 +30,7 @@ module Diskman
             puts
 
             @items.each_with_index do |device, i|
-                puts "%6d. %s" % [i + 1, device]
+                puts '%6d. %s' % [i + 1, device]
             end
 
             puts

data/lib/diskman/commands/fdisk.rb

@@ -3,7 +3,7 @@ module Command
         def run
             root_device = RootDevice.choose
             cmd = root_device.get_fdisk_command
-            System.exec! cmd, safe: false
+            System.exec!(cmd, safe: false)
         end
     end
 end

data/lib/diskman/commands/mkfs.rb

@@ -22,7 +22,7 @@ module Command
             puts "Device:     #{device.to_s.yellow}"
             puts "Command:    #{cmd.yellow}"
 
-            System.exec! cmd
+            System.exec!(cmd)
         end
     end
 end

data/lib/diskman/commands/write.rb

@@ -1,7 +1,7 @@
 module Command
     class Write
         def run(file:)
-            if !File.exists?(file)
+            if !File.exist?(file)
                 puts ('Unable to read ' + file).red
                 raise Interrupt
             end
@@ -10,13 +10,13 @@ module Command
             device = device.choose_with_partitions
 
             size = File.size(file)
-            cmd = device.get_write_command(file, size)
+            cmd = device.get_write_command(file)
 
             puts "File:    #{file.yellow} (#{System.bytes2human(size)})"
             puts "Device:  #{device.to_s.yellow}"
             puts "Command: #{cmd.yellow}"
 
-            System.exec! cmd
+            System.exec!(cmd)
         end
     end
 end

data/lib/diskman/confirmer.rb

@@ -1,7 +1,7 @@
 module Diskman
     # Confirms whether the user wants to do something destructive.
     class Confirmer
-        YES = 'YES'
+        YES = 'yes'
 
         def self.check!
             new.check!
@@ -9,7 +9,7 @@ module Diskman
 
         def check!
             puts
-            puts 'Are you sure? Type "%s" if so.' % YES
+            puts 'Are you sure? Type "%s"' % YES
             puts
 
             print '> '

data/lib/diskman/device.rb

@@ -16,7 +16,7 @@ module Diskman
             'sudo mkfs.%s %s' % [fs, @path]
         end
 
-        def get_write_command(path, bytes)
+        def get_write_command(path)
             dd = 'sudo dd if="%s" of="%s" bs=%dK status=progress'
             dd % [path, @path, 4096]
         end
@@ -27,8 +27,8 @@ module Diskman
 
         private
 
-        def <=>(o)
-            @path <=> o.path
+        def <=>(other)
+            @path <=> other.path
         end
     end
 end

data/lib/diskman/root_device.rb

@@ -35,7 +35,7 @@ module Diskman
         private
 
         def get_with_partitions
-            Dir[@path + '*'].sort.map do |file|
+            Dir[@path + '*'].map do |file|
                 file =~ %r[/dev/(.*)] && Device.new($1)
             end.sort
         end
@@ -45,7 +45,7 @@ module Diskman
         end
 
         def get_prop(name)
-            file = "/sys/class/block/%s/%s" % [@name, name]
+            file = '/sys/class/block/%s/%s' % [@name, name]
             File.read(file).strip.gsub(/\s+/, ' ')
         end
 

data/lib/diskman/system.rb

@@ -15,7 +15,7 @@ module Diskman
             Confirmer.check! if safe
             prepare_sudo_session! if sudo
             puts
-            exec cmd
+            exec(cmd)
         end
 
         # Convert bytes into a human-friendly representation.
@@ -26,7 +26,7 @@ module Diskman
             # advertised.
             k = 1000
 
-            suffixes = ['T', 'G', 'M', 'K', 'B']
+            suffixes = %w[T G M K B]
 
             suffixes.each_with_index do |suffix, i|
                 threshold = k ** (suffixes.length - i - 1)

data/lib/diskman/version.rb

@@ -1,3 +1,3 @@
 module Diskman
-    VERSION = "1.0.5"
+    VERSION = '1.0.9'
 end

data/lib/diskman.rb

@@ -5,7 +5,7 @@ require 'ostruct'
 
 module Diskman
     def self.root_dir
-        File.expand_path('../..', __FILE__)
+        File.expand_path('..', __dir__)
     end
 end
 

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: diskman
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.9
 platform: ruby
 authors:
 - crdx
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: require_all
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: docopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: docopt
+  name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.21.0
 description:
 email:
 executables:
@@ -116,7 +116,8 @@ files:
 homepage: https://github.com/crdx/diskman
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -125,14 +126,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Interactive command line interface for safely managing disks