rubeepass 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a497c0ba1c2d89f4be0f1c386c3cba1b692d1452
-  data.tar.gz: ff4a9f75e497c6d7c1c06d21fffe40680798d929
+  metadata.gz: 54e5d7978fbfd618209c6f5d38fb222aca339399
+  data.tar.gz: 537d3ac1597fefa44e2a81e85705b20a53fcf8d1
 SHA512:
-  metadata.gz: d2141b8e46f3f30be2b0bd08f5159ee71692f1aee5ca923dbf48ffe27a534f7598d47b3e2b28466346bb7a09fa90a39472edee09f207eba583a6981397d0aa48
-  data.tar.gz: 1a702fca0863fc0787d6b3034ff71c1b32a00d8f01d0539dc217466b76072915c7c333c37d57e3705c60432c45930dd78646e34e0f64a5dce403a017db64923f
+  metadata.gz: 4b7f8d5e516f29751c59aad5cd466bc5b338244d1470c0e516272a6a644cfe7d57cf4bcab984caca98f7d6dee4b96417f547ceda03db5b2bbb47ce68095c886a
+  data.tar.gz: 3fbae9d48900fb97bc6d3f23c81f82235d4d6dfe5f1317b8d5390bdf58924f39406941f21eceac7b165560d47cb6007605332415fe67d12230a324f1f95903b4

data/lib/rubeepass/entry.rb

@@ -159,15 +159,11 @@ class RubeePass::Entry
     end
 
     def has_attachment?(name)
-        return @attachments.any? do |k, v|
-            k.downcase == name.downcase
-        end
+        return !@attachments[name].nil?
     end
 
     def has_attribute?(attr)
-        return @attributes.any? do |k, v|
-            k.downcase == attr.downcase
-        end
+        return !@attributes[attr].nil?
     end
 
     def hilight_attr(title)

data/lib/rubeepass/group.rb

@@ -51,7 +51,7 @@ class RubeePass::Group
         end
     end
 
-    def find_group(path)
+    def find_group(path, case_insensitive = false)
         return nil if (@keepass.nil?)
 
         path = @keepass.absolute_path(path, @path)
@@ -59,16 +59,30 @@ class RubeePass::Group
 
         path.split("/").each do |group|
             next if (group.empty?)
-            if (cwd.has_group?(group))
-                cwd = cwd.groups[group]
+            if (case_insensitive)
+                if (cwd.has_group_like?(group))
+                    cwd = cwd.groups.select do |k, v|
+                        k.downcase == group.downcase
+                    end.values.first
+                else
+                    return nil
+                end
             else
-                return nil
+                if (cwd.has_group?(group))
+                    cwd = cwd.groups[group]
+                else
+                    return nil
+                end
             end
         end
 
         return cwd
     end
 
+    def find_group_like(path)
+        return find_group(path, true)
+    end
+
     def self.from_xml(keepass, parent, xml)
         name = "/"
         name = xml.elements["Name"].text || "" if (parent)
@@ -122,8 +136,10 @@ class RubeePass::Group
         new_cwd = find_group(path)
         return [Array.new, Array.new] if (new_cwd.nil?)
 
-        if (new_cwd.has_group?(target))
-            new_cwd = new_cwd.groups[target]
+        if (new_cwd.has_group_like?(target))
+            new_cwd = new_cwd.groups.select do |k, v|
+                k.downcase == target.downcase
+            end.values.first
             target = ""
         end
 
@@ -150,15 +166,23 @@ class RubeePass::Group
         end
     end
 
-    def has_entry?(title)
-        return entry_titles.any? do |entry|
-            entry.downcase == title.downcase
+    def has_entry?(entry)
+        return !@entries[entry].nil?
+    end
+
+    def has_entry_like?(entry)
+        return entry_titles.any? do |title|
+            title.downcase == entry.downcase
         end
     end
 
-    def has_group?(name)
-        return group_names.any? do |group|
-            group.downcase == name.downcase
+    def has_group?(group)
+        return !@groups[group].nil?
+    end
+
+    def has_group_like?(group)
+        return group_names.any? do |name|
+            name.downcase == group.downcase
         end
     end
 

data/lib/rubeepass/wish/cd_wish.rb

@@ -16,7 +16,7 @@ class CDWish < Djinni::Wish
         prompt_color = djinni_env["prompt_color"]
 
         path = keepass.absolute_path(args, cwd.path)
-        new_cwd = keepass.find_group(path)
+        new_cwd = keepass.find_group_like(path)
 
         if (new_cwd.nil?)
             puts "Group not found"

data/lib/rubeepass/wish/copy_wish.rb

@@ -32,27 +32,34 @@ class CopyWish < Djinni::Wish
 
         path = keepass.absolute_path(path, cwd.path)
         path, found, target = path.rpartition("/")
