popo 0.1.7 → 0.1.8

data/bin/popo

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-POPO_BASE_PATH = File.expand_path('../', File.dirname(__FILE__))
+POPO_BASE_PATH = File.expand_path('..', File.dirname(__FILE__))
 require File.join(POPO_BASE_PATH, 'lib/popo')
 Popo::Runner.boot(ARGV)
 

data/lib/popo.rb

@@ -8,12 +8,14 @@ require File.join(File.dirname(__FILE__), 'popo/version')
 module Popo
   POPO_LIB_ROOT = File.join(File.dirname(__FILE__), 'popo')
 
-  autoload :Constants, (File.join(POPO_LIB_ROOT, 'constants'))
-  autoload :Database, (File.join(POPO_LIB_ROOT, 'database'))
-  autoload :GitUtils, (File.join(POPO_LIB_ROOT, 'git_utils'))
-  autoload :Initializer, (File.join(POPO_LIB_ROOT, 'initializer'))
-  autoload :Runner, (File.join(POPO_LIB_ROOT, 'runner'))
-  autoload :RVM, (File.join(POPO_LIB_ROOT, 'rvm'))
-  autoload :Sync, (File.join(POPO_LIB_ROOT, 'sync'))
-  autoload :Utils, (File.join(POPO_LIB_ROOT, 'utils'))
+  autoload :Constants, File.join(POPO_LIB_ROOT, 'constants')
+  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 :Runner, File.join(POPO_LIB_ROOT, 'runner')
+  autoload :RVM, File.join(POPO_LIB_ROOT, 'rvm')
+  autoload :Service, File.join(POPO_LIB_ROOT, 'service')
+  autoload :Sync, File.join(POPO_LIB_ROOT, 'sync')
+  autoload :Utils, File.join(POPO_LIB_ROOT, 'utils')
 end

data/lib/popo/constants.rb

@@ -1,10 +1,13 @@
 module Popo
   module Constants
-    POPORC = 'script/poporc'
+    POPORC              = 'script/poporc'
     DEFAULT_CONFIG_FILE = "popo_config.yml"
-    POPO_WORK_PATH = ".manifest"
-    POPO_YML_FILE = "popo.yml"
-    POPO_CONFIG = {}
-    POPO_DIRECTORY_KEY = "sync.directories"
+    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']
   end
 end

data/lib/popo/error.rb

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

data/lib/popo/git_utils.rb

@@ -72,7 +72,7 @@ module Popo
           Utils.say "#{commit_id} \<#{author}\> #{commit_msg}"
         end
       else
-        raise "#{cwd} is not a git repo!"
+        Error.say "#{cwd} is not a git repo!"
       end
 
     end

data/lib/popo/runner.rb

@@ -12,15 +12,12 @@ module Popo
     end
 
     def initialize(args)
-      @popo_path = ENV['popo_path'] || Dir.pwd
-      Object.const_set("POPO_PATH", @popo_path)
-
-      @options = {}
-      @cabler_options = {}
+      @db_opts           = {}
+      @options           = {}
+      @app_root         = ENV['popo_path'] || Dir.pwd
       @options[:verbose] = false
-      @options[:target] = 'development'
 
-      if Utils.has_popo_config?(@popo_path)
+      if Utils.has_popo_config?(@app_root)
         @options[:target] = POPO_CONFIG['target']
       end
 
@@ -65,114 +62,108 @@ module Popo
 
       optparse.parse!
 
-      if args.length == 0
+      if args.length < 1
         Utils.say optparse.help
       else
-        Object.const_set("POPO_TARGET", @options[:target])
+        # set manifest usable constants
+        Object.const_set("POPO_PATH", @app_root)
+        Object.const_set("POPO_TARGET", DEFAULT_POPO_TARGET)
         Object.const_set("POPO_LOCATION", @options[:location])
         Object.const_set("POPO_USER", @options[:user])
 
