diskman 1.0.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 356141ac045d586f1d8dec632762474496de583c2cd1f9199b392ad273baf123
-  data.tar.gz: '09057fecdaa82c8fddac9a7ed21c2d172f0cc1e342331d226967f908e0330906'
+  metadata.gz: 43341f349eb41e671944d772c80251464f79466e80a25adc30e03a26c2815d90
+  data.tar.gz: 86c14d2131fb7b85890630ee23a7030d9577929aebd9eb3b09f69a89097845b0
 SHA512:
-  metadata.gz: 1c5c298f9849ef5e25d952b8bc782749c2b98075ef9289f2379f708932c4041bb301cb22dcbe0fa90337fae41103af8b8f9c0079ba7a414935222094b621ffc7
-  data.tar.gz: e840f6c4bb49c3a6f8559494986c082515d3ff8f8c9b705d9d4f9a32bd9794308e21d6044296a03c5dd8305f34a626ce10d2aeb7cfb488491c1931bc9da9d4cb
+  metadata.gz: 84d64b05256f09d08f828397b2c32aaa5fb6398100bbd53bdb0d2a89f712623d3873c47869848e3a2abc82ffbb502b0f79aeb36c429e50e013644f9341375724
+  data.tar.gz: da21b4b198349178d3c0285446746f5da0b9077fc71ddd8aff272bfa8935ab5f97732d3d7b463974adf41eff05b7dd1f4212b1d6fe40e79d31d9f0c931f58602

data/bin/diskman

@@ -8,9 +8,13 @@ Params = Struct.new(
     :version,
     :list,
     :write,
+    :clone,
     :fdisk,
     :mkfs,
     :file,
+    :choose,
+    :device,
+    :partition,
     keyword_init: true,
 )
 
@@ -28,9 +32,13 @@ class Main
             version: @opts['--version'],
             list: @opts['--list'],
             write: @opts['write'],
+            clone: @opts['clone'],
             fdisk: @opts['fdisk'],
             mkfs: @opts['mkfs'],
             file: @opts['<file>'],
+            choose: @opts['choose'],
+            device: @opts['device'],
+            partition: @opts['partition'],
         )
     end
 
@@ -44,23 +52,33 @@ class Main
             Command::Mkfs.new.run(list: params.list)
         elsif params.write
             Command::Write.new.run(file: params.file)
+        elsif params.clone
+            Command::Clone.new.run(file: params.file)
         elsif params.fdisk
             Command::Fdisk.new.run
+        elsif params.choose && params.device
+            Command::ChooseDevice.new.run
+        elsif params.choose && params.partition
+            Command::ChoosePartition.new.run
         end
     rescue Interrupt # rubocop:disable Lint/SuppressedException
     end
 end
 
+PROGRAM_NAME = File.basename($PROGRAM_NAME)
+
 usage = <<~EOF
     Usage:
-        #{File.basename($0)} write <file>
-        #{File.basename($0)} fdisk
-        #{File.basename($0)} mkfs [--list]
-        #{File.basename($0)} ( --version | --help )
+        #{PROGRAM_NAME} write <file>
+        #{PROGRAM_NAME} clone <file>
+        #{PROGRAM_NAME} fdisk
+        #{PROGRAM_NAME} mkfs [--list]
+        #{PROGRAM_NAME} choose ( device | partition )
+        #{PROGRAM_NAME} ( --version | --help )
 
     Options:
         -v, --version    Show version
-        -h, --help       Show this help
+        -h, --help       Show help
 EOF
 
 begin

data/lib/diskman/chooser.rb

@@ -17,37 +17,37 @@ module Diskman
 
         def select
             if @items.length == 0
-                puts 'No %s found'.yellow % @plural
+                $stderr.puts 'No %s found'.yellow % @plural
                 raise Interrupt
             end
 
             if @items.length == 1
-                puts 'Found the following %s.' % label
+                $stderr.puts 'Found the following %s.' % label
             else
-                puts 'Choose from the following %s.' % @plural
+                $stderr.puts 'Choose from the following %s.' % @plural
             end
 
-            puts
+            $stderr.puts
 
             @items.each_with_index do |device, i|
-                puts '%6d. %s' % [i + 1, device]
+                $stderr.puts '%5d. %s' % [i + 1, device]
             end
 
-            puts
+            $stderr.puts
 
             if @items.length == 1
