lockr 0.2.0 → 0.2.1

data/lib/lockr.rb

@@ -8,11 +8,15 @@ require 'lockr/action/add'
 require 'lockr/action/list'
 require 'lockr/action/remove'
 require 'lockr/action/show'
+require 'lockr/config'
 require 'lockr/pwdgen'
+require 'lockr/version'
   
 class Lockr
+  
   def run()
     options = parse_options()
+    merge_config( options)
     validate_options( options)
     acquire_additional_input( options)
     process_actions( options)
@@ -58,6 +62,14 @@ class Lockr
         puts opts
         exit
       end
+      
+      opts.on('-v', '--version', 'Show version') do
+        puts "Lockr #{LockrVer::VERSION} (#{LockrVer::DATE})"
+        exit
+      end
+      
+      opts.separator ""
+      opts.separator "For detailed instructions on how to use Lockr, please visit http://lockr.byteblues.com"
     end
     
     # Parse the command-line. Remember there are two forms
@@ -70,6 +82,21 @@ class Lockr
     options
   end
   
+  def merge_config( options)
+    configfile = Configuration.new()
+    
+    if configfile.config.nil? 
+      return
+    end
+    
+    unless configfile.config.has_key?( :lockr)
+      return
+    end
+    
+    cfg = configfile.config[:lockr]
+    options[:vault] = File.expand_path(cfg[:vault]) if options[:vault] == 'vault.yaml'
+  end
+  
   def validate_options( options)
     if options[:action].nil?
       puts 'Please provide an action (--action)'

data/lib/lockr/config.rb

@@ -0,0 +1,15 @@
+class Configuration
+  CONFIG_FILE = '.lockr'
+  attr_reader :config
+  
+  def initialize()
+    @config = nil
+    
+    filename = File.expand_path("~/#{CONFIG_FILE}")
+    if File.exists?( filename)
+      File.open( filename, 'r') do |f|
+        @config = YAML::load(f)
+      end
+    end
+  end
+end

data/lib/lockr/version.rb

@@ -0,0 +1,4 @@
+module LockrVer
+  VERSION = "0.2.1"
+  DATE = "2012-08-10"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lockr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70213081483480 !ruby/object:Gem::Requirement
+  requirement: &70152742830400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213081483480
+  version_requirements: *70152742830400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70213081482560 !ruby/object:Gem::Requirement
+  requirement: &70152742829840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213081482560
+  version_requirements: *70152742829840
 description: Store your passwords AES encrypted in a simple yaml file
 email: info@byteblues.com
 executables:
@@ -48,8 +48,10 @@ files:
 - lib/lockr/action/remove.rb
 - lib/lockr/action/show.rb
 - lib/lockr/encryption/aes.rb
+- lib/lockr/config.rb
 - lib/lockr/pwdgen.rb
 - lib/lockr/pwdstore.rb
+- lib/lockr/version.rb
 - !binary |-
   YmluL2xvY2ty
 homepage: http://lockr.byteblues.com/