popo 0.1.10 → 0.2.0

data/CHANGELOG

@@ -1,6 +1,34 @@
--- 0.1.10
+-- 1.0.0
+  * added popo update. this updates the manifest to respective branch and remigrates your
+    manifest data
+
+  * optparse separated
+
+  * interactive popo now displays colors for eye candy
+
+  * the runner is now passed to each command
+
+  * version bump
+
+  * a copy of ps1_functions scripts is now automatically sourced by poporc. if you're a fan of
+    changing your prompt with ps1_set, then you can call this inside popo.
+    remember that this will unset any PROMPT_COMMAND sourced before popo loads.
+    this means that any ps1_set or PROMPT_COMMAND defined and sourced in your local RVM will be gone.
+    this measure is to enforce prefixing your ps1 with the popo prompt to distinguish what world
+    you are in so that you will not be in limbo.
 
-features
+  * ps1 functions in zsh are still not supported. sorry!
+
+  * for those who aren't familiar or interested with ps1_functions, you may visit
+    https://rvm.io/workflow/prompt/
+
+  * for CI, since colors render as pure text, you can export popo_no_color=true to your CI server.
+    this will disable the eye candy.
+
+bug fixes
+  * changed some variable names for more readability
+
+-- 0.1.10
   * popo bash is now popo shell. bash still works though. just changed
     underlying code to be more generic
 

data/README.md

@@ -0,0 +1,17 @@
+# Popo Repo Tool
+Contain all of your related Rails applications into one single virtual system.
+
+## Features:
+* Customizable manifest
+* Separate shell, rvm. No conflict worries
+* Easy on resources (RAM and CPU)
+* Integrated with cableguy to ease Rails configuration file deployment
+* Is best used when deploying and working with multiple Rails applications
+
+# HOWTO
+
+## Installation
+> TODO
+
+## Configuration
+> TODO

data/lib/popo.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'palmade/cableguy'
-require 'optparse'
 require 'yaml'
 require 'fileutils'
 require File.join(File.dirname(__FILE__), 'popo/version')
@@ -13,6 +12,7 @@ module Popo
   autoload :Error, File.join(POPO_LIB_ROOT, 'error')
   autoload :GitUtils, File.join(POPO_LIB_ROOT, 'git_utils')
   autoload :Init, File.join(POPO_LIB_ROOT, 'init')
+  autoload :OptParse, File.join(POPO_LIB_ROOT, 'opt_parse')
   autoload :Runner, File.join(POPO_LIB_ROOT, 'runner')
   autoload :RVM, File.join(POPO_LIB_ROOT, 'rvm')
   autoload :Sync, File.join(POPO_LIB_ROOT, 'sync')

data/lib/popo/constants.rb

@@ -1,13 +1,26 @@
 module Popo
   module Constants
-    POPORC              = 'script/poporc'
+    POPORC              = "script/poporc"
     DEFAULT_CONFIG_FILE = "popo_config.yml"
     DEFAULT_POPO_TARGET = "development"
     POPO_WORK_PATH      = ".manifest"
     POPO_YML_FILE       = "popo.yml"
     POPO_CONFIG         = {}
     POPO_DIR_KEY        = "sync.directories"
-    POPO_KEY_VALUES     = ['branch', 'repo']
-    POPO_COMMANDS       = ['sync', 'rvm', 'migrate', 'diff', 'status']
+    POPO_KEY_VALUES     = %w(branch repo)
+    POPO_COMMANDS       = %w(sync rvm migrate diff info update)
+    REQUIRED_COMMANDS   = %w(git env)
+
+    # colors
+    COLOR_RED     = "\e[1;31m"
+    COLOR_GREEN   = "\e[1;32m"
+    COLOR_YELLOW  = "\e[1;33m"
+    COLOR_NONE    = "\e[1;0m"
+
+    POST_INSTALL_NOTE = <<NOTE
+You're almost done!\n
+Do the following inside popo:\n
+1. rvm reload\n
+NOTE
   end
 end

data/lib/popo/error.rb

@@ -1,7 +1,7 @@
 module Popo
   module Error
     def self.say(message, subitem = false)
-      puts "#{subitem ? "   ->" : "--"} #{message}"
+      puts "#{subitem ? "   ->" : "Error:"} #{message}".red
       exit(-1)
     end
   end

data/lib/popo/git_utils.rb

@@ -7,23 +7,23 @@ module Popo
       branch = 'master' if branch.nil?
 
       if clone_path.nil?
