rubeepass 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a23be2b3bb598095b6dcdd4fa3f1b10fc604748
-  data.tar.gz: b28f86207bc3cacf7b53af4c07028b5edd01e0d3
+  metadata.gz: eb87ea45836dac08a8f7d0127dc31134e976e57f
+  data.tar.gz: 405356c08747438ffbb5c58203bbe631a98377a2
 SHA512:
-  metadata.gz: 58872aac5c8e05220c3157d120e8e5889659e4ce68b2066d59cfa298cbbd46c65d625abcea1331d3a78905c872e1beeb1905f2a8672b3d421d6ffc9a1fa9e57e
-  data.tar.gz: ba86990fadd0a959fb83a0cc9d21cdd4bd20db243b4e017001ee72cc74999bdcc132c0fde0769e3de8eec665df1969c0938f7fdabc541b5bca660144a863b236
+  metadata.gz: 72834f102e69ffca03cccec065741aef39f834558cb46014269b1386b80a41aa748140c1b4f3c905e63a038bea25fe8c2fb6f51efe551d23f5868821173781e0
+  data.tar.gz: 3ca9453d67fa6f66a07883e9dc665753d4db6261831b266963c6785de13ff7e77e8a282e4bb73ed2eefaac1f4841d741224bb3148e3ccdd1dde38926dd3a9a1f

data/bin/rpass

@@ -251,7 +251,9 @@ begin
     end
 
     djinni = Djinni.new
-    djinni.load_wishes("#{File.dirname(__FILE__)}/../lib/rubeepass/wish")
+    djinni.load_wishes(
+        "#{File.dirname(__FILE__)}/../lib/rubeepass/wish"
+    )
 
     if (options["command"])
         djinni.grant_wish(

data/lib/rubeepass/entry.rb

@@ -6,7 +6,12 @@ class RubeePass::Entry
 
     attr_accessor :group
     attr_accessor :keepass
+    attr_accessor :notes
+    attr_accessor :password
     attr_accessor :path
+    attr_accessor :title
+    attr_accessor :url
+    attr_accessor :username
     attr_accessor :uuid
 
     def ==(other)
@@ -26,7 +31,7 @@ class RubeePass::Entry
         ret.push("#{lvl}Username : #{@username}")
         if (show_passwd)
             ret.push(
-                hilight_password("#{lvl}Password : #{password}")
+                hilight_password("#{lvl}Password : #{@password}")
             )
         end
         ret.push("#{lvl}Url      : #{@url}")
@@ -45,53 +50,17 @@ class RubeePass::Entry
     end
 
     def self.from_xml(keepass, parent, xml)
-        notes = ""
-        password = ""
-        title = ""
-        url = ""
-        username = ""
+        attrs = Hash.new
 
-        uuid = xml.elements["UUID"].text
-        uuid = "" if (uuid.nil?)
+        uuid = xml.elements["UUID"].text || ""
 
         xml.elements.each("String") do |elem|
+            key = elem.elements["Key"].text
             value = elem.elements["Value"]
-            case elem.elements["Key"].text
-            when "Notes"
-                if (value.attributes["Protected"] == "True")
-                    notes = handle_protected(keepass, value.text)
-                else
-                    notes = value.text
-                    notes = "" if (notes.nil?)
-                end
-            when "Password"
-                if (value.attributes["Protected"] == "True")
-                    password = handle_protected(keepass, value.text)
-                else
-                    password = value.text
-                    password = "" if (password.nil?)
-                end
-            when "Title"
-                if (value.attributes["Protected"] == "True")
-                    title = handle_protected(keepass, value.text)
-                else
-                    title = value.text
-                    title = "" if (title.nil?)
-                end
-            when "URL"
-                if (value.attributes["Protected"] == "True")
-                    url = handle_protected(keepass, value.text)
-                else
-                    url = value.text
-                    url = "" if (url.nil?)
-                end
-            when "UserName"
-                if (value.attributes["Protected"] == "True")
-                    username = handle_protected(keepass, value.text)
-                else
-                    username = value.text
-                    username = "" if (username.nil?)
-                end
+
+            attrs[key] = value.text || ""
+            if (value.attributes["Protected"] == "True")
+                attrs[key] = handle_protected(keepass, value.text)
             end
         end
 
@@ -102,16 +71,7 @@ class RubeePass::Entry
             end
         end
 
-        return RubeePass::Entry.new(
-            parent,
-            keepass,
-            notes,
-            password,
-            title,
-            url,
-            username,
-            uuid
-        )
+        return RubeePass::Entry.new(parent, keepass, attrs, uuid)
     end
 
     def self.handle_protected(keepass, base64)
@@ -142,23 +102,17 @@ class RubeePass::Entry
     end
     private :hilight_title
 
-    def initialize(
-        group,
-        keepass,
-        notes,
-        password,
-        title,
-        url,
-        username,
-        uuid
-    )
+    def initialize(group, keepass, attributes, uuid)
         @group = group
         @keepass = keepass
-        @notes = notes
-        @password = password
-        @title = title
-        @url = url
-        @username = username
+        @attributes = attributes
+
+        @notes = attribute("Notes")
+        @password = attribute("Password")
+        @title = attribute("Title")
+        @url = attribute("URL")
+        @username = attribute("UserName")
+
         @uuid = uuid
 
         @path = @title
@@ -176,7 +130,7 @@ class RubeePass::Entry
             )
             case method_name
             when "password"
-                @keepass.copy_to_clipboard(password)
+                @keepass.copy_to_clipboard(@password)
             when "url"
                 @keepass.copy_to_clipboard(@url)
             when "username"
@@ -187,7 +141,7 @@ class RubeePass::Entry
         elsif (method_name.match(/^echo_.+$/))
             case method_name.to_s.gsub(/^echo_/, "")
             when "password"
-                puts password
+                puts @password
             when "url"
                 puts @url
             when "username"
@@ -200,58 +154,32 @@ class RubeePass::Entry
         end
     end
 
-    def notes
-        return nil if (@keepass.nil?)
-        return "" if (@notes.nil?)
-        begin
-            return @keepass.protected_decryptor.get_password(@notes)
-        rescue
-            return @notes
-        end
+    def has_attribute?(attr)
+        !@attributes[attr].nil?
     end
 
-    def password
+    def attribute(attr)
         return nil if (@keepass.nil?)
-        return "" if (@password.nil?)
+        return "" unless (has_attribute?(attr))
+
         begin
             return @keepass.protected_decryptor.get_password(
-                @password
+                @attributes[attr]
             )
         rescue
-            return @password
+            return @attributes[attr]
         end
     end
 
-    def title
+    def attributes
         return nil if (@keepass.nil?)
-        return "" if (@title.nil?)
-        begin
-            return @keepass.protected_decryptor.get_password(@title)
-        rescue
-            return @title
-        end
-    end
 
-    def url
-        return nil if (@keepass.nil?)
-        return "" if (@url.nil?)
-        begin
-            return @keepass.protected_decryptor.get_password(@url)
-        rescue
-            return @url
+        attributes = {}
+        @attributes.each do |key, value|
+            attributes[key] = attribute(key)
         end
-    end
 
-    def username
-        return nil if (@keepass.nil?)
-        return "" if (@username.nil?)
-        begin
-            return @keepass.protected_decryptor.get_password(
-                @username
-            )
-        rescue
-            return @username
-        end
+        return attributes
     end
 
     def to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.9.1
+        version: 5.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.9.1
+        version: 5.10.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.3.0
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.3.0
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: djinni
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: hilighter
   requirement: !ruby/object:Gem::Requirement
@@ -116,20 +116,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: salsa20
   requirement: !ruby/object:Gem::Requirement