rubeepass 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8226617f8abe2bfe0a9b92d5f650785bd68fac14
-  data.tar.gz: 81e0391b37f439830a284063771d5dccc6af4d04
+  metadata.gz: 225032ca27aae7a359a0aaa46f3ca5d6cc0be876
+  data.tar.gz: 9c5fff439de444eda840e951e460d73a1e9c7afd
 SHA512:
-  metadata.gz: 1922e8c6defb427f2c581ed28c20a9e51f53630e6c96b8f4554bc3e31b9db27315e440ab918017b2b0e02476840b5e424e9dd674fcad9ec71cdcbb7d1b551227
-  data.tar.gz: 5308e20223253ead6b627d078894765a7dbd1970ab16a67f82e5f443a579eca04796a3ed8a417c5503cdd6b60065251859d7a4a463ba5d846956f9b31b8af474
+  metadata.gz: 12098aca371ff956e07f15db6f70c36a6721f7b4af7e4ff191a0a8ed9322a3732107bc80cbe2ddbc2bd0a571713a982c282e9db81342038eef4378d9f0e7e88f
+  data.tar.gz: 123f4c1b4d48b51adc76e82321fdcc709d8c341d7e5f771b626f1b995a702860b8ff15e1044738340c67f02def6b4f4122d3751335b226871946cd0e73f24b11

data/bin/rpass

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "colorize"
 require "djinni"
+require "hilighter"
 require "io/console"
 require "json_config"
 require "optparse"
@@ -111,7 +111,7 @@ def parse(args)
         end
 
         opts.on("--nocolor", "Disable colorized output") do
-            String.disable_colorization = true
+            Hilighter.disable
         end
 
         opts.on(
@@ -220,7 +220,7 @@ begin
         kdbx,
         password,
         keyfile,
-        !String.disable_colorization
+        !Hilighter.disable?
     )
 
     loop do
@@ -242,7 +242,7 @@ begin
                 kdbx,
                 password,
                 keyfile,
-                !String.disable_colorization
+                !Hilighter.disable?
             )
         end
     end

data/lib/rubeepass/entry.rb

@@ -1,4 +1,4 @@
-require "colorize"
+require "hilighter"
 require "rexml/document"
 
 class RubeePass::Entry
@@ -17,28 +17,16 @@ class RubeePass::Entry
         return (self.title.downcase <=> other.title.downcase)
     end
 
-    def colorize_password(passwd)
-        return passwd if (!RubeePass.colorize?)
-        return passwd.light_red
-    end
-    private :colorize_password
-
-    def colorize_title(title)
-        return title if (!RubeePass.colorize?)
-        return title.light_green
-    end
-    private :colorize_title
-
     def details(level = 0, show_passwd = false)
         lvl = Array.new(level, "  ").join
 
         ret = Array.new
-        ret.push(colorize_title("#{lvl}Title    : #{@title}"))
+        ret.push(hilight_title("#{lvl}Title    : #{@title}"))
         # ret.push("#{lvl}UUID     : #{@uuid}")
         ret.push("#{lvl}Username : #{@username}")
         if (show_passwd)
             ret.push(
-                colorize_password("#{lvl}Password : #{password}")
+                hilight_password("#{lvl}Password : #{password}")
             )
         end
         ret.push("#{lvl}Url      : #{@url}")
@@ -142,6 +130,18 @@ class RubeePass::Entry
         return keepass.protected_decryptor.add_to_stream(data)
     end
 
+    def hilight_password(passwd)
+        return passwd if (!RubeePass.hilight?)
+        return passwd.light_red
+    end
+    private :hilight_password
+
+    def hilight_title(title)
+        return title if (!RubeePass.hilight?)
+        return title.light_green
+    end
+    private :hilight_title
+
     def initialize(
         group,
         keepass,

data/lib/rubeepass/group.rb

@@ -1,4 +1,4 @@
-require "colorize"
+require "hilighter"
 require "rexml/document"
 
 class RubeePass::Group
@@ -20,18 +20,12 @@ class RubeePass::Group
         return (self.name.downcase <=> other.name.downcase)
     end
 
-    def colorize_header(header)
-        return header if (!RubeePass.colorize?)
-        return header.light_blue
-    end
-    private :colorize_header
-
     def details(level = 0, show_passwd = false)
         out = Array.new
         lvl = Array.new(level, "  ").join
 
-        group_details = [ colorize_header(@path) ] if (level == 0)
-        group_details = [ colorize_header(@name) ] if (level != 0)
+        group_details = [ hilight_header(@path) ] if (level == 0)
+        group_details = [ hilight_header(@name) ] if (level != 0)
 
         group_details.each do |line|
             out.push("#{lvl}#{line}")
@@ -170,6 +164,12 @@ class RubeePass::Group
         return false
     end
 
+    def hilight_header(header)
+        return header if (!RubeePass.hilight?)
+        return header.light_blue
+    end
+    private :hilight_header
+
     def initialize(
         group,
         keepass,

data/lib/rubeepass/wish/cd_wish.rb

@@ -1,5 +1,5 @@
-require "colorize"
 require "djinni"
+require "hilighter"
 
 class CDWish < Djinni::Wish
     def aliases

data/lib/rubeepass.rb

@@ -72,9 +72,9 @@ class RubeePass
         end
     end
 
-    def self.colorize?
-        @@colorize ||= false
-        return @@colorize
+    def self.hilight?
+        @@hilight ||= false
+        return @@hilight
     end
 
     def copy_to_clipboard(string, err = true)
@@ -178,8 +178,8 @@ class RubeePass
         return @db.fuzzy_find(input)
     end
 
-    def initialize(kdbx, password, keyfile = nil, colorize = false)
-        @@colorize = colorize
+    def initialize(kdbx, password, keyfile = nil, hilight = false)
+        @@hilight = hilight
         @kdbx = Pathname.new(kdbx).expand_path
         @keyfile = nil
         @keyfile = Pathname.new(keyfile).expand_path if (keyfile)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -51,45 +51,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.5.0
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: djinni
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: djinni
+  name: hilighter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: json_config
   requirement: !ruby/object:Gem::Requirement