-        cmd = "#{GIT_CMD} clone -b #{branch} #{repo}"
+        cmd = "#{GIT_CMD} clone -b #{branch} #{repo} 2>&1"
       else
-        cmd = "#{GIT_CMD} clone -b #{branch} #{repo} #{clone_path}"
+        cmd = "#{GIT_CMD} clone -b #{branch} #{repo} #{clone_path} 2>&1"
       end
 
-      clone_msg = "Cloning branch #{branch} from #{repo}" +
-                  " to #{clone_path}"
-
-      Utils.say_with_time clone_msg do
+      Utils.git_say_with_time "CLONE".green, nil do
+        Utils.say "#{'[Source]'.yellow} => #{repo}", true
+        Utils.say "#{'[Target]'.yellow} => #{clone_path}", true
+        Utils.say "#{'[Branch]'.yellow} => #{branch}", true
        `#{cmd}`
       end
     end
 
     def self.git_update(repo, branch)
-      Utils.say_with_time "Updating #{repo}" do
+      Utils.git_say_with_time "FETCH".green, "#{repo}" do
         Dir.chdir(repo) do
-          `#{GIT_CMD} fetch`
+          `#{GIT_CMD} fetch 2>&1`
         end
       end
 
@@ -32,7 +32,7 @@ module Popo
     end
 
     def self.git_stash(repo)
-      Utils.say_with_time "Stashing changes for #{repo}" do
+      Utils.git_say_with_time "STASH".yellow, "#{repo}" do
         Dir.chdir(repo) do
           `#{GIT_CMD} stash`
         end
@@ -40,17 +40,19 @@ module Popo
     end
 
     def self.git_reset(repo, branch)
-      Utils.say_with_time "Doing a hard reset for #{repo}" do
+      Utils.git_say_with_time "RESET".red, "#{repo}" do
         Dir.chdir(repo) do
-          `#{GIT_CMD} reset --hard origin/#{branch}`
+          out = `#{GIT_CMD} reset --hard origin/#{branch} 2>&1`
+          Utils.say(out, true)
         end
       end
     end
 
     def self.git_checkout(repo, branch)
-      Utils.say_with_time "Switching to #{branch} branch" do
+      Utils.git_say_with_time "CHECKOUT".yellow, "#{branch} branch" do
         Dir.chdir(repo) do
-          `#{GIT_CMD} checkout #{branch}`
+          out = `#{GIT_CMD} checkout #{branch} 2>&1`
+          Utils.say(out, true)
         end
       end
     end
@@ -62,14 +64,14 @@ module Popo
 
         parsed = diff_msg.scan(/(commit [0-9a-f]+)\n+(.*?)\n+(.*?)(?:\n|$)/)
 
-        Utils.say "#{File.basename(cwd).capitalize}"
+        Utils.git_say "#{File.basename(cwd).capitalize}"
 
         parsed.each do |p|
           commit_id = p[0].gsub(/commit/,'').strip
           author = p[1].scan(/Author: (.*) <.*>/)
           commit_msg = p[2].strip
 
-          Utils.say "#{commit_id} \<#{author}\> #{commit_msg}", true
+          Utils.git_say "#{commit_id} \<#{author}\> #{commit_msg}", true
         end
       else
         repos = Dir.entries(cwd) - [ '.', '..' ]

data/lib/popo/init.rb

@@ -2,17 +2,16 @@ module Popo
   class Init
     include Constants
 
-    def self.boot(db, config, options)
-      self.new(db, config, options)
+    def self.boot(runner)
+      self.new(runner)
     end
 
-    def initialize(db, config, options)
-      @options = options
-      @db = db
-      @manifest = config['manifests'][@options[:manifest]]
-      @default_target = @options[:target] || 'development'
-      @deploy_path = File.absolute_path(@options[:path])
+    def initialize(runner)
+      @db = runner.database
+      @options = runner.options
       @location = @options[:location] || nil
+      @manifest = runner.config['manifests'][@options[:manifest]]
+      @deploy_path = File.absolute_path(@options[:path])
     end
 
     def print_variables
@@ -43,7 +42,7 @@ module Popo
 
     def write_config
       popo = {}
-      popo['target'] = @default_target
+      popo['target'] = DEFAULT_POPO_TARGET
       popo['path'] = @deploy_path
       popo['location'] = @location if !@location.nil?
 

data/lib/popo/opt_parse.rb

