gpr 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09a37952ff672aa804dd9ed53da451b70f8de187
-  data.tar.gz: 2e78a77ee446ae0790f8919039edc87bc7040a99
+  metadata.gz: 3ebb91a2b27eaa19285b573821f2e654a4eae0da
+  data.tar.gz: 3930255785d40eee536855a72900b8bb8afc0885
 SHA512:
-  metadata.gz: 4c90b35c596c6def17b6e917eb7b09ff0beaafdb539ce7b331772132260a0f6d15ff584671ee7ddea5de497ed733a35e36de1d2f9a70f52add6095f09558b685
-  data.tar.gz: 1739611ba31101e707b1c07ba8ced63b8fc8b55ea5d9e39e29e62ad55337b34ad6cf96483358e496ae5c3c20221f7e7f9d3a78a665682d8aa8b48d55127eba26
+  metadata.gz: debf8c21b110ec4bd22528d1fc7bd3cfc37b744a647872570e1795e9788e61ba552a1cf320173b074a631f28ac186c916f63b0f60a44caf86149cb1a96e58cbd
+  data.tar.gz: 2e81e1e35114218e7413d9fe8a4a6342d9c5ff83d5287a9e44a6b4d045850d4942331059045d57ab4d27d484ca5f8889abf008fadc49e46103784c0ea5af0f3a

data/lib/gpr/cli.rb

@@ -169,13 +169,13 @@ module Gpr
       repositories = get_repositories
       table do
         row do
-          column('REPOSITORY NAME'.style(:bold), 15)
-          column('BRANCH STATUS'.style(:bold), 40)
+          column('REPOSITORY NAME'.style(:bold), 25)
+          column('BRANCH STATUS'.style(:bold), 45)
           column('DIRECTORY STATUS'.style(:bold), 25)
         end
         repositories.each do |repository|
           row do
-            column(repository.match(/.+\/(.+)/)[1])
+            column(repository.match(/.+\/(.+\/.+)/)[1])
             column(GitHelper.status(repository)[:branch])
             column(GitHelper.status(repository)[:directory])
           end

data/lib/gpr/git_helper.rb

@@ -1,5 +1,9 @@
+require 'safe_colorize'
+
 module Gpr
   module GitHelper
+    using SafeColorize
+
     class << self
       def clone(url, path)
         `git clone #{url} #{path}`
@@ -22,19 +26,31 @@ module Gpr
       def status(path)
         Dir.chdir(path)
         result = {}
-        status = `git status`
+        git_status = `git status`
+        branch_status = `git status -sb`.split("\n")[0].match(/## (.+)/)[1]
 
-        result[:branch] = status.match(/Your branch (is|and) (.+?)(,|\.)/)[2]
+        case branch_status
+        # Means ahead || behind
+        when /\[.+\]/
+          result[:branch] = branch_status.color(:red)
+        when /master/
+          result[:branch] = git_status.match(/Your branch (is|and) (.+?)(,|\.)/)[2].color(:green)
+        else
+          result[:branch] = git_status.match(/(On branch .+)/)[1].color(:green)
+        end
 
-        case status
+        case git_status
         when /nothing to commit, working directory clean/
-          result[:directory] = 'Working directory clean'
+          result[:directory] = 'Working directory clean'.color(:green)
+
+        when /Changes to be committed:/
+          result[:directory] = 'Exist staged changes'.color(:red)
 
         when /Changes not staged for commit:/
-          result[:directory] = 'Exist unstaged changes'
+          result[:directory] = 'Exist unstaged changes'.color(:red)
 
         when /Untracked files:/
-          result[:directory] = 'Exist untracked files'
+          result[:directory] = 'Exist untracked files'.color(:red)
         end
         result
       end

data/lib/gpr/version.rb

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

metadata

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