popo 0.1.9 → 0.1.10

data/CHANGELOG

@@ -0,0 +1,27 @@
+-- 0.1.10
+
+features
+  * popo bash is now popo shell. bash still works though. just changed
+    underlying code to be more generic
+
+  * popo will now check for $SHELL instead of which
+
+  * git and env are now called on boot before everything else. without it,
+    popo will not have the ability to work.
+  * added boring README and CHANGELOG.
+
+  * version bump 0.1.9 -> 0.1.10
+
+  * added sourcing of rvm ps1_functions for ps1_set option
+
+  * removed deprecated targets folder
+
+  * poporc is now read from popo source and not from a manifest
+
+  * a customrc is now loaded if it is found under .manifest/script
+
+bug fixes
+  * fixed sync not being be able to update when path basename is equal
+    to app basename.
+
+  * changed parameters in order of importance

data/README

@@ -1 +1,11 @@
-popo rails repo tool
+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
+

data/lib/popo.rb

@@ -12,7 +12,7 @@ module Popo
   autoload :Database, File.join(POPO_LIB_ROOT, 'database')
   autoload :Error, File.join(POPO_LIB_ROOT, 'error')
   autoload :GitUtils, File.join(POPO_LIB_ROOT, 'git_utils')
-  autoload :Initializer, File.join(POPO_LIB_ROOT, 'initializer')
+  autoload :Init, File.join(POPO_LIB_ROOT, 'init')
   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/{initializer.rb → init.rb}

@@ -1,12 +1,12 @@
 module Popo
-  class Initializer
+  class Init
     include Constants
 
-    def self.boot(config, options, db)
-      self.new(config, options, db)
+    def self.boot(db, config, options)
+      self.new(db, config, options)
     end
 
-    def initialize(config, options, db)
+    def initialize(db, config, options)
       @options = options
       @db = db
       @manifest = config['manifests'][@options[:manifest]]

data/lib/popo/runner.rb

@@ -3,18 +3,39 @@ module Popo
     include Constants
 
     def self.boot(args)
-      Popo::Constants.const_set("BASH_CMD", `which bash 2>/dev/null`.strip)
-      Popo::Constants.const_set("ZSH_CMD", `which zsh 2>/dev/null`.strip)
-      Popo::Constants.const_set("ENV_CMD", `which env 2>/dev/null`.strip)
-      Popo::Constants.const_set("GIT_CMD", `which git 2>/dev/null`.strip)
+      check_requirements
+
+      Popo::Constants.const_set("SHELL", ENV['SHELL'])
+
+      if SHELL.empty?
+        Error.say("SHELL is empty.")
+      end
 
       self.new(args)
     end
 
+    def self.check_requirements
+      bins = ['env', 'git' ]
+
+      bins.each do |b|
+        const_fn = "#{b.upcase}_CMD"
+
+        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!"
+        end
+      end
+    end
+
+    def self.get_bin_path(bin)
+      `which #{bin}`.strip
+    end
+
     def initialize(args)
       @db_opts           = {}
       @options           = {}
-      @app_root         = ENV['popo_path'] || Dir.pwd
+      @app_root          = ENV['popo_path'] || Dir.pwd
       @options[:verbose] = false
 
       if Utils.has_popo_config?(@app_root)
@@ -67,15 +88,14 @@ module Popo
       else
         @db_opts[:path]     = File.join(@app_root, POPO_WORK_PATH)
         @db_opts[:target]   = ENV['CABLING_TARGET'] || @options[:target] || DEFAULT_POPO_TARGET
-        @db_opts[:location] = ENV['CABLING_LOCATION'] || @options[:location]
         @db_opts[:verbose]  = @options[:verbose]
+        @db_opts[:location] = ENV['CABLING_LOCATION'] || @options[:location]
 
         # set manifest usable constants
         Object.const_set("POPO_PATH", @app_root)
+        Object.const_set("POPO_USER", @options[:user])
         Object.const_set("POPO_TARGET", @db_opts[:target])
         Object.const_set("POPO_LOCATION", @options[:location])
-        Object.const_set("POPO_USER", @options[:user])
-
 
         mandatory = [:path, :manifest]
         mandatory = mandatory.select { |p| @options[p].nil? }
@@ -89,7 +109,7 @@ module Popo
     end
 
     def run(args)
-      if POPO_COMMANDS.include?(args)
+      if POPO_COMMANDS.include?(args.first)
         Utils.in_popo?(@app_root)
       end
 
