rubeepass 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 006a68f0d13c9efe8eecf937d1bec8a8c2d067eb
-  data.tar.gz: e19d1a9a76ffd938a85feea89d3bc8211a7458c2
+  metadata.gz: 50fa9c39b81cfba5ca3fa62523807f0332856606
+  data.tar.gz: 3607dc60aaa4b4d074a0acc68bb2eaec4cf7a193
 SHA512:
-  metadata.gz: 1b71c2f598f1e5d56575e6faca2dad81f24c790f713218b101467f3982ce3a5cc4b84f6f0815b7b4f8c40cec87b772097a07ce08d523551ed6849d26699d584b
-  data.tar.gz: 1f53c5905d5e620f58576789dfeea5617394f278e8196f3bb1d01b23fc48c78704a1c9367dd76a2cb8cae420dba05b83fc77d5d0629e3fdcfbe89dc1a40cc380
+  metadata.gz: 0081a426f6ab744f2a8f54bebf825959e352637cf1e556857abcb188c53d91faadbadb968fa4386f3a69a79b1c55f07164209f18e1224a24601fc6f7090b25a7
+  data.tar.gz: d4e0190ed211f367722b9ba77b8f0bbcb56a92e78c3f8ff029e28d522e8a8dd48ff5effb8490031dccbf00701ae00be6a04b2dd32a8e81bc4e3646307a647eff

data/bin/rpass

@@ -23,9 +23,17 @@ end
 
 def get_password
     print "Enter password: "
-    passwd = STDIN.noecho(&:gets)
-    puts
-    return passwd.chomp
+    begin
+        passwd = STDIN.noecho(&:gets)
+        puts
+        return passwd.chomp
+    rescue Interrupt => e
+        puts
+        exit RPassExit::GOOD
+    rescue
+        puts
+        exit RPassExit::KDBX_NOT_OPENED
+    end
 end
 
 def parse(args)
@@ -207,15 +215,31 @@ keyfile = options["keyfile"]
 keepass = RubeePass.new(kdbx, password, keyfile)
 
 if (options["export_file"])
-    keepass.export(options["export_file"], options["export_format"])
+    begin
+        keepass.export(
+            options["export_file"],
+            options["export_format"]
+        )
+    rescue RubeePass::Error::InvalidPasswordError => e
+        puts e.message
+        password = get_password
+        keepass = RubeePass.new(kdbx, password, keyfile)
+    end
     exit RPassExit::GOOD
 end
 
-begin
-    keepass.open
-rescue RubeePass::Error => e
-    puts e.message
-    exit RPassExit::KDBX_NOT_OPENED
+loop do
+    begin
+        keepass.open
+        break
+    rescue RubeePass::Error::InvalidPasswordError => e
+        puts e.message
+        password = get_password
+        keepass = RubeePass.new(kdbx, password, keyfile)
+    rescue RubeePass::Error => e
+        puts e.message
+        exit RPassExit::KDBX_NOT_OPENED
+    end
 end
 
 djinni = Djinni.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Miles Whittaker