diskman 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f495782abb13ab1f2378141a37adccc8795754376bceb7b431424f72773bf0b
-  data.tar.gz: a858344c43c168dc352e3ee6e68b9009ba607e89a8ca20f3cc92ba6085ad964a
+  metadata.gz: 60a56cc84faf0b324ccd66b0839aae9b647fd2ce580bfb0b699f42eba3ad136a
+  data.tar.gz: 49689697c2d6ad593fad02dbee1fc10283bcd97d43a350f8c8c8924ea96e9ede
 SHA512:
-  metadata.gz: adee8c52252440fd704dac86884cae71c63b4fd476f316ecd70029e324b9fe5b75679f80f996edd8b6675abd2dee6044c03b3ba99b8aba477630ea76dadcfea3
-  data.tar.gz: '09ed132b747d2b505e822f96c399df95302c5ac152260489d64fb496cc64e68e11211b33e2f69859e6f89dca959a88d4c511af85fbb38b0907d1841859fcecb9'
+  metadata.gz: b40ccefcd84a1adfe607029800ecb2107b64ad2cb4022d3507d8c105e40e531d82e7fecc04bcad6f1bb5b3f299119d3c0668c4a2150d87a3c5c07da18c638627
+  data.tar.gz: c6c571cada30b6228851b2e61a564ae01fa3fac63ea04e94615bb8501b0d466599df6afb2bda0d06be34ed90f387f42d5e593507041a3cea8d101464c37847a4

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

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.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diskman
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - crdx
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all