-        @cabler_options = { :path  => File.join(@popo_path, POPO_WORK_PATH),
-                            :target   => ENV['CABLING_TARGET'] || @options[:target] || 'development',
-                            :location => ENV['CABLING_LOCATION'] || @options[:location],
-                            :verbose  => @options[:verbose]
-                          }
+        @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]
+
+        mandatory = [:path, :manifest]
+        mandatory = mandatory.select { |p| @options[p].nil? }
+
+        if args.first == 'init' and !mandatory.empty?
+          Error.say "Missing options: #{mandatory.join(', ')}"
+        end
+
         self.run(args)
       end
     end
 
     def run(args)
-      case args.shift
+      if POPO_COMMANDS.include?(args)
+        Utils.in_popo?(@app_root)
+      end
+
+      cmd = args.shift
+
+      case cmd
       when 'init'
         config = get_config!
 
-        if !@options[:manifest].nil?
-          if config['manifests'][@options[:manifest]].nil?
-            raise "manifest #{@options[:manifest]} does not exist in #{DEFAULT_CONFIG_FILE}!"
-          end
-        else
-          raise "manifest (-m) option needed!"
+        if config['manifests'][@options[:manifest]].nil?
+          Error.say "\'#{@options[:manifest]}\' does not exist in #{DEFAULT_CONFIG_FILE}!"
         end
 
-        if !@options[:path].nil?
-          if !File.exist?(File.join(@popo_path, @options[:path]))
-            @cabler_options[:path] = File.join(@popo_path, @options[:path], POPO_WORK_PATH)
-            db = Database.new(@popo_path, @cabler_options)
-            Initializer.boot(config, @options, db).setup
-          else
-            raise "Path already exists!"
-          end
+        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)
+
+          Initializer.boot(config, @options, db).setup
         else
-          raise "path (-p) option needed!"
+          Error.say "Path already exists!"
         end
       when 'sync'
-        if Utils.in_popo?(@popo_path)
-          db = Database.new(@popo_path, @cabler_options)
-          db.boot_database
+        db = Database.new(@app_root, @db_opts)
+        db.boot_database
 
-          Sync.new(@popo_path, args, db).gather
-        end
-      when 'rvminstall'
-        if Utils.in_popo?(@popo_path)
-          db = Database.new(@popo_path, @cabler_options)
-          db.boot_database
-          RVM.new(@popo_path, args, db).setup
-        end
+        Sync.new(@app_root, args, db).sync
+      when 'rvm'
+        db = Database.new(@app_root, @db_opts)
+        db.boot_database
+
+        RVM.new(@app_root, args, db).setup
       when 'migrate'
-        if Utils.in_popo?(@popo_path)
-          db = Database.new(@popo_path, @cabler_options)
-          db.boot_database
-          db.migrate_database
-        end
+        db = Database.new(@app_root, @db_opts)
+        db.boot_database
+        db.migrate_database
       when 'status'
-        Utils.say `cat #{File.join(@popo_path, POPO_WORK_PATH, POPO_YML_FILE)}`
-      when 'upload'
-        puts "Pushing!"
+        Utils.say `cat #{File.join(@app_root, POPO_WORK_PATH, POPO_YML_FILE)}`
       when 'bash'
-        bash!
+        sh!(cmd)
       when 'zsh'
-        zsh!
+        sh!(cmd)
       when 'diff'
         GitUtils.branch_diff(Dir.pwd)
-      else
-        puts "I don't know what to do."
-      end
-    end
+      when 'stop' || 'start' || 'restart'
+        db = Database.new(@app_root, @db_opts)
+        db.boot_database
 
-    def bash!
-      if Utils.has_popo_config?(Dir.pwd)
-
-        poporc_path = File.join(Dir.pwd, POPO_WORK_PATH, POPORC)
-        target = POPO_CONFIG['target']
-        path = POPO_CONFIG['path']
-        location = POPO_CONFIG['location']
-
-        bashcmd = "%s popo_target=%s popo_path=%s \
-                  popo_location=%s %s --rcfile %s" \
-                  % [ENV_CMD, target, path, location, BASH_CMD, poporc_path]
-
-        exec(bashcmd)
+        Service.new(@app_root, cmd, db).run
       else