@@ -105,64 +125,71 @@ module Popo
 
         if !File.exist?(File.join(@app_root, @options[:path]))
           @db_opts[:path] = File.join(@app_root, @options[:path], POPO_WORK_PATH)
-          db = Database.new(@app_root, @db_opts)
+          db = get_database
 
-          Initializer.boot(config, @options, db).setup
+          Init.boot(db, config, @options).setup
         else
-          Error.say "Path already exists!"
+          Error.say "Path \'#{@options[:path]}\' already exists!"
         end
       when 'sync'
-        db = Database.new(@app_root, @db_opts)
-        db.boot_database
+        db = get_database
 
-        Sync.new(@app_root, args, db).sync
+        Sync.new(db, @app_root, args).sync
       when 'rvm'
-        db = Database.new(@app_root, @db_opts)
-        db.boot_database
+        db = get_database
 
-        RVM.new(@app_root, args, db).setup
+        RVM.new(db, @app_root, args).setup
       when 'migrate'
-        db = Database.new(@app_root, @db_opts)
-        db.boot_database
-        db.migrate_database
+        get_database.migrate_database
       when 'status'
         Utils.say `cat #{File.join(@app_root, POPO_WORK_PATH, POPO_YML_FILE)}`
-      when 'bash'
-        sh!(cmd)
-      when 'zsh'
-        sh!(cmd)
+      when 'shell', 'bash'
+        sh!
       when 'diff'
         GitUtils.branch_diff(Dir.pwd)
       else
-        Error.say "#{args} not a valid command!"
+        Error.say "#{cmd} is not a valid command!"
       end
     end
 
-    def sh!(shell)
+    protected
+
+    def sh!
       if Utils.has_popo_config?(@app_root)
         path     = POPO_CONFIG['path']
         target   = POPO_CONFIG['target']
         location = POPO_CONFIG['location']
+        shell    = File.basename(SHELL)
 
-        if shell == 'bash'
+        case shell
+        when 'bash'
           poporc  = File.expand_path('../../../script/poporc', __FILE__)
 
           shcmd   = "%s popo_target=%s popo_path=%s \
                     popo_location=%s %s --rcfile %s" \
-                    % [ENV_CMD, target, path, location, BASH_CMD, poporc]
-        else
+                    % [ENV_CMD, target, path, location, shell, poporc]
+        when 'zsh'
           zdotdir = File.expand_path('../../../script', __FILE__)
 
           shcmd   = "%s popo_target=%s popo_path=%s \
                     popo_location=%s ZDOTDIR=%s\
                     %s" \
-                    % [ENV_CMD, target, path, location, zdotdir, ZSH_CMD]
+                    % [ENV_CMD, target, path, location, zdotdir, shell]
+        else
+          Error.say "Shell #{SHELL} is not supported!"
         end
 
         exec(shcmd)
       end
     end
 
+    def get_database
+      database = Database.new(@app_root, @db_opts)
+      database.boot_database
+
+      database
+    end
+
     def get_config!
       if File.exist?(File.join(ENV['HOME'], ".#{DEFAULT_CONFIG_FILE}"))
         config_file_path = File.join(ENV['HOME'], ".#{DEFAULT_CONFIG_FILE}")

data/lib/popo/rvm.rb

@@ -1,6 +1,6 @@
 module Popo
   class RVM
-    def initialize(app_root, args, db)
+    def initialize(db, app_root, args)
       @db = db
       @app_root = app_root
       @rvm_bin = File.join(@app_root, 'rvm/bin/rvm')

data/lib/popo/sync.rb

@@ -2,7 +2,7 @@ module Popo
   class Sync
     include Constants
 
-    def initialize(popo_path, args, db)
+    def initialize(db, popo_path, args)
       @db = db
       @sync_list = @db.get(POPO_DIR_KEY).split(',')
       @popo_path = popo_path
@@ -29,9 +29,10 @@ module Popo
         if @cwd.eql? @popo_path
           @sync_list.each { |p| sync_all(p) }
         else
-          project = @cwd.split('/') - @popo_path.split('/')
+          key = @cwd.split('/')
+          key.shift(@popo_path.split('/').count)
 
-          sync_all(convert_to_key(project))
+          sync_all(convert_to_key(key))
         end
       end
     end
@@ -74,7 +75,6 @@ module Popo
       end
     end
 
