diskman 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6831a1ef183d31bdae66d4ae5080cf3a019b0ace76d259a0783d4751cfca1f94
-  data.tar.gz: 62ac2d6b97e14081766fd44cefbeca8529afcf51ffd2a63c309850b3c58013cc
+  metadata.gz: 5f495782abb13ab1f2378141a37adccc8795754376bceb7b431424f72773bf0b
+  data.tar.gz: a858344c43c168dc352e3ee6e68b9009ba607e89a8ca20f3cc92ba6085ad964a
 SHA512:
-  metadata.gz: 314214d528f832e92563265161fbf3e11d8960a04720686084ed4d78361a7f2e2b08e67f8bac3c014f329f088f9d9c6b15b32dc3d9e7a48000780d9b1146e9f9
-  data.tar.gz: 48598af4a378a4190d1292d872133e9c334a214d5d42f02a969b8765079da8ac74f8cdc9c6a8fa82db6c5caae38a8d80b620914542c3905e2176c52210a53608
+  metadata.gz: adee8c52252440fd704dac86884cae71c63b4fd476f316ecd70029e324b9fe5b75679f80f996edd8b6675abd2dee6044c03b3ba99b8aba477630ea76dadcfea3
+  data.tar.gz: '09ed132b747d2b505e822f96c399df95302c5ac152260489d64fb496cc64e68e11211b33e2f69859e6f89dca959a88d4c511af85fbb38b0907d1841859fcecb9'

data/bin/diskman

@@ -2,6 +2,8 @@
 require_relative '../lib/diskman'
 include Diskman
 
+require 'docopt'
+
 class Main
     def initialize(opts)
         @opts = opts

data/lib/diskman.rb

@@ -1,6 +1,5 @@
 require 'require_all'
 require 'colorize'
-require 'docopt'
 
 require 'ostruct'
 

data/lib/diskman/chooser.rb

@@ -1,10 +1,10 @@
 module Diskman
     # Presents the user with a list of items to choose from.
     class Chooser
-        def initialize(items, what:)
+        def initialize(items, item:)
             @items = items
-            @singular = what
-            @plural = what + 's'
+            @singular = item
+            @plural = item + 's'
         end
 
         def label
@@ -15,10 +15,6 @@ module Diskman
             end
         end
 
-        def space
-            ' '
-        end
-
         def select
             if @items.length == 0
                 puts 'No %s found'.yellow % @plural
@@ -28,13 +24,13 @@ module Diskman
             if @items.length == 1
                 puts 'Found the following %s.' % label
             else
-                puts 'Please pick from the following %s.' % @plural
+                puts 'Choose from the following %s.' % @plural
             end
 
             puts
 
             @items.each_with_index do |device, i|
-                puts "#{(space * 4) }#{i + 1}. #{device}"
+                puts "%6d. %s" % [i + 1, device]
             end
 
             puts
@@ -45,7 +41,7 @@ module Diskman
                 return @items.first
             end
 
-            puts 'Enter the number of your selection.'
+            puts 'Enter your selection.'
             puts
             print '> '
 

data/lib/diskman/commands/mkfs.rb

@@ -15,9 +15,9 @@ module Command
             device = RootDevice.choose
             device.ensure_not_mounted!
 
-            device = device.choose_block_device
+            device = device.choose_with_partitions
 
-            fs = Chooser.new(get_list, what: 'filesystem').select
+            fs = Chooser.new(get_list, item: 'filesystem').select
             cmd = device.get_mkfs_command(fs)
 
             puts "Filesystem: #{fs.yellow}"

data/lib/diskman/confirmer.rb

@@ -4,7 +4,7 @@ module Diskman
         YES = 'YES'
 
         def self.check!
-            self.new.check!
+            new.check!
         end
 
         def check!

data/lib/diskman/mount.rb

@@ -1,11 +1,11 @@
 module Diskman
-    class Mount
-        def self.is_mounted(name)
-            Mount.new.find(name)
+    class Mtab
+        def self.mounted?(name)
+            new.find(name)
         end
 
