pro 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b46ba0d458a00a3e57452241e9d84257bf1df7b2
-  data.tar.gz: 95a98916c8e66f1859811c6f5dc3e1f98c3a483c
+  metadata.gz: 3db7f68df476b807f22c2d69fce741dbe6cb9940
+  data.tar.gz: 95a0ced81a2cf42b99bb91deb5d47b48895136eb
 SHA512:
-  metadata.gz: 16274c408ee82cf3991f086ae2040f3fc0a896916b9815340bb13d0c0b70a1c1cb94a21897fcf27eb9fe2cdfed56174066370ec2ad07c1a25d1ecdcf535b4eb8
-  data.tar.gz: 8fbc4d8148c271c092b7c5fcaa69c679c769c63d164a674a49c76d6a07dd7698ba38d68ca6e3c98aa09926926f8e00d85ce93c30f986b67962320faebaedc5c0
+  metadata.gz: 70eb07a63a67d9986b5a801b68d1e6ad64016e68d670efbc33d69981571cdd7a9bb8b74c574297e95761155bb44c4693cfbcd8b6e5e946a315c95e254d27a315
+  data.tar.gz: b9c79cb990b22445219cb8bc77b89eb5e9871f7a81b57d39305d302a483f1065d9b5d70b66b37909062ea158e851aff08020dc2c8ba0aa0f05de04868cbef5da

data/lib/pro/commands.rb

@@ -28,7 +28,9 @@ END
 
 module Pro
   class Commands
-    DIRTY_MESSAGE = 'uncommitted'.red
+    EMPTY_MESSAGE = 'empty'.green
+    UNCOMMITTED_MESSAGE = 'uncommitted'.red
+    UNTRACKED_MESSAGE = 'untracked'.magenta
     UNPUSHED_MESSAGE = 'unpushed'.blue
     JOIN_STRING = ' + '
 
@@ -89,18 +91,38 @@ module Pro
     # returns a short status message for the repo
     def repo_status(path)
       messages = []
-      messages << DIRTY_MESSAGE unless repo_clean?(path)
+      messages << EMPTY_MESSAGE if repo_empty?(path)
+      messages << UNCOMMITTED_MESSAGE if commit_pending?(path)
+      messages << UNTRACKED_MESSAGE if untracked_files?(path)
       messages << UNPUSHED_MESSAGE if repo_unpushed?(path)
       messages.join(JOIN_STRING)
     end
 
-    # Checks if there are any uncommitted changes
-    def repo_clean?(path)
+    # Checks if there are nothing in the repo
+    def repo_empty?(path)
       status = ""
       Dir.chdir(path) do
         status = `git status 2>/dev/null`
       end
-      return status.end_with?("(working directory clean)\n") || status.end_with?("working directory clean\n")
+      return status.include?("Initial commit")
+    end
+
+    # Checks if there are pending commits / edited files
+    def commit_pending?(path)
+      status = ""
+      Dir.chdir(path) do
+        status = `git status 2>/dev/null`
+      end
+      return status.include?("Changes to be committed") || status.include?("Changes not staged for commit")
+    end
+
+    # Checks if there are untracked files in the repo
+    def untracked_files?(path)
+      status = ""
+      Dir.chdir(path) do
+        status = `git status 2>/dev/null`
+      end
+      return status.include?("Untracked files")
     end
 
     # Finds if there are any commits which have not been pushed to origin
@@ -148,4 +170,4 @@ module Pro
       end
     end
   end
-end
+end

data/lib/pro/version.rb

@@ -1,3 +1,3 @@
 module Pro
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pro
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Tristan Hume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fuzzy_match