subcontractor 0.6.1 → 0.7.0

data/README.md

@@ -18,7 +18,7 @@ gem install subcontractor
 or with bundler
 
 ```ruby
-gem 'subcontractor', '0.3.0'
+gem 'subcontractor', '0.7.0'
 ```
 
 The gem provides an executable called ```subcontract``` that you will use from your Procfile. You can see what it does by running ```subcontract --help```
@@ -26,6 +26,7 @@ The gem provides an executable called ```subcontract``` that you will use from y
 ```
 USAGE: subcontract [options] -- executable
     -r, --rvm RVM                    run in a specific RVM (use `.` for ruby from `PATH`)
+    -b, --rbenv RBENV                run in a specific RBENV
     -d, --chdir PATH                 chdir to PATH before starting process
     -s, --signal SIGNAL              signal to send to process to kill it, default TERM
 ```
@@ -52,6 +53,12 @@ Newer versions of RVM use a slightly different syntax for referencing the app .r
 new_rvm_app: push: subcontract --rvm --with-rubies default-with-rvmrc do --chdir ../push --signal INT -- bundle exec rails server
 ```
 
+You can use specific rbenv version.
+
+```
+rbenv_app: bundle exec subcontract --rbenv 'ree-1.8.7-2012.02' --chdir ~/rbenv_app -- bundle exec rails server -p 3001
+```
+
 ### Contributions
 * Fork the project
 * Make your change
@@ -63,3 +70,4 @@ new_rvm_app: push: subcontract --rvm --with-rubies default-with-rvmrc do --chdir
 * Drew Olson [github](http://github.com/drewolson) [blog](http://fingernailsinoatmeal.com/) [twitter](http://twitter.com/drewolson)
 * Paul Gross [github](http://github.com/pgr0ss) [blog](http://www.pgrs.net) [twitter](http://twitter.com/pgr0ss)
 * Rune Skjoldborg Madsen [github](https://github.com/runemadsen)
+* Masahiro Ihara [github](http://github.com/ihara2525) [twitter](http://twitter.com/ihara2525)

data/lib/subcontractor/cli.rb

@@ -7,6 +7,7 @@ module SafePty
   def self.spawn command, &block
     if Object.const_defined?('Bundler')
       Bundler.with_clean_env do
+        self.clear_more_env
         self.spawn_internal command, &block
       end
     else
@@ -26,6 +27,10 @@ module SafePty
 
     $?.exitstatus
   end
+
+  def self.clear_more_env
+    ['GEM_HOME', 'GEM_PATH', 'RUBYOPT', 'RBENV_DIR'].each { |e| ENV.delete(e) }
+  end
 end
 
 module Subcontractor
@@ -71,6 +76,7 @@ module Subcontractor
 
     def build_command(parts, options)
       parts.unshift("rvm #{options[:rvm]} exec") if options.has_key?(:rvm)
+      parts.unshift("env RBENV_VERSION=#{options[:rbenv]} rbenv exec") if options.has_key?(:rbenv)
       parts.join(' ')
     end
 
@@ -81,6 +87,9 @@ module Subcontractor
         opt.on('-r', '--rvm RVM', 'run in a specific RVM') do |rvm|
           options[:rvm] = rvm
         end
+        opt.on('-b', '--rbenv RBENV', 'run in a specific RBENV') do |rbenv|
+          options[:rbenv] = rbenv
+        end
         opt.on('-d', '--chdir PATH', 'chdir to PATH before starting process') do |path|
           options[:chdir] = path
         end

data/lib/subcontractor/version.rb

@@ -1,3 +1,3 @@
 module Subcontractor
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: subcontractor
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
+  hash: 3
+  prerelease: false
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Tony Pitluga
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-27 00:00:00 Z
+date: 2013-03-04 00:00:00 -08:00
+default_executable: 
 dependencies: []
 
 description: rvm aware process launcher for foreman
@@ -46,6 +47,7 @@ files:
 - lib/subcontractor/cli.rb
 - lib/subcontractor/version.rb
 - subcontractor.gemspec
+has_rdoc: true
 homepage: https://github.com/pitluga/subcontractor
 licenses: []
 
@@ -75,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: subcontractor
-rubygems_version: 1.8.24
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: rvm aware process launcher for foreman