-        raise "#{POPO_YML_FILE} not found or it may be wrong!"
+        Error.say "#{args} not a valid command!"
       end
     end
 
-    def zsh!
-      if Utils.has_popo_config?(Dir.pwd)
-
-        zdotdir  = File.join(Dir.pwd, POPO_WORK_PATH, 'script')
-        target   = POPO_CONFIG['target']
+    def sh!(shell)
+      if Utils.has_popo_config?(@app_root)
         path     = POPO_CONFIG['path']
+        target   = POPO_CONFIG['target']
         location = POPO_CONFIG['location']
 
-        zshcmd = "%s popo_target=%s popo_path=%s \
-                popo_location=%s ZDOTDIR=%s\
-                %s" \
-                % [ENV_CMD, target, path, location, zdotdir, ZSH_CMD]
+        if shell == 'bash'
+          poporc  = File.expand_path('../../../script/poporc', __FILE__)
 
-                exec(zshcmd)
-      else
-        raise "#{POPO_YML_FILE} not found or it may be wrong!"
+          shcmd   = "%s popo_target=%s popo_path=%s \
+                    popo_location=%s %s --rcfile %s" \
+                    % [ENV_CMD, target, path, location, BASH_CMD, poporc]
+        else
+          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]
+        end
+
+        exec(shcmd)
       end
     end
 
@@ -182,7 +173,7 @@ module Popo
       elsif File.exist?(File.join('/etc', DEFAULT_CONFIG_FILE))
         config_file_path = "/etc/#{DEFAULT_CONFIG_FILE}"
       else
-        raise "No popo_config.yml found in #{ENV['HOME']} or /etc"
+        Error.say "No popo_config.yml found in #{ENV['HOME']} or /etc"
       end
 
       config_hash = YAML.load_file(config_file_path)

data/lib/popo/sync.rb

@@ -2,73 +2,91 @@ module Popo
   class Sync
     include Constants
 
-    def initialize(app_root, args, db)
+    def initialize(popo_path, args, db)
       @db = db
-      @current_dir = File.basename(Dir.pwd)
-      @app_root = app_root
+      @sync_list = @db.get(POPO_DIR_KEY).split(',')
+      @popo_path = popo_path
       @cwd = Dir.pwd
-      @repos = args
+      @projects = args
       @info = {}
     end
 
-    def gather
-      trap("INT") { exit -1 }
+    def sync
+      @projects.each do |project|
+        if project =~ /\//
+          @info['key'] = convert_to_key(project)
+          @info['path'] = File.join(@popo_path, project)
 
-      if !@repos.empty?
-        @repos.each do |repo|
-          if repo =~ /\//
-            r = repo.split('/')
-            @info[:parent], @info[:name] = r
-            @info[:key] = [@info[:parent], @info[:name]].join('.')
-            @info[:path] = File.join(@app_root, @info[:parent], @info[:name])
+          get_values(@info['key'])
 
-            get_repo_values(@info[:key])
-
-            clone_or_update
-          else
-            gather_many(repo)
-          end
+          get_project
+        else
+          sync_all(project)
         end
-      else
-        if @cwd == @app_root
-          popo_folders = @db.get(POPO_DIRECTORY_KEY).split(',')
-          popo_folders.each { |p| gather_many(p) }
+      end
+
+      if @projects.empty?
+        if @cwd.eql? @popo_path
+          @sync_list.each { |p| sync_all(p) }
         else
-          repo = File.basename(@cwd)
-          gather_many(repo)
+          project = @cwd.split('/') - @popo_path.split('/')
+
+          sync_all(convert_to_key(project))
         end
       end
     end
 
-    def gather_many(repo)
-      children = @db.get_children(repo)
+    def sync_all(project)
+      if @sync_list.include? project
+        children = @db.get_children(project)
 
-      if children.empty?
-        raise "No values for parent key \'#{repo}\'."
-      end
+        if children.empty?
+          Error.say "No values for parent key \'#{project}\'."
+        end
+
+        children.each do |c|
+          @info['key'] = [project, c].join('.')
 
-      children.each do |c|
-        @info[:key] = [repo, c].join('.')
-        get_repo_values(@info[:key])
-        @info[:path] = File.join(@app_root, repo,  c)
+          get_values(@info['key'])
 
-        clone_or_update
+          @info['path'] = File.join(@popo_path, project.gsub('.','/'), c)
+
+          get_project
+        end
+      else
+        get_values(project)
+
+        @info['path'] = File.join(@popo_path, project.gsub('.','/'))
+
+        get_project
       end
     end
 
-    def clone_or_update
-      if !File.exists?(@info[:path])
-        GitUtils.git_clone(@info[:host], @info[:path], @info[:branch])
+    def get_project
+      if !File.exists?(@info['path'])
+        GitUtils.git_clone(@info[''], @info['path'], @info['branch'])
       else
-        GitUtils.git_stash(@info[:path]) if POPO_CONFIG['target'] == 'development'
-        GitUtils.git_update(@info[:path], @info[:branch])
+        if POPO_CONFIG['target'] == DEFAULT_POPO_TARGET
+          GitUtils.git_stash(@info['path'])
+        end
+
+        GitUtils.git_update(@info['path'], @info['branch'])
       end
     end
 
 
-    def get_repo_values(key)
-      @info[:branch] = @db.get("#{key}.branch")
-      @info[:host] = @db.get("#{key}.repo")
+    def get_values(key)
+      POPO_KEY_VALUES.each do |v|
+        @info[v] = @db.get("#{key}.#{v}")
+      end
+    end
+
+    def convert_to_key(project)
+      if project.is_a? String
+        project.split('/').join('.')
+      else
+        project.join('.')
+      end
     end
   end
 end

data/lib/popo/utils.rb

@@ -19,15 +19,15 @@ module Popo
 
     def self.in_popo?(root_path)
       if !ENV.include?('popo_path')
-        raise "You must be inside popo!"
+        Error.say "You must be inside popo!"
       end
       true
     end
 
     def self.has_popo_config?(root_path)
-      popo_work_path = File.expand_path(File.join(root_path, POPO_WORK_PATH))
+      popo_work_path = File.join(root_path, POPO_WORK_PATH)
 
-      popo_yml = File.expand_path(File.join(popo_work_path, POPO_YML_FILE))
+      popo_yml = File.join(popo_work_path, POPO_YML_FILE)
 
       if File.exists?(popo_yml)
         popo_config = YAML.load_file(popo_yml)
@@ -35,14 +35,13 @@ module Popo
         if popo_config.is_a?(Hash)
           POPO_CONFIG.update(popo_config)
         else
-          raise "#{POPO_WORK_PATH}/#{POPO_YML_FILE} seems to be wrong."
+          Error.say "#{POPO_YML_FILE} seems to be wrong."
         end
-
-        true
       else
         false
-#        raise "#{POPO_YML_FILE} not found."
       end
+
+      true
     end
   end
 end

data/lib/popo/version.rb

@@ -1,3 +1,3 @@
 module Popo
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/popo.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |s|
   s.summary     = %q{Popo ruby and rails repo tool}
   s.description = %q{Ruby and rails repo tool}
 
-  s.rubyforge_project = "popo"
   s.add_dependency "sequel"
   s.add_dependency "sqlite3"
   s.add_dependency "cableguy"

data/script/.zshrc

@@ -0,0 +1,54 @@
+if [[ -z "$popo_path" ]] ; then
+  echo "FAIL Please set the popo_path environment var"
+  exit -1
+fi
+
+if [[ -z "$popo_target" ]] ; then
+  echo "FAIL Please set the popo_target environment var"
+  exit -1
+fi
+
+BASEPATH=`which basename`
+BASENAME=`$BASEPATH $popo_path`
+
+
+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
+
+rubies_path=$rvm_path/rubies
+
+unset PALMADE_GEMS_DIR
+export PATH="$rvm_path/bin:$popo_path/tools:$PATH"
+
+source ~/.zshrc
+
+# Load default rvm if rubies folder is not empty
+if [ -d $rubies_path ] && [ "$(ls -A $rubies_path)" ] ; then
+  rvm default
+fi
+
+echo ""
+echo "Welcome to the popoed zsh 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 ""

data/script/poporc

@@ -1,20 +1,48 @@
 #!/usr/bin/env bash
 
 if [[ -z "$popo_path" ]] ; then
-    echo "FAIL Please set the popo_path environment var"
-    exit -1
+  echo "FAIL Please set the popo_path environment var"
+  exit -1
 fi
 
 if [[ -z "$popo_target" ]] ; then
-    echo "FAIL Please set the popo_target environment var"
-    exit -1
+  echo "FAIL Please set the popo_target environment var"
+  exit -1
 fi
 
-SHIT="\[\033[33m\]"
+YELLOW="\[\033[33m\]"
 NORMAL="\[\033[0;0m\]"
 BASEPATH=`which basename`
 BASENAME=`$BASEPATH $popo_path`
 
+
+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
+
+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
+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
@@ -25,29 +53,15 @@ if [[ $PS1 != "" ]] ; then
     fi
 
     if [[ $BASENAME != $popo_target ]] ; then
-        export PS1="$SHIT(popo $popo_target/$BASENAME) $NORMAL$PS1"
+        export PS1="$YELLOW(popo $popo_target/$BASENAME) $NORMAL$PS1"
     else
-        export PS1="$SHIT(popo $popo_target) $NORMAL$PS1"
+        export PS1="$YELLOW(popo $popo_target) $NORMAL$PS1"
     fi
 fi
 
-# Let's unload system installed rvm and move path prefix to popo
-unset $(env | awk -F= '/^rvm_/{print $1" "}')
-export rvm_reload_flag=1
-export rvm_prefix=$popo_path
-export CABLING_PATH=$popo_path/.popo/cabling.yml
-export CABLING_TARGET=$popo_target
-source $rvm_prefix/rvm/scripts/rvm
-
-# Load default rvm
-rvm default 1>/dev/null 2>&1
-unset PALMADE_GEMS_DIR
-export PATH="$popo_path/rvm/bin:$popo_path/tools:$PATH"
-export rvm_path=$popo_path/rvm
 if [[ -z "$PS1" ]] ; then
 	rvm $*
 else
-    echo ""
     echo "Welcome to the popoed bash environment, where you can play with your very own popo."
     echo ""
     echo "  popo path: $popo_path"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popo
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000Z
+date: 2012-02-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &17642360 !ruby/object:Gem::Requirement
+  requirement: &23544220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17642360
+  version_requirements: *23544220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &17641840 !ruby/object:Gem::Requirement
+  requirement: &23543520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17641840
+  version_requirements: *23543520
 - !ruby/object:Gem::Dependency
   name: cableguy
-  requirement: &17641380 !ruby/object:Gem::Requirement
+  requirement: &23542420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17641380
+  version_requirements: *23542420
 description: Ruby and rails repo tool
 email:
 - poymode@gmail.com
@@ -65,6 +65,7 @@ files:
 - lib/popo.rb
 - lib/popo/constants.rb
 - lib/popo/database.rb
+- lib/popo/error.rb
 - lib/popo/git_utils.rb
 - lib/popo/initializer.rb
 - lib/popo/runner.rb
@@ -74,6 +75,7 @@ files:
 - lib/popo/version.rb
 - lib/templates/envy.yml
 - popo.gemspec
+- script/.zshrc
 - script/Rakefile
 - script/envy.template
 - script/envyrc
@@ -103,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: popo
+rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3