marhan_cli 0.0.7 → 0.0.8

data/Changelog.md

@@ -27,4 +27,8 @@
 ## v0.0.7
 
 * TrueCrypt command for unmount all devices added.
-* Expect configuration file '.marhan_cli.yaml' in home directory to define encrypted devices and mount folder.
+* Expect configuration file '.marhan_cli.yaml' in home directory to define encrypted devices and mount folder.
+
+## v0.0.8
+
+* Name (configuration key) of device as parameter of mount command. (command => crypt:mount)

data/lib/marhan_cli/app/true_crypt_app.rb

@@ -9,12 +9,12 @@ module MarhanCli
       @mount_folder = mount_folder
     end
 
-    def mount_command(encrypted_devices)
-      "#{@binary} --mount #{encrypted_devices[:enc1]} #{mount_folder}/#{:enc1.to_s}"
+    def mount_command(encrypted_device, mount_to_folder)
+      "#{@binary} --mount #{encrypted_device} #{@mount_folder}/#{mount_to_folder}"
     end
 
     def unmount_command()
-      "#{@binary} -d #{mount_folder}/enc1"
+      "#{@binary} -d #{@mount_folder}/enc1"
     end
 
     def mount_folder

data/lib/marhan_cli/command.rb

@@ -24,5 +24,15 @@ module MarhanCli
       config = Ambience.create(config_file_path)
       config.to_mash
     end
+
+    def get_or_ask(option_name)
+      options[option_name] || ask_for_option(option_name)
+    end
+
+    def ask_for_option(option)
+      value = ask("Please enter #{option}:")
+      raise Thor::Error, "You must enter a value for that field." if value.empty?
+      value
+    end
   end
 end

data/lib/marhan_cli/commands/network.rb

@@ -51,14 +51,5 @@ module MarhanCli
       options[option_name]
     end
 
-    def get_or_ask(option_name)
-      options[option_name] || ask_for_option(:host)
-    end
-
-    def ask_for_option(option)
-      value = ask("Please enter #{option}:")
-      raise Thor::Error, "You must enter a value for that field." if value.empty?
-      value
-    end
   end
 end

data/lib/marhan_cli/commands/true_crypt.rb

@@ -9,11 +9,17 @@ module MarhanCli
 
     desc "crypt:mount", "Mounts encrypted disk with TrueCrypt"
 
+    method_option :device,
+                  :type => :string,
+                  :aliases => "-d",
+                  :desc => "Name of device in configuration file."
+
     def mount
       begin
         config = load_config
+        device = get_or_ask(:device)
         @app = TrueCryptApp.new(config.crypt.mount_folder)
-        run @app.mount_command(config.crypt[:encrypted_devices])
+        run @app.mount_command(config.crypt.encrypted_devices[device], device)
         say "finished", :green
       rescue Exception => e
         exit_with_error(e)
@@ -44,6 +50,5 @@ module MarhanCli
         exit_with_error(e)
       end
     end
-
   end
 end

data/lib/marhan_cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marhan_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor