glark 1.10.2 → 1.10.3

data/test/glark/app/options_test.rb

@@ -7,12 +7,14 @@ require 'glark/app/tc'
 require 'glark/app/options'
 require 'glark/util/highlight'
 
+Logue::Log.level = Logue::Log::DEBUG
+
 module Glark
   class OptionsTestCase < AppTestCase
-    @@hl = HlWrapper.new
+    @@hl = RainbowHighlighter.instance
     
     def str_to_color_codes str
-      @@hl.make_color str
+      @@hl.to_codes str
     end
     
     def assert_method_values opts, exp, args
@@ -216,21 +218,21 @@ module Glark
     end
     
     def test_verbose
-      if origverb = Log.verbose
+      if origverb = Logue::Log.verbose
         %w{ --verbose }.each do |vtag|
           [ nil, 1, 2, 3, 4 ].each do |num|
             vopt = vtag
             if num
               vopt += "=" + num.to_s
             end
-            Log.verbose = nil
+            Logue::Log.verbose = nil
             run_test([ vopt, 'foo' ]) do |opts|
-              assert_equal true, Log.verbose, "log verbosity"
+              assert_equal true, Logue::Log.verbose, "log verbosity"
             end
           end
         end
 
-        Log.verbose = origverb
+        Logue::Log.verbose = origverb
       end
     end
     
@@ -306,7 +308,7 @@ module Glark
     def test_quiet
       %w{ -q -s --quiet --messages }.each do |opt|
         run_test([ opt, 'foo' ]) do |opts|
-          assert Log.quiet
+          assert Logue::Log.quiet
         end
       end
     end
@@ -314,7 +316,7 @@ module Glark
     def test_no_quiet
       %w{ -Q -S --no-quiet --no-messages }.each do |opt|
         run_test([ opt, 'foo' ]) do |opts|
-          assert !Log.quiet
+          assert !Logue::Log.quiet
         end
       end
     end

data/test/glark/input/directory_test.rb

@@ -49,7 +49,7 @@ module Glark
                   "  330 Justice he was full often in assize,",
                   "  605 Of which there was a dozen in that house,",
                   "/proj/org/incava/glark/test/resources/greet.rb",
-                  "    8   def initialize name",
+                  "    5   def initialize name",
                   "/proj/org/incava/glark/test/resources/rcfile.txt",
                   "    8 size-limit: 1000",
                   "/proj/org/incava/glark/test/resources/zfile.txt",

data/test/glark/input/ext_test.rb

@@ -11,9 +11,9 @@ module Glark
                   "/proj/org/incava/glark/test/resources/add.rb",
                   "    5   def initialize x, y",
                   "/proj/org/incava/glark/test/resources/greet.rb",
-                  "    8   def initialize name",
-                  "    9     puts \"hello, \" + name",
-                  "   13 Greet.new ARGV.shift || \"world\"",
+                  "    5   def initialize name",
+                  "    6     puts \"hello, \" + name",
+                  "   10 Greet.new ARGV.shift || \"world\"",
                  ]
       run_app_test expected, [ '-r', '--match-ext', 'rb', 't.*e' ], dirname
     end

data/test/glark/input/size_limit_test.rb

@@ -14,9 +14,9 @@ module Glark
                   "/proj/org/incava/glark/test/resources/expressions.txt",
                   "    2 TheM.*Tale",
                   "/proj/org/incava/glark/test/resources/greet.rb",
-                  "    7 class Greet",
-                  "    8   def initialize name",
-                  "    9     puts \"hello, \" + name",
+                  "    4 class Greet",
+                  "    5   def initialize name",
+                  "    6     puts \"hello, \" + name",
                   "/proj/org/incava/glark/test/resources/rcfile.txt",
                   "    2 highlight: single",
                   "    4 local-config-files: true",

data/test/glark/match_test.rb

@@ -2,7 +2,6 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'riel'
 require 'glark/match/factory'
 require 'glark/tc'
 require 'stringio'
@@ -21,7 +20,7 @@ module Glark
       opts.output_options.out = sio
 
       files = opts.fileset
-      glark = Runner.new opts, files
+      Runner.new opts, files
       
       result = sio.string
       assert_equal expected.collect { |line| "#{line}\n" }.join(''), result

data/test/glark/resources.rb

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'riel'
+require 'logue/loggable'
 
 module Glark
   class Resource

data/test/glark/tc.rb

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'riel'
+require 'logue/log'
 require 'test/unit'
 require 'tempfile'
 
@@ -11,14 +11,14 @@ STDERR.sync = true
 
 require 'glark/app/runner'
 
-# Log.verbose = true
-Log.set_widths(-15, 35, -35)
-Log.quiet = true
-Log.verbose = false
+# Logue::Log.verbose = true
+Logue::Log.set_widths(-15, 35, -35)
+Logue::Log.quiet = true
+Logue::Log.verbose = false
 
 module Glark
   class TestCase < Test::Unit::TestCase
-    include Loggable
+    include Logue::Loggable
 
     # Returns a list of instance methods, in sorted order, so that they are run
     # predictably by the unit test framework.

data/test/resources/greet.rb

@@ -1,9 +1,6 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'rubygems'
-require 'riel'
-
 class Greet
   def initialize name
     puts "hello, " + name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glark
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riel
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.16
+- !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
@@ -43,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.4
+- !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
 
@@ -125,6 +157,7 @@ files:
 - lib/glark/util/options.rb
 - lib/glark/util/optutil.rb
 - lib/glark/util/timestamper.rb
+- man/glark.1
 - bin/glark
 - test/glark/app/and_test.rb
 - test/glark/app/compound_test.rb