rubeepass 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 966b64731923309c08bfa13dbcc0c449fe134a0f4c5995a6a7af7980a7bee879
-  data.tar.gz: 1365a3a62c8a1bf3b0c4b178eb235b827de72de638ae17388a615b21f013f31e
+  metadata.gz: 36a76dde7f5f12b9e591c3ec0147a1e5dcbe6a4316ceb1d006f06a4b8131c728
+  data.tar.gz: b2471a888adf6ef93a9f95e0580c7808720a166ef6b065a7cfb40dd9bf914358
 SHA512:
-  metadata.gz: 3b9041e4eb2c49f8db7e839e489232ff6fa3baf080c738294a183694b32a4fa6ee52c043b474c2c1a82a57e37d51cdc5fb3d1d45a84f8d737c5bb41322a22a4b
-  data.tar.gz: ca95904d016acb29b237b1dba1f859fcbd143d49fe797f8d19d875b2f6b661bda067ceaec43b8aab1be107723a14e78786cb52cbb4251ed5434385ec82050688
+  metadata.gz: 8bed9a37a826ee088f51d113ebfc153f70a6afe28e44c7dfd1116f075538e30302a5551c3bfcdfae4a0c766be22d70fcb2c1bfb679b4942931b9a5660438191c
+  data.tar.gz: a2d315b67eeabf46f9d024dd34c12238e1af4d0ad2079255c217b36505f74588598dbaff116c052a70b30a06d8ca30da4b83954f3e4433ba2e557b0d637f64e6

data/bin/rpass

@@ -19,37 +19,20 @@ class RubeePassExit
 end
 
 class RubeePassConfig < JSONConfig
-    def default_config
-        set("last_kdbx", nil)
-        set("last_keyfile", nil)
-        set("timeout", 10)
-    end
-
-    def last_kdbx(kdbx = nil)
-        set("last_kdbx", Pathname.new(kdbx).expand_path) if (kdbx)
-        kdbx = get("last_kdbx").to_s
-        return nil if (kdbx.nil? || kdbx.empty?)
-        return kdbx
-    end
-
-    def last_keyfile(kf = nil)
-        file = nil
-        file = Pathname.new(kf).expand_path if (kf && !kf.empty?)
-        set("last_keyfile", file) if (kf)
-        kf = get("last_keyfile").to_s
-        return nil if (kf.nil? || kf.empty?)
-        return kf
-    end
-
-    def timeout(t = nil)
-        set("timeout", t) if (t)
-        t = get("timeout")
-        case t.to_s
-        when /[0-9]+/
-            return t.to_i
-        else
-            return nil
-        end
+    extend JSONConfig::Keys
+
+    add_key("kdbx")
+    add_key("keyfile")
+    add_key("timeout")
+
+    def initialize(file = nil)
+        file ||= "~/.config/rubeepass/rc"
+        @defaults = {
+            "kdbx" => nil,
+            "keyfile" => nil,
+            "timeout" => 10
+        }
+        super(file)
     end
 end
 
@@ -63,11 +46,10 @@ end
 def parse(args)
     options = Hash.new
     options["command"] = nil
+    options["config"] = RubeePassConfig.new
     options["export_file"] = nil
     options["export_format"] = "xml"
     options["password"] = nil
-    options["keyfile"] = nil
-    options["timeout"] = nil
     options["verbose"] = false
 
     info = "KeePass 2.x read-only client."
@@ -121,7 +103,8 @@ def parse(args)
             "--keyfile=KEYFILE",
             "Use specified keyfile"
         ) do |keyfile|
-            options["keyfile"] = keyfile
+            k = Pathname.new(keyfile).expand_path
+            options["config"].set_keyfile(k)
         end
 
         opts.on("--nocolor", "Disable colorized output") do
@@ -136,8 +119,13 @@ def parse(args)
             options["password"] = password
         end
 
-        opts.on("-t", "--timeout=TIMEOUT", "Clipboard timeout") do |t|
-            options["timeout"] = t.to_i
+        opts.on(
+            "-t",
+            "--timeout=TIMEOUT",
+            Integer,
+            "Clipboard timeout"
+        ) do |t|
+            options["config"].set_timeout(t)
         end
 
         opts.on(
@@ -183,59 +171,36 @@ def parse(args)
         exit RubeePassExit::AMBIGUOUS_ARGUMENT
     end
 
-    if (args.length > 1)
-        puts parser
-        exit RubeePassExit::EXTRA_ARGUMENTS
-    end
-
-    # Read config
-    rc = RubeePassConfig.new("~/.rpassrc")
-
-    # Determine kdbx and keyfile
     if (args.length == 1)
-        # Use specified kdbx (and keyfile if specified)
-        options["kdbx"] = args[0]
-        options["keyfile"] ||= ""
-    else
-        # Use kdbx from config if stored
-        if (rc.last_kdbx)
-            options["kdbx"] = rc.last_kdbx
-        end
+        k = Pathname.new(args[0]).expand_path
+        options["config"].set_kdbx(k)
 
-        # Use keyfile from config if stored and not specified already
-        if (options["keyfile"].nil?)
-            if (rc.last_keyfile)
-                options["keyfile"] = rc.last_keyfile
-            end
-        end
-    end
-
-    # Determine timeout
-    if (options["timeout"].nil?)
-        options["timeout"] = 10
-        options["timeout"] = rc.timeout if (rc.timeout)
+        # Save keyfile even if not specified
+        options["config"].savediff
+    elsif (args.length > 1)
+        puts parser
+        exit RubeePassExit::EXTRA_ARGUMENTS
     end
 
     # Throw error if kdbx not specified or in config
-    if (options["kdbx"].nil?)
+    if (!options["config"].kdbx?)
         puts parser
         exit RubeePassExit::MISSING_ARGUMENT
     end
 
-    # Store data in config
-    options["kdbx"] = rc.last_kdbx(options["kdbx"])
-    options["keyfile"] = rc.last_keyfile(options["keyfile"])
-    options["timeout"] = rc.timeout(options["timeout"])
-
     return options
 end
 
 options = parse(ARGV)
 
 begin
-    kdbx = options["kdbx"]
+    rc = options["config"]
+    kdbx = Pathname.new(rc.get_kdbx).expand_path
     password = options["password"] || get_password
-    keyfile = options["keyfile"]
+    keyfile = nil
+    if (rc.keyfile?)
+        keyfile = Pathname.new(rc.get_keyfile).expand_path
+    end
 
     # Read password from file if filename was provided
     pfile = Pathname.new(password).expand_path
@@ -283,7 +248,7 @@ begin
             {
                 "keepass" => keepass,
                 "cwd" => keepass.db,
-                "clipboard_timeout" => options["timeout"]
+                "clipboard_timeout" => options["config"].get_timeout
             }
         )
         keepass.wait_to_exit
@@ -292,7 +257,7 @@ begin
             {
                 "keepass" => keepass,
                 "cwd" => keepass.db,
-                "clipboard_timeout" => options["timeout"],
+                "clipboard_timeout" => options["config"].get_timeout,
                 "prompt_color" => "light_white"
             },
             "rpass:/> ".light_white

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -94,22 +94,22 @@ dependencies:
   name: json_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement