rubeepass 0.5.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 797e4b5d5f2b72f43feef99f141440eee6890f0e
-  data.tar.gz: efcd65291652a76394b9f56d93158a5980ed0720
+  metadata.gz: 6cd12a155f8a2bcbc5da07aee0406bcd4040ca4b
+  data.tar.gz: 506e2a4064b4ae4f0a2fb3d46eae776aea0a6265
 SHA512:
-  metadata.gz: c0447457c9a9b99eadd8e11efdaa3cdeb204293a37b28942de7f7b8053b2ce1ef24deb0c29cc644529f65c223b077ac6d003165ddce5c86eff573fab3c044292
-  data.tar.gz: 7ec1c0f82ae395a5dbd37d26bc38aeb6cfe38898ded1d7e230b20042ad9e45f8970396b7e0773aba9452e7866b65336a4e59b96c00530b8c335a67b3a2c82a7d
+  metadata.gz: 0f80638206bbc1e018eb631a219898620c15bc2ca7f6210960638c70a3276059a2749e9156a3ab7e0477ea4adc209b8236c5af1d9ae16e8fb149ce82b998693a
+  data.tar.gz: 6719b71656475fe4dabf4ac4e41db654f8baa3429decc2a62477335eaddb717c5931939b3e48d15f7a1da52ca494086231b4285876c5860c33f9d74d74af27d3

data/bin/rpass

@@ -277,6 +277,7 @@ rescue RubeePass::Error => e
     puts e.message
     exit RubeePassExit::EXCEPTION
 rescue Exception => e
+    $stderr.puts
     $stderr.puts "Oops! Looks like an error has occured! If the " \
         "error persists, file a bug at:".word_wrap
     $stderr.puts

data/lib/rubeepass/entry.rb

@@ -1,17 +1,12 @@
 require "colorize"
 require "rexml/document"
-require "string"
 
 class RubeePass::Entry
     include Comparable
 
     attr_accessor :group
     attr_accessor :keepass
-    attr_accessor :notes
     attr_accessor :path
-    attr_accessor :title
-    attr_accessor :url
-    attr_accessor :username
     attr_accessor :uuid
 
     def ==(other)
@@ -72,12 +67,16 @@ class RubeePass::Entry
         uuid = "" if (uuid.nil?)
 
         xml.elements.each("String") do |elem|
+            value = elem.elements["Value"]
             case elem.elements["Key"].text
             when "Notes"
-                notes = elem.elements["Value"].text
-                notes = "" if (notes.nil?)
+                if (value.attributes["Protected"] == "True")
+                    notes = handle_protected(keepass, value.text)
+                else
+                    notes = value.text
+                    notes = "" if (notes.nil?)
+                end
             when "Password"
-                value = elem.elements["Value"]
                 if (value.attributes["Protected"] == "True")
                     password = handle_protected(keepass, value.text)
                 else
@@ -85,14 +84,26 @@ class RubeePass::Entry
                     password = "" if (password.nil?)
                 end
             when "Title"
-                title = elem.elements["Value"].text
-                title = "" if (title.nil?)
+                if (value.attributes["Protected"] == "True")
+                    title = handle_protected(keepass, value.text)
+                else
+                    title = value.text
+                    title = "" if (title.nil?)
+                end
             when "URL"
-                url = elem.elements["Value"].text
-                url = "" if (url.nil?)
+                if (value.attributes["Protected"] == "True")
+                    url = handle_protected(keepass, value.text)
+                else
+                    url = value.text
+                    url = "" if (url.nil?)
+                end
             when "UserName"
-                username = elem.elements["Value"].text
-                username = "" if (username.nil?)
+                if (value.attributes["Protected"] == "True")
+                    username = handle_protected(keepass, value.text)
+                else
+                    username = value.text
+                    username = "" if (username.nil?)
+                end
             end
         end
 
@@ -119,8 +130,11 @@ class RubeePass::Entry
         data = nil
         return nil if (base64.nil?)
         begin
-            data = base64.unpack("m*")[0].fix
-        rescue ArgumentError => e
+            data = base64.unpack("m*")[0]
+            if (data.length != data.bytesize)
+                data = data.unpack("H*").pack("H*")
+            end
+        rescue ArgumentError
             raise Error::InvalidProtectedData.new
         end
         raise Error::InvalidProtectedData.new if (data.nil?)
@@ -186,6 +200,16 @@ 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
+    end
+
     def password
         return nil if (@keepass.nil?)
         return "" if (@password.nil?)
@@ -198,6 +222,38 @@ class RubeePass::Entry
         end
     end
 
+    def title
+        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
+        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
+    end
+
     def to_s
         return details
     end

data/lib/rubeepass/error/invalid_gzip.rb

@@ -1,5 +1,3 @@
-require "rubeepass/error"
-
 class RubeePass::Error::InvalidGzip < RubeePass::Error
     def initialize
         super("Invalid gzip format!")

data/lib/rubeepass/error/invalid_header.rb

@@ -1,5 +1,3 @@
-require "rubeepass/error"
-
 class RubeePass::Error::InvalidHeader < RubeePass::Error
     def initialize
         super("Invalid header format!")

data/lib/rubeepass/error/invalid_magic.rb

@@ -1,5 +1,3 @@
-require "rubeepass/error"
-
 class RubeePass::Error::InvalidMagic < RubeePass::Error
     def initialize
         super("Invalid magic values detected!")

data/lib/rubeepass/error/invalid_password.rb

@@ -1,5 +1,3 @@
-require "rubeepass/error"
-
 class RubeePass::Error::InvalidPassword < RubeePass::Error
     def initialize
         super("Invalid password provided!")

data/lib/rubeepass/error/invalid_protected_data.rb

@@ -1,5 +1,3 @@
-require "rubeepass/error"
-
 class RubeePass::Error::InvalidProtectedData < RubeePass::Error
     def initialize
         super("Invalid protected data!")

data/lib/rubeepass/error/invalid_protected_stream_key.rb

@@ -1,5 +1,3 @@
-require "rubeepass/error"
-
 class RubeePass::Error::InvalidProtectedStreamKey < RubeePass::Error
     def initialize
         super("Invalid protected stream key!")

data/lib/rubeepass/error/invalid_version.rb

@@ -1,5 +1,3 @@
-require "rubeepass/error"
-
 class RubeePass::Error::InvalidVersion < RubeePass::Error
     def initialize
         super("Invalid version detected!")

data/lib/rubeepass/error/invalid_xml.rb

@@ -1,5 +1,3 @@
-require "rubeepass/error"
-
 class RubeePass::Error::InvalidXML < RubeePass::Error
     def initialize
         super("Invalid xml schema!")

data/lib/rubeepass/error/not_aes.rb

@@ -1,5 +1,3 @@
-require "rubeepass/error"
-
 class RubeePass::Error::NotAES < RubeePass::Error
     def initialize
         super("Not AES!")

data/lib/rubeepass/error/not_salsa20.rb

@@ -1,5 +1,3 @@
-require "rubeepass/error"
-
 class RubeePass::Error::NotSalsa20 < RubeePass::Error
     def initialize
         super("Not a Salsa20 CrsAlgorithm!")

data/lib/rubeepass/group.rb

@@ -49,7 +49,9 @@ class RubeePass::Group
     end
 
     def entry_titles
-        return @entries.keys.sort
+        return @entries.keys.sort do |a, b|
+            a.downcase <=> b.downcase
+        end
     end
 
     def find_group(path)
@@ -116,41 +118,42 @@ class RubeePass::Group
         return group
     end
 
-    def fuzzy_find(input)
-        return [ [], [], [] ] if (@keepass.nil?)
+    def fuzzy_find(search)
+        return [[], []] if (@keepass.nil?)
 
-        input = @path if (input.nil? || input.empty?)
-        input = @keepass.absolute_path(input, @path)
-        path, target = input.rsplit("/")
+        search = @path if (search.nil? || search.empty?)
+        search = @keepass.absolute_path(search, @path)
+        path, target = search.rsplit("/")
 
         new_cwd = find_group(path)
-        return [ input, [], [] ] if (new_cwd.nil?)
+        return [[], []] if (new_cwd.nil?)
 
         if (new_cwd.has_group?(target))
             new_cwd = new_cwd.groups[target]
             target = ""
-            input += "/"
         end
 
         group_completions = new_cwd.group_names
         entry_completions = new_cwd.entry_titles
 
         if (target.empty?)
-            return [ input, group_completions, entry_completions ]
+            return [group_completions, entry_completions]
         end
 
-        group_completions.delete_if do |group|
-            !group.downcase.start_with?(target.downcase)
+        group_completions.keep_if do |group|
+            group.downcase.start_with?(target.downcase)
         end
-        entry_completions.delete_if do |entry|
-            !entry.downcase.start_with?(target.downcase)
+        entry_completions.keep_if do |entry|
+            entry.downcase.start_with?(target.downcase)
         end
 
-        return [ input, group_completions, entry_completions ]
+        return [group_completions, entry_completions]
     end
 
     def group_names
-        return @groups.keys.sort
+        return @groups.keys.sort do |a, b|
+            a.downcase <=> b.downcase
+        end
     end
 
     def has_entry?(title)

data/lib/rubeepass/wish/cd_wish.rb

@@ -3,7 +3,7 @@ require "djinni"
 
 class CDWish < Djinni::Wish
     def aliases
-        return [ "cd" ]
+        return ["cd"]
     end
 
     def description
@@ -15,47 +15,37 @@ class CDWish < Djinni::Wish
         cwd = djinni_env["cwd"]
         prompt_color = djinni_env["prompt_color"]
 
-        args = keepass.absolute_path(args, cwd.path)
-        new_cwd = keepass.find_group(args)
-
-        if (new_cwd)
-            djinni_env["cwd"] = new_cwd
-            if (prompt_color)
-                prompt = "rpass:#{new_cwd.name}> ".send(prompt_color)
-            else
-                prompt = "rpass:#{new_cwd.name}> "
-            end
-            djinni_env["djinni_prompt"] = prompt
+        path = keepass.absolute_path(args, cwd.path)
+        new_cwd = keepass.find_group(path)
+
+        if (new_cwd.nil?)
+            puts "Group not found"
+            return
+        end
+
+        djinni_env["cwd"] = new_cwd
+        if (prompt_color)
+            prompt = "rpass:#{new_cwd.name}> ".send(prompt_color)
         else
-            puts "Group \"#{args}\" doesn't exist!"
+            prompt = "rpass:#{new_cwd.name}> "
         end
+        djinni_env["djinni_prompt"] = prompt
     end
 
     def tab_complete(input, djinni_env = {})
         cwd = djinni_env["cwd"]
-        input, groups = cwd.fuzzy_find(input)
-        return input.gsub(%r{^#{cwd.path}/?}, "") if (groups.empty?)
-
-        path, dest = input.rsplit("/")
-
-        if (dest.empty?)
-            if (groups.length == 1)
-                input = "#{path}/#{groups.first}/"
-                return input.gsub(%r{^#{cwd.path}/?}, "")
-            end
-            puts
-            groups.each do |group|
-                puts "#{group}/"
-            end
-            return input.gsub(%r{^#{cwd.path}/?}, "")
+        groups, entries = cwd.fuzzy_find(input)
+
+        completions = Hash.new
+        groups.each do |group|
+            completions[group] = "Group"
         end
 
-        input = "#{path}/#{groups.first}/"
-        return input.gsub(%r{^#{cwd.path}/?}, "")
+        return [completions, input.rsplit("/")[1], "/"]
     end
 
     def usage
         puts "#{aliases.join(", ")} [group]"
-        puts "\t#{description}."
+        puts "    #{description}."
     end
 end

data/lib/rubeepass/wish/copy_wish.rb

@@ -2,7 +2,7 @@ require "djinni"
 
 class CopyWish < Djinni::Wish
     def aliases
-        return [ "copy", "cp" ]
+        return ["copy", "cp"]
     end
 
     def description
@@ -10,129 +10,103 @@ class CopyWish < Djinni::Wish
     end
 
     def execute(args, djinni_env = {})
-        if (args.nil? || args.empty?)
-            puts usage
-            return
-        end
-
-        field, args = args.split(" ", 2)
-        if (!@fields.include?(field))
-            puts usage
-            return
-        end
-
-        if (ENV["DISPLAY"].nil? || ENV["DISPLAY"].empty?)
-            puts "DISPLAY not set!"
+        # "".split(" ", 2) => [] aka [nil, nil]
+        # " ".split(" ", 2) => [""] aka ["", nil]
+        # "pass".split(" ", 2) => ["pass"] aka ["pass", nil]
+        # "pass ".split(" ", 2) => ["pass", ""]
+
+        field, path = args.split(" ", 2)
+        if (
+            field.nil? ||
+            field.empty? ||
+            !@fields.include?(field) ||
+            path.nil? ||
+            path.empty?
+        )
+            usage
             return
         end
 
         keepass = djinni_env["keepass"]
         cwd = djinni_env["cwd"]
-        args = cwd.path if (args.nil? || args.empty?)
 
-        args = keepass.absolute_path(args, cwd.path)
-        path, target = args.rsplit("/")
+        path = keepass.absolute_path(path, cwd.path)
+        path, target = path.rsplit("/")
         new_cwd = keepass.find_group(path)
+        timeout = djinni_env["clipboard_timeout"]
 
-        if (new_cwd)
-            if (target.empty?)
-                usage
-            elsif (new_cwd.has_entry?(target))
-                target = new_cwd.entry_titles.select do |entry|
-                    target.downcase == entry.downcase
-                end.first
-
-                timeout = djinni_env["clipboard_timeout"]
-
-                case field
-                when "pass"
-                    new_cwd.entries[target].copy_password_to_clipboard
-                    keepass.send(
-                        "clear_clipboard_after_#{timeout}_seconds"
-                    )
-                when "url"
-                    new_cwd.entries[target].copy_url_to_clipboard
-                    keepass.send(
-                        "clear_clipboard_after_#{timeout}_seconds"
-                    )
-                when "user"
-                    new_cwd.entries[target].copy_username_to_clipboard
-                    keepass.send(
-                        "clear_clipboard_after_#{timeout}_seconds"
-                    )
-                end
-            else
-                puts "Entry \"#{args}\" doesn't exist!"
-            end
-        else
-            puts "Entry \"#{args}\" doesn't exist!"
+        if (new_cwd.nil? || !new_cwd.has_entry?(target))
+            puts "Entry not found"
+            return
+        end
+
+        case field
+        when "pass"
+            new_cwd.entries[target].copy_password_to_clipboard
+            keepass.send(
+                "clear_clipboard_after_#{timeout}_seconds"
+            )
+        when "url"
+            new_cwd.entries[target].copy_url_to_clipboard
+            keepass.send(
+                "clear_clipboard_after_#{timeout}_seconds"
+            )
+        when "user"
+            new_cwd.entries[target].copy_username_to_clipboard
+            keepass.send(
+                "clear_clipboard_after_#{timeout}_seconds"
+            )
         end
     end
 
     def initialize
-        @fields = [ "pass", "url", "user" ]
+        @fields = {
+            "pass" => "Password",
+            "url" => "URL",
+            "user" => "Username"
+        }
     end
 
     def tab_complete(input, djinni_env = {})
-        if (input.nil? || input.empty?)
-            puts
-            puts @fields
-            return ""
-        end
+        # "".split(" ", 2) => [] aka [nil, nil]
+        # " ".split(" ", 2) => [""] aka ["", nil]
+        # "pass".split(" ", 2) => ["pass"] aka ["pass", nil]
+        # "pass ".split(" ", 2) => ["pass", ""]
 
-        field, input = input.split(" ", 2)
+        field, path = input.split(" ", 2)
+        return [@fields, "", ""] if (field.nil? || field.empty?)
 
-        if (input.nil? || input.empty?)
-            @fields.each do |f|
-                break if (f == field)
-                if (f.start_with?(field))
-                    return "#{f} "
-                end
+        if (path.nil?)
+            completions = @fields.select do |f, d|
+                f.start_with?(field)
             end
+            return [completions, field, " "]
         end
 
-        input = "" if (input.nil?)
-
         cwd = djinni_env["cwd"]
-        input, groups, entries = cwd.fuzzy_find(input)
-        if (groups.empty? && entries.empty?)
-            return "#{field} #{input.gsub(%r{^#{cwd.path}/?}, "")}"
-        end
-
-        path, target = input.rsplit("/")
+        groups, entries = cwd.fuzzy_find(path)
 
-        if (target.empty?)
-            if ((groups.length == 1) && entries.empty?)
-                input = "#{path}/#{groups.first}/"
-                return "#{field} #{input.gsub(%r{^#{cwd.path}/?}, "")}"
-            elsif (groups.empty? && (entries.length == 1))
-                input = "#{path}/#{entries.first}"
-                return "#{field} #{input.gsub(%r{^#{cwd.path}/?}, "")}"
-            end
-            puts
-            groups.each do |group|
-                puts "#{group}/"
-            end
-            puts entries
-            return "#{field} #{input.gsub(%r{^#{cwd.path}/?}, "")}"
+        completions = Hash.new
+        groups.each do |group|
+            completions[group] = "Group"
         end
-
-        if (!groups.empty?)
-            input = "#{path}/#{groups.first}/"
-        elsif (!entries.empty?)
-            input = "#{path}/#{entries.first}"
+        entries.each do |entry|
+            completions[entry] = "Entry"
         end
 
-        return "#{field} #{input.gsub(%r{^#{cwd.path}/?}, "")}"
+        append = "/"
+        append = "" if (groups.empty?)
+
+        return [completions, path.rsplit("/")[1], append]
     end
 
     def usage
         puts "#{aliases.join(", ")} <field> <entry>"
-        puts "\t#{description}."
+        puts "    #{description}."
         puts
         puts "FIELDS"
-        @fields.each do |field|
-            puts "\t#{field}"
+        @fields.each do |field, desc|
+            puts "    #{field}"
         end
     end
 end

data/lib/rubeepass/wish/echo_wish.rb

@@ -2,7 +2,7 @@ require "djinni"
 
 class EchoWish < Djinni::Wish
     def aliases
-        return [ "echo" ]
+        return ["echo"]
     end
 
     def description
@@ -10,113 +10,93 @@ class EchoWish < Djinni::Wish
     end
 
     def execute(args, djinni_env = {})
-        if (args.nil? || args.empty?)
-            puts usage
-            return
-        end
-
-        field, args = args.split(" ", 2)
-        if (!@fields.include?(field))
-            puts usage
+        # "".split(" ", 2) => [] aka [nil, nil]
+        # " ".split(" ", 2) => [""] aka ["", nil]
+        # "pass".split(" ", 2) => ["pass"] aka ["pass", nil]
+        # "pass ".split(" ", 2) => ["pass", ""]
+
+        field, path = args.split(" ", 2)
+        if (
+            field.nil? ||
+            field.empty? ||
+            !@fields.include?(field) ||
+            path.nil? ||
+            path.empty?
+        )
+            usage
             return
         end
 
         keepass = djinni_env["keepass"]
         cwd = djinni_env["cwd"]
-        args = cwd.path if (args.nil? || args.empty?)
 
-        args = keepass.absolute_path(args, cwd.path)
-        path, target = args.rsplit("/")
+        path = keepass.absolute_path(path, cwd.path)
+        path, target = path.rsplit("/")
         new_cwd = keepass.find_group(path)
 
-        if (new_cwd)
-            if (target.empty?)
-                usage
-            elsif (new_cwd.has_entry?(target))
-                target = new_cwd.entry_titles.select do |entry|
-                    target.downcase == entry.downcase
-                end.first
-
-                case field
-                when "pass"
-                    new_cwd.entries[target].echo_password
-                when "url"
-                    new_cwd.entries[target].echo_url
-                when "user"
-                    new_cwd.entries[target].echo_username
-                end
-            else
-                puts "Entry \"#{args}\" doesn't exist!"
-            end
-        else
-            puts "Entry \"#{args}\" doesn't exist!"
+        if (new_cwd.nil? || !new_cwd.has_entry?(target))
+            puts "Entry not found"
+            return
+        end
+
+        case field
+        when "pass"
+            new_cwd.entries[target].echo_password
+        when "url"
+            new_cwd.entries[target].echo_url
+        when "user"
+            new_cwd.entries[target].echo_username
         end
     end
 
     def initialize
-        @fields = [ "pass", "url", "user" ]
+        @fields = {
+            "pass" => "Password",
+            "url" => "URL",
+            "user" => "Username"
+        }
     end
 
     def tab_complete(input, djinni_env = {})
-        if (input.nil? || input.empty?)
-            puts
-            puts @fields
-            return ""
-        end
+        # "".split(" ", 2) => [] aka [nil, nil]
+        # " ".split(" ", 2) => [""] aka ["", nil]
+        # "pass".split(" ", 2) => ["pass"] aka ["pass", nil]
+        # "pass ".split(" ", 2) => ["pass", ""]
 
-        field, input = input.split(" ", 2)
+        field, path = input.split(" ", 2)
+        return [@fields, "", ""] if (field.nil? || field.empty?)
 
-        if (input.nil? || input.empty?)
-            @fields.each do |f|
-                break if (f == field)
-                if (f.start_with?(field))
-                    return "#{f} "
-                end
+        if (path.nil?)
+            completions = @fields.select do |f, d|
+                f.start_with?(field)
             end
+            return [completions, field, " "]
         end
 
-        input = "" if (input.nil?)
-
         cwd = djinni_env["cwd"]
-        input, groups, entries = cwd.fuzzy_find(input)
-        if (groups.empty? && entries.empty?)
-            return "#{field} #{input.gsub(%r{^#{cwd.path}/?}, "")}"
-        end
+        groups, entries = cwd.fuzzy_find(path)
 
-        path, target = input.rsplit("/")
-
-        if (target.empty?)
-            if ((groups.length == 1) && entries.empty?)
-                input = "#{path}/#{groups.first}/"
-                return "#{field} #{input.gsub(%r{^#{cwd.path}/?}, "")}"
-            elsif (groups.empty? && (entries.length == 1))
-                input = "#{path}/#{entries.first}"
-                return "#{field} #{input.gsub(%r{^#{cwd.path}/?}, "")}"
-            end
-            puts
-            groups.each do |group|
-                puts "#{group}/"
-            end
-            puts entries
-            return "#{field} #{input.gsub(%r{^#{cwd.path}/?}, "")}"
+        completions = Hash.new
+        groups.each do |group|
+            completions[group] = "Group"
         end
-
-        if (!groups.empty?)
-            input = "#{path}/#{groups.first}/"
-        elsif (!entries.empty?)
-            input = "#{path}/#{entries.first}"
+        entries.each do |entry|
+            completions[entry] = "Entry"
         end
 
-        return "#{field} #{input.gsub(%r{^#{cwd.path}/?}, "")}"
+        append = "/"
+        append = "" if (groups.empty?)
+
+        return [completions, path.rsplit("/")[1], append]
     end
 
     def usage
         puts "#{aliases.join(", ")} <field> <entry>"
-        puts "\t#{description}."
+        puts "    #{description}."
         puts
         puts "FIELDS"
-        @fields.each do |field|
-            puts "\t#{field}"
+        @fields.each do |field, desc|
+            puts "    #{field}"
         end
     end
 end

data/lib/rubeepass/wish/ls_wish.rb

@@ -2,7 +2,7 @@ require "djinni"
 
 class LSWish < Djinni::Wish
     def aliases
-        return [ "ls", "dir" ]
+        return ["ls", "dir"]
     end
 
     def description
@@ -12,48 +12,38 @@ class LSWish < Djinni::Wish
     def execute(args, djinni_env = {})
         keepass = djinni_env["keepass"]
         cwd = djinni_env["cwd"]
-        args = cwd.path if (args.nil? || args.empty?)
-
-        args = keepass.absolute_path(args, cwd.path)
-        new_cwd = keepass.find_group(args)
-
-        if (new_cwd)
-            new_cwd.group_names.each do |group|
-                puts "#{group}/"
-            end
-            new_cwd.entry_titles.each do |entry|
-                puts "#{entry}"
-            end
-        else
-            puts "Group \"#{args}\" doesn't exist!"
+
+        args = cwd.path if (args.empty?)
+        path = keepass.absolute_path(args, cwd.path)
+        new_cwd = keepass.find_group(path)
+
+        if (new_cwd.nil?)
+            puts "Group not found"
+            return
+        end
+
+        new_cwd.group_names.each do |group|
+            puts "#{group}/"
+        end
+        new_cwd.entry_titles.each do |entry|
+            puts "#{entry}"
         end
     end
 
     def tab_complete(input, djinni_env = {})
         cwd = djinni_env["cwd"]
-        input, groups = cwd.fuzzy_find(input)
-        return input.gsub(%r{^#{cwd.path}/?}, "") if (groups.empty?)
-
-        path, dest = input.rsplit("/")
-
-        if (dest.empty?)
-            if (groups.length == 1)
-                input = "#{path}/#{groups.first}/"
-                return input.gsub(%r{^#{cwd.path}/?}, "")
-            end
-            puts
-            groups.each do |group|
-                puts "#{group}/"
-            end
-            return input.gsub(%r{^#{cwd.path}/?}, "")
+        groups, entries = cwd.fuzzy_find(input)
+
+        completions = Hash.new
+        groups.each do |group|
+            completions[group] = "Group"
         end
 
-        input = "#{path}/#{groups.first}/"
-        return input.gsub(%r{^#{cwd.path}/?}, "")
+        return [completions, input.rsplit("/")[1], "/"]
     end
 
     def usage
         puts "#{aliases.join(", ")} [group]"
-        puts "\t#{description}."
+        puts "    #{description}."
     end
 end

data/lib/rubeepass/wish/pwd_wish.rb

@@ -2,7 +2,7 @@ require "djinni"
 
 class PwdWish < Djinni::Wish
     def aliases
-        return [ "pwd" ]
+        return ["pwd"]
     end
 
     def description
@@ -10,15 +10,12 @@ class PwdWish < Djinni::Wish
     end
 
     def execute(args, djinni_env = {})
-        if (args.nil? || args.empty?)
-            puts djinni_env["cwd"].path
-        else
-            usage
-        end
+        puts djinni_env["cwd"].path if (args.empty?)
+        usage if (!args.empty?)
     end
 
     def usage
         puts aliases.join(", ")
-        puts "\t#{description}."
+        puts "    #{description}."
     end
 end

data/lib/rubeepass/wish/show_wish.rb

@@ -2,7 +2,7 @@ require "djinni"
 
 class ShowWish < Djinni::Wish
     def aliases
-        return [ "cat", "show", "showall" ]
+        return ["cat", "show", "showall"]
     end
 
     def description
@@ -12,82 +12,67 @@ class ShowWish < Djinni::Wish
     def execute(args, djinni_env = {})
         keepass = djinni_env["keepass"]
         cwd = djinni_env["cwd"]
-        args = cwd.path if (args.nil? || args.empty?)
 
-        args = keepass.absolute_path(args, cwd.path)
-        path, target = args.rsplit("/")
+        args = cwd.path if (args.empty?)
+        path = keepass.absolute_path(args, cwd.path)
+        path, target = path.rsplit("/")
         new_cwd = keepass.find_group(path)
 
-        if (new_cwd)
-            if (target.empty?)
-                case djinni_env["djinni_input"]
-                when "showall"
-                    puts new_cwd.details(0, true)
-                else
-                    puts new_cwd
-                end
-            elsif (new_cwd.has_group?(target))
+        if (new_cwd.nil?)
+            puts "Group not found"
+            return
+        end
+
+        if (target.empty?)
+            case djinni_env["djinni_input"]
+            when "showall"
+                puts new_cwd.details(0, true)
+            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]
+            end
+        elsif (new_cwd.has_entry?(target))
+            new_cwd.entry_titles.select do |entry|
+                target.downcase == entry.downcase
+            end.each do |entry|
                 case djinni_env["djinni_input"]
                 when "showall"
-                    puts new_cwd.groups[target].details(0, true)
+                    puts new_cwd.entries[entry].details(0, true)
                 else
-                    puts new_cwd.groups[target]
-                end
-            elsif (new_cwd.has_entry?(target))
-                new_cwd.entry_titles.select do |entry|
-                    target.downcase == entry.downcase
-                end.each do |entry|
-                    case djinni_env["djinni_input"]
-                    when "showall"
-                        puts new_cwd.entries[entry].details(0, true)
-                    else
-                        puts new_cwd.entries[entry]
-                    end
+                    puts new_cwd.entries[entry]
                 end
-            else
-                puts "Group/entry \"#{args}\" doesn't exist!"
             end
         else
-            puts "Group/entry \"#{args}\" doesn't exist!"
+            puts "Group/Entry not found"
         end
     end
 
     def tab_complete(input, djinni_env = {})
         cwd = djinni_env["cwd"]
-        input, groups, entries = cwd.fuzzy_find(input)
-        if (groups.empty? && entries.empty?)
-            return input.gsub(%r{^#{cwd.path}/?}, "")
-        end
-
-        path, target = input.rsplit("/")
+        groups, entries = cwd.fuzzy_find(input)
 
-        if (target.empty?)
-            if ((groups.length == 1) && entries.empty?)
-                input = "#{path}/#{groups.first}/"
-                return input.gsub(%r{^#{cwd.path}/?}, "")
-            elsif (groups.empty? && (entries.length == 1))
-                input = "#{path}/#{entries.first}"
-                return input.gsub(%r{^#{cwd.path}/?}, "")
-            end
-            puts
-            groups.each do |group|
-                puts "#{group}/"
-            end
-            puts entries
-            return input.gsub(%r{^#{cwd.path}/?}, "")
+        completions = Hash.new
+        groups.each do |group|
+            completions[group] = "Group"
         end
-
-        if (!groups.empty?)
-            input = "#{path}/#{groups.first}/"
-        elsif (!entries.empty?)
-            input = "#{path}/#{entries.first}"
+        entries.each do |entry|
+            completions[entry] = "Entry"
         end
 
-        return input.gsub(%r{^#{cwd.path}/?}, "")
+        append = "/"
+        append = "" if (groups.empty?)
+
+        return [completions, input.rsplit("/")[1], append]
     end
 
     def usage
         puts "#{aliases.join(", ")} [group|entry]"
-        puts "\t#{description}."
+        puts "    #{description}."
     end
 end

data/lib/rubeepass.rb

@@ -6,7 +6,6 @@ require "pathname"
 require "rexml/document"
 require "scoobydoo"
 require "shellwords"
-require "string"
 require "uri"
 require "zlib"
 
@@ -208,7 +207,11 @@ class RubeePass
 
         filehash = ""
         if (@keyfile)
-            contents = File.readlines(@keyfile).join.fix
+            require "string"
+            contents = File.readlines(@keyfile).join
+            if (contents.length != contents.bytesize)
+                contents = contents.unpack("H*").pack("H*")
+            end
             if (contents[0..4] == "<?xml")
                 # XML Key file
                 # My ugly attempt to parse a small XML Key file with a
@@ -352,7 +355,7 @@ class RubeePass
             data = StringIO.new(
                 cipher.update(encrypted) + cipher.final
             )
-        rescue OpenSSL::Cipher::CipherError => e
+        rescue OpenSSL::Cipher::CipherError
             raise Error::InvalidPassword.new
         end
 
@@ -455,7 +458,7 @@ class RubeePass
         return if (@thread.nil?)
         begin
             @thread.join
-        rescue Interrupt => e
+        rescue Interrupt
             puts
         end
     end

data/lib/string.rb

@@ -1,16 +1,5 @@
 # Modify String class to allow for rsplit and word wrap
 class String
-    def fix
-        # Fix unicode (I think???)
-        # Apparently sometimes length and bytesize don't always agree.
-        # When this happens, there are "invisible" bytes, which I need
-        # to be "visible". Converting to hex and back fixes this.
-        if (length != bytesize)
-            return self.unpack("H*").pack("H*")
-        end
-        return self
-    end
-
     def rsplit(pattern)
         ret = rpartition(pattern)
         ret.delete_at(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -76,20 +76,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: json_config
   requirement: !ruby/object:Gem::Requirement