sq_ruby_grep 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ecbae1d7f5407a9164e0945f0b9a4c2597abb97
-  data.tar.gz: 43c21842405cf2548d04417a3481d2b2ddba8b57
+  metadata.gz: 2688d28246d3cb3f85bb521c7681bc7eba93e37c
+  data.tar.gz: 93a5b5a2a4922e6f85f478493fe16d21afb0ec8a
 SHA512:
-  metadata.gz: 9822f2472d575e7caa1ccb8daa64fe5f3abed5ef394598aef434016452006ecac6cd63bbada25acbd8cbbe25a6cb851d74a8dd672b7962c78a777dc372886e2f
-  data.tar.gz: f49524ba86648e4fb8797e5d8be4572b6cd154ae71cf60cf9284c597c385300667ff7fef89f68c3e7eb8b40374e16b0e9bc16cd15f8c4976018543d6753a6f5c
+  metadata.gz: 538b57f60e8f781d162d2f446ca27ebced40ce97be61d5b861ca00d80de16e8d45b37c37a4c6669680e9e3110588e3d81870c62186fc3dd3d0c142714f7f76c6
+  data.tar.gz: f0a4c4307c86f0de281d367867ff68a93fff2d97a4eb89a1cc50d95465eac0c46208c753f62341df8f80a980d94ed1f4f814cc4e1c3d24428c372e34b723e87d

data/README.md

@@ -1,7 +1,5 @@
 # SqRubyGrep
 
-It just the training project for SQ interview. Forget it! :)
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -20,15 +18,13 @@ Or install it yourself as:
 
 ## Usage
 
-    $ sq_ruby_grep [FILE] [options]
+    $ sq_ruby_grep <pattern> <file> [options]
 
-    -e, --regex=PATTERN              Use PATTERN as the pattern.
-    
     -A, --after-context=NUM          Print NUM lines of trailing context after matching lines.
     
     -B, --before-context=NUM         Print NUM line of leading context before matching lines.
-    
-    -c, --colorize                   Colorize matches
-    
+
+    --not-colorize                   Without colorize
+
     -h, --help                       Prints this help
 

data/bin/sq_ruby_grep

@@ -3,5 +3,6 @@
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sq_ruby_grep'
+require 'parser'
 
-SqRubyGrep.run
+puts SqRubyGrep.run SqRubyGrep::Parser.parse(ARGV)

data/example.rb

@@ -2,11 +2,4 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sq_ruby_grep'
 
-SqRubyGrep.grep(file_path:'test/fixtures/text.txt', pattern: /non/, after_lines: 2, before_lines: 2, colorize: true).each do |result|
-  p '------------'
-  puts result.before_context
-  puts '---' + result.match_line
-  puts result.after_context
-  p '------------'
-end
-
+puts SqRubyGrep.run(file_path:'test/fixtures/text.txt', pattern: /needle/, after_lines: 1, before_lines: 2)

data/lib/sq_ruby_grep/parser.rb

@@ -3,16 +3,12 @@ require 'optparse'
 module SqRubyGrep
   class Parser
     def self.parse(options)
-      args = Hash.new
+      args = {colorize: true}
 
       opt_parser = OptionParser.new do |opts|
         opts.banner = 'RubyGrep searches the named input FILE for lines containing a match to the given PATTERN.'
         opts.banner = 'Usage: ruby_grep [FILE] [options]'
 
-        opts.on('-e PATTERN', '--regex=PATTERN', String, 'Use PATTERN as the pattern.') do |pattern|
-          args[:pattern] = pattern
-        end
-
         opts.on('-A NUM', '--after-context=NUM', Integer, 'Print NUM lines of trailing context after matching lines.') do |n|
           args[:after_lines] = n
         end
@@ -21,8 +17,8 @@ module SqRubyGrep
           args[:before_lines] = n
         end
 
-        opts.on('-c', '--colorize', 'Colorize matches') do
-          args[:colorize] = true
+        opts.on('--not-colorize', 'Without colorize.') do
+          args[:colorize] = false
         end
 
         opts.on('-h', '--help', 'Prints this help') do
@@ -34,6 +30,7 @@ module SqRubyGrep
 
       opt_parser.parse!(options)
 
+      args[:pattern]   = ARGV.shift
       args[:file_path] = ARGV.shift
 
       if args[:file_path].to_s.empty? || args[:pattern].to_s.empty?

data/lib/sq_ruby_grep/version.rb

@@ -1,3 +1,3 @@
 module SqRubyGrep
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/sq_ruby_grep.rb

@@ -4,67 +4,57 @@ require 'sq_ruby_grep/parser'
 
 module SqRubyGrep
 
-  Result = Struct.new(:match_line, :before_context, :after_context)
 
-  def self.run
-    resuts = grep(Parser.parse(ARGV))
-
-    resuts.each do |result|
-      puts '--'
-      puts result.before_context
-      puts result.match_line
-      puts result.after_context
-    end
-
-    puts '----'
-    puts "Line count: #{resuts.count}"
-  end
-
-  def self.grep(file_path:, pattern:, after_lines: 0, before_lines: 0, colorize: false)
-    results = []
-
-    buffer           = RingBuffer.new(after_lines + before_lines + 1)
-    current_position = 0
+  def self.run(pattern:, file_path:, after_lines: 0, before_lines: 0, colorize: true)
+    result = []
 
     File.open(file_path, 'r') do |file|
+      current_position, last_match_position = 0, 0
+      buffer = RingBuffer.new after_lines + before_lines
+      f = false
+      was_matches = false
       file.each_line do |line|
-        buffer << line
         current_position += 1
 
-        offset = buffer.size - after_lines - 1
-
-        if current_position > after_lines && buffer[offset].match(pattern)
-          match_line = buffer[offset]
-          match_line = self.colorize(match_line, pattern) if colorize
-
-          result = Result.new(match_line, buffer[0, offset], buffer[offset + 1, after_lines])
-
-          results << result
-        end
-      end
-
-      offset = (buffer.size - after_lines) > 0 ? (buffer.size - after_lines) : 0
-
-      buffer[offset, after_lines].each_with_index do |line, i|
-        if line.match(pattern)
-          before_offset = (offset + i) > before_lines ? (offset + i - before_lines) : 0
-          _before_lines = (offset + i) > before_lines ? before_lines : (offset + i)
-
-          line = colorize(line, pattern) if colorize
-
-          result = Result.new(line, buffer[before_offset, _before_lines], buffer[i + offset + 1, after_lines])
-
-          results << result
+        if after_lines + before_lines > 0
+          if line.match(pattern)
+            if was_matches
+              if (current_position - last_match_position) > after_lines + before_lines + 1
+                result << (colorize ? "\e[0;36m--\033[0m" : "--")
+                result.concat buffer.last(before_lines)
+              else
+                result.concat buffer
+              end
+            else
+              result.concat buffer.last(before_lines)
+            end
+
+            result << (colorize ? line.gsub(/(#{pattern})/, "\e[01;31m\\1\033[0m") : line)
+            f = false
+            was_matches = true
+            buffer.clear
+            last_match_position = current_position
+          else
+            buffer << line
+          end
+
+          if (current_position - last_match_position) == after_lines + before_lines && was_matches
+            result.concat buffer.shift(after_lines)
+            # result.concat buffer.last(before_lines)
+            f = true
+          end
+        else
+          if line.match(pattern)
+            result << (colorize ? line.gsub(/(#{pattern})/, "\e[01;31m\\1\033[0m") : line)
+          end
         end
       end
 
+      result.concat buffer.first(after_lines) unless f
     end
 
-    results
+    result
   end
 
-  def self.colorize(string, pattern)
-    string.gsub(/(#{pattern})/, "\e[0;33m\\1\033[0m")
-  end
 
 end

data/spec/sq_ruby_grep_spec.rb

@@ -2,136 +2,74 @@ require 'spec_helper'
 
 describe SqRubyGrep do
   context 'when grep file' do
-    let(:lines)        { lines = File.readlines path }
-    let(:path)         { 'test/fixtures/lines.txt' }
-    let(:after_lines)  { 3 }
-    let(:before_lines) { 3 }
-    let(:result)       { SqRubyGrep.grep(file_path:path, pattern: pattern, before_lines: before_lines, after_lines: after_lines).first }
-    let(:pattern)      { /#{target_line} line/ }
-
-    context 'when the target line at the middle' do
-
-      let(:target_line) { 6 }
-
-      it 'before_context is valid' do
-        expect(result.before_context).to eql lines[target_line - before_lines - 1 , before_lines]
-      end
-
-      it 'match_line is valid' do
-        expect(result.match_line).to eql lines[target_line - 1]
+    let(:path)          { 'test/fixtures/text.txt' }
+    let(:bin_path)      { File.expand_path '../../bin/sq_ruby_grep', __FILE__ }
+    let(:result)        { Grep.new(pattern: pattern, file_path: path, before_lines: before_lines, after_lines: after_lines).run.first }
+    let(:pattern)       { 'needle' }
+    let(:original_grep) { "grep #{pattern} #{path} -A #{after_lines} -B #{before_lines}" }
+    let(:sq_ruby_grep) { "#{bin_path} #{pattern} #{path} -A #{after_lines} -B #{before_lines} --not-colorize" }
+
+    shared_examples 'origin grep' do
+      it 'sq_ruby_grep vs original_grep' do
+        expect(`#{sq_ruby_grep}`).to eq  `#{original_grep}`
       end
-
-      it 'after_context is valid' do
-        expect(result.after_context).to eql lines[target_line, after_lines]
-      end
-
-      context 'when after_lines is out scope of file' do
-        let(:after_lines) { 30 }
-
-        it 'after_context is valid' do
-          expect(result.after_context).to eql lines[target_line, after_lines]
-        end
-
-        it 'before_context is valid' do
-          expect(result.before_context).to eql lines[target_line - before_lines - 1 , before_lines]
-        end
-      end
-
-      context 'when before_lines is out scope of file' do
-        let(:before_lines) { 30 }
-
-        it 'after_context is valid' do
-          expect(result.after_context).to eql  lines[target_line, after_lines]
-        end
-
-        it 'before_context is valid' do
-          expect(result.before_context).to eql lines[0 , target_line - 1]
-        end
-      end
-
     end
 
-    context 'when the target line at the end' do
-      let(:target_line) { 12 }
-
-      it 'before_context is valid' do
-        expect(result.before_context).to eql lines[target_line - before_lines - 1 , before_lines]
-      end
-
-      it 'match_line is valid' do
-        expect(result.match_line).to eql lines[target_line - 1]
-      end
-
-      it 'after_context is valid' do
-        expect(result.after_context).to eql lines[target_line, after_lines]
-      end
+    context 'when has no context' do
+      let(:after_lines)   { 0 }
+      let(:before_lines)  { 0 }
 
-      context 'when after_lines is out scope of file' do
-        let(:after_lines) { 30 }
+      it_behaves_like 'origin grep'
+    end
 
-        it 'after_context is valid' do
-          expect(result.after_context).to eql lines[target_line, after_lines]
-        end
+    context 'when has no group separator' do
+      let(:after_lines)   { 2 }
+      let(:before_lines)  { 2 }
 
-        it 'before_context is valid' do
-          expect(result.before_context).to eql lines[target_line - before_lines - 1 , before_lines]
-        end
-      end
+      it_behaves_like 'origin grep'
+    end
 
-      context 'when before_lines is out scope of file' do
-        let(:before_lines) { 30 }
+    context 'when before context intersects prev after context' do
+      let(:after_lines)   { 2 }
+      let(:before_lines)  { 3 }
 
-        it 'after_context is valid' do
-          expect(result.after_context).to eql  lines[target_line, after_lines]
-        end
+      it_behaves_like 'origin grep'
+    end
 
-        it 'before_context is valid' do
-          expect(result.before_context).to eql lines[0 , target_line - 1]
-        end
-      end
+    context 'when before context touch prev after context' do
+      let(:after_lines)   { 2 }
+      let(:before_lines)  { 3 }
 
+      it_behaves_like 'origin grep'
     end
 
-    context 'when the target line at the beginning ' do
-      let(:target_line) { 2 }
-
-      it 'before_context is valid' do
-        expect(result.before_context).to eql lines[0, 1]
-      end
+    context 'when after context is out range of file' do
+      let(:after_lines)   { 20 }
+      let(:before_lines)  { 2 }
 
-      it 'match_line is valid' do
-        expect(result.match_line).to eql lines[target_line - 1]
-      end
+      it_behaves_like 'origin grep'
+    end
 
-      it 'after_context is valid' do
-        expect(result.after_context).to eql lines[target_line, after_lines]
-      end
+    context 'when before context is out range of file' do
+      let(:after_lines)   { 2 }
+      let(:before_lines)  { 20 }
 
-      context 'when after_lines is out scope of file' do
-        let(:after_lines) { 30 }
+      it_behaves_like 'origin grep'
+    end
 
-        it 'after_context is valid' do
-          expect(result.after_context).to eql lines[target_line, after_lines]
-        end
+    context 'when has no after context' do
+      let(:after_lines)   { 0 }
+      let(:before_lines)  { 1 }
 
-        it 'before_context is valid' do
-          expect(result.before_context).to eql lines[0, target_line - 1]
-        end
-      end
+      it_behaves_like 'origin grep'
+    end
 
-      context 'when before_lines is out scope of file' do
-        let(:before_lines) { 30 }
 
-        it 'after_context is valid' do
-          expect(result.after_context).to eql lines[target_line, after_lines]
-        end
+    context 'when has no before context' do
+      let(:after_lines)   { 1 }
+      let(:before_lines)  { 0 }
 
-        it 'before_context is valid' do
-          expect(result.before_context).to eql lines[0 , target_line - 1]
-        end
-      end
+      it_behaves_like 'origin grep'
     end
-
   end
-
 end

data/sq_ruby_grep.gemspec

@@ -4,22 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sq_ruby_grep/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "sq_ruby_grep"
+  spec.name          = 'sq_ruby_grep'
   spec.version       = SqRubyGrep::VERSION
-  spec.authors       = ["coolelvis"]
-  spec.email         = ["elvisplus2@gmail.com"]
+  spec.authors       = ['coolelvis']
+  spec.email         = ['elvisplus2@gmail.com']
   spec.summary       = %q{It just the training project for SQ interview.}
   spec.description   = %q{It just the training project for SQ interview.}
-  spec.homepage      = "https://github.com/CoolElvis/ruby_grep.git"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/CoolElvis/ruby_grep.git'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.required_ruby_version = '~> 2.1.3'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.2.2'
 end

data/test/fixtures/text.txt

@@ -3,11 +3,11 @@ line 2 Vivamus id tortor non metus ornare rutrum.
 line 3 Curabitur vel ex id tellus faucibus lobortis.
 line 4 Cras aliquet orci at accumsan rhoncus.
 line 5 Cras at justo ut risus rutrum posuere.
-line 6 Mauris sit amet eros sed risus accumsan vulputate.
-line 7 Aenean id nulla tempus, blandit nunc lacinia, tincidunt odio.
-line 8 Vestibulum non est eu tortor ullamcorper scelerisque.
+needle line 6 Mauris sit amet eros sed risus accumsan vulputate. non
+needle line 7 Aenean id nulla tempus, blandit nunc lacinia, tincidunt odio.
+line 8 Vestibulum non est eu non tortor ullamcorper scelerisque.
 line 9 Duis pharetra nisl at nibh feugiat varius.
-line 10 Praesent vitae magna feugiat lectus aliquet hendrerit ac ut urna.
-line 11 Vivamus sed arcu sit amet orci auctor maximus.
+line 10 Praesent vitae magna feugiat lectus aliquet hendrerit ac ut urna .
+needle line 11 Vivamus sed arcu sit amet orci auctor maximus.
 line 12 Pellentesque vitae purus sagittis, ultrices urna at, porttitor eros.
 line 13 Curabitur id metus egestas, bibendum nisi id, aliquet lacus.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sq_ruby_grep
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - coolelvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.2
 description: It just the training project for SQ interview.
 email:
 - elvisplus2@gmail.com
@@ -61,7 +75,6 @@ files:
 - spec/spec_helper.rb
 - spec/sq_ruby_grep_spec.rb
 - sq_ruby_grep.gemspec
-- test/fixtures/lines.txt
 - test/fixtures/text.txt
 homepage: https://github.com/CoolElvis/ruby_grep.git
 licenses:
@@ -90,5 +103,4 @@ summary: It just the training project for SQ interview.
 test_files:
 - spec/spec_helper.rb
 - spec/sq_ruby_grep_spec.rb
-- test/fixtures/lines.txt
 - test/fixtures/text.txt

data/test/fixtures/lines.txt

@@ -1,13 +0,0 @@
-1 line
-2 line
-3 line
-4 line
-5 line
-6 line
-7 line
-8 line
-9 line
-10 line
-11 line
-12 line
-13 line