-                puts 'Press enter to select it.'
+                $stderr.puts 'Press enter to select it.'
                 $stdin.gets
                 return @items.first
             end
 
-            puts 'Enter your selection.'
-            puts
-            print '> '
+            $stderr.puts 'Enter your selection.'
+            $stderr.puts
+            $stderr.print '> '
 
             selection = $stdin.gets.chomp
 
-            puts
+            $stderr.puts
 
             if selection.length == 0
                 raise Interrupt
@@ -56,7 +56,7 @@ module Diskman
             selection = selection.to_i
 
             if selection <= 0 || selection > @items.length
-                puts 'Invalid selection'.red
+                $stderr.puts 'Invalid selection'.red
                 raise Interrupt
             end
 

data/lib/diskman/commands/choose_device.rb

@@ -0,0 +1,7 @@
+module Command
+    class ChooseDevice
+        def run
+            puts RootDevice.choose.path
+        end
+    end
+end

data/lib/diskman/commands/choose_partition.rb

@@ -0,0 +1,7 @@
+module Command
+    class ChoosePartition
+        def run
+            puts RootDevice.choose.choose_with_partitions.path
+        end
+    end
+end

data/lib/diskman/commands/clone.rb

@@ -0,0 +1,19 @@
+module Command
+    class Clone
+        def run(file:)
+            if File.exist?(file)
+                puts ('File exists: ' + file).red
+                raise Interrupt
+            end
+
+            device = RootDevice.choose
+            cmd = device.get_clone_command(file)
+
+            puts "File:    #{file.yellow}"
+            puts "Device:  #{device.to_s.yellow}"
+            puts "Command: #{cmd.yellow}"
+
+            System.exec!(cmd)
+        end
+    end
+end

data/lib/diskman/device.rb

@@ -17,8 +17,13 @@ module Diskman
         end
 
         def get_write_command(path)
-            dd = 'sudo dd if="%s" of="%s" bs=%dK status=progress'
-            dd % [path, @path, 4096]
+            dd = 'sudo dd if="%s" of="%s" bs=%dM status=progress conv=fsync'
+            dd % [path, @path, 4]
+        end
+
+        def get_clone_command(path)
+            dd = 'sudo dd if="%s" of="%s" bs=%dM status=progress conv=fsync'
+            dd % [@path, path, 4]
         end
 
         def to_s

data/lib/diskman/system.rb

@@ -1,19 +1,10 @@
 module Diskman
     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 sudo --validate
-        # first to ensure that we are preauthenticated.
-        def self.prepare_sudo_session!
-            system('sudo --validate')
-        end
-
         # Execute a command.
-        # If sudo is true, ensures sudo is ready before running the command.
-        # If safe is true, ensures the user definitely wants to run the command
-        # before running it.
-        def self.exec!(cmd, safe: true, sudo: true)
+        #
+        # If safe is true, ensures the user definitely wants to run the command before running it.
+        def self.exec!(cmd, safe: true)
             Confirmer.check! if safe
-            prepare_sudo_session! if sudo
             puts
             exec(cmd)
         end
@@ -22,8 +13,7 @@ module Diskman
         def self.bytes2human(b)
             return '0B' if b <= 0
 
-            # Use 1000 to match the misleading way disk capacities are
-            # advertised.
+            # Use 1000 to match the misleading way disk capacities are advertised.
             k = 1000
 
             suffixes = %w[T G M K B]

data/lib/diskman/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diskman
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.3.0
 platform: ruby
 authors:
 - crdx
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2023-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -52,48 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
 description:
 email:
 executables:
@@ -104,6 +62,9 @@ files:
 - bin/diskman
 - lib/diskman.rb
 - lib/diskman/chooser.rb
+- lib/diskman/commands/choose_device.rb
+- lib/diskman/commands/choose_partition.rb
+- lib/diskman/commands/clone.rb
 - lib/diskman/commands/fdisk.rb
 - lib/diskman/commands/mkfs.rb
 - lib/diskman/commands/write.rb
@@ -115,7 +76,7 @@ files:
 - lib/diskman/version.rb
 homepage: https://github.com/crdx/diskman
 licenses:
-- MIT
+- GPLv3
 metadata:
   rubygems_mfa_required: 'true'
 post_install_message:
@@ -133,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: Interactive command line interface for safely managing disks