@@ -0,0 +1,60 @@
+require 'optparse'
+
+module Popo
+  class OptParse
+    include Constants
+
+    attr_reader :optparse, :options
+
+    def initialize
+      @options = {}
+      @options[:verbose] = false
+
+      @optparse = OptionParser.new do |options|
+        options.banner = "Usage: popo COMMAND [options]"
+        options.separator ""
+        options.separator "Commands: #{POPO_COMMANDS.join(',')}"
+        options.separator ""
+        options.separator "options:"
+
+        options.on('-p', '--path PATH', 'Target path') do |path|
+          @options[:path] = path
+        end
+
+        options.on('-t', '--target TARGET', 'Deployment target') do |target|
+          @options[:target] = target
+        end
+
+        options.on('-u', '--user USER', 'Specify a username for git') do |user|
+          @options[:user] = user
+        end
+
+        options.on('-m', '--manifest MANIFEST', 'Specify a manifest repo') do |manifest|
+          @options[:manifest] = manifest
+        end
+
+        options.on('-l', '--location LOCATION', 'Set the deployment location') do |location|
+          @options[:location] = location
+        end
+
+        options.on('-r', '--reset', 'WARNING: It will not stash changes') do
+          @options[:reset] = true
+        end
+
+        options.on('-v', '--verbose', 'Prints more info about what you executed') do
+          @options[:verbose] = true
+        end
+
+        options.on('-V', '--version', 'Show popo\'s current version') do
+          puts Popo::VERSION
+          exit
+        end
+
+        options.on('-h', '--help', 'Display this screen') do
+          puts options
+          exit
+        end
+      end
+    end
+  end
+end

data/lib/popo/runner.rb

@@ -2,96 +2,67 @@ module Popo
   class Runner
     include Constants
 
-    def self.boot(args)
-      check_requirements
-
-      Popo::Constants.const_set("SHELL", ENV['SHELL'])
-
-      if SHELL.empty?
-        Error.say("SHELL is empty.")
+    attr_reader :config
+    attr_reader :database, :db_opts
+    attr_reader :app_root, :args, :options
+
+    class << self
+      def boot(args)
+        Utils.colorize
+        self.new(args) if has_requirements?
       end
 
-      self.new(args)
-    end
-
-    def self.check_requirements
-      bins = ['env', 'git' ]
+      def has_requirements?
+        if ENV.include?('SHELL')
+          Popo::Constants.const_set("SHELL", ENV['SHELL'])
+        else
+          Error.say("SHELL is empty.")
+        end
 
-      bins.each do |b|
-        const_fn = "#{b.upcase}_CMD"
+        Popo::Constants::REQUIRED_COMMANDS.each do |b|
+          const_fn = "#{b.upcase}_CMD"
 
-        Popo::Constants.const_set(const_fn, get_bin_path(b))
+          Popo::Constants.const_set(const_fn, get_bin_path(b))
 
-        if Popo::Constants.const_get(const_fn).empty?
-          Error.say "#{b} is needed and is not found in PATH!"
+          if Popo::Constants.const_get(const_fn).empty?
+            Error.say "#{b} is needed and is not found in PATH!"
+          end
         end
+
+        true
       end
-    end
 
-    def self.get_bin_path(bin)
-      `which #{bin}`.strip
+      def get_bin_path(bin)
+        `which #{bin}`.strip
+      end
     end
 
     def initialize(args)
-      @db_opts           = {}
-      @options           = {}
-      @app_root          = ENV['popo_path'] || Dir.pwd
-      @options[:verbose] = false
+      @args     = args
+      @db_opts  = {}
+      @options  = {}
+      @app_root = ENV['popo_path'] || Dir.pwd
 
       if Utils.has_popo_config?(@app_root)
         @options[:target] = POPO_CONFIG['target']
       end
 
-      optparse = OptionParser.new do |opts|
-        opts.banner = "Popo tool."
-        opts.separator "Options:"
-
-        opts.on('-p', '--path PATH', 'Target path') do |path|
-          @options[:path] = path
-        end
-
-        opts.on('-t', '--target TARGET', 'Deployment target') do |target|
-          @options[:target] = target
-        end
-
-        opts.on('-u', '--user USER', 'Username') do |user|
-          @options[:user] = user
-        end
-
-        opts.on('-m', '--manifest MANIFEST', 'Manifest') do |manifest|
-          @options[:manifest] = manifest
-        end
-
-        opts.on('-l', '--location LOCATION', 'Location') do |location|
-          @options[:location] = location
-        end
-
-        opts.on('-v', '--verbose', 'Verbose') do
-          @options[:verbose] = true
-        end
-
-        opts.on('-V', '--version', 'Version') do
-          puts Popo::VERSION
-          exit
-        end
+      opt = OptParse.new
 
-        opts.on('-h', '--help', 'Display this screen') do
-          puts opts
-          exit
-        end
-      end
+      if @args.length >= 1
+        opt.optparse.parse!
+        @options.merge!(opt.options)
 
-      optparse.parse!
+        db_options = {
+          :path => File.join(@app_root, POPO_WORK_PATH),
+          :target => ENV['CABLING_TARGET'] || @options[:target] || DEFAULT_POPO_TARGET,
+          :verbose => @options[:verbose],
+          :location => ENV['CABLING_LOCATION'] || @options[:location]
+        }
 
-      if args.length < 1
-        Utils.say optparse.help
-      else
-        @db_opts[:path]     = File.join(@app_root, POPO_WORK_PATH)
-        @db_opts[:target]   = ENV['CABLING_TARGET'] || @options[:target] || DEFAULT_POPO_TARGET
-        @db_opts[:verbose]  = @options[:verbose]
-        @db_opts[:location] = ENV['CABLING_LOCATION'] || @options[:location]
+        @db_opts.merge!(db_options)
 
-        # set manifest usable constants
+        # let set these so we can use them in migration files
         Object.const_set("POPO_PATH", @app_root)
         Object.const_set("POPO_USER", @options[:user])
         Object.const_set("POPO_TARGET", @db_opts[:target])
@@ -100,16 +71,18 @@ module Popo
         mandatory = [:path, :manifest]
         mandatory = mandatory.select { |p| @options[p].nil? }
 
-        if args.first == 'init' and !mandatory.empty?
-          Error.say "Missing options: #{mandatory.join(', ')}"
+        if @args.first.eql? 'init' and !mandatory.empty?
+          Error.say "Required options: #{mandatory.join(', ')}"
         end
 
-        self.run(args)
+        run
+      else
+        Utils.say opt.optparse.help
       end
     end
 
-    def run(args)
-      if POPO_COMMANDS.include?(args.first)
+    def run
+      if POPO_COMMANDS.include?(@args.first)
         Utils.in_popo?(@app_root)
       end
 
@@ -117,31 +90,44 @@ module Popo
 
       case cmd
       when 'init'
-        config = get_config!
+        @config = get_config!
 
-        if config['manifests'][@options[:manifest]].nil?
+        if @config['manifests'][@options[:manifest]].nil?
           Error.say "\'#{@options[:manifest]}\' does not exist in #{DEFAULT_CONFIG_FILE}!"
         end
 
         if !File.exist?(File.join(@app_root, @options[:path]))
           @db_opts[:path] = File.join(@app_root, @options[:path], POPO_WORK_PATH)
-          db = get_database
+          get_database
 
-          Init.boot(db, config, @options).setup
+          Init.boot(self).setup
         else
           Error.say "Path \'#{@options[:path]}\' already exists!"
         end
       when 'sync'
-        db = get_database
+        get_database
 
-        Sync.new(db, @app_root, args).sync
+        Sync.new(self).sync
       when 'rvm'
-        db = get_database
+        get_database
+
+        RVM.new(self).setup
+      when 'update'
+        manifest_path = File.join(@app_root, POPO_WORK_PATH)
 
-        RVM.new(db, @app_root, args).setup
+        case POPO_TARGET
+        when DEFAULT_POPO_TARGET
+          GitUtils.git_update(manifest_path, DEFAULT_POPO_TARGET)
+        else
+          GitUtils.git_update(manifest_path, 'master')
+        end
+
+        get_database
+        @database.migrate_database
       when 'migrate'
-        get_database.migrate_database
-      when 'status'
+        get_database
+        @database.migrate_database
+      when 'info'
         Utils.say `cat #{File.join(@app_root, POPO_WORK_PATH, POPO_YML_FILE)}`
       when 'shell', 'bash'
         sh!
@@ -152,7 +138,7 @@ module Popo
       end
     end
 
-    protected
+    private
 
     def sh!
       if Utils.has_popo_config?(@app_root)
@@ -184,10 +170,8 @@ module Popo
     end
 
     def get_database
-      database = Database.new(@app_root, @db_opts)
-      database.boot_database
-
-      database
+      @database = Database.new(@app_root, @db_opts)
+      @database.boot_database
     end
 
     def get_config!

