gpr 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 416f71fde2acd96aa5793a4727bc98684fe57074
-  data.tar.gz: 0c4c0d3ea7b6e2c7ae98513d59228d90fe46c87d
+  metadata.gz: f91a087109c606f02532188032e4f9416afc3340
+  data.tar.gz: a3969ac73df86f4a3dc19a359da39a92321d9bae
 SHA512:
-  metadata.gz: 30fadcd8ca2162d53eddd98b4ba60934e88b4f8ce4f4e835e469d40c4420eeca6d241bfcebad1c66d1a67019d4325975ffab229c70044382d6b9b7a258adb62f
-  data.tar.gz: b430d3e905d80dcefd4c0711a64a03c22af9bed46af57809b87f2b7d15705f404077cf639f5789e69e5696d4f894796c64da68d71fb700513549cc33bd08aa3a
+  metadata.gz: 0d24746135344420454173fd37dd83c9c9671917316d8a83d236b760808491edbdd17cfde358186a03dd8ca012bf0e6f60fb89ea51e2937a69404ea467d4f5d1
+  data.tar.gz: d0c52d99232833be53e494eda4c5a1fe582876edca14895f5ee96cfa42e974676c0704ce5f0d2e0e00bdb8f5114b4611118d7731a9c7d385f0e8fb8970a2035f

data/README.md

@@ -44,6 +44,28 @@ $ gpr get <host>/<user>
 
 ```sh
 $ gpr list
+
+github.com - kaihar4/dotfiles
+github.com - kaihar4/gpr
+
+$ gpr list --paths
+
+/home/kaihara/.gpr/github.com/kaihar4/dotfiles
+/home/kaihara/.gpr/github.com/kaihar4/gpr
+```
+
+### Show the status of all registered repositories
+
+```sh
+$ gpr status
+
++-----------------+------------------------------------------+---------------------------+
+| REPOSITORY NAME | BRANCH STATUS                            | DIRECTORY STATUS          |
++-----------------+------------------------------------------+---------------------------+
+| dotfiles        | up-to-date with 'origin/master'          | Working directory clean   |
++-----------------+------------------------------------------+---------------------------+
+| gpr             | ahead of 'origin/master' by 1 commit     | Exist unstaged changes    |
++-----------------+------------------------------------------+---------------------------+
 ```
 
 ### Search the specified keyword in registered repositories
@@ -63,7 +85,42 @@ Search the specified keyword in registered repositories
 ```
 
 ```sh
-$ gpr search <keyword>
+$ gpr search 'net/http'
+
+github.com - kaihar4/gpr : lib/gpr.rb
+github.com - kaihar4/kaihar4.com : source/articles/2014-06-29-mechanize-scraping.md
+
+$ gpr search 'net/http' -f '.rb'
+
+github.com - kaihar4/gpr : lib/gpr.rb
+
+$ gpr search 'net/http' -r 'kaihar4/kaihar4.com'
+
+github.com - kaihar4/kaihar4.com : source/articles/2014-06-29-mechanize-scraping.md
+```
+
+### Update the database to be used for search
+
+```sh
+$ gpr update
+```
+
+### Fetch all registered repositories
+
+```sh
+$ gpr fetch remote_repo
+```
+
+If you run for short, it means `gpr fetch origin`.
+
+```sh
+$ gpr fetch
+```
+
+## Change the directory to be cloned
+
+```sh
+$ export GPR_ROOT=$HOME/develop
 ```
 
 ## Install the zsh completion

data/lib/colorize.rb

@@ -0,0 +1,43 @@
+module Colorize
+  refine String do
+    COLORS = {
+      black: 0,
+      red: 1,
+      green: 2,
+      yellow: 3,
+      blue: 4,
+      magenta: 5,
+      cyan: 6,
+      white: 7
+    }
+
+    STYLES = {
+      reset: 0,
+      bold: 1,
+      underscore: 4,
+      blink: 5,
+      reverse: 6,
+      concealed: 7
+    }
+
+    def color(color)
+      to_ansi("3#{COLORS[color]}")
+    end
+
+    def bg_color(color)
+      to_ansi("4#{COLORS[color]}")
+    end
+
+    def style(style)
+      to_ansi(STYLES[style])
+    end
+
+    def to_ansi(code)
+      "\e[#{code.to_i}m#{self}\e[0m"
+    end
+
+    def to_pure
+      gsub(/\x1B\[[0-9]{1,3}[mK]/, '')
+    end
+  end
+end

data/lib/gpr.rb

@@ -6,12 +6,14 @@ require 'find'
 require 'thor'
 require 'groonga'
 
-require 'extends/colorize'
+require 'colorize'
+require 'table_builder'
 require 'gpr/version'
 require 'gpr/api_helper'
+require 'gpr/git_helper'
 require 'gpr/cli'
 
 module Gpr
-  APP_PATH = "#{ENV['HOME']}/.gpr"
+  APP_PATH = ENV['GPR_ROOT'] || "#{ENV['HOME']}/.gpr"
   DB_PATH = "#{APP_PATH}/.database"
 end

data/lib/gpr/cli.rb

@@ -1,31 +1,34 @@
 module Gpr
   class CLI < Thor
+    using Colorize
+    include TableBuilder
+
     desc 'get', 'Get a repository'
     def get(param)
       case param
       when /.+(\/\/|@)(.+)\.git$/
         host, user, repository =
           param.match(/.+(\/\/|@)(.+)\.git$/)[2].split(/(:|\/)/).delete_if.with_index { |_c, index| index.odd? }
+        path = "#{APP_PATH}/#{host}/#{user}/#{repository}"
 
-        if Dir.exist?("#{APP_PATH}/#{host}/#{user}/#{repository}")
+        if Dir.exist?(path)
           puts "#{user}/#{repository} is already registered."
           return
         end
 
         puts "#{user}/#{repository} is registering..."
-        unless system("git clone #{param} #{APP_PATH}/#{host}/#{user}/#{repository} >/dev/null 2>&1")
+        unless GitHelper.clone(param, path)
           puts "Failed to clone #{user}/#{repository}."
           return
         end
-        add_file("#{APP_PATH}/#{host}/#{user}/#{repository}")
+        add_file(path)
 
       when /^([^\/]+)\/([^\/]+)$/
         parsed_param = param.match(/^([^\/]+)\/([^\/]+)$/)
         host = parsed_param[1]
         user = parsed_param[2]
 
-        clone_urls = APIHelper.get_repository_urls(host, user)
-        clone_urls.each do |clone_url|
+        APIHelper.get_repository_urls(host, user).each do |clone_url|
           get(clone_url)
         end
       end
@@ -42,11 +45,9 @@ module Gpr
 
       else
         repositories.each do |repository|
-          parsed_path = repository.match(/#{APP_PATH}\/([^\/]+)\/(.+)/)
-          host = parsed_path[1]
-          repository = parsed_path[2]
+          repo_info = parse_repository(repository)
 
-          puts "#{host.color(:yellow)} - #{repository.color(:blue)}"
+          puts "#{repo_info[:host].color(:yellow)} - #{repo_info[:repository].color(:blue)}"
         end
       end
     end
@@ -84,6 +85,37 @@ module Gpr
       end
     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)
+
+        puts "#{repo_info[:host].color(:yellow)} - #{repo_info[:repository].color(:blue)}"
+
+        GitHelper.fetch(repository, remote, branch)
+      end
+    end
+
+    desc 'status', 'Show the status of all registered repositories'
+    def status
+      repositories = get_repositories
+      table do
+        row do
+          column('REPOSITORY NAME'.style(:bold), 15)
+          column('BRANCH STATUS'.style(:bold), 40)
+          column('DIRECTORY STATUS'.style(:bold), 25)
+        end
+        repositories.each do |repository|
+          row do
+            column(repository.match(/.+\/(.+)/)[1])
+            column(GitHelper.status(repository)[:branch])
+            column(GitHelper.status(repository)[:directory])
+          end
+        end
+      end
+    end
+
     desc 'version', 'Display installed gpr version'
     map '-v' => :version
     def version
@@ -92,6 +124,14 @@ module Gpr
 
     private
 
+    def parse_repository(repository_path)
+      repo_info = {}
+      parsed_path = repository_path.match(/#{APP_PATH}\/([^\/]+)\/(.+)/)
+      repo_info[:host] = parsed_path[1]
+      repo_info[:repository] = parsed_path[2]
+      repo_info
+    end
+
     def get_repositories
       repositories = Dir.glob("#{APP_PATH}/*/*/*").select do |directory|
         FileTest.directory?(directory)
@@ -100,17 +140,16 @@ module Gpr
     end
 
     def add_file(path)
-      parsed_path = path.match(/#{APP_PATH}\/([^\/]+)\/(.+)/)
+      repo_info = parse_repository(path)
 
-      Dir.chdir(path)
-      `git ls-files`.split("\n").each do |file|
+      GitHelper.ls_files(path).each do |file|
         next unless FileTest.file?(file)
         Groonga['Files'].add(
           File.expand_path(file),
           filename: File.basename(file),
           body: File.open(file).read,
-          host: parsed_path[1],
-          repository: parsed_path[2]
+          host: repo_info[:host],
+          repository: repo_info[:repository]
         )
       end
     end

data/lib/gpr/git_helper.rb

@@ -0,0 +1,43 @@
+module Gpr
+  module GitHelper
+    class << self
+      def clone(url, path)
+        system("git clone #{url} #{path} >/dev/null 2>&1")
+      end
+
+      def ls_files(path)
+        Dir.chdir(path)
+        `git ls-files`.split("\n")
+      end
+
+      def fetch(path, remote, branch)
+        Dir.chdir(path)
+        if branch.nil?
+          `git fetch #{remote}`
+        else
+          `git fetch #{remote} #{branch}`
+        end
+      end
+
+      def status(path)
+        Dir.chdir(path)
+        result = {}
+        status = `git status`
+
+        result[:branch] = status.match(/Your branch (is|and) (.+?)(,|\.)/)[2]
+
+        case status
+        when /nothing to commit, working directory clean/
+          result[:directory] = 'Working directory clean'
+
+        when /Changes not staged for commit:/
+          result[:directory] = 'Exist unstaged changes'
+
+        when /Untracked files:/
+          result[:directory] = 'Exist untracked files'
+        end
+        result
+      end
+    end
+  end
+end

data/lib/gpr/version.rb

@@ -1,3 +1,3 @@
 module Gpr
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/table_builder.rb

@@ -0,0 +1,23 @@
+require 'table_builder/table'
+require 'table_builder/row'
+require 'table_builder/column_validator'
+require 'table_builder/column'
+
+module TableBuilder
+  def table(min_column_size = 10, &block)
+    @table = Table.new(min_column_size)
+    block.call
+    @table.to_s
+  end
+
+  def row(&block)
+    @row = Row.new
+    block.call
+    @table.add(@row)
+  end
+
+  def column(text, size = nil)
+    @column = Column.new(text, size)
+    @row.add(@column)
+  end
+end

data/lib/table_builder/column.rb

@@ -0,0 +1,16 @@
+module TableBuilder
+  class Column
+    using Colorize
+    prepend ColumnValidator
+
+    attr_accessor :text
+
+    def initialize(text, size)
+      # Ignore ANSI escape sequences
+      pure_text = text.to_pure
+
+      text += ' ' * (size - pure_text.size) if !size.nil? && size > pure_text.size
+      @text = text
+    end
+  end
+end

data/lib/table_builder/column_validator.rb

@@ -0,0 +1,9 @@
+module TableBuilder
+  module ColumnValidator
+    def initialize(text, size)
+      fail 'Invalid multibyte char' if text =~ /[^\x01-\x7E]/
+
+      super
+    end
+  end
+end

data/lib/table_builder/row.rb

@@ -0,0 +1,13 @@
+module TableBuilder
+  class Row
+    attr_accessor :columns
+
+    def initialize
+      @columns = []
+    end
+
+    def add(column)
+      @columns << column
+    end
+  end
+end

data/lib/table_builder/table.rb

@@ -0,0 +1,81 @@
+module TableBuilder
+  class Table
+    using Colorize
+
+    def initialize(min_column_size)
+      @rows = []
+      @header_column_sizes = []
+      @min_column_size = min_column_size
+    end
+
+    def add(row)
+      # Means the header
+      if @rows.size.zero?
+        set_header_column_size(row)
+
+      else
+        if row.columns.size != @header_column_sizes.size
+          fail "Bud number of columns (#{row.columns.size} for #{@header_column_sizes.size})"
+        end
+      end
+
+      @rows << row
+    end
+
+    def to_s
+      puts separate
+
+      @rows.each.with_index do |row, index|
+        puts format_line(row)
+        puts separate if index != @rows.size - 1
+      end
+
+      puts separate
+    end
+
+    private
+
+    def set_header_column_size(row)
+      row.columns.each.with_index do |column, index|
+        # Ignore ANSI escape sequences
+        pure_text = column.text.to_pure
+
+        if pure_text.size > @min_column_size
+          @header_column_sizes[index] = pure_text.size
+        else
+          @header_column_sizes[index] = @min_column_size
+        end
+      end
+    end
+
+    def format_line(row)
+      line = '| '
+
+      row.columns.each.with_index do |column, index|
+        # Ignore ANSI escape sequences
+        pure_text = column.text.to_pure
+
+        if pure_text.size < @header_column_sizes[index]
+          line << column.text + ' ' * (@header_column_sizes[index] - pure_text.size)
+
+        elsif pure_text.size > @header_column_sizes[index]
+          line << column.text[0, @header_column_sizes[index] - 3] + '...'
+
+        else
+          line << column.text
+        end
+
+        line << ' | ' if index != row.columns.size - 1
+      end
+
+      line << ' |'
+    end
+
+    def separate
+      left = middle = right = '+'
+      bar = '-'
+
+      left + @header_column_sizes.map { |size| bar * (size + 2) }.join(middle) + right
+    end
+  end
+end

data/zsh/gpr.zsh

@@ -33,6 +33,12 @@ function _gpr () {
           ;;
         (update)
           ;;
+        (fetch)
+          ;;
+        (status)
+          ;;
+        (version)
+          ;;
       esac
       ;;
   esac
@@ -48,6 +54,9 @@ __gpr_cmds () {
     'list:Show all registered repositories'
     'search:Search the specified keyword in registered repositories'
     'update:Update the database to be used for search'
+    'fetch:Fetch the registered repositories'
+    'status:Show the status of all registered repositories'
+    'version:Display installed gpr version'
   )
 
   _describe -t commands Commands _c

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gpr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -109,11 +109,17 @@ files:
 - Rakefile
 - bin/gpr
 - gpr.gemspec
-- lib/extends/colorize.rb
+- lib/colorize.rb
 - lib/gpr.rb
 - lib/gpr/api_helper.rb
 - lib/gpr/cli.rb
+- lib/gpr/git_helper.rb
 - lib/gpr/version.rb
+- lib/table_builder.rb
+- lib/table_builder/column.rb
+- lib/table_builder/column_validator.rb
+- lib/table_builder/row.rb
+- lib/table_builder/table.rb
 - zsh/gpr.zsh
 homepage: https://github.com/kaihar4/gpr
 licenses:
@@ -135,9 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple management of the git repository.
 test_files: []
-has_rdoc: 

data/lib/extends/colorize.rb

@@ -1,39 +0,0 @@
-class String
-  COLORS = {
-    black: 0,
-    red: 1,
-    green: 2,
-    yellow: 3,
-    blue: 4,
-    magenta: 5,
-    cyan: 6,
-    white: 7
-  }
-
-  STYLES = {
-    reset: 0,
-    bold: 1,
-    underscore: 4,
-    blink: 5,
-    reverse: 6,
-    concealed: 7
-  }
-
-  def color(color)
-    to_ansi("3#{COLORS[color]}")
-  end
-
-  def bg_color(color)
-    to_ansi("4#{COLORS[color]}")
-  end
-
-  def style(style)
-    to_ansi(STYLES[style])
-  end
-
-  protected
-
-  def to_ansi(code)
-    "\e[#{code.to_i}m#{self}\e[0m"
-  end
-end