ifilter 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 785b1a55881274c8540597c38a0f2a721f283760
-  data.tar.gz: 8ceb304314af687f91f1ec464e1f0352b081bbe4
+  metadata.gz: b3c3826565d691dd1f2125b61351f67e7328599d
+  data.tar.gz: f98fc31feb76580b6b696b7ccc76a6eee7902eb2
 SHA512:
-  metadata.gz: a7be243c9ca4a2f18b91f4724de580cb731f099253abeab4964ef3ef2a97dcc99fab23fb74eeb46303d9d2f7a86dfbbbdbb2f6e2c999a331e93d4df011d683e7
-  data.tar.gz: 89597c557f58eb73841e8df3538a233735931ab1618a9e7bc4fe009c512b400be3d0fb9356204822cc9a8f40a326a48422fae53229165fd452971a3a35ad8fb0
+  metadata.gz: 300473b6da810bc1c060924881e2ecc3bd3e49293eb51c35449aafc32e1e41fc397033f97bd5be826b75be72e3b3af2d8523448ab2922cf5c600e418d37d9cac
+  data.tar.gz: a9809b2d05043a1f6f0bf82b1233d3f091af9fb2f0d079cc64a84b8b22ac7192b531b748e681f4a051aa865bda180de99c39dadb2d553aa414993539a7ea87be

data/.gitignore

@@ -7,8 +7,3 @@
 /pkg/
 /spec/reports/
 /tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log

data/LICENSE.txt

@@ -1,22 +1,21 @@
-Copyright (c) 2014 kaihar4
+The MIT License (MIT)
 
-MIT License
+Copyright (c) 2015 kaihar4
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -16,11 +16,13 @@ Add this line to your application's Gemfile:
 gem 'ifilter'
 ```
 
+And then execute:
+
+    $ bundle
+
 Or install it yourself as:
 
-```sh
-$ gem install ifilter
-```
+    $ gem install ifilter
 
 ## Usage
 
@@ -30,7 +32,7 @@ $ gem install ifilter
 $ ps aux | ifilter
 ```
 
-![execute](https://raw.github.com/wiki/kaihar4/ifilter/images/execute.gif)
+![execute](http://kaihar4.com/images/github.com/kaihar4/ifilter/execute.gif)
 
 ### Module Style
 
@@ -42,4 +44,18 @@ array = ['foo', 'bar', 'hoge', 'fuga']
 puts Ifilter.filtering(array)
 ```
 
-![module](https://raw.github.com/wiki/kaihar4/ifilter/images/module.gif)
+![module](http://kaihar4.com/images/github.com/kaihar4/ifilter/module.gif)
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+1. Fork it ( https://github.com/kaihar4/ifilter/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'ifilter'
+
+require 'pry'
+Pry.start

data/bin/setup

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install --path vendor/bundle

data/ifilter.gemspec

@@ -1,4 +1,5 @@
-$LOAD_PATH << File.expand_path('../lib', __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ifilter/version'
 
 Gem::Specification.new do |spec|
@@ -6,19 +7,21 @@ Gem::Specification.new do |spec|
   spec.version       = Ifilter::VERSION
   spec.authors       = ['kaihar4']
   spec.email         = ['kaihar4@gmail.com']
-  spec.summary       = 'Interactive Filter.'
+  spec.summary       = 'Interactive Filter'
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/kaihar4/ifilter'
   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.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'curses'
   spec.add_runtime_dependency 'safe_colorize'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'awesome_print'
 end

data/lib/ifilter.rb

@@ -1,9 +1,10 @@
-require 'ifilter/interface'
+require 'ifilter/window'
+require 'ifilter/client'
 require 'ifilter/input'
 
 module Ifilter
   def self.filtering(array)
-    name = caller.last.match(/([^\/]+?)(\.|:)/)[1].capitalize
+    name = caller.last.match(/(?<name>[^\/]+?)(\.|:)/)[:name].capitalize
 
     isatty = STDOUT.isatty
 
@@ -12,7 +13,7 @@ module Ifilter
       STDOUT.reopen('/dev/tty')
     end
 
-    ifilter = Interface.new(name)
+    ifilter = Client.new(name)
     result = ifilter.grep(array)
 
     unless isatty

data/lib/ifilter/{interface.rb → client.rb}

@@ -1,7 +1,7 @@
 require 'curses'
 
 module Ifilter
-  class Interface
+  class Client
     def initialize(name)
       @prompt = "#{name}> "
       @target = []
@@ -11,11 +11,7 @@ module Ifilter
       @cursor_position = 1
       @page_number = 1
 
-      Curses.init_screen
-      Curses.crmode
-      Curses.noecho
-      @window = Curses::Window.new(Curses.lines, Curses.cols, 0, 0)
-      @window.keypad(true)
+      @window = Window.new(Curses.lines, Curses.cols, 0, 0)
     end
 
     def grep(array)
@@ -36,11 +32,11 @@ module Ifilter
         elsif keycode == :KEY_CTRL_J # <CR>
           break if @outputs.size >= @cursor_position
 
-        elsif keycode == :KEY_DOWN
+        elsif keycode == :KEY_DOWN || keycode == :KEY_CTRL_N
           down_cursor_position unless @outputs.empty?
           next
 
-        elsif keycode == :KEY_UP
+        elsif keycode == :KEY_UP || keycode == :KEY_CTRL_P
           up_cursor_position unless @outputs.empty?
           next
 
@@ -52,10 +48,10 @@ module Ifilter
         update_window
       end
 
-      Curses.close_screen
+      @window.close
       @outputs[@cursor_position - 1]
     rescue Interrupt # <C-c>
-      Curses.close_screen
+      @window.close
     end
 
     private
@@ -81,7 +77,7 @@ module Ifilter
 
     def get_keycode(key)
       Curses.constants.select do |name|
-        /^KEY/ =~ name && Curses.const_get(name) == key
+        name =~ /^KEY/ && Curses.const_get(name) == key
       end.first
     end
 
@@ -89,7 +85,7 @@ module Ifilter
       array.each_with_object([]).with_index do |(str, outputs), index|
         next if index < start_index
 
-        regex = @input.to_regex
+        regex = @input.to_regexp
 
         if !regex.nil? && regex =~ str
           outputs << str
@@ -100,9 +96,20 @@ module Ifilter
     def output_line(word)
       unless @cursor_position - 1 > @window.maxy - 1
         @window.setpos(@cursor_position - 1, 0)
-        @cursor_position += 1
 
-        @window << word
+        if !@input.size.zero? && @cursor_position > 1 && match_pos = word =~ @input.to_regexp
+          @window << word[0, match_pos]
+
+          @window.standout
+          @window << word[match_pos, @input.size]
+          @window.standend
+
+          @window << word[match_pos + @input.size, word.size - match_pos + @input.size]
+        else
+          @window << word
+        end
+
+        @cursor_position += 1
       end
     end
 

data/lib/ifilter/input.rb

@@ -22,7 +22,7 @@ module Ifilter
       @text
     end
 
-    def to_regex
+    def to_regexp
       /#{@text}/i
     rescue
       nil

data/lib/ifilter/version.rb

@@ -1,3 +1,3 @@
 module Ifilter
-  VERSION = '0.0.7'
+  VERSION = '0.1.0'
 end

data/lib/ifilter/window.rb

@@ -0,0 +1,19 @@
+require 'curses'
+
+module Ifilter
+  class Window < Curses::Window
+    def initialize(height, width, y, x)
+      Curses.init_screen
+      Curses.crmode
+      Curses.noecho
+
+      super
+
+      self.keypad(true)
+    end
+
+    def close
+      Curses.close_screen
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ifilter
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,35 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Interactive Filter.
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Interactive Filter
 email:
 - kaihar4@gmail.com
 executables:
@@ -79,12 +107,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/ifilter
+- bin/console
+- bin/setup
+- exe/ifilter
 - ifilter.gemspec
 - lib/ifilter.rb
+- lib/ifilter/client.rb
 - lib/ifilter/input.rb
-- lib/ifilter/interface.rb
 - lib/ifilter/version.rb
+- lib/ifilter/window.rb
 homepage: https://github.com/kaihar4/ifilter
 licenses:
 - MIT
@@ -105,8 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Interactive Filter.
+summary: Interactive Filter
 test_files: []