-        def self.get_mount_point(name)
-            Mount.new.find(name).chomp.match(/[^ ]+ (?<m>[^ ]+)/)[:m]
+        def self.mount_point(name)
+            new.find(name).chomp.match(/[^ ]+ (?<m>[^ ]+)/)[:m]
         end
 
         def find(name)

data/lib/diskman/root_device.rb

@@ -4,46 +4,38 @@ module Diskman
             Dir['/sys/block/*/removable'].select do |file|
                 File.read(file).strip == '1'
             end.map do |path|
-                path =~ /^\/sys\/block\/(.*)\/removable$/ && RootDevice.new($1)
+                path =~ %r[^/sys/block/(.*)/removable$]x && RootDevice.new($1)
             end.sort
         end
 
         def self.choose
-            Chooser.new(RootDevice.get_removable, what: 'removable device').select
+            Chooser.new(RootDevice.get_removable, item: 'removable device').select
         end
 
-        def get_devices
-            Dir[@path + '*'].sort.map do |file|
-                file =~ %r[/dev/(.*)] && Device.new($1)
-            end.sort
-        end
-
-        def choose_block_device
-            Chooser.new(get_devices, what: 'device').select
+        def choose_with_partitions
+            Chooser.new(get_with_partitions, item: 'block device').select
         end
 
         def ensure_not_mounted!
             if mounted?
-                puts ('Warning: device appears to be mounted at ' + get_mount_point).yellow
+                puts ('Warning: device appears to be mounted at ' + mount_point).yellow
                 puts 'Not continuing'.red
                 raise Interrupt
             end
         end
 
-        def mounted?
-            Mount.is_mounted(@name)
-        end
-
-        def get_mount_point
-            Mount.get_mount_point(@name)
-        end
-
         def to_s
             @path + ' [' + [size, label].reject(&:empty?).join(', ') + ']'
         end
 
         private
 
+        def get_with_partitions
+            Dir[@path + '*'].sort.map do |file|
+                file =~ %r[/dev/(.*)] && Device.new($1)
+            end.sort
+        end
+
         def get_int_prop(name)
             get_prop(name).to_i
         end
@@ -54,7 +46,8 @@ module Diskman
         end
 
         def label
-            [get_prop('device/vendor'), get_prop('device/model')].reject(&:empty?).join(' ')
+            parts = [get_prop('device/vendor'), get_prop('device/model')]
+            parts.reject(&:empty?).join(' ')
         end
 
         def size_bytes
@@ -64,5 +57,13 @@ module Diskman
         def size
             System.bytes2human(size_bytes)
         end
+
+        def mounted?
+            Mtab.mounted?(@name)
+        end
+
+        def mount_point
+            Mtab.mount_point(@name)
+        end
     end
 end

data/lib/diskman/system.rb

@@ -1,11 +1,10 @@
 module Diskman
-    class System
+    module System
         # If sudo prompts for the password when a pipeline with pv has already
-        # started then we're unable to enter the password. Run a pointless
-        # command with sudo first to ensure that we can accept keyboard input
-        # for the password, if necessary.
+        # started then we're unable to enter the password. Run sudo --validate
+        # first to ensure that we are preauthenticated.
         def self.prepare_sudo_session!
-            system('sudo echo >/dev/null')
+            system('sudo --validate')
         end
 
         # Execute a command.
@@ -27,10 +26,10 @@ module Diskman
             # advertised.
             k = 1000
 
-            suffices = ['T', 'G', 'M', 'K', 'B']
+            suffixes = ['T', 'G', 'M', 'K', 'B']
 
-            suffices.each_with_index do |suffix, i|
-                threshold = k ** (suffices.length - i - 1)
+            suffixes.each_with_index do |suffix, i|
+                threshold = k ** (suffixes.length - i - 1)
                 if b >= threshold
                     return (b / threshold).to_s + suffix
                 end

data/lib/diskman/version.rb

@@ -1,3 +1,3 @@
 module Diskman
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diskman
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - crdx