diskman 1.0.1 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f495782abb13ab1f2378141a37adccc8795754376bceb7b431424f72773bf0b
-  data.tar.gz: a858344c43c168dc352e3ee6e68b9009ba607e89a8ca20f3cc92ba6085ad964a
+  metadata.gz: fc55f72e8adacb9143ad05cf5edc11c2db9d8be185569bb9263735efcbe54700
+  data.tar.gz: 28a1cfa67910767440b3f6293192ddd05be1194e3b9a7246ed304b3bdb33df3c
 SHA512:
-  metadata.gz: adee8c52252440fd704dac86884cae71c63b4fd476f316ecd70029e324b9fe5b75679f80f996edd8b6675abd2dee6044c03b3ba99b8aba477630ea76dadcfea3
-  data.tar.gz: '09ed132b747d2b505e822f96c399df95302c5ac152260489d64fb496cc64e68e11211b33e2f69859e6f89dca959a88d4c511af85fbb38b0907d1841859fcecb9'
+  metadata.gz: b07d213e836deffc0998b14e57e68a4b41f509cf3ba7e7d60d488c6ee8a9f376c7032c90e34a1fb603bee553aaa81902145dfe2a83ca79d1bd976627e269c18d
+  data.tar.gz: 0f68a40ed3db1504f00b05765a646fd57e1e8686fb37e6d1b6e6a7af93303bbd2b4018dffafa9b9ab27a434be3a30b8d4ef5b96cee8f988a768fbddbd51f2729

data/lib/diskman/chooser.rb

@@ -36,7 +36,7 @@ module Diskman
             puts
 
             if @items.length == 1
-                puts 'Press any key to select it.'
+                puts 'Press enter to select it.'
                 $stdin.gets
                 return @items.first
             end

data/lib/diskman/commands/mkfs.rb

@@ -1,8 +1,8 @@
 module Command
     class Mkfs
         def get_list
-            Dir['/usr/bin/mkfs.*'].map do |path|
-                path.gsub(%r[^/usr/bin/mkfs.], '')
+            Dir['/sbin/mkfs.*'].map do |path|
+                path.gsub(%r[^/sbin/mkfs.], '')
             end.sort
         end
 
@@ -13,8 +13,6 @@ module Command
             end
 
             device = RootDevice.choose
-            device.ensure_not_mounted!
-
             device = device.choose_with_partitions
 
             fs = Chooser.new(get_list, item: 'filesystem').select
@@ -24,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

@@ -7,7 +7,7 @@ module Command
             end
 
             device = RootDevice.choose
-            device.ensure_not_mounted!
+            device = device.choose_with_partitions
 
             size = File.size(file)
             cmd = device.get_write_command(file, size)
@@ -16,7 +16,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/device.rb

@@ -1,5 +1,6 @@
 module Diskman
     class Device
+        attr_reader :name
         attr_reader :path
 
         def initialize(name)
@@ -16,13 +17,7 @@ module Diskman
         end
 
         def get_write_command(path, bytes)
-            if `which 2>/dev/null pv`.length > 0
-                pv = 'pv --size %d' % bytes
-                dd = 'dd if="%s" | ' + pv + ' | sudo dd of="%s" bs=%d'
-            else
-                dd = 'sudo dd if="%s" of="%s" bs=%d'
-            end
-
+            dd = 'sudo dd if="%s" of="%s" bs=%dK status=progress'
             dd % [path, @path, 4096]
         end
 

data/lib/diskman/root_device.rb

@@ -5,11 +5,15 @@ module Diskman
                 File.read(file).strip == '1'
             end.map do |path|
                 path =~ %r[^/sys/block/(.*)/removable$]x && RootDevice.new($1)
+            end.reject do |device|
+                device.name =~ /sr\d+/
             end.sort
         end
 
         def self.choose
-            Chooser.new(RootDevice.get_removable, item: 'removable device').select
+            selection = Chooser.new(RootDevice.get_removable, item: 'removable device').select
+            selection.ensure_not_mounted!
+            selection
         end
 
         def choose_with_partitions

data/lib/diskman/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diskman
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.5
 platform: ruby
 authors:
 - crdx
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,16 +86,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-description: 
-email: 
+        version: '13.0'
+description:
+email:
 executables:
 - diskman
 extensions: []
@@ -117,7 +117,7 @@ homepage: https://github.com/crdx/diskman
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,8 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.21
+signing_key:
 specification_version: 4
 summary: Interactive command line interface for safely managing disks
 test_files: []