gpr 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c11926b160dca631188153c62153510901e3bef
-  data.tar.gz: 529750cb9b97d1317ce1642c567ab9bd45bb1706
+  metadata.gz: 6fc828306cf6fcbd57901691545268d4fce5fac8
+  data.tar.gz: c07bf80b3194da4ed975ab34d6713cc1a6b2c54d
 SHA512:
-  metadata.gz: b72525f504cfd32a9b2f91d8ede053c6fb5a212552f668ffec575fc76c13a12fa5af8a5445e11d99935ca7059cba34838987f1beb6576860a743b80c6eb95bfa
-  data.tar.gz: b4ead424e95bc6d5d4659f0e8bdf45436f1bf9851dd27ec755aa94bce08d4332616965e060d300b1bc67537abb380393a867656f89df1b0711ccf485eda186a8
+  metadata.gz: f731f0de4b5dec48f3778c8da6d80edfa9aa7de5ba608616a5ec8d8a2df991e0672915448250767a001405ce5a5df203c8f082ab31870b5e45fd21dee5acd4d6
+  data.tar.gz: e09dd812a64e122c9fd6fbb3876bb4bf6f1a98ee2665acdd61f798e2b8af275074d404af44fd4b999e4278078b7e5edb96f4d0bbc68f702f474b9819b7c49df1

data/lib/gpr/cli.rb

@@ -137,7 +137,8 @@ module Gpr
       puts 'Processing...'
 
       Dir.glob("#{APP_PATH}/*/*").each do |path|
-        Dir.rmdir(path) if Dir.entries(path).join == '...'
+        # Unregistered directories returns [".", ".."].
+        Dir.rmdir(path) if Dir.entries(path).size == 2
       end
     end
 

data/lib/gpr/git_helper.rb

@@ -26,34 +26,32 @@ module Gpr
       def status(path)
         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]
+        git_status = `git status -sb`.split("\n")
+        branch_name = git_status.shift.match(/## (.+)/)[1]
+        unstaged_changes = []
+        untracked_files = []
 
-        # Means ahead || behind
-        if branch_status =~ /\[.+\]/
-          result[:branch] = branch_status.color(:red)
-
-        elsif git_status =~ /up-to-date with 'origin\/master'/
-          result[:branch] = (branch_name + " {origin/master}").color(:green)
+        git_status.each do |file|
+          if match_object = file.match(/^\sM (.+)$/)
+            unstaged_changes << match_object[1]
+          elsif match_object = file.match(/^\?\? (.+)$/)
+            untracked_files << match_object[1]
+          end
+        end
 
+        # Means no branch || ahead || behind
+        if branch_name =~ /HEAD|\[.+\]/
+          result[:branch] = branch_name.color(:red)
         else
           result[:branch] = branch_name.color(:green)
         end
 
-        case git_status
-        when /nothing to commit, working directory clean/
+        if unstaged_changes.empty? && untracked_files.empty?
           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'.color(:red)
-
-        when /Untracked files:/
-          result[:directory] = 'Exist untracked files'.color(:red)
+        else
+          result[:directory] = "Modified[#{unstaged_changes.size}] ??[#{untracked_files.size}]".color(:red)
         end
+
         result
       end
 

data/lib/gpr/version.rb

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

metadata

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