subcontractor 0.7.0 → 0.8.0

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+/vendor/bundle

data/README.md

@@ -18,7 +18,7 @@ gem install subcontractor
 or with bundler
 
 ```ruby
-gem 'subcontractor', '0.7.0'
+gem 'subcontractor', '0.8.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,7 +26,8 @@ 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
+    -b, --rbenv RBENV                run in a specific RBENV (use `.` for local rbenv)
+    -c, --choose-env ENV             run in either a specified RBENV or RVM, whichever is present
     -d, --chdir PATH                 chdir to PATH before starting process
     -s, --signal SIGNAL              signal to send to process to kill it, default TERM
 ```
@@ -40,25 +41,32 @@ another_app: subcontract --rvm ruby-1.8.7-p249@another_app --chdir ../another_ap
 
 Here another_app will be launch from the sibling directory another_app and will use the rvm ruby-1.8.7-p249@another_app. As you can see, the command that we wish to use to launch our application follows the double dashes (--).
 
-You can also allow another_app to use its existing .rvmrc file
+You can also allow another_app to use its existing .rvmrc file. This will load the .rvmrc file out of the current folder once it has been changed to the folder specified by --chdir
 
 ```
 rails: rails s
-another_app: subcontract --rvm "--with-rubies rvmrc" --chdir ../another_app --signal INT -- rails s -p 3001
+another_app: subcontract --rvm . --chdir ../another_app --signal INT -- rails s -p 3001
 ```
 
-Newer versions of RVM use a slightly different syntax for referencing the app .rvmrc file.
+You can use specific rbenv version.
 
 ```
-new_rvm_app: push: subcontract --rvm --with-rubies default-with-rvmrc do --chdir ../push --signal INT -- bundle exec rails server
+rbenv_app: bundle exec subcontract --rbenv 'ree-1.8.7-2012.02' --chdir ~/rbenv_app -- bundle exec rails server -p 3001
 ```
 
-You can use specific rbenv version.
+Or you can use whatever the local rbenv settings are for a project. This will load whatever `rbenv local` returns out of the current folder once it has been changed to the folder specified by --chdir
 
 ```
-rbenv_app: bundle exec subcontract --rbenv 'ree-1.8.7-2012.02' --chdir ~/rbenv_app -- bundle exec rails server -p 3001
+rbenv_app: bundle exec subcontract --rbenv . --chdir ~/rbenv_app -- bundle exec rails server -p 3001
 ```
 
+If you have team members using both rvm and rbenv on a project then use --choose-env to use whatever version manager is present on the system. If both are present rbenv is chosen.
+
+```
+mixed_env_manager_app: bundle exec subcontract --choose-env . --chdir ~/mixed_env_manager_app -- bundle exec rails server -p 3001
+```
+
+
 ### Contributions
 * Fork the project
 * Make your change
@@ -71,3 +79,4 @@ rbenv_app: bundle exec subcontract --rbenv 'ree-1.8.7-2012.02' --chdir ~/rbenv_a
 * 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)
+* Michael Nussbaum [github](https://github.com/mnussbaum)

data/lib/subcontractor/cli.rb

@@ -1,11 +1,12 @@
-require 'optparse'
-require 'pty'
+require "optparse"
+require "pty"
+require "subcontractor/command"
 
 $stdout.sync = true
 
 module SafePty
   def self.spawn command, &block
-    if Object.const_defined?('Bundler')
+    if Object.const_defined?("Bundler")
       Bundler.with_clean_env do
         self.clear_more_env
         self.spawn_internal command, &block
@@ -29,16 +30,15 @@ module SafePty
   end
 
   def self.clear_more_env
-    ['GEM_HOME', 'GEM_PATH', 'RUBYOPT', 'RBENV_DIR'].each { |e| ENV.delete(e) }
+    ["GEM_HOME", "GEM_PATH", "RUBYOPT", "RBENV_DIR"].each { |e| ENV.delete(e) }
   end
 end
 
 module Subcontractor
   class CLI
-
     def run
       options = parse_options(ARGV)
-      command = build_command(ARGV.dup, options)
+      command = Subcontractor::Command.build(ARGV, options)
       Dir.chdir(options[:chdir]) if options[:chdir]
       signal = options[:signal] || "TERM"
       SafePty.spawn(command) do |stdin, stdout, pid|
@@ -74,26 +74,23 @@ module Subcontractor
       end.map(&:first).map(&:to_i)
     end
 
-    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
-
     def parse_options(argv)
       options = {}
       parser = OptionParser.new do |opt|
         opt.banner = "USAGE: subcontract [options] -- executable"
-        opt.on('-r', '--rvm RVM', 'run in a specific RVM') do |rvm|
+        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|
+        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|
+        opt.on("-c", "--choose-env ENV", "run in either specified RBENV or RVM, whichever is present") do |env|
+          options[:choose_env] = env
+        end
+        opt.on("-d", "--chdir PATH", "chdir to PATH before starting process") do |path|
           options[:chdir] = path
         end
-        opt.on('-s', '--signal SIGNAL', 'signal to send to process to kill it, default TERM') do |signal|
+        opt.on("-s", "--signal SIGNAL", "signal to send to process to kill it, default TERM") do |signal|
           options[:signal] = signal
         end
       end
@@ -101,6 +98,5 @@ module Subcontractor
       parser.parse! argv
       options
     end
-
   end
 end

data/lib/subcontractor/command.rb

@@ -0,0 +1,40 @@
+module Subcontractor
+  class Command
+    def self.build(parts, options)
+      new(parts.dup, options).build
+    end
+
+    def initialize(parts, options)
+      @parts = parts
+      @options = options
+    end
+
+    def build
+      if _use_command?(:rbenv)
+        @parts.unshift("#{_set_rbenv_version} rbenv exec")
+      elsif _use_command?(:rvm)
+        @parts.unshift("rvm #{_env_specifier(:rvm)} exec")
+      end
+
+      @parts.join(" ")
+    end
+
+    def _use_command?(command)
+      @options.has_key?(command) || _choose_env_and_command_present?(command)
+    end
+
+    def _choose_env_and_command_present?(command)
+      @options.has_key?(:choose_env) && system("which #{command} > /dev/null 2>&1")
+    end
+
+    def _set_rbenv_version
+      env_specifier = _env_specifier(:rbenv)
+      env_specifier = "`rbenv local`" if env_specifier == "."
+      "env RBENV_VERSION=#{env_specifier}"
+    end
+
+    def _env_specifier(command)
+      @options[command] || @options[:choose_env]
+    end
+  end
+end

data/lib/subcontractor/version.rb

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

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require "subcontractor"
+require "subcontractor/cli"
+
+RSpec.configure do |config|
+  config.color = true
+end

data/spec/subcontractor/cli_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+
+describe Subcontractor::CLI do
+  before(:each) do
+    Object.instance_eval{ remove_const(:ARGV) }
+  end
+
+  describe "#run" do
+    it "uses rvm with --rvm" do
+      ARGV = ["--rvm", ".", "test"]
+      SafePty.should_receive(:spawn).with("rvm . exec test")
+      Subcontractor::CLI.new.run
+    end
+
+    context "with --rbenv" do
+      it "specifies a rbenv" do
+        ARGV = ["--rbenv", "1.9.3", "test"]
+        SafePty.should_receive(:spawn).with("env RBENV_VERSION=1.9.3 rbenv exec test")
+        Subcontractor::CLI.new.run
+      end
+
+      it "uses 'rbenv local' if a '.' is given as the rbenv version" do
+        ARGV = ["--rbenv", ".", "test"]
+        SafePty.should_receive(:spawn).with("env RBENV_VERSION=`rbenv local` rbenv exec test")
+        Subcontractor::CLI.new.run
+      end
+    end
+
+    it "creates a valid command if no environment manager is specifed" do
+      ARGV = ["test"]
+      SafePty.should_receive(:spawn).with("test")
+      Subcontractor::CLI.new.run
+    end
+
+    context "with --choose-env" do
+      it "uses rbenv when rbenv is present" do
+        ARGV = ["--choose-env", "1.9.3", "test"]
+        SafePty.should_receive(:spawn).with("env RBENV_VERSION=1.9.3 rbenv exec test")
+        command = Subcontractor::Command.any_instance
+        command.should_receive(:system).with("which rbenv > /dev/null 2>&1").and_return(true)
+        Subcontractor::CLI.new.run
+      end
+
+      it "uses rvm when rvm is present and rbenv isn't" do
+        ARGV = ["--choose-env", ".", "test"]
+        SafePty.should_receive(:spawn).with("rvm . exec test")
+        command = Subcontractor::Command.any_instance
+        command.should_receive(:system).with("which rbenv > /dev/null 2>&1").and_return(false)
+        command.should_receive(:system).with("which rvm > /dev/null 2>&1").and_return(true)
+        Subcontractor::CLI.new.run
+      end
+    end
+  end
+end

data/subcontractor.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "subcontractor"
 
+  s.add_development_dependency("rspec")
+
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

metadata

@@ -1,34 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: subcontractor
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 0
-  version: 0.7.0
+version: !ruby/object:Gem::Version
+  version: 0.8.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Tony Pitluga
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-04 00:00:00 -08:00
-default_executable: 
-dependencies: []
-
+date: 2013-10-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: rvm aware process launcher for foreman
-email: 
+email:
 - tony.pitluga@gmail.com
-executables: 
+executables:
 - subcontract
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -45,41 +51,33 @@ files:
 - examples/webapp/config.ru
 - lib/subcontractor.rb
 - lib/subcontractor/cli.rb
+- lib/subcontractor/command.rb
 - lib/subcontractor/version.rb
+- spec/spec_helper.rb
+- spec/subcontractor/cli_spec.rb
 - subcontractor.gemspec
-has_rdoc: true
 homepage: https://github.com/pitluga/subcontractor
 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 
-      hash: 3
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: subcontractor
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: rvm aware process launcher for foreman
 test_files: []
-