marhan_cli 0.0.8 → 0.0.9

data/Changelog.md

@@ -31,4 +31,8 @@
 
 ## v0.0.8
 
-* Name (configuration key) of device as parameter of mount command. (command => crypt:mount)
+* Name (configuration key) of device as parameter of mount command. (command => crypt:mount)
+
+## v0.0.9
+
+* Name (configuration key) of device as parameter of unmount command. (command => crypt:unmount)

data/lib/marhan_cli/app/true_crypt_app.rb

@@ -9,12 +9,12 @@ module MarhanCli
       @mount_folder = mount_folder
     end
 
-    def mount_command(encrypted_device, mount_to_folder)
-      "#{@binary} --mount #{encrypted_device} #{@mount_folder}/#{mount_to_folder}"
+    def mount_command(encrypted_device, mount_sub_folder)
+      "#{@binary} --mount #{encrypted_device} #{@mount_folder}/#{mount_sub_folder}"
     end
 
-    def unmount_command()
-      "#{@binary} -d #{@mount_folder}/enc1"
+    def unmount_command(mount_sub_folder)
+      "#{@binary} -d #{@mount_folder}/#{mount_sub_folder}"
     end
 
     def mount_folder

data/lib/marhan_cli/command.rb

@@ -20,7 +20,7 @@ module MarhanCli
       unless File.exists?(config_file_path)
         raise "Stop processing! Command needs the configuration file '#{CONFIG_FILE}' in you're home directory."
       end
-      say "I will use the '#{CONFIG_FILE}' configuration file in you're home directory.", :cyan
+      #say "I will use the '#{CONFIG_FILE}' configuration file in you're home directory.", :cyan
       config = Ambience.create(config_file_path)
       config.to_mash
     end

data/lib/marhan_cli/commands/true_crypt.rb

@@ -16,10 +16,10 @@ module MarhanCli
 
     def mount
       begin
-        config = load_config
+        config = load_crypt_config
+        true_crypt = TrueCryptApp.new(config.mount_folder)
         device = get_or_ask(:device)
-        @app = TrueCryptApp.new(config.crypt.mount_folder)
-        run @app.mount_command(config.crypt.encrypted_devices[device], device)
+        run true_crypt.mount_command(config.encrypted_devices[device], device)
         say "finished", :green
       rescue Exception => e
         exit_with_error(e)
@@ -28,11 +28,17 @@ module MarhanCli
 
     desc "crypt:umount", "Unmounts encrypted disk with TrueCrypt"
 
-    def unmount
+    method_option :device,
+                  :type => :string,
+                  :aliases => "-d",
+                  :desc => "Name of device in configuration file."
+
+    def umount
       begin
-        config = load_config
-        @app = TrueCryptApp.new(config.crypt.mount_folder)
-        run @app.unmount_command
+        config = load_crypt_config
+        true_crypt = TrueCryptApp.new(config.mount_folder)
+        device = get_or_ask(:device)
+        run true_crypt.unmount_command(device)
         say "finished", :green
       rescue Exception => e
         exit_with_error(e)
@@ -43,12 +49,18 @@ module MarhanCli
 
     def umount_all
       begin
-        @app = TrueCryptApp.new
-        run @app.unmount_all_command
+        true_crypt = TrueCryptApp.new
+        run true_crypt.unmount_all_command
         say "finished", :green
       rescue Exception => e
         exit_with_error(e)
       end
     end
+
+    protected
+
+    def load_crypt_config
+      load_config.crypt
+    end
   end
 end

data/lib/marhan_cli/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module MarhanCli
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marhan_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: