hl 1.0.0 → 1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hl (0.0.1)
+    hl (1.1.0)
       gem-man
       methadone (~> 1.0.0.rc5)
       rainbow

data/bin/hl

@@ -8,18 +8,12 @@ class App
   include Methadone::Main
   include Methadone::CLILogging
 
-  main do |keyword,*filenames|
-    if options[:regexp]
-      Array(filenames).unshift(keyword)
-      keyword = options[:regexp]
-    end
+  main do
+    keyword = options[:regexp] || ARGV.shift
 
     exit_now! 'search term or --regexp/-p required' if keyword.nil?
 
-    keyword = keyword.dup
-    highlighter = Hl::Highlighter.new(options)
-
-    puts highlighter.highlight(filenames,keyword)
+    Hl::Highlighter.new(options).highlight(keyword.dup)
   end
 
   description "Highlight terms in output without grepping out lines"

data/lib/hl/highlighter.rb

@@ -11,22 +11,12 @@ module Hl
       @options = options
     end
 
-    # Returns a string containing the highlighted text from the given files or
-    # STDIN if filenames is empty
-    def highlight(filenames,keyword)
+    # Highlights ARGF's contents, outputing each line as it comes in
+    def highlight(keyword)
       Sickill::Rainbow.enabled = true
-      files = if filenames.empty?
-                [STDIN]
-              else
-                filenames.map { |_| File.open(_) }
-              end
-      begin
-
-        regexp = Regexp.new(keyword,@options['ignore-case'] ? Regexp::IGNORECASE : nil)
-
-        files.map { |_| _.readlines}.flatten.map { |_| highlight_matches(regexp,_) }.join("")
-      ensure
-        files && files.map(&:close)
+      regexp = Regexp.new(keyword,@options['ignore-case'] ? Regexp::IGNORECASE : nil)
+      ARGF.lines.each do |line|
+        puts highlight_matches(regexp,line)
       end
     end
 

data/lib/hl/version.rb

@@ -1,3 +1,3 @@
 module Hl
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hl
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70185432164160 !ruby/object:Gem::Requirement
+  requirement: &70164276201800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185432164160
+  version_requirements: *70164276201800
 - !ruby/object:Gem::Dependency
   name: ronn
-  requirement: &70185432163640 !ruby/object:Gem::Requirement
+  requirement: &70164276201160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185432163640
+  version_requirements: *70164276201160
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70185432148560 !ruby/object:Gem::Requirement
+  requirement: &70164276136060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185432148560
+  version_requirements: *70164276136060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70185432146860 !ruby/object:Gem::Requirement
+  requirement: &70164276134460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70185432146860
+  version_requirements: *70164276134460
 - !ruby/object:Gem::Dependency
   name: methadone
-  requirement: &70185432145980 !ruby/object:Gem::Requirement
+  requirement: &70164276133660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0.rc5
   type: :runtime
   prerelease: false
-  version_requirements: *70185432145980
+  version_requirements: *70164276133660
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70185432145440 !ruby/object:Gem::Requirement
+  requirement: &70164276133160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70185432145440
+  version_requirements: *70164276133160
 - !ruby/object:Gem::Dependency
   name: gem-man
-  requirement: &70185432144820 !ruby/object:Gem::Requirement
+  requirement: &70164276132560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70185432144820
+  version_requirements: *70164276132560
 description: To help with reading the results of grep without further reducing the
   output, hl will highlight terms in the output
 email: