lockr 0.2.1 → 0.3.0

data/lib/lockr.rb

@@ -43,12 +43,12 @@ class Lockr
       
       options[:keyfile] = nil
       opts.on( '-k', '--keyfile FILE', 'the FILE to use as key for the password encryption') do |file|
-        options[:keyfile] = file
+        options[:keyfile] = File.expand_path(file)
       end
       
       options[:vault] = 'vault.yaml'
       opts.on( '-v', '--vault FILE', 'FILE is the name of the vault to store the password sets') do |file|
-        options[:vault] = file
+        options[:vault] = File.expand_path(file)
       end
       
       options[:generatepwd] = nil
@@ -63,7 +63,7 @@ class Lockr
         exit
       end
       
-      opts.on('-v', '--version', 'Show version') do
+      opts.on('--version', 'Show version') do
         puts "Lockr #{LockrVer::VERSION} (#{LockrVer::DATE})"
         exit
       end

data/lib/lockr/action/show.rb

@@ -15,13 +15,17 @@ class ShowAction < AesAction
     pwd_directory_id = YAML::load(decrypt( pwd_directory[id][:enc], keyfilehash, pwd_directory[id][:salt]))
     
     if username.nil? 
-      unless pwd_directory_id.length == 1
-        puts "More than one username for id '#{id}'. Please provide a username!"
-        exit 13
+      if pwd_directory_id.length == 1
+        key = pwd_directory_id.keys[0]
+        store = pwd_directory_id[key]
+      else
+        puts "More than one username for id '#{id}'."
+        while username.nil? 
+          username = ask("Username?  ") { |q| }
+          username = nil if username.strip == ''
+        end
+        store = pwd_directory_id[username]
       end
-       
-      key = pwd_directory_id.keys[0]
-      store = pwd_directory_id[key]
     else  
       unless pwd_directory_id.has_key?(username)
         puts "Username '#{username}' not found for id '#{id}'"

data/lib/lockr/config.rb

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

data/lib/lockr/pwdgen.rb

@@ -1,25 +1,44 @@
 require 'securerandom'
+require 'highline/import'
 
 class PasswordGenerator
   
+  ALPHA = ('A'..'Z').to_a|('a'..'z').to_a
+  ALPHA_NUM = ('A'..'Z').to_a|('a'..'z').to_a|('0'..'9').to_a
+  ALPHA_NUM_SYM = (' '..'!').to_a|('#'..'[').to_a|(']'..'~').to_a
+  
+  # generate a random password. 
+  # format of parameter: 
+  # rxx - r = type (a ... alpha, n ... alpha + num, s ... alpha + num + sym) and xx = password length 
+  # 
+  # example: n10 -> GcQfP4OBFh
+  # a12 -> DChpRnhpHiha
+  # s18 -> JHnXZ<hrcVKorO6mO:
   def generate( params)
     pwd = []
+    range = nil
     
-    # create x random characters
-    params.to_i.times do
-      l = SecureRandom.random_number(26)
-      pwd << l
+    case params[0]
+    when 's'
+      range = ALPHA_NUM_SYM
+    when 'n'
+      range = ALPHA_NUM
+    when 'a'
+      range = ALPHA
+    else
+      puts 'Invalid parameter: ' + params
+      exit 50
     end
     
-    # up/downcase with 50% chance
-    pwd.collect!{ |i| (i + 65).chr }.collect!{ |c| 
-      if ( SecureRandom.random_number(0) > 0.5)
-        c.downcase 
-      else
-        c
-      end 
-    }
+    # create x random characters
+    params[1..params.length].to_i.times do
+      l = SecureRandom.random_number(range.length)
+      pwd << range[l]
+    end
     
-    pwd.join
+    pwd = pwd.join
+    # print pwd with single quote escape
+    say( "<%= color( 'Generated password: #{pwd.gsub( "'", "\\\\'")}', :yellow) %>")
+    pwd
   end
 end

data/lib/lockr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lockr
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70152742830400 !ruby/object:Gem::Requirement
+  requirement: &70208522621980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152742830400
+  version_requirements: *70208522621980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70152742829840 !ruby/object:Gem::Requirement
+  requirement: &70208522620300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152742829840
+  version_requirements: *70208522620300
 description: Store your passwords AES encrypted in a simple yaml file
 email: info@byteblues.com
 executables: