gpr 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ebb91a2b27eaa19285b573821f2e654a4eae0da
-  data.tar.gz: 3930255785d40eee536855a72900b8bb8afc0885
+  metadata.gz: 2c11926b160dca631188153c62153510901e3bef
+  data.tar.gz: 529750cb9b97d1317ce1642c567ab9bd45bb1706
 SHA512:
-  metadata.gz: debf8c21b110ec4bd22528d1fc7bd3cfc37b744a647872570e1795e9788e61ba552a1cf320173b074a631f28ac186c916f63b0f60a44caf86149cb1a96e58cbd
-  data.tar.gz: 2e81e1e35114218e7413d9fe8a4a6342d9c5ff83d5287a9e44a6b4d045850d4942331059045d57ab4d27d484ca5f8889abf008fadc49e46103784c0ea5af0f3a
+  metadata.gz: b72525f504cfd32a9b2f91d8ede053c6fb5a212552f668ffec575fc76c13a12fa5af8a5445e11d99935ca7059cba34838987f1beb6576860a743b80c6eb95bfa
+  data.tar.gz: b4ead424e95bc6d5d4659f0e8bdf45436f1bf9851dd27ec755aa94bce08d4332616965e060d300b1bc67537abb380393a867656f89df1b0711ccf485eda186a8

data/README.md

@@ -115,6 +115,12 @@ Search the specified keyword in registered repositories
 
 ![search](https://raw.github.com/wiki/kaihar4/gpr/images/search.png)
 
+### Remove the unregistered directories
+
+```sh
+$ gpr clean
+```
+
 ### Update the database to be used for search
 
 ```sh

data/Rakefile

@@ -1,17 +1,37 @@
 require 'bundler/gem_tasks'
 
 namespace :zsh do
+  COMPLETION_PATH = "source #{File.dirname(__FILE__)}/zsh/gpr.zsh"
+
   desc 'Install the zsh completion'
   task :install do
     if ENV['SHELL'].include?('zsh')
       File.open("#{ENV['HOME']}/.zshrc", 'a+') do |file|
-        path = "source #{Dir.pwd}/zsh/gpr.zsh"
+        file.flock(File::LOCK_EX)
 
-        file.puts path unless file.read.include?(path)
+        body = file.read
+        unless body.include?(COMPLETION_PATH)
+          file.puts COMPLETION_PATH
+          puts "Done.\nPlease execute 'source ~/.zshrc'."
+        end
       end
-      puts 'Done.'
     else
       puts 'Please change default shell to zsh.'
     end
   end
+
+  desc 'Clean the zsh completion'
+  task :clean do
+    File.open("#{ENV['HOME']}/.zshrc", 'r+') do |file|
+      file.flock(File::LOCK_EX)
+
+      body = file.read
+      if body.include?(COMPLETION_PATH)
+        file.rewind
+        file.write(body.gsub(/#{COMPLETION_PATH}\n/, ''))
+        file.truncate(file.tell)
+        puts "Done.\nPlease execute 'source ~/.zshrc'."
+      end
+    end
+  end
 end

data/lib/gpr/cli.rb

@@ -132,6 +132,15 @@ module Gpr
       end
     end
 
+    desc 'clean', 'Remove the unregistered directories'
+    def clean
+      puts 'Processing...'
+
+      Dir.glob("#{APP_PATH}/*/*").each do |path|
+        Dir.rmdir(path) if Dir.entries(path).join == '...'
+      end
+    end
+
     desc 'update', 'Update the database to be used for search'
     def update
       puts 'Updating...'
@@ -174,10 +183,11 @@ module Gpr
           column('DIRECTORY STATUS'.style(:bold), 25)
         end
         repositories.each do |repository|
+          status = GitHelper.status(repository)
           row do
             column(repository.match(/.+\/(.+\/.+)/)[1])
-            column(GitHelper.status(repository)[:branch])
-            column(GitHelper.status(repository)[:directory])
+            column(status[:branch])
+            column(status[:directory])
           end
         end
       end

data/lib/gpr/git_helper.rb

@@ -27,16 +27,18 @@ module Gpr
         Dir.chdir(path)
         result = {}
         git_status = `git status`
+        branch_name = git_status.match(/(On branch .+)/)[1]
         branch_status = `git status -sb`.split("\n")[0].match(/## (.+)/)[1]
 
-        case branch_status
         # Means ahead || behind
-        when /\[.+\]/
+        if branch_status =~ /\[.+\]/
           result[:branch] = branch_status.color(:red)
-        when /master/
-          result[:branch] = git_status.match(/Your branch (is|and) (.+?)(,|\.)/)[2].color(:green)
+
+        elsif git_status =~ /up-to-date with 'origin\/master'/
+          result[:branch] = (branch_name + " {origin/master}").color(:green)
+
         else
-          result[:branch] = git_status.match(/(On branch .+)/)[1].color(:green)
+          result[:branch] = branch_name.color(:green)
         end
 
         case git_status

data/lib/gpr/version.rb

@@ -1,3 +1,3 @@
 module Gpr
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gpr
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor