promptula 0.0.5 → 0.0.8

data/lib/promptula/version.rb

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

data/lib/promptula.rb

@@ -21,31 +21,40 @@ module Promptula
   end
 
   def self.git()
-    branch = `git rev-parse --abbrev-ref HEAD 2>/dev/null`.chomp
-    branch.split("\n").each do |line|
-      if line[0] == '*'
-        branch = line.sub('*', '').chomp
+    if system 'git status > /dev/null 2>/dev/null'
+      branch = `git rev-parse --abbrev-ref HEAD`.chomp
+      branch.split("\n").each do |line|
+        if line[0] == '*'
+          branch = line.sub('*', '').chomp
+        end
       end
-    end
-    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
+      tracking = Hash[`git for-each-ref --format='%(refname:short) %(upstream:short)' refs/heads`
+        .split("\n")
+        .map {|l| l.split ' '}]
 
-    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)
+      status = `git status --ignore-submodules --porcelain`
+      untracked = (status.match('\?\?') or '').size > 0 ? " #{GLYPH}" : ''
+      dirty = status.size > 0
+      background = dirty ? :red : :green
+      prompt = SEPARATOR.foreground(background).background(BACKGROUND).inverse
+      prompt += "#{branch}#{untracked} ".background(background)
+      remote = tracking[branch]
+      if remote
+        push_pull  = `git rev-list --left-right #{remote}...HEAD`.split("\n")
+        to_push = (push_pull.select {|m| m.start_with? '>'}).length
+        to_pull = (push_pull.select {|m| m.start_with? '<'}).length
+        if to_pull > 0
+          prompt += "#{PULL_ARROW}#{to_pull} ".background(background)
+        end
+        if to_push > 0
+          prompt += "#{PUSH_ARROW}#{to_push} ".background(background)
+        end
+      end
+      prompt += SEPARATOR.foreground(background).reset()
+      prompt
+    else
+      ''
     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.5
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop