thieve 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d3ecda5d73f40c593b0a03d850151e232e9769f
-  data.tar.gz: 3893bd040172eecd8d6a815579ad1eb19d362c57
+  metadata.gz: 296ca24daa54e8188d73f8dfc0dc6b1c13c7fc10
+  data.tar.gz: 503d73205205cd6f28bc23f0b8898ca995b87f5a
 SHA512:
-  metadata.gz: c64086e8cf3e9a434c008e6db39aad325bc885e1169f34367edc9ed5ffc0ea9c446a80194657cbf86d9e91ab495e7d2a11319d0a2f65a395e040370a51c5b8c3
-  data.tar.gz: 18d938a5115a2d6889242b62bb00f8d5525c47a92be826e2c8fdcca393b3765611b3a4bbdb6ca82cfa84514172505c8c31eedfcbc5e2dedeec34b581f5d3d31d
+  metadata.gz: 78d3fb2391a5986023f1b2f01b8e5db51270182bcde302a57c87726e6e96529a60347cef15e122db43428bb7aaa70ddeaeb085869b88429a1f8a3b8775310fbc
+  data.tar.gz: a30840cd25adc12836d75074b4dce8b2d8a948cf8146d721d5332e97e9c5b043d754bec38774c434e8e742809583e3dea3e85887c83badf0367a77525adeedff

data/bin/thieve

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require "colorize"
+require "hilighter"
 require "io/wait"
 require "optparse"
 require "thieve"
@@ -31,7 +31,7 @@ def parse(args)
 
         opts.on("", "DESCRIPTION")
 
-        info.scan(/\S.{0,#{76}}\S(?=\s|$)|\S+/).each do |line|
+        info.scan(/\S.{0,76}\S(?=\s|$)|\S+/).each do |line|
             opts.on("    #{line}")
         end
 
@@ -51,7 +51,7 @@ def parse(args)
         end
 
         opts.on("--nocolor", "Disable colorized output") do
-            String.disable_colorization = true
+            Hilighter.disable
         end
 
         opts.on(
@@ -96,7 +96,7 @@ end
 options = parse(ARGV)
 
 begin
-    thieve = Thieve.new(!String.disable_colorization)
+    thieve = Thieve.new(!Hilighter.disable?)
     options["dirs"].each do |dir|
         thieve.steal_from(dir)
     end

data/lib/thieve/key_info.rb

@@ -24,36 +24,36 @@ class Thieve::KeyInfo
     # Type of key/cert
     attr_reader :type
 
-    def colorize_file(file = @file)
-        return file if (!Thieve.colorize?)
+    def export(directory)
+        FileUtils.mkdir_p(directory)
+        File.open("#{directory}/#{@fingerprint}.#{@ext}", "w") do |f|
+            f.write(@key)
+        end
+    end
+
+    def hilight_file(file = @file)
+        return file if (!Thieve.hilight?)
         return file.to_s.light_blue
     end
-    private :colorize_file
+    private :hilight_file
 
-    def colorize_key(key = @key)
-        return key if (!Thieve.colorize?)
+    def hilight_key(key = @key)
+        return key if (!Thieve.hilight?)
         return key.split("\n").map do |line|
             line.light_white
         end.join("\n")
     end
-    private :colorize_key
+    private :hilight_key
 
-    def colorize_match(match = @match)
+    def hilight_match(match = @match)
         return "" if (match.nil?)
-        return "Matches #{match}" if (!Thieve.colorize?)
+        return "Matches #{match}" if (!Thieve.hilight?)
         return [
             "Matches".light_blue,
             match.light_green
         ].join(" ")
     end
-    private :colorize_match
-
-    def export(directory)
-        FileUtils.mkdir_p(directory)
-        File.open("#{directory}/#{@fingerprint}.#{@ext}", "w") do |f|
-            f.write(@key)
-        end
-    end
+    private :hilight_match
 
     def initialize(file, type, key)
         @ext = type.gsub(/ +/, ".").downcase
@@ -153,9 +153,9 @@ class Thieve::KeyInfo
 
     def to_s
         ret = Array.new
-        ret.push(colorize_file)
-        ret.push(colorize_key)
-        ret.push(colorize_match) if (@match)
+        ret.push(hilight_file)
+        ret.push(hilight_key)
+        ret.push(hilight_match) if (@match)
         return ret.join("\n")
     end
 end

data/lib/thieve.rb

@@ -1,4 +1,4 @@
-require "colorize"
+require "hilighter"
 require "io/wait"
 require "json"
 require "pathname"
@@ -7,17 +7,6 @@ require "scoobydoo"
 class Thieve
     attr_accessor :loot
 
-    def self.colorize?
-        @@colorize ||= false
-        return @@colorize
-    end
-
-    def colorize_type(type)
-        return type if (!@@colorize)
-        return type.light_cyan
-    end
-    private :colorize_type
-
     def export_loot(dir)
         exported = Hash.new
         @loot.each do |type, keys|
@@ -61,7 +50,7 @@ class Thieve
                             Thieve::KeyInfo.new(file, type, keydata)
                         )
                     rescue Exception => e
-                        if (@@colorize)
+                        if (@@hilight)
                             $stderr.puts file.to_s.light_blue
                             keydata.each_line do |line|
                                 $stderr.puts line.strip.light_yellow
@@ -99,12 +88,23 @@ class Thieve
         end
     end
 
-    def initialize(colorize = false)
+    def self.hilight?
+        @@hilight ||= false
+        return @@hilight
+    end
+
+    def hilight_type(type)
+        return type if (!@@hilight)
+        return type.light_cyan
+    end
+    private :hilight_type
+
+    def initialize(hilight = false)
         if (ScoobyDoo.where_are_you("gpg").nil?)
             raise Thieve::Error::ExecutableNotFound.new("gpg")
         end
 
-        @@colorize = colorize
+        @@hilight = hilight
         @loot = Hash.new
     end
 
@@ -129,7 +129,7 @@ class Thieve
     def summarize_loot
         ret = Array.new
         @loot.each do |type, keys|
-            ret.push(colorize_type(type))
+            ret.push(hilight_type(type))
             keys.each do |key|
                 ret.push("#{key.to_s}\n")
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thieve
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 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: rake
@@ -31,25 +31,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.5.0
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: hilighter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: scoobydoo
   requirement: !ruby/object:Gem::Requirement