imp 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca718bcafa6983935ec3f5cebab249382b78e08d
-  data.tar.gz: da7918ac1a7f95ce76da11cf7cbf100c6ac399d3
+  metadata.gz: 89aa2f96352505f2038a3824082459a3012637e6
+  data.tar.gz: 69aeb301287ff6be0c440695f527548522d9bb38
 SHA512:
-  metadata.gz: 468ba338782bf8215381da5d0a9fdc15fb8f95f489613367dbc208753f33de81ddb4440203a509249af390533f8956af810b306a1bb9a43ff7a30e76951f0859
-  data.tar.gz: fce1f953626dae4b430864589a80c1c2c6633e0e43859d3f92adf2ab0bc090caa7fe193da64f2955e28735bc64fc78343517aff5ee778f2e8cdc275ff5a0784f
+  metadata.gz: d44f5b225fdca01fcb88678a8057fed230dfef118b986dca2d2a5f095ca8030cb98cd4634a03968bf6f9a2cde9e0e8b8c0ba6a487adfe2dcd2308abc50ff14ea
+  data.tar.gz: f1fa1b6808134c5f6fd855fc79fb9505d83084b10f30df8e689efcb37bc83b0c4e813e18414e9787a88f59db57ff8d2dc5301e7c8ef2043eb026e3b5cfe94271

data/imp.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.description = "
 IMP is a simple console password manager. Passwords are stored in an AES
 encrypted filesystem-like tree. The main functionality includes printing,
-setting and copying files, allowing the handling of passwords without them
-being shown on screen."
+setting and copying passwords, allowing the handling of passwords without
+them being shown on screen."
   spec.description
   spec.version = Imp::VERSION
   spec.date = Time.now.strftime('%Y-%m-%d')

data/lib/imp.rb

@@ -3,7 +3,7 @@ require_relative 'imp/ui'
 module Imp
   
   # The current version number.
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
   
   # Run the program.
   def self.main

data/lib/imp/commands.rb

@@ -2,6 +2,7 @@ require 'clipboard'
 require 'highline/import'
 
 require_relative 'ui'
+require_relative 'util'
 
 module Imp
   
@@ -88,7 +89,7 @@ remenicient of urls).")
     # 
     # @param args [Array] Ignored.
     def self.change_passwd(*args)
-      pass = read_passwd
+      pass = Util.read_passwd("password for file '#{$file}'")
       return unless pass
       $tree.password = pass
       $tree.flush
@@ -100,7 +101,7 @@ remenicient of urls).")
     # @param key [String] The key to set the value for.
     def self.set(key)
       fail "Key must be supplied." unless key
-      pass = read_passwd
+      pass = Util.read_passwd
       return unless pass
       $tree[key] = pass
       # We save the tree whenever it is modified.
@@ -176,29 +177,6 @@ remenicient of urls).")
     # defined as private.
     private
     
-    # Reads a password from the user.
-    # 
-    # @return [String, nil] The password enetered, or nil if aborted.
-    def self.read_passwd
-      first_pass = true
-      pass1 = pass2 = nil
-      until pass1 == pass2 && !first_pass
-        unless first_pass
-          puts "The pass did not match. Please try again."
-        end
-        pass1 = ask "Please enter the pass (leave blank to cancel): " do |q|
-          q.echo = false
-        end
-        return if pass1 == ''
-        pass2 = ask "Re-enter the pass to confirm: " do |q|
-          q.echo = false
-        end
-        first_pass = false
-      end
-      return pass1
-    end
-    private_class_method :read_passwd
-    
     # Copies the value of a single 1-indexed character of the value of a key
     # to the system clipboard.
     # 

data/lib/imp/ui.rb

@@ -1,4 +1,5 @@
 require 'highline/import'
+
 require 'readline'
 require 'timeout'
 require 'optparse'
@@ -28,13 +29,8 @@ module Imp
     def self.load_file
       until $tree
         begin
-          passwd = ask("Password for file #{$file} (leave blank to cancel): ")\
-              do |q|
-            q.echo = false
-          end
-          if passwd == ''
-            break
-          end
+          passwd = get_passwd
+          return unless passwd
           $tree = EncryptedTree.new(passwd, $file)
         rescue OpenSSL::Cipher::CipherError
           $stderr.puts "Decryption failed. Corrupt file or wrong password."
@@ -104,7 +100,7 @@ module Imp
     # Displays welcome text.
     def self.welcome
       puts "imp version #{VERSION}"
-      puts "Using password file #{$file}."
+      puts "Using password file '#{$file}'."
       puts "Welcome to imp! Type 'help' for a list of commands."
     end
     private_class_method :welcome
@@ -186,6 +182,22 @@ module Imp
     end
     private_class_method :init_readline
     
+    def self.get_passwd
+      if File.exists? File.expand_path($file)
+        pass = ask("Password for file '#{$file}' (leave blank to cancel): ")\
+            do |q|
+          q.echo = false
+        end
+        pass == "" ? nil : pass
+      else
+        puts "This is your first time using the file '#{$file}' to save "
+          "your passwords."
+        puts "Please enter your password for first-time use."
+        puts "Note that you can change this password at any time."
+        Util.read_passwd("password for the file '#{$file}'")
+      end
+    end
+    
   end
   
 end

data/lib/imp/util.rb

@@ -14,6 +14,30 @@ module Imp
       Dir.mkdir(dir)
     end
     
+    # Reads a password from the user.
+    # 
+    # @param desc [String] The description of the password inserted into query
+    #   texts.
+    # @return [String, nil] The password enetered, or nil if aborted.
+    def self.read_passwd(desc = 'password')
+      first_pass = true
+      pass1 = pass2 = nil
+      until pass1 == pass2 && !first_pass
+        unless first_pass
+          puts "The pass did not match. Please try again."
+        end
+        pass1 = ask "Please enter the #{desc} (leave blank to cancel): " do |q|
+          q.echo = false
+        end
+        return if pass1 == ''
+        pass2 = ask "Re-enter the #{desc} to confirm: " do |q|
+          q.echo = false
+        end
+        first_pass = false
+      end
+      return pass1
+    end
+    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Thomas Kerber
@@ -42,8 +42,8 @@ description: |2-
 
   IMP is a simple console password manager. Passwords are stored in an AES
   encrypted filesystem-like tree. The main functionality includes printing,
-  setting and copying files, allowing the handling of passwords without them
-  being shown on screen.
+  setting and copying passwords, allowing the handling of passwords without
+  them being shown on screen.
 email: t.kerber@online.de
 executables:
 - imp
@@ -51,13 +51,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/imp
-- lib/imp/commands.rb
 - lib/imp/crypto.rb
 - lib/imp/encrypted_tree.rb
 - lib/imp/tree.rb
+- lib/imp/encrypted_file.rb
 - lib/imp/util.rb
+- lib/imp/commands.rb
 - lib/imp/ui.rb
-- lib/imp/encrypted_file.rb
 - lib/imp.rb
 - LICENSE
 - README.md