-
     def get_values(key)
       POPO_KEY_VALUES.each do |v|
         @info[v] = @db.get("#{key}.#{v}")

data/lib/popo/utils.rb

@@ -21,6 +21,7 @@ module Popo
       if !ENV.include?('popo_path')
         Error.say "You must be inside popo!"
       end
+
       true
     end
 

data/lib/popo/version.rb

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

data/script/poporc

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 if [[ -z "$popo_path" ]] ; then
   echo "FAIL Please set the popo_path environment var"
   exit -1
@@ -14,26 +13,15 @@ YELLOW="\[\033[33m\]"
 NORMAL="\[\033[0;0m\]"
 BASEPATH=`which basename`
 BASENAME=`$BASEPATH $popo_path`
+CUSTOMRC=$popo_path/.manifest/script/customrc
 
-
-export rvm_reload_flag=1
 export rvm_prefix=$popo_path
-
-export CABLING_PATH=$popo_path/.manifest/cabling
-export CABLING_TARGET=$popo_target
-
-if [[ -n "$popo_location" ]] ; then
-  export CABLING_LOCATION=$popo_location
-fi
-
-export DBGET_PATH=$popo_path/.manifest
-
 unset $(env | awk -F= '/^rvm_/{print $1" "}')
-
 export rvm_path=$popo_path/rvm
 source $rvm_path/scripts/rvm
-
+source $rvm_path/contrib/ps1_functions
 rubies_path=$rvm_path/rubies
+
 # Load default rvm if rubies folder is not empty
 if [ -d $rubies_path ] && [ "$(ls -A $rubies_path)" ] ; then
   rvm default
@@ -42,30 +30,32 @@ 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 $HOME/.bashrc ]] ; then
-        source $HOME/.bashrc
-    fi
-
-    if [[ $BASENAME != $popo_target ]] ; then
-        export PS1="$YELLOW(popo $popo_target/$BASENAME) $NORMAL$PS1"
-    else
-        export PS1="$YELLOW(popo $popo_target) $NORMAL$PS1"
-    fi
+  if [[ -f /etc/bash.bashrc ]] ; then
+    source /etc/bash.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"
+  else
+    export PS1="$YELLOW(popo $popo_target) $NORMAL$PS1"
+  fi
 fi
 
+rvm reload
+
 if [[ -z "$PS1" ]] ; then
 	rvm $*
 else
-    echo "Welcome to the popoed bash environment, where you can play with your very own popo."
+    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 "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."
@@ -73,3 +63,8 @@ else
     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
+fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popo
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000Z
+date: 2012-03-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &20227340 !ruby/object:Gem::Requirement
+  requirement: &17259580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20227340
+  version_requirements: *17259580
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &20226280 !ruby/object:Gem::Requirement
+  requirement: &17259080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20226280
+  version_requirements: *17259080
 - !ruby/object:Gem::Dependency
   name: cableguy
-  requirement: &20225240 !ruby/object:Gem::Requirement
+  requirement: &17258660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20225240
+  version_requirements: *17258660
 description: Ruby and rails repo tool
 email:
 - poymode@gmail.com
@@ -54,6 +54,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG
 - Gemfile
 - README
 - Rakefile
@@ -67,7 +68,7 @@ files:
 - lib/popo/database.rb
 - lib/popo/error.rb
 - lib/popo/git_utils.rb
-- lib/popo/initializer.rb
+- lib/popo/init.rb
 - lib/popo/runner.rb
 - lib/popo/rvm.rb
 - lib/popo/sync.rb
@@ -80,12 +81,6 @@ files:
 - script/envy.template
 - script/envyrc
 - script/poporc
-- targets/beta.rb
-- targets/common.rb
-- targets/development.rb
-- targets/production.rb
-- targets/staging.rb
-- targets/test.rb
 homepage: https://github.com/poymode/popo
 licenses: []
 post_install_message: 

data/targets/beta.rb

@@ -1 +0,0 @@
-# BETA target

data/targets/common.rb

@@ -1 +0,0 @@
-# COMMON TARGET

data/targets/development.rb

@@ -1 +0,0 @@
-# DEVELOPMENT TARGET

data/targets/production.rb

@@ -1 +0,0 @@
-# PRODUCTION TARGET

data/targets/staging.rb

@@ -1 +0,0 @@
-# STAGING TARGET

data/targets/test.rb

@@ -1 +0,0 @@
-# TEST TARGET