gpr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6aaeb3e46219acf803f62ee8fed9789232e25f1
-  data.tar.gz: c13cb934f58327cd44bb16a54aed8a95734a947d
+  metadata.gz: 80d2d92c3f8db42725dddeb4d0b9b260afe8a8ba
+  data.tar.gz: b0b7c3932b6a09afea0b4225aa69d377f2871c2b
 SHA512:
-  metadata.gz: 03bf320b8e4ec2952e6e3893fd5e921826616149d078eef651712b4b8d01983e294c6e4764adddb2e7682b7ff12d3525d661575984734ca9d580368ba6ffb725
-  data.tar.gz: d3269f2cbd486c71b90bb18a596bb9686187e62a01e5ce93208b8df0408ffc273fdff16e31185f50d2576195794bb03d1193111f59aa406100033e844c0bcce1
+  metadata.gz: d0717eec796c4a585f41c2f43c1dd9b248763a63e79657343582a7e4da00bcdb784de28b9aef82e6dfc03eb900f3e7b355e302a7d030684e7b8a69351e0345e4
+  data.tar.gz: 105a7e363d6ef9c09fe5a1d30e1790e3dd7274fa0d7302730d30618446c950692551f478e5d17a32f7645e48323fdca090368878a16518739713edce5e7c70c3

data/README.md

@@ -12,14 +12,6 @@ For example, all repositories are cloned to `$HOME/.gpr/<host>/<user>/<repositor
 
 It is possible to centrally manage of the all repositories.
 
-## Work with peco
-
-Gpr provides a list of directories of all registered repositories.
-
-Therefore, it is powerful when combined with [peco](https://github.com/peco/peco).
-
-![with\_peco](https://raw.github.com/wiki/kaihar4/gpr/images/with_peco.gif)
-
 ## Installation
 
 ```sh
@@ -32,7 +24,7 @@ $ gem install gpr
 $ gpr help
 ```
 
-### Clone a git repository into Gpr directory
+### Register a git repository into Gpr directory
 
 Just clone a git repository into `$HOME/.gpr/<host>/<user>/<repository>`.
 
@@ -40,7 +32,7 @@ Just clone a git repository into `$HOME/.gpr/<host>/<user>/<repository>`.
 $ gpr get <repository url>
 ```
 
-### Clone all public repositories of the specified user
+### Register all public repositories of the specified user
 
 You can specify host only `github.com` or `bitbucket.org`.
 