data/lib/popo/rvm.rb

@@ -1,18 +1,28 @@
 module Popo
   class RVM
-    def initialize(db, app_root, args)
-      @db = db
-      @app_root = app_root
-      @rvm_bin = File.join(@app_root, 'rvm/bin/rvm')
-      @repos = args
+    include Constants
 
-      @rubies = @db.get("rvm.rubies").split(",")
-      @default_ruby = @db.get("rvm.ruby.default")
-      @default_gems = @db.get_children("rvm.gems.default")
+    def initialize(runner)
+      @db       = runner.database
+      @repos    = runner.args
+      @rvm_bin  = File.join(runner.app_root, 'rvm/bin/rvm')
+      @app_root = runner.app_root
 
       if @db.has_key?("rvm.gems.source")
         @default_gem_source = @db.get("rvm.gems.source")
       end
+
+      get_rubies
+      set_rubies
+    end
+
+    def get_rubies
+      @rubies = @db.get("rvm.rubies").split(",")
+    end
+
+    def set_rubies
+      @default_ruby = @db.get("rvm.ruby.default")
+      @default_gems = @db.get_children("rvm.gems.default")
     end
 
     def setup
@@ -60,11 +70,4 @@ module Popo
       end
     end
   end
-
-POST_INSTALL_NOTE = <<NOTE
-You're almost done!\n
-Do the following inside popo:\n
-1. rvm reload\n
-NOTE
-
 end

data/lib/popo/sync.rb

@@ -2,22 +2,23 @@ module Popo
   class Sync
     include Constants
 
-    def initialize(db, popo_path, args)
-      @db = db
+    def initialize(runner)
+      @db        = runner.database
+      @cwd       = Dir.pwd
+      @info      = {}
+      @projects  = runner.args
+      @options   = runner.options
       @sync_list = @db.get(POPO_DIR_KEY).split(',')
-      @popo_path = popo_path
-      @cwd = Dir.pwd
-      @projects = args
-      @info = {}
+      @app_root = runner.app_root
     end
 
     def sync
       @projects.each do |project|
         if project =~ /\//
-          @info['key'] = convert_to_key(project)
-          @info['path'] = File.join(@popo_path, project)
+          @info[:key] = convert_to_key(project)
+          @info[:path] = File.join(@app_root, project)
 
-          get_values(@info['key'])
+          get_values(@info[:key])
 
           get_project
         else
@@ -26,11 +27,11 @@ module Popo
       end
 
       if @projects.empty?
-        if @cwd.eql? @popo_path
+        if @cwd.eql? @app_root
           @sync_list.each { |p| sync_all(p) }
         else
           key = @cwd.split('/')
-          key.shift(@popo_path.split('/').count)
+          key.shift(@app_root.split('/').count)
 
           sync_all(convert_to_key(key))
         end
@@ -46,38 +47,38 @@ module Popo
         end
 
         children.each do |c|
-          @info['key'] = [project, c].join('.')
+          @info[:key] = [project, c].join('.')
 
-          get_values(@info['key'])
+          get_values(@info[:key])
 
-          @info['path'] = File.join(@popo_path, project.gsub('.','/'), c)
+          @info[:path] = File.join(@app_root, project.gsub('.','/'), c)
 
           get_project
         end
       else
         get_values(project)
 
-        @info['path'] = File.join(@popo_path, project.gsub('.','/'))
+        @info[:path] = File.join(@app_root, project.gsub('.','/'))
 
         get_project
       end
     end
 
     def get_project
-      if !File.exists?(@info['path'])
-        GitUtils.git_clone(@info['repo'], @info['path'], @info['branch'])
+      if !File.exists?(@info[:path])
+        GitUtils.git_clone(@info[:repo], @info[:path], @info[:branch])
       else
-        if POPO_CONFIG['target'] == DEFAULT_POPO_TARGET
-          GitUtils.git_stash(@info['path'])
+        if POPO_CONFIG['target'] == DEFAULT_POPO_TARGET and !@options[:reset]
+          GitUtils.git_stash(@info[:path])
         end
 
-        GitUtils.git_update(@info['path'], @info['branch'])
+        GitUtils.git_update(@info[:path], @info[:branch])
       end
     end
 
     def get_values(key)
       POPO_KEY_VALUES.each do |v|
-        @info[v] = @db.get("#{key}.#{v}")
+        @info[v.to_sym] = @db.get("#{key}.#{v}")
       end
     end
 

data/lib/popo/utils.rb

@@ -4,8 +4,26 @@ module Popo
   module Utils
     include Constants
 
+    def self.colorize
+      String.class_eval do
+        include Popo::Constants
+
+        constants.grep(/^COLOR/).each do |c|
+          color = c.to_s.gsub('COLOR_','').downcase.to_sym
+
+          define_method color do
+            if !ENV['popo_no_color']
+              "#{Popo::Constants.const_get(c)}#{self}#{COLOR_NONE}"
+            else
+              self
+            end
+          end
+        end
+      end
+    end
+
     def self.say(message, subitem = false)
-      puts "#{subitem ? "   ->" : "--"} #{message}"
+      puts "#{subitem ? " \->" : "--"} #{message}"
     end
 
     def self.say_with_time(message)
@@ -17,6 +35,20 @@ module Popo
       result
     end
 
+    def self.git_say(action, message, subitem = false)
+      puts "#{subitem ? "\r->" : "\[#{action}\]"} #{message}"
+    end
+
+    def self.git_say_with_time(action, message)
+      git_say(action, message)
+      result = nil
+      time = Benchmark.measure { result = yield }
+      say "%.4fs" % time.real, :subitem
+      say("#{result} rows", :subitem) if result.is_a?(Integer)
+      result
+    end
+
+
     def self.in_popo?(root_path)
       if !ENV.include?('popo_path')
         Error.say "You must be inside popo!"
@@ -46,4 +78,3 @@ module Popo
     end
   end
 end
-

data/lib/popo/version.rb

@@ -1,3 +1,3 @@
 module Popo
-  VERSION = "0.1.10"
+  VERSION = "0.2.0"
 end

data/script/poporc

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+
 if [[ -z "$popo_path" ]] ; then
   echo "FAIL Please set the popo_path environment var"
   exit -1
@@ -9,62 +10,78 @@ if [[ -z "$popo_target" ]] ; then
   exit -1
 fi
 
-YELLOW="\[\033[33m\]"
-NORMAL="\[\033[0;0m\]"
-BASEPATH=`which basename`
-BASENAME=`$BASEPATH $popo_path`
-CUSTOMRC=$popo_path/.manifest/script/customrc
-
-export rvm_prefix=$popo_path
+# remove all rvm paths
 unset $(env | awk -F= '/^rvm_/{print $1" "}')
-export rvm_path=$popo_path/rvm
-source $rvm_path/scripts/rvm
-source $rvm_path/contrib/ps1_functions
+
+# variables
+scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+basename=`which basename`
+path_basename=`$basename $popo_path`
+customrc=$popo_path/.manifest/script/customrc
+
+# load self contained rvm
+rvm_prefix=$popo_path
+rvm_path=$popo_path/rvm
 rubies_path=$rvm_path/rubies
 
-# Load default rvm if rubies folder is not empty
+# load all relative rvm scripts
+source $rvm_path/scripts/rvm
+
+# load default rvm if rubies folder is not empty
 if [ -d $rubies_path ] && [ "$(ls -A $rubies_path)" ] ; then
   rvm default
 fi
 
-unset PALMADE_GEMS_DIR
-export PATH="$rvm_path/bin:$popo_path/tools:$PATH"
-
 if [[ $PS1 != "" ]] ; then
   if [[ -f /etc/bash.bashrc ]] ; then
     source /etc/bash.bashrc
   fi
 
+  if [[ -f /etc/bashrc ]] ; then
+    source /etc/bashrc
+  fi
+
   if [[ -f $HOME/.bashrc ]] ; then
     source $HOME/.bashrc
   fi
 
-  if [[ $BASENAME != $popo_target ]] ; then
-    export PS1="$YELLOW(popo $popo_target/$BASENAME) $NORMAL$PS1"
+  if [[ `uname` == 'Darwin' && -f $HOME/.bash_profile ]] ; then
+    source $HOME/.bash_profile
+  fi
+
+  if [[ $path_basename != $popo_target ]] ; then
+    popo_ps1="\[\033[1;33m\][popo $popo_target/$path_basename] \[\033[0m\]"
   else
-    export PS1="$YELLOW(popo $popo_target) $NORMAL$PS1"
+    popo_ps1="\[\033[0;33m\][popo $popo_target] \[\033[0m\]"
   fi
+
+  PS1="$popo_ps1 $PS1"
 fi
 
+# lets unset PROMPT_COMMAND. We use our own PS1!
+unset PROMPT_COMMAND
+
+# source popo ps1 functions
+source $scriptdir/ps1_functions
+
 rvm reload
 
 if [[ -z "$PS1" ]] ; then
 	rvm $*
 else
-    echo "Welcome to the popoed environment, where you can play with your very own popo."
-    echo ""
-    echo "Popo has set these variables for you lazy ass people".
-    echo "  popo_path:   $popo_path"
-    echo "  popo_target: $popo_target"
-    echo ""
-    echo "Remember to keep things clean and civil around here."
-    echo "To go back to your normal world, just hit exit."
-    echo ""
-    echo "But wait, you ask, who needs popo? Baahh, popo's for n00bs!"
-    echo ""
+  echo "Welcome to the popoed environment, where you can play with your very own popo."
+   echo ""
+   echo "  popo_path:   $popo_path"
+   echo "  popo_target: $popo_target"
+   echo ""
+   echo "Remember to keep things clean and civil around here."
+   echo "To go back to your normal world, just hit exit."
+   echo ""
+   echo "But wait, you ask, who needs popo? Baahh, popo's for n00bs!"
+   echo ""
 fi
 
 # source a custom rc file
-if [[ -s $CUSTOMRC ]] ; then
-  source $CUSTOMRC
+if [[ -s $customrc ]] ; then
+  source $customrc
 fi

data/script/ps1_functions

@@ -0,0 +1,162 @@
+#!/usr/bin/env bash
+
+#
+# Source this file in your ~/.bash_profile or interactive startup file.
+# This is done like so:
+#
+#    [[ -s "$HOME/.rvm/contrib/ps1_functions" ]] &&
+#      source "$HOME/.rvm/contrib/ps1_functions"
+#
+# Then in order to set your prompt you simply do the following for example
+#
+# Examples:
+#
+#   ps1_set --prompt ∫
+#
+#   or
+#
+#   ps1_set --prompt ∴
+#
+# This will yield a prompt like the following, for example,
+#
+# 00:00:50 wayneeseguin@GeniusAir:~/projects/db0/rvm/rvm  (git:master:156d0b4)  ruby-1.8.7-p334@rvm
+# ∴
+#
+ps1_titlebar()
+{
+  case $TERM in
+    (xterm*|rxvt*)
+      printf "%s" "\033]0;\\u@\\h: \W\\007"
+      ;;
+  esac
+}
+
+ps1_identity()
+{
+  if (( $UID == 0 )) ; then
+    printf "%s" "\[\033[36m\]\\u\[\033[0m\]@\[\033[36m\]\\h\[\033[35m\]:\w\[\033[0m\] "
+  else
+    printf "%s" "\[\033[32m\]\\u\[\033[0m\]@\[\033[36m\]\\h\[\033[35m\]:\w\[\033[0m\] "
+  fi
+}
+
+ps1_git()
+{
+  local branch="" sha1="" line="" attr="" color=0
+
+  shopt -s extglob # Important, for our nice matchers :)
+
+  command -v git >/dev/null 2>&1 || {
+    printf " \033[1;37m\033[41m[git not found]\033[m "
+    return 0
+  }
+
+  branch=$(git symbolic-ref -q HEAD 2>/dev/null) || return 0 # Not in git repo.
+  branch=${branch##refs/heads/}
+
+  # Now we display the branch.
+  sha1=$(git rev-parse --short --quiet HEAD)
+
+  case "${branch:-"(no branch)"}" in
+   production|prod) attr="1;37m\033[" ; color=41 ;; # red
+   master|deploy)   color=31                     ;; # red
+   stage|staging)   color=33                     ;; # yellow
+   dev|develop|development) color=34             ;; # blue
+   next)            color=36                     ;; # gray
+   *)
+     if [[ -n "${branch}" ]] ; then # Feature Branch :)
+       color=32 # green
+     else
+       color=0 # reset
+     fi
+     ;;
+  esac
+
+  [[ $color -gt 0 ]] &&
+    printf "\[\033[${attr}${color}m\](git:${branch}$(ps1_git_status):$sha1)\[\033[0m\] "
+}
+
+ps1_git_status()
+{
+  local git_status="$(git status 2>/dev/null)"
+
+  [[ "${git_status}" = *deleted* ]]                    && printf "%s" "-"
+  [[ "${git_status}" = *Untracked[[:space:]]files:* ]] && printf "%s" "+"
+  [[ "${git_status}" = *modified:* ]]                  && printf "%s" "*"
+}
+
+ps1_rvm()
+{
+  command -v rvm-prompt >/dev/null 2>&1 && printf "%s" " $(rvm-prompt) "
+}
+
+ps1_update()
+{
+  local prompt_char='$' separator="\n" notime=0
+
+  (( $UID == 0 )) && prompt_char='#'
+
+  while [[ $# -gt 0 ]] ; do
+    local token="$1" ; shift
+
+    case "$token" in
+      --trace)
+        export PS4="+ \${BASH_SOURCE##\${rvm_path:-}} : \${FUNCNAME[0]:+\${FUNCNAME[0]}()}  \${LINENO} > "
+        set -o xtrace
+        ;;
+      --prompt)
+        prompt_char="$1"
+        shift
+        ;;
+      --noseparator)
+        separator=""
+        ;;
+      --separator)
+        separator="$1"
+        shift
+        ;;
+      --notime)
+        notime=1
+        ;;
+      *)
+        true # Ignore everything else.
+        ;;
+    esac
+  done
+
+  if (( notime > 0 )) ; then
+    PS1="$popo_ps1$(ps1_titlebar)$(ps1_identity)$(ps1_git)$(ps1_rvm)${separator}${prompt_char} "
+  else
+    PS1="$popo_ps1$(ps1_titlebar)\D{%H:%M:%S} $(ps1_identity)$(ps1_git)$(ps1_rvm)${separator}${prompt_char} "
+  fi
+}
+
+ps2_set()
+{
+  PS2="  \[\033[0;40m\]\[\033[0;33m\]> \[\033[1;37m\]\[\033[1m\]"
+}
+
+ps4_set()
+{
+  export PS4="+ \${BASH_SOURCE##\${rvm_path:-}} : \${FUNCNAME[0]:+\${FUNCNAME[0]}()}  \${LINENO} > "
+}
+
+# WARNING:  This clobbers your PROMPT_COMMAND so if you need to write your own, call
+#           ps1_update within your PROMPT_COMMAND with the same arguments you pass
+#           to ps1_set
+#
+# The PROMPT_COMMAND is used to help the prompt work if the separator is not a new line.
+# In the event that the separtor is not a new line, the prompt line may become distored if
+# you add or delete a certian number of characters, making the string wider than the
+# $COLUMNS + len(your_input_line).
+# This orginally was done with callbacks within the PS1 to add in things like the git
+# commit, but this results in the PS1 being of an unknown width which results in the prompt
+# being distored if you add or remove a certain number of characters. To work around this
+# it now uses the PROMPT_COMMAND callback to re-set the PS1 with a known width of chracters
+# each time a new command is entered. see PROMPT_COMMAND for more details.
+#
+ps1_set()
+{
+  PROMPT_COMMAND="ps1_update $@"
+}
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popo
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000Z
+date: 2012-05-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &17259580 !ruby/object:Gem::Requirement
+  requirement: &70203560628300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17259580
+  version_requirements: *70203560628300
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &17259080 !ruby/object:Gem::Requirement
+  requirement: &70203560627740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17259080
+  version_requirements: *70203560627740
 - !ruby/object:Gem::Dependency
   name: cableguy
