popo 0.1.6 → 0.1.7

data/bin/envy

@@ -7,14 +7,14 @@ module Popo
     POPO_CONFIG_FILE = 'popo.yml'
     ENVYRC_FILE = 'envyrc'
     BASH_PATH = `which bash`.strip
-    ENVY_CMD = `which env`.strip
+    ENV_CMD = `which env`.strip
     ENVYRC = File.expand_path("../../script/#{ENVYRC_FILE}", __FILE__)
 
     def self.boot(args)
       options = {}
 
       optparse = OptionParser.new do |opts|
-        opts.on('-C', '--chdir DIRECTORY', 'Changed to a given directory') do |d|
+        opts.on('-d', '--chdir DIRECTORY', 'Changed to a given directory') do |d|
           options[:directory] = d
         end
       end
@@ -27,40 +27,35 @@ module Popo
     def initialize(args, options)
       @root_path = args.shift
       @options = options
-      @commands = []
-
-      # set commands
-      args.each do |a|
-        @commands << a
-      end
+      args = args.join(' ')
 
       config_file = File.join(@root_path, POPO_CONFIG_FILE)
 
       if File.exists?(config_file)
-        cfg = YAML.load_file(config_file)
-        @popo_path = cfg['path']
-        @popo_target = cfg['target']
+        config = YAML.load_file(config_file)
+        @popo_path = config['path']
+        @popo_target = config['target']
       else
         raise "#{config_file} doesn't exist!"
       end
 
       if !@options[:directory].nil?
         @directory = File.join(@popo_path, @options[:directory])
+        @cmd = ["cd #{@directory};", args].join(' ')
       else
-        @directory = ''
+        @cmd = args
       end
+
     end
 
     def run!
-      cmd = "#{ENVY_CMD} popo_path=#{@popo_path} \
-            popo_target=#{@popo_target} #{BASH_PATH} \
-            -c 'source #{ENVYRC}; #{@commands.join(' ')}'"
+      cmd = "#{ENV_CMD} "\
+            "popo_path=#{@popo_path} "\
+            "popo_target=#{@popo_target} "\
+            "#{BASH_PATH} -c "\
+            "'source #{ENVYRC}; #{@cmd}'"
 
-      if @directory.empty?
-        `#{cmd}`
-      else
-        Dir.chdir(@directory) { `#{cmd}` }
-      end
+      system(cmd)
     end
   end
 end

data/lib/popo/version.rb

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

data/popo.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Popo::VERSION
   s.authors     = ["Jan Mendoza"]
   s.email       = ["poymode@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/poymode/popo"
   s.summary     = %q{Popo ruby and rails repo tool}
   s.description = %q{Ruby and rails repo tool}
 

data/script/envy.template

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+ENVY_PATH = `which envy`.strip
+ROOT_PATH = File.expand_path('../..', __FILE__)
+
+# add additional escape for shell variables
+# so that it will not be parsed before passing to envy
+
+args = ARGV.join(' ')
+args.gsub!(/\$\w+/) { |match| "\\#{match}" }
+
+cmd = "#{ENVY_PATH} #{ROOT_PATH} #{args}"
+system(cmd)
+

data/script/envyrc

@@ -1,16 +1,15 @@
 #!/usr/bin/env bash
 
 # 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 PATH=$(echo $PATH | tr ':' '\n' | grep -v /\.rvm/ | paste -sd:)
 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
 export PATH="$popo_path/rvm/bin:$popo_path/tools:$PATH"
-export CABLING_PATH=$popo_path/.popo/cabling.yml
+export CABLING_PATH=$popo_path/.manifest/cabling
 export CABLING_TARGET=$popo_target
 export DBGET_PATH=$popo_path/.manifest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popo
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000Z
+date: 2012-02-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &6695400 !ruby/object:Gem::Requirement
+  requirement: &17642360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6695400
+  version_requirements: *17642360
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &6694780 !ruby/object:Gem::Requirement
+  requirement: &17641840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6694780
+  version_requirements: *17641840
 - !ruby/object:Gem::Dependency
   name: cableguy
-  requirement: &6692780 !ruby/object:Gem::Requirement
+  requirement: &17641380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6692780
+  version_requirements: *17641380
 description: Ruby and rails repo tool
 email:
 - poymode@gmail.com
@@ -75,6 +75,7 @@ files:
 - lib/templates/envy.yml
 - popo.gemspec
 - script/Rakefile
+- script/envy.template
 - script/envyrc
 - script/poporc
 - targets/beta.rb
@@ -83,7 +84,7 @@ files:
 - targets/production.rb
 - targets/staging.rb
 - targets/test.rb
-homepage: ''
+homepage: https://github.com/poymode/popo
 licenses: []
 post_install_message: 
 rdoc_options: []