glark 1.10.4 → 1.10.5

data/lib/glark/app/info/options.rb

@@ -7,7 +7,7 @@ require 'glark/util/options'
 
 module Glark
   PACKAGE = 'glark'
-  VERSION = '1.10.4'
+  VERSION = '1.10.5'
   
   class InfoOptions < Options
     attr_reader :colors

data/lib/glark/io/file/zip_file.rb

@@ -12,22 +12,11 @@ module Glark
     def initialize fname, range, &blk
       super fname, range
       
-      # Same caveat as ZipFile. Given that this is a gem, I'm not sure if it is
-      # installed with other package managers. So the require is down here, used
-      # only if needed.
-
-      begin
-        require 'zip/zip'
-      rescue LoadError => e
-        msg = "error loading zip gem: #{e}\n"
-        msg << "to install this dependency, run 'gem install rubyzip'"
-        info "msg: #{msg}".color(:red)
-        raise msg
-      end
+      check_rubyzip
     end
 
     def get_reader 
-      @zipfile = Zip::ZipFile.new @fname
+      @zipfile = Zip::File.new @fname
     end
 
     def read entry
@@ -37,5 +26,41 @@ module Glark
     def entry_name entry
       entry.name
     end
+
+    def check_rubyzip
+      check_rubyzip_exists
+      check_rubyzip_version
+    end
+
+    def check_rubyzip_exists
+      # Given that this is a gem, I'm not sure if it is installed with other
+      # package managers. So the require is down here, used only if needed.
+      begin
+        require 'zip'
+      rescue LoadError => e
+        msg = "error loading zip gem: #{e}\n"
+        msg << "to install this dependency, run 'gem install rubyzip'"
+        info Rainbow::Presenter.new("msg: #{msg}").color(:red)
+        raise msg
+      end
+      check_rubyzip_version
+    end
+
+    def check_rubyzip_version
+      require 'zip/version'
+      reqver = '1.1.4'
+      reqnum = version_to_number reqver
+      currnum = version_to_number Zip::VERSION
+      if currnum < reqnum
+        msg = "error: support for zip files requires rubyzip version >= #{reqver}; current version is #{Zip::VERSION}"
+        info Rainbow::Presenter.new("msg: #{msg}").color(:red)
+        raise msg
+      end        
+    end
+
+    def version_to_number ver
+      vernums = ver.split('.')
+      num = vernums.inject(0) { |s, n| 1000 * s + n.to_i }
+    end
   end
 end

data/lib/glark/match/re.rb

@@ -38,7 +38,7 @@ class RegexpExpression < Expression
   def match? line
     begin
       @re.match line
-    rescue => e
+    rescue
       false
     end
   end

data/lib/glark/util/highlight.rb

@@ -13,23 +13,6 @@ module Highlight
   end
 end
 
-module Sickill
-  module Rainbow
-    class AnsiColor
-      $-w = false
-      # includes the aberrant color name in the error message.
-      def validate_color_name #:nodoc:
-        color_names = TERM_COLORS.keys
-
-        unless color_names.include?(@color)
-          raise ArgumentError.new "Unknown color name: '#{@color}'; valid names: #{color_names.join(', ')}"
-        end
-      end
-      $-w = true
-    end
-  end
-end
-
 class RainbowHighlighter
   include Singleton
 
@@ -49,25 +32,25 @@ class RainbowHighlighter
   def get_code color, type
     case color
     when 'bold', 'bright'
-      Sickill::Rainbow::TERM_EFFECTS[:bright]
+      Rainbow::Presenter::TERM_EFFECTS[:bright]
     when 'reverse', 'negative', 'inverse'
-      Sickill::Rainbow::TERM_EFFECTS[:inverse]
+      Rainbow::Presenter::TERM_EFFECTS[:inverse]
     when 'underline'
-      Sickill::Rainbow::TERM_EFFECTS[:underline]
+      Rainbow::Presenter::TERM_EFFECTS[:underline]
     when 'blink'
-      Sickill::Rainbow::TERM_EFFECTS[:blink]
+      Rainbow::Presenter::TERM_EFFECTS[:blink]
     when %r{^[\dA-Fa-f]{6}$}
-      ac = Sickill::Rainbow::AnsiColor.new type, color
-      ac.code
+      ac = Rainbow::Color.build type, [ color ]
+      ac.codes.join(';')
     else
-      ac = Sickill::Rainbow::AnsiColor.new type, color.to_sym
-      ac.code
+      ac = Rainbow::Color.build type, [ color.to_sym ]
+      ac.codes.join(';')
     end
   end
 
   def to_codes color
     codes = ""
-    return codes unless Sickill::Rainbow.enabled
+    return codes unless Rainbow.enabled
     color.scan(COLORS_RE).collect do |md|
       color, type = md[0] ? [ md[0], :background ] : [ md[1], :foreground ]
       code = get_code color, type

data/test/glark/app/highlight_test.rb

@@ -43,6 +43,25 @@ module Glark
       run_app_test expected, [ '--file-color', 'yellow', 'The.?M.*Tale' ], *files
     end
 
+    def test_rgb
+      files = [ '/proj/org/incava/glark/test/resources/textfile.txt', '/proj/org/incava/glark/test/resources/filelist.txt' ]
+      expected = [
+                  "/proj/org/incava/glark/test/resources/textfile.txt",
+                  "    3   -rw-r--r--   1 jpace jpace   45450 2010-12-04 15:24 02-TheMillersTale.txt",
+                  "    6   -rw-r--r--   1 jpace jpace   63290 2010-12-04 15:24 05-TheManOfLawsTale.txt",
+                  "   11   -rw-r--r--   1 jpace jpace   65852 2010-12-04 15:24 10-TheMerchantsTale.txt",
+                  "   20   -rw-r--r--   1 jpace jpace   49747 2010-12-04 15:24 19-TheMonksTale.txt",
+                  "   24   -rw-r--r--   1 jpace jpace   21141 2010-12-04 15:24 23-TheManciplesTale.txt",
+                  "/proj/org/incava/glark/test/resources/filelist.txt",
+                  "    3 02-The_Millers_Tale.txt",
+                  "    6 05-The_Man_Of_Laws_Tale.txt",
+                  "   11 10-The_Merchants_Tale.txt",
+                  "   20 19-The_Monks_Tale.txt",
+                  "   24 23-The_Manciples_Tale.txt",
+                 ]
+      run_app_test expected, [ '--file-color', '#aabbcc', '--text-color', '#f03dda', 'The.?M.*Tale' ], *files
+    end
+
     def test_highlight_multi
       fname = '/proj/org/incava/glark/test/resources/04-TheCooksTale.txt'
       expected = [

metadata

@@ -1,76 +1,90 @@
 --- !ruby/object:Gem::Specification
 name: glark
 version: !ruby/object:Gem::Version
-  version: 1.10.4
+  version: 1.10.5
+  prerelease: 
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: logue
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: ragol
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: |
-  Glark searches files for regular expressions, extending grep by matching complex
+description: ! 'Glark searches files for regular expressions, extending grep by matching
+  complex
+
   expressions ("and", "or", and "xor"), extracting and searching within compressed
+
   files, and excluding .svn and .git subdirectories by default. Different projects
+
   can have their own Glark configuration.
+
+'
 email: jeugenepace@gmail.com
 executables:
 - glark
@@ -194,26 +208,27 @@ files:
 - test/resources/greet.rb
 homepage: http://www.incava.org/projects/glark
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Extended searching of text files.
 test_files:
 - test/glark/app/and_test.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: dfdc6d9ef40b4b5c09b5a7c5957b39b6b35d33e7
-  data.tar.gz: 91b8ef68d27dbfbc99285023675d083df7208148
-SHA512:
-  metadata.gz: af2c59dfac30ecba8c342938d319edaa58424066e25ae27ec1492367195708586b46b3a97bf6f93edeb6ef58c154eee9fd26a5aa4b9be8e95c5020992627a9c8
-  data.tar.gz: 0bf5f92f6018b2663ffdf7496443c32d9560c49c7a1e932f920debd6e603cfc5e73a90e0ec5f45e57ac718d343115d9c6a289771a88ece7df9891e7a93557793