popo 0.1.1 → 0.1.4

data/bin/envy

@@ -7,7 +7,7 @@ ENV_PATH = `which env`.strip
 POPO_PATH = ENV['popo_path'] if ENV.include?('popo_path')
 POPO_TARGET = ENV['popo_target'] if ENV.include?('popo_target')
 POPO_WORK_PATH = '.manifest'
-ENVYRC = File.join(POPO_PATH, POPO_WORK_PATH, 'script/envyrc')
+ENVYRC = File.expand_path(File.join(File.dirname(__FILE__), '../script/envyrc'))
 
 cmd = ARGV.join(' ')
 

data/lib/popo.rb

@@ -3,6 +3,7 @@ require 'palmade/cableguy'
 require 'optparse'
 require 'yaml'
 require 'fileutils'
+require File.join(File.dirname(__FILE__), 'popo/version')
 
 module Popo
   POPO_LIB_ROOT = File.join(File.dirname(__FILE__), 'popo')

data/lib/popo/database.rb

@@ -19,5 +19,9 @@ module Popo
     def get_children(key, group = 'manifest')
       @cabler.db.get_children(key, group)
     end
+
+    def has_key?(key, group = 'manifest')
+      @cabler.db.has_key?(key, group)
+    end
   end
 end

data/lib/popo/git_utils.rb

@@ -27,7 +27,6 @@ module Popo
         end
       end
 
-      git_stash(repo)
       git_checkout(repo, branch)
       git_reset(repo, branch)
     end

data/lib/popo/initializer.rb

@@ -2,18 +2,14 @@ module Popo
   class Initializer
     include Constants
 
-    def self.boot(config, options)
-      self.new(config, options)
+    def self.boot(config, options, db)
+      self.new(config, options, db)
     end
 
-    def initialize(config, options)
-      @repos = {}
-
-      config['repos'].each do |k, v|
-        @repos[k] = v
-      end
-
+    def initialize(config, options, db)
       @options = options
+      @db = db
+      @manifest = config['manifests'][@options[:manifest]]
       @default_target = @options[:target] || 'development'
       @deploy_path = File.absolute_path(@options[:path])
       @location = @options[:location] || nil
@@ -28,16 +24,18 @@ module Popo
     def setup
       print_variables if @options[:verbose]
 
-      @repos.each do |k, v|
-        basename = File.basename(v['git'])
+      clone_path = File.join(@deploy_path, POPO_WORK_PATH)
+      GitUtils.git_clone(@manifest['git'], clone_path, @manifest['branch'])
 
-        if k == POPO_WORK_PATH.delete('.')
-          clone_path = File.join(@deploy_path, POPO_WORK_PATH)
-        else
-          clone_path = File.join(@deploy_path, basename)
-        end
+      @db.boot_database
+      @db.migrate_database
+      repos = @db.get_children("repos")
 
-        GitUtils.git_clone(v['git'], clone_path, v['branch'])
+      repos.each do |r|
+        git = @db.get("repos.#{r}.git")
+        branch = @db.get("repos.#{r}.branch")
+        clone_path = File.join(@deploy_path, r)
+        GitUtils.git_clone(git, clone_path, branch)
       end
 
       write_config

data/lib/popo/runner.rb

@@ -12,9 +12,16 @@ module Popo
 
     def initialize(args)
       @popo_path = ENV['popo_path'] || Dir.pwd
+      Object.const_set("POPO_PATH", @popo_path)
+
       @options = {}
       @cabler_options = {}
       @options[:verbose] = false
+      @options[:target] = 'development'
+
+      if Utils.has_popo_config?(@popo_path)
+        @options[:target] = POPO_CONFIG['target']
+      end
 
       optparse = OptionParser.new do |opts|
         opts.banner = "Popo tool."
@@ -32,6 +39,10 @@ module Popo
           @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
@@ -40,6 +51,11 @@ module Popo
           @options[:verbose] = true
         end
 
+        opts.on('-V', '--version', 'Version') do
+          puts Popo::VERSION
+          exit
+        end
+
         opts.on('-h', '--help', 'Display this screen') do
           puts opts
           exit
@@ -51,26 +67,42 @@ module Popo
       if args.length == 0
         Utils.say optparse.help
       else
-        @cabler_options = { :path  => File.join(@popo_path, POPO_WORK_PATH),
-                         :target   => ENV['CABLING_TARGET'],
-                         :location => ENV['CABLING_LOCATION'],
-                         :verbose  => @options[:verbose] }
+        Object.const_set("POPO_TARGET", @options[:target])
+        Object.const_set("POPO_LOCATION", @options[:location])
+        Object.const_set("POPO_USER", @options[:user])
 
-        run(args)
+        @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]
+                          }
+        self.run(args)
       end
     end
 
     def run(args)
       case args.shift
       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!"
+        end
+
         if !@options[:path].nil?
           if !File.exist?(File.join(@popo_path, @options[:path]))
-            Initializer.boot(get_config!, @options).setup
+            @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
         else
-          raise "Supply a path with the -p option!"
+          raise "path (-p) option needed!"
         end
       when 'sync'
         if Utils.in_popo?(@popo_path)
@@ -81,16 +113,9 @@ module Popo
         end
       when 'rvminstall'
         if Utils.in_popo?(@popo_path)
-          print "Install all rubies?(y/N): "
-
-          ok = $stdin.gets.chomp!
-          if ok == 'y'
-            db = Database.new(@popo_path, @cabler_options)
-            db.boot_database
-            RVM.new(@popo_path, args, db).setup
-          else
-            Utils.say "y/N only!"
-          end
+          db = Database.new(@popo_path, @cabler_options)
+          db.boot_database
+          RVM.new(@popo_path, args, db).setup
         end
       when 'migrate'
         if Utils.in_popo?(@popo_path)
@@ -110,18 +135,21 @@ module Popo
     end
 
     def bash!
-      Utils.require_relative_work_popo(Dir.pwd)
+      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']
+        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]
+        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)
+        exec(bashcmd)
+      else
+        raise "#{POPO_YML_FILE} not found or it may be wrong!"
+      end
     end
 
     def get_config!

data/lib/popo/rvm.rb

@@ -8,12 +8,15 @@ module Popo
 
       @rubies = @db.get("rvm.rubies").split(",")
       @default_ruby = @db.get("rvm.ruby.default")
-      @default_gems = @db.get("rvm.gems.default").split(",")
-      @gem_source = @db.get("rvm.gems.source")
+      @default_gems = @db.get_children("rvm.gems.default")
+
+      if @db.has_key?("rvm.gems.source")
+        @default_gem_source = @db.get("rvm.gems.source")
+      end
     end
 
     def setup
-      Utils.say "Rubies to be installed #{@rubies}...\n\n"
+      Utils.say "Rubies to be installed #{@rubies}...\n"
 
       @rubies.each do |r|
         patch = File.join(@app_root, 'rvm', "#{r}.patch")
@@ -26,6 +29,7 @@ module Popo
         end
 
         system(cmd)
+        install_default_gems(r)
       end
 
       Utils.say_with_time "Setting #{@default_ruby} as default ruby..." do
@@ -33,27 +37,34 @@ module Popo
       end
 
       Utils.say(POST_INSTALL_NOTE)
+    end
 
-#      Utils.say_with_time "Reloading rvm..." do
-#        `#{@rvm_bin} reload`
-#      end
+    def install_default_gems(ruby_version)
+      gem_source = ''
+      gem_bin = File.join(@app_root, 'rvm', 'bin', "gem-#{ruby_version}")
+
+      @default_gems.each do |g|
+        if @db.has_key?("rvm.gems.default.#{g}.source")
+          gem_source = @db.get("rvm.gems.default.#{g}.source")
+        end
 
-#      @default_gems.each do |g|
-#        Utils.say_with_time "Installing gem #{g}" do
-#          `gem install #{g} --source #{@gem_source}`
-#        end
-#      end
+        if !gem_source.empty?
+         gem_cmd = "#{gem_bin} install #{g} --source #{gem_source} --no-ri --no-rdoc"
+        elsif !@default_gem_source.empty?
+         gem_cmd = "#{gem_bin} install #{g} --source #{@default_gem_source} --no-ri --no-rdoc"
+        else
+         gem_cmd = "#{gem_bin} install #{g} --no-ri --no-rdoc"
+        end
+
+        system(gem_cmd)
+      end
     end
   end
 
 POST_INSTALL_NOTE = <<NOTE
-You're almost done!\n\n
+You're almost done!\n
 Do the following inside popo:\n
 1. rvm reload\n
-2. gem install cableguy popo dbget_client --source http://gems.caresharing.eu --no-ri --no-rdoc\n\n
-OPTIONAL: (If you use another ruby version). In this example, ree.\n
-1. rvm use ree-1.8.7-2011.03\n
-2. gem install cableguy popo dbget_client --source http://gems.caresharing.eu --no-ri --no-rdoc\n
 NOTE
 
 end

data/lib/popo/sync.rb

@@ -1,5 +1,7 @@
 module Popo
   class Sync
+    include Constants
+
     def initialize(app_root, args, db)
       @db = db
       @current_dir = File.basename(Dir.pwd)
@@ -27,7 +29,7 @@ module Popo
 
       if @repos.empty?
         if @cwd.eql? @app_root
-          popo_folders = @db.get("popo_folders").split(',')
+          popo_folders = @db.get("sync.directories").split(',')
           popo_folders.each { |p| gather_many(p) }
         else
           repo = File.basename(@cwd)
@@ -54,6 +56,7 @@ module Popo
       if !File.exists?(@info[:path])
         GitUtils.git_clone(@info[:host], @info[:path], @info[:branch])
       else
+        GitUtils.git_stash(@info[:path]) if POPO_CONFIG['target'] == 'development'
         GitUtils.git_update(@info[:path], @info[:branch])
       end
     end

data/lib/popo/utils.rb

@@ -24,7 +24,7 @@ module Popo
       true
     end
 
-    def self.require_relative_work_popo(root_path)
+    def self.has_popo_config?(root_path)
       popo_work_path = File.expand_path(File.join(root_path, POPO_WORK_PATH))
 
       popo_yml = File.expand_path(File.join(popo_work_path, POPO_YML_FILE))
@@ -37,8 +37,11 @@ module Popo
         else
           raise "#{POPO_WORK_PATH}/#{POPO_YML_FILE} seems to be wrong."
         end
+
+        true
       else
-        raise "#{POPO_YML_FILE} not found."
+        false
+#        raise "#{POPO_YML_FILE} not found."
       end
     end
   end

data/lib/popo/version.rb

@@ -0,0 +1,3 @@
+module Popo
+  VERSION = "0.1.4"
+end

data/popo.gemspec

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-VERSION = "0.1.1"
+require 'popo/version'
 
 Gem::Specification.new do |s|
   s.name        = "popo"
-  s.version     = VERSION
+  s.version     = Popo::VERSION
   s.authors     = ["Jan Mendoza"]
   s.email       = ["poymode@gmail.com"]
   s.homepage    = ""

data/script/envyrc

@@ -4,11 +4,9 @@
 unset $(env | awk -F= '/^rvm_/{print $1" "}')
 export rvm_reload_flag=1
 export rvm_prefix=$popo_path
-
-
+export rvm_path=$popo_path/rvm
 # Now let's load rvm inside popo
 source $rvm_prefix/rvm/scripts/rvm
-
 # Load default rvm
 rvm default 1>/dev/null 2>&1
 unset PALMADE_GEMS_DIR
@@ -16,30 +14,3 @@ export PATH="$popo_path/rvm/bin:$popo_path/tools:$PATH"
 export CABLING_PATH=$popo_path/.popo/cabling.yml
 export CABLING_TARGET=$popo_target
 
-# this section is for backup
-#unset PALMADE_GEMS_DIR
-#unset rvm_loaded_flag
-#rvm_loaded_flag=1
-#export PATH="$popo_path/rvm/bin:$popo_path/tools:$PATH"
-#export rvm_prefix=$popo_path
-#export rvm_path=$popo_path/rvm
-#export rvm_scripts_path=$rvm_path/scripts
-#export rvm_archives_path=$rvm_path/archives
-#export rvm_src_path=$rvm_path/src
-#export rvm_log_path=$rvm_path/log
-#export rvm_bin_path=$rvm_path/bin
-#export rvm_gems_path=$rvm_path/gems
-#export rvm_hooks_path=$rvm_path/hooks
-#export rvm_tmp_path=$rvm_path/tmp
-#export rvm_gemsets_path=$rvm_path/gemsets
-#export rvm_bin_path=$rvm_path/bin
-#export rvm_patchsets_path=$rvm_path/patchsets
-#export rvm_patches_path=$rvm_path/patches
-#export rvm_gems_cache_path=$rvm_path/gems/cache
-#export rvm_config_path=$rvm_path/config
-#export rvm_rubies_path=$rvm_path/rubies
-#export rvm_gems_path=$rvm_path/gems
-#export rvm_repo_path=$rvm_path/repos
-#unset rvm_loaded_flag
-#source $rvm_scripts_path/rvm
-#rvm default 1>/dev/null 2>&1

metadata

@@ -1,72 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: popo
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.1.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jan Mendoza
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-01 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-10 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sequel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &22157620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *22157620
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &22157000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cableguy
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *22157000
+- !ruby/object:Gem::Dependency
+  name: cableguy
+  requirement: &22156360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *22156360
 description: Ruby and rails repo tool
-email: 
+email:
 - poymode@gmail.com
-executables: 
+executables:
 - envy
 - popo
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README
@@ -85,6 +71,7 @@ files:
 - lib/popo/rvm.rb
 - lib/popo/sync.rb
 - lib/popo/utils.rb
+- lib/popo/version.rb
 - lib/templates/envy.yml
 - popo.gemspec
 - script/Rakefile
@@ -97,37 +84,28 @@ files:
 - targets/production.rb
 - targets/staging.rb
 - targets/test.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: popo
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Popo ruby and rails repo tool
 test_files: []
-