-  requirement: &17258660 !ruby/object:Gem::Requirement
+  requirement: &70203560627200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17258660
+  version_requirements: *70203560627200
 description: Ruby and rails repo tool
 email:
 - poymode@gmail.com
@@ -56,7 +56,7 @@ files:
 - .gitignore
 - CHANGELOG
 - Gemfile
-- README
+- README.md
 - Rakefile
 - bin/envy
 - bin/popo
@@ -69,6 +69,7 @@ files:
 - lib/popo/error.rb
 - lib/popo/git_utils.rb
 - lib/popo/init.rb
+- lib/popo/opt_parse.rb
 - lib/popo/runner.rb
 - lib/popo/rvm.rb
 - lib/popo/sync.rb
@@ -81,6 +82,7 @@ files:
 - script/envy.template
 - script/envyrc
 - script/poporc
+- script/ps1_functions
 homepage: https://github.com/poymode/popo
 licenses: []
 post_install_message: 
@@ -101,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Popo ruby and rails repo tool

data/README

@@ -1,11 +0,0 @@
-Popo Repo Tool
-
-Deploy your rails app
-
-Features:
-- Customizable manifest
-- Separate shell, rvm. No conflict worries
-- Easy on resources (RAM and CPU)
-- Integrated with cableguy to ease Rails configuration file deployment
-- Is best used when deploying and working with multiple Rails applications
-