@@ -62,7 +54,19 @@ $ gpr list --paths
 
 ![list\_paths](https://raw.github.com/wiki/kaihar4/gpr/images/list_paths.png)
 
-### Show contributions of registered repositories
+### Select a repository using the interactive interface
+
+```sh
+$ gpr select
+```
+
+Possible use as this.
+
+![select](https://raw.github.com/wiki/kaihar4/gpr/images/select.gif)
+
+Other benefits is [here](#convenient-aliases).
+
+### Show your contributions of registered repositories
 
 Display in graph format.
 
@@ -109,7 +113,7 @@ $ gpr update
 ### Fetch all registered repositories
 
 ```sh
-$ gpr fetch <remote_repo>
+$ gpr fetch <remote repository>
 ```
 
 If you run for short, it means `gpr fetch origin`.
@@ -118,13 +122,15 @@ If you run for short, it means `gpr fetch origin`.
 $ gpr fetch
 ```
 
-## Change the directory to be cloned
+## Configuration
+
+### Change the directory to be cloned
 
 ```sh
 $ export GPR_ROOT=$HOME/develop
 ```
 
-## Install the zsh completion
+### Install the zsh completion
 
 ```sh
 $ gpr get https://github.com/kaihar4/gpr.git
@@ -132,3 +138,16 @@ $ cd $HOME/.gpr/github.com/kaihar4/gpr
 $ rake zsh:install
 $ source ~/.zshrc
 ```
+
+### Convenient aliases
+
+```sh
+# Change Directory to a directory that you specify
+alias gcd='cd $(gpr select)'
+# Remove a directory that you specify
+alias grm='rm -rf $(gpr select)'
+# Show your contributions of a directory that you specify
+alias gcontrib='gpr contrib $(gpr select)'
+# Fetch a repository of a directory that you specify
+alias gfetch='gpr fetch $(gpr select)'
+```

data/bin/gpr

@@ -2,9 +2,9 @@
 
 require 'gpr'
 
-begin
+if FileTest.exist?("#{Gpr::DB_PATH}/gpr.db")
   Groonga::Database.open("#{Gpr::DB_PATH}/gpr.db")
-rescue Groonga::NoSuchFileOrDirectory
+else
   FileUtils.mkdir_p(Gpr::DB_PATH)
   Groonga::Context.default_options = { encoding: :utf8 }
   Groonga::Database.create(path: "#{Gpr::DB_PATH}/gpr.db")

data/gpr.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor'
   spec.add_dependency 'rroonga'
+  spec.add_dependency 'curses'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

data/lib/gpr.rb

@@ -5,10 +5,12 @@ require 'find'
 
 require 'thor'
 require 'groonga'
+require 'curses'
 
 require 'colorize'
 require 'table_builder'
 require 'graph_drawer'
+require 'interactive_filter'
 require 'gpr/version'
 require 'gpr/api_helper'
 require 'gpr/git_helper'

data/lib/gpr/cli.rb

@@ -53,28 +53,37 @@ module Gpr
       end
     end
 
-    desc 'contrib', 'Show contributions of registered repositories'
+    desc 'select', 'Select a repository using the interactive interface'
+    def select
+      repositories = get_repositories
+      puts InteractiveFilter.filtering(repositories)
+    end
+
+    desc 'contrib', 'Show your contributions of registered repositories'
     def contrib(path = nil)
-      if path.nil?
-        dates = []
+      git_user = File.open("#{ENV['HOME']}/.gitconfig", 'r') do |f|
+        body = f.read
+        body.match(/name\s+=\s+(.+)/)[1]
+      end
+      user = git_user || ENV['USER']
 
+      if path.nil?
         repositories = get_repositories
-        repositories.each do |repository|
-          dates.concat(GitHelper.log_by_date(repository))
+        dates = repositories.each_with_object([]) do |repository, ary|
+          ary.concat(GitHelper.log_by_date(repository, user))
         end
 
       else
-        dates = GitHelper.log_by_date(path)
+        dates = GitHelper.log_by_date(path, user)
       end
 
       first_date = Time.parse(dates.sort.first)
       diff = ((Time.now - first_date).to_i / 86400) + 1
 
       # Initialize a hash
-      commit_counts = {}
-      diff.times.with_index do |index|
+      commit_counts = diff.times.each_with_object({}) do |index, hash|
         date = Time.at(first_date + (86400 * index)).strftime('%Y-%m-%d')
-        commit_counts[date] = 0
+        hash[date] = 0
       end
 
       # Count commits
@@ -123,14 +132,22 @@ module Gpr
     end
 
     desc 'fetch', 'Fetch the registered repositories'
-    def fetch(remote = 'origin', branch = nil)
-      repositories = get_repositories
-      repositories.each do |repository|
-        repo_info = parse_repository(repository)
+    def fetch(remote = 'origin', branch = nil, path = nil)
+      if path.nil?
+        repositories = get_repositories
+        repositories.each do |repository|
+          repo_info = parse_repository(repository)
+
+          puts "#{repo_info[:host].color(:yellow)} - #{repo_info[:repository].color(:blue)}"
+
+          GitHelper.fetch(repository, remote, branch)
+        end
+      else
+        repo_info = parse_repository(path)
 
         puts "#{repo_info[:host].color(:yellow)} - #{repo_info[:repository].color(:blue)}"
 
-        GitHelper.fetch(repository, remote, branch)
+        GitHelper.fetch(path, remote, branch)
       end
     end
 

data/lib/gpr/git_helper.rb

@@ -39,9 +39,13 @@ module Gpr
         result
       end
 
-      def log_by_date(path)
+      def log_by_date(path, user = nil)
         Dir.chdir(path)
-        `git log --date=short --pretty=format:"%cd"`.split("\n")
+        if user.nil?
+          `git log --date=short --pretty=format:"%cd"`.split("\n")
+        else
+          `git log --author=#{user} --date=short --pretty=format:"%cd"`.split("\n")
+        end
       end
     end
   end

data/lib/gpr/version.rb

@@ -1,3 +1,3 @@
 module Gpr
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/graph_drawer.rb

@@ -2,9 +2,9 @@ require 'graph_drawer/graph.rb'
 require 'graph_drawer/data.rb'
 
 module GraphDrawer
-  def graph(&block)
+  def graph
     @graph = Graph.new
-    block.call
+    yield
     @graph.datas_init
     @graph.to_s
   end

data/lib/graph_drawer/data.rb

@@ -23,8 +23,15 @@ module GraphDrawer
           :blue
         end
 
-      bar = ' ' * @value
-      "#{@item}|#{bar.bg_color(color)}"
+      if @value.zero?
+        draw_str = "#{@item}|"
+      else
+        bar = ' ' * (@value - 1)
+        data_label = @value.to_s.color(:black)
+        draw_str = "#{@item}|#{(bar + data_label).bg_color(color)}"
+      end
+
+      draw_str
     end
   end
 end

data/lib/interactive_filter.rb

@@ -0,0 +1,25 @@
+require 'interactive_filter/input'
+require 'interactive_filter/interface'
+
+module InteractiveFilter
+  def self.filtering(repositories)
+    name = caller.last.match(/.+\/(.+?)(:|\.)/)[1].capitalize
+
+    isatty = STDOUT.isatty
+
+    unless isatty
+      stdout_old = STDOUT.dup
+      STDOUT.reopen('/dev/tty')
+    end
+
+    ifilter = Interface.new(name, repositories)
+    result = ifilter.grep
+
+    unless isatty
+      STDOUT.flush
+      STDOUT.reopen(stdout_old)
+    end
+
+    result
+  end
+end

data/lib/interactive_filter/input.rb

@@ -0,0 +1,27 @@
+module InteractiveFilter
+  class Input
+    attr_accessor :text
+
+    def initialize(text = '')
+      @text = text
+    end
+
+    def <<(text)
+      @text << text
+    end
+
+    def backspace!
+      @text.chop!
+    end
+
+    def to_s
+      @text
+    end
+
+    def to_regex
+      /#{@text}/
+    rescue
+      nil
+    end
+  end
+end

data/lib/interactive_filter/interface.rb

@@ -0,0 +1,120 @@
+module InteractiveFilter
+  class Interface
+    def initialize(name, array)
+      @prompt = "#{name}> "
+      @targets = array
+
+      @input = Input.new
+      @cursor_position = 1
+
+      Curses.init_screen
+      Curses.crmode
+      Curses.noecho
+      @window = Curses::Window.new(Curses.lines, Curses.cols, 0, 0)
+      @window.keypad(true)
+
+      # Initialize a window
+      @outputs = []
+      @window.clear
+      reset_cursor_position
+
+      output_line(@prompt)
+      output_choises
+      reset_cursor_position
+    end
+
+    def grep
+      loop do
+        key = @window.getch
+        keycode = get_keycode(key)
+
+        if key.class == String
+          @input << key
+
+        # <BS>
+        elsif key == 127
+          @input.backspace!
+
+        # <CR>
+        elsif keycode == :KEY_CTRL_J
+          if @outputs.size >= @cursor_position && @cursor_position >= 1
+            break
+          else
+            next
+          end
+
+        elsif keycode == :KEY_DOWN
+          down_cursor_position if @outputs.size > @cursor_position
+          next
+
+        elsif keycode == :KEY_UP
+          up_cursor_position if @cursor_position > 1
+          next
+
+        # Ignore other keys
+        else
+          next
+        end
+
+        # Initialize a window
+        @outputs = []
+        @window.clear
+        reset_cursor_position
+
+        output_line(@prompt + @input.to_s)
+        output_choises
+        reset_cursor_position
+      end
+
+      Curses.close_screen
+      return @outputs[@cursor_position - 1]
+
+    # <C-c>
+    rescue Interrupt
+      Curses.close_screen
+    end
+
+    private
+
+    def get_keycode(key)
+      Curses.constants.select do |name|
+        /^KEY/ =~ name && Curses.const_get(name) == key
+      end.first
+    end
+
+    def output_choises
+      # Filtering
+      @targets.each do |target|
+        regex = @input.to_regex
+
+        if !regex.nil? && regex =~ target
+          @outputs << target
+        end
+      end
+
+      @outputs.each { |output| output_line(output) }
+    end
+
+    def output_line(word)
+      @window.setpos(@cursor_position - 1, 0)
+      @cursor_position += 1
+
+      @window << word
+    end
+
+    def up_cursor_position
+      @window.setpos(@cursor_position - 1, 0)
+      @cursor_position -= 1
+    end
+
+    def down_cursor_position
+      @window.setpos(@cursor_position + 1, 0)
+      @cursor_position += 1
+    end
+
+    def reset_cursor_position
+      @window.setpos(1, 0)
+      @cursor_position = 1
+    end
+  end
+end

data/lib/table_builder.rb

@@ -4,15 +4,15 @@ require 'table_builder/column_validator'
 require 'table_builder/column'
 
 module TableBuilder
-  def table(min_column_size = 10, &block)
+  def table(min_column_size = 10)
     @table = Table.new(min_column_size)
-    block.call
+    yield
     @table.to_s
   end
 
-  def row(&block)
+  def row
     @row = Row.new
-    block.call
+    yield
     @table.add(@row)
   end
 

data/zsh/gpr.zsh

@@ -23,6 +23,8 @@ function _gpr () {
             '(-)*:: :->null_state' \
             && ret=0
           ;;
+        (select)
+          ;;
         (contrib)
           ;;
         (search)
@@ -54,7 +56,8 @@ __gpr_cmds () {
     'get:Get a repository'
     'help:Describe available commands or one specific command'
     'list:Show all registered repositories'
-    'contrib:Show contributions of registered repositories'
+    'select:Select a repository using the interactive interface'
+    'contrib:Show your contributions of registered repositories'
     'search:Search the specified keyword in registered repositories'
     'update:Update the database to be used for search'
     'fetch:Fetch the registered repositories'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gpr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: curses
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +132,9 @@ files:
 - lib/graph_drawer.rb
 - lib/graph_drawer/data.rb
 - lib/graph_drawer/graph.rb
+- lib/interactive_filter.rb
+- lib/interactive_filter/input.rb
+- lib/interactive_filter/interface.rb
 - lib/table_builder.rb
 - lib/table_builder/column.rb
 - lib/table_builder/column_validator.rb