-        new_cwd = keepass.find_group(path)
+        new_cwd = keepass.find_group_like(path)
         timeout = djinni_env["clipboard_timeout"]
 
-        if (new_cwd.nil? || !new_cwd.has_entry?(target))
+        if (new_cwd.nil? || !new_cwd.has_entry_like?(target))
             puts "Entry not found"
             return
         end
 
+        # Prefer exact match
+        entry = new_cwd.entries[target]
+        # Fallback to case-insensitive match
+        entry ||= new_cwd.entries.select do |k, v|
+            k.downcase == target.downcase
+        end.values.first
+
         case field
         when "pass"
-            new_cwd.entries[target].copy_password_to_clipboard
+            entry.copy_password_to_clipboard
             keepass.send(
                 "clear_clipboard_after_#{timeout}_seconds"
             )
         when "url"
-            new_cwd.entries[target].copy_url_to_clipboard
+            entry.copy_url_to_clipboard
             keepass.send(
                 "clear_clipboard_after_#{timeout}_seconds"
             )
         when "user"
-            new_cwd.entries[target].copy_username_to_clipboard
+            entry.copy_username_to_clipboard
             keepass.send(
                 "clear_clipboard_after_#{timeout}_seconds"
             )

data/lib/rubeepass/wish/echo_wish.rb

@@ -32,20 +32,27 @@ class EchoWish < Djinni::Wish
 
         path = keepass.absolute_path(path, cwd.path)
         path, found, target = path.rpartition("/")
-        new_cwd = keepass.find_group(path)
+        new_cwd = keepass.find_group_like(path)
 
-        if (new_cwd.nil? || !new_cwd.has_entry?(target))
+        if (new_cwd.nil? || !new_cwd.has_entry_like?(target))
             puts "Entry not found"
             return
         end
 
+        # Prefer exact match
+        entry = new_cwd.entries[target]
+        # Fallback to case-insensitive match
+        entry ||= new_cwd.entries.select do |k, v|
+            k.downcase == target.downcase
+        end.values.first
+
         case field
         when "pass"
-            new_cwd.entries[target].echo_password
+            entry.echo_password
         when "url"
-            new_cwd.entries[target].echo_url
+            entry.echo_url
         when "user"
-            new_cwd.entries[target].echo_username
+            entry.echo_username
         end
     end
 

data/lib/rubeepass/wish/ls_wish.rb

@@ -15,7 +15,7 @@ class LSWish < Djinni::Wish
 
         args = cwd.path if (args.empty?)
         path = keepass.absolute_path(args, cwd.path)
-        new_cwd = keepass.find_group(path)
+        new_cwd = keepass.find_group_like(path)
 
         if (new_cwd.nil?)
             puts "Group not found"

data/lib/rubeepass/wish/show_wish.rb

@@ -16,7 +16,7 @@ class ShowWish < Djinni::Wish
         args = cwd.path if (args.empty?)
         path = keepass.absolute_path(args, cwd.path)
         path, found, target = path.rpartition("/")
-        new_cwd = keepass.find_group(path)
+        new_cwd = keepass.find_group_like(path)
 
         if (new_cwd.nil?)
             puts "Group not found"
@@ -30,22 +30,26 @@ class ShowWish < Djinni::Wish
             else
                 puts new_cwd
             end
-        elsif (new_cwd.has_group?(target))
-            case djinni_env["djinni_input"]
-            when "showall"
-                puts new_cwd.groups[target].details(0, true)
-            else
-                puts new_cwd.groups[target]
+        elsif (new_cwd.has_group_like?(target))
+            new_cwd.groups.select do |k, v|
+                k.downcase == target.downcase
+            end.values.each do |group|
+                case djinni_env["djinni_input"]
+                when "showall"
+                    puts group.details(0, true)
+                else
+                    puts group
+                end
             end
-        elsif (new_cwd.has_entry?(target))
-            new_cwd.entry_titles.select do |entry|
-                target.downcase == entry.downcase
-            end.each do |entry|
+        elsif (new_cwd.has_entry_like?(target))
+            new_cwd.entries.select do |k, v|
+                k.downcase == target.downcase
+            end.values.each do |entry|
                 case djinni_env["djinni_input"]
                 when "showall"
-                    puts new_cwd.entries[entry].details(0, true)
+                    puts entry.details(0, true)
                 else
-                    puts new_cwd.entries[entry]
+                    puts entry
                 end
             end
         else

data/lib/rubeepass.rb

@@ -175,6 +175,10 @@ class RubeePass
         return @db.find_group(path)
     end
 
+    def find_group_like(path)
+        return @db.find_group(path, true)
+    end
+
     def fuzzy_find(input)
         return @db.fuzzy_find(input)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest