promptula 0.0.9 → 0.0.10

data/bin/promptula

@@ -10,12 +10,7 @@ opts = Trollop::options do
 end
 
 install_with = <<jam
-function _update_ps1()
-{
-   export PS1="$(promptula)"
-}
-
-export PROMPT_COMMAND="_update_ps1"
+export PROMPT_COMMAND='echo -ne $(promptula)'
 jam
 
 if opts[:install]

data/lib/promptula/version.rb

@@ -1,3 +1,3 @@
 module Promptula
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/promptula.rb

@@ -1,25 +1,13 @@
 require "promptula/version"
 require "rainbow"
 module Promptula
-  SEPARATOR = "\u25B6"
-  SEPARATOR_THIN = "\u276F"
-  PATH_SEPARATOR = '/'
-  BACKGROUND = "3a3a3a"
+
+  LEFT_EDGE = "\u25C0"
+  RIGHT_EDGE = "\u25B6"
   GLYPH = "\u2733"
   PULL_ARROW = "\u2798"
   PUSH_ARROW = "\u279A"
 
-  def self.cwd()
-    current = Dir.pwd
-    home = ENV['HOME']
-    ret = ''
-    current.sub(home, '~').split('/').each do |segment|
-      ret += PATH_SEPARATOR.foreground(:black).background(BACKGROUND) if segment != '~'
-      ret += "#{segment}".background BACKGROUND
-    end
-    ret + ' '.background(BACKGROUND)
-  end
-
   def self.git()
     if system 'git status > /dev/null 2>/dev/null'
       branch = `git rev-parse --abbrev-ref HEAD 2>/dev/null`.chomp
@@ -35,22 +23,22 @@ module Promptula
       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)
+      prompt = LEFT_EDGE.foreground(background)
+      prompt += " #{branch}#{untracked} ".foreground(background).background(:white).inverse()
       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)
+          prompt += "#{PULL_ARROW}#{to_pull} ".foreground(background).background(:white).inverse()
         end
         if to_push > 0
-          prompt += "#{PUSH_ARROW}#{to_push} ".background(background)
+          prompt += "#{PUSH_ARROW}#{to_push} ".foreground(background).background(:white).inverse()
         end
       end
-      prompt += SEPARATOR.foreground(background).reset()
-      prompt
+      prompt += RIGHT_EDGE.foreground(background)
+      prompt.chomp
     else
       ''
     end
@@ -58,6 +46,6 @@ module Promptula
 
   def self.prompt()
     Sickill::Rainbow.enabled = true
-    cwd() + git()
+    git()
   end
 end

data/lib/rainbow.rb

@@ -88,8 +88,8 @@ module Sickill
 
       var = self.dup
       matched = var.match(/^(\e\[([\d;]+)m)*/)
-      var.insert(matched.end(0), '\[\033[' + code.to_s + 'm\]')
-      var.concat('\[\033[0m\]')
+      var.insert(matched.end(0), "\e[#{code}m")
+      var.concat("\e[0m") unless var =~ /\e\[0m$/
       var
     end
 

metadata

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