diskman 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b601bff2adbe81099f2b8c279a9757a99d0afc8b62fbec38a8cff8140fb7b1f
-  data.tar.gz: 12579cdae49bf6a812e0a415ab7bc273f0106dee52880e2a2850c4f1ea9ad680
+  metadata.gz: 7fc1b38621654bc6c54e2c341508f7a34bad56edea11e3d6a1430fb386aa7998
+  data.tar.gz: ef7d21e5d8fd39f346e755fd8cc961c38d0b0f90fbd1a8a8326faacd5021ce39
 SHA512:
-  metadata.gz: 99c8eeb4df39180d09418c9b8707df8bb1413aaa4c6ec55a2f058a66ce017e1a2a51b12254a7461dbfc2215aa0138995fdcd7b179f7987116eed8826bd938ab5
-  data.tar.gz: 05051535ce5c6007a5e6372e7c779b73b48e6ea920a16e7876533063b0d9ed754a21f2a1e1f5ace6b015eb01654230f78ec18e8e2684c4d13237f3790aa7947b
+  metadata.gz: 1633d95b48a889716644ec065f124add986f10eaa11ed8386b4c64cf354bcf0a909231e00d727637ff6f2821fe1282cf7f2e37a7ce648c3bfe58224c86ac298d
+  data.tar.gz: 6e3d1a87a326e762cef359c67ba782f87a63f8f8f658b6dadbb21f3bf6ad2c13e1db6aaf550759384f6ba699f7deb5f0422ff1982ac68aff04709fc05c26301f

data/bin/diskman

@@ -2,7 +2,18 @@
 require_relative '../lib/diskman'
 require 'docopt'
 
-include Diskman # rubocop:disable Style/MixinUsage
+include Diskman
+
+Params = Struct.new(
+    :version,
+    :list,
+    :write,
+    :clone,
+    :fdisk,
+    :mkfs,
+    :file,
+    keyword_init: true,
+)
 
 class Main
     def initialize(opts)
@@ -14,14 +25,15 @@ class Main
     end
 
     def params
-        @params ||= OpenStruct.new({
+        @params ||= Params.new(
             version: @opts['--version'],
             list: @opts['--list'],
             write: @opts['write'],
+            clone: @opts['clone'],
             fdisk: @opts['fdisk'],
             mkfs: @opts['mkfs'],
             file: @opts['<file>'],
-        })
+        )
     end
 
     def run
@@ -34,6 +46,8 @@ 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
         end
@@ -41,16 +55,19 @@ class Main
     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} ( --version | --help )
 
     Options:
         -v, --version    Show version
-        -h, --help       Show this help
+        -h, --help       Show help
 EOF
 
 begin

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.8'
+    VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diskman
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - crdx
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -104,6 +104,7 @@ files:
 - bin/diskman
 - lib/diskman.rb
 - lib/diskman/chooser.rb
+- lib/diskman/commands/clone.rb
 - lib/diskman/commands/fdisk.rb
 - lib/diskman/commands/mkfs.rb
 - lib/diskman/commands/write.rb
@@ -115,8 +116,9 @@ files:
 - lib/diskman/version.rb
 homepage: https://github.com/crdx/diskman
 licenses:
-- MIT
-metadata: {}
+- GPLv3
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -132,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: Interactive command line interface for safely managing disks