promptula 0.0.4 → 0.0.5

data/lib/promptula/version.rb

@@ -1,3 +1,3 @@
 module Promptula
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/promptula.rb

@@ -6,6 +6,8 @@ module Promptula
   PATH_SEPARATOR = '/'
   BACKGROUND = "3a3a3a"
   GLYPH = "\u2733"
+  PULL_ARROW = "\u2798"
+  PUSH_ARROW = "\u279A"
 
   def self.cwd()
     current = Dir.pwd
@@ -25,14 +27,25 @@ module Promptula
         branch = line.sub('*', '').chomp
       end
     end
-    status = `git status --porcelain 2>/dev/null`
+    remote = `git config branch.#{branch}.remote`.strip
+    status = `git status --ignore-submodules --porcelain 2>/dev/null`
     untracked = (status.match('\?\?') or '').size > 0 ? " #{GLYPH}" : ''
     dirty = status.size > 0
     background = dirty ? :red : :green
+    push_pull  = `git rev-list --left-right remotes/#{remote}/#{branch}...HEAD`.split("\n")
+    to_push = (push_pull.select {|m| m.start_with? '>'}).length
+    to_pull = (push_pull.select {|m| m.start_with? '<'}).length
 
-    SEPARATOR.foreground(background).background(BACKGROUND).inverse + 
-    "#{branch}#{untracked} ".background(background) +
-    SEPARATOR.foreground(background).reset()
+    prompt = SEPARATOR.foreground(background).background(BACKGROUND).inverse
+    prompt += "#{branch}#{untracked} ".background(background)
+    if to_pull > 0
+      prompt += "#{PULL_ARROW}#{to_pull} ".background(background)
+    end
+    if to_push > 0
+      prompt += "#{PUSH_ARROW}#{to_push} ".background(background)
+    end
+    prompt += SEPARATOR.foreground(background).reset()
+    prompt
   end
 
   def self.prompt()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promptula
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop