marhan_cli 0.0.6 → 0.0.7

data/Changelog.md

@@ -22,4 +22,9 @@
 ## v0.0.6
 
 * TrueCrypt command added.
-* Mount and unmount commands for private hard disk added.
+* Mount and unmount commands for private hard disk added.
+
+## 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.

data/README.md

@@ -22,6 +22,13 @@ Ater installation of the gem type `mcli` to get a list of possible commands
 
     $ mcli
 
+Configuration file `~/.marhan_cli.yml` is used for several commands
+
+    crypt:
+      mount_folder: /Volumes
+      encrypted_devices:
+        enc1: /dev/rdisk1s2
+
 ## Contributing
 
 1. Fork it

data/lib/marhan_cli/app/true_crypt_app.rb

@@ -1,19 +1,29 @@
-require 'marhan_cli/helper/constraint'
+# encoding: utf-8
 
 module MarhanCli
   class TrueCryptApp
 
-    def initialize()
+    def initialize(mount_folder = nil)
       @binary = "/Applications/TrueCrypt.app/Contents/MacOS/TrueCrypt"
       raise ArgumentError, "No installation of TrueCrypt found!" unless File.exist? @binary
+      @mount_folder = mount_folder
     end
 
-    def mount_command()
-      "#{@binary} --mount /dev/rdisk1s2 /Volumes/enc1"
+    def mount_command(encrypted_devices)
+      "#{@binary} --mount #{encrypted_devices[:enc1]} #{mount_folder}/#{:enc1.to_s}"
     end
 
     def unmount_command()
-      "#{@binary} -d /Volumes/enc1"
+      "#{@binary} -d #{mount_folder}/enc1"
+    end
+
+    def mount_folder
+      raise ArgumentError, "No mount folder defined! Don't know where to mount!" unless @mount_folder
+      @mount_folder
+    end
+
+    def unmount_all_command()
+      "#{@binary} -d"
     end
 
   end

data/lib/marhan_cli/command.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "thor"
+require "ambience"
 
 module MarhanCli
   class Command < Thor
@@ -7,10 +8,21 @@ module MarhanCli
 
     protected
 
-    def exit_command(message)
+    CONFIG_FILE = ".marhan_cli.yml"
+
+    def exit_with_error(message)
       say message, :red
       exit(1)
     end
 
+    def load_config
+      config_file_path = File.join(File.expand_path("~/"), CONFIG_FILE)
+      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
+      config = Ambience.create(config_file_path)
+      config.to_mash
+    end
   end
 end

data/lib/marhan_cli/commands/network.rb

@@ -42,7 +42,7 @@ module MarhanCli
       remote_machine.add_id_to_authorized_keys(user, password, id_file)
       say "successfully copied #{id_file} to #{host}", :green
     rescue Exception => e
-      exit_command("copying of id file to remote machine failed: #{e}")
+      exit_with_error("copying of id file to remote machine failed: #{e}")
     end
 
     protected

data/lib/marhan_cli/commands/true_crypt.rb

@@ -11,23 +11,37 @@ module MarhanCli
 
     def mount
       begin
-        @app = TrueCryptApp.new
-        run @app.mount_command
+        config = load_config
+        @app = TrueCryptApp.new(config.crypt.mount_folder)
+        run @app.mount_command(config.crypt[:encrypted_devices])
         say "finished", :green
       rescue Exception => e
-        exit_command("Failed: #{e}")
+        exit_with_error(e)
       end
     end
 
-    desc "crypt:unmount", "Unmounts encrypted disk with TrueCrypt"
+    desc "crypt:umount", "Unmounts encrypted disk with TrueCrypt"
 
     def unmount
       begin
-        @app = TrueCryptApp.new
+        config = load_config
+        @app = TrueCryptApp.new(config.crypt.mount_folder)
         run @app.unmount_command
         say "finished", :green
       rescue Exception => e
-        exit_command("Failed: #{e}")
+        exit_with_error(e)
+      end
+    end
+
+    desc "crypt:umount_all", "Unmounts all encrypted disk with TrueCrypt"
+
+    def umount_all
+      begin
+        @app = TrueCryptApp.new
+        run @app.unmount_all_command
+        say "finished", :green
+      rescue Exception => e
+        exit_with_error(e)
       end
     end
 

data/lib/marhan_cli/version.rb

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

data/marhan_cli.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency('thor')
   gem.add_runtime_dependency('net-ssh', '~> 2.6.1')
+  gem.add_runtime_dependency('ambience', '~> 2.0.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marhan_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-24 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.1
+- !ruby/object:Gem::Dependency
+  name: ambience
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: 
 email: me@markushanses.de
 executables: