eycap 0.6.5 → 0.6.6

data/History.txt

@@ -1,3 +1,6 @@
+== 0.6.6 / 2013-03-15
+  * adding rvm support to eycap #37 - thank you Michal Papis!
+
 == 0.6.5 / 2012-12-07
   * removed unnecessary if/then statement see closed pull request #36
   * Merged pull request #34 - include rails_env in Thinking Sphinx recipe

data/lib/eycap.rb

@@ -14,6 +14,7 @@ require 'eycap/recipes/monit'
 require 'eycap/recipes/nginx'
 require 'eycap/recipes/passenger'
 require 'eycap/recipes/resque'
+require 'eycap/recipes/rvm'
 require 'eycap/recipes/slice'
 require 'eycap/recipes/solr'
 require 'eycap/recipes/sphinx'

data/lib/eycap/recipes/bundler.rb

@@ -2,12 +2,26 @@ Capistrano::Configuration.instance(:must_exist).load do
 
 set :bundle_without, "test development" unless exists?(:bundle_without)
 
-  namespace :bundler do   
+  namespace :bundler do
     desc "Automatically installed your bundled gems if a Gemfile exists"
     task :bundle_gems, :roles => :app, :except => {:no_bundle => true} do
-      run "mkdir -p #{shared_path}/bundled_gems"
-      run "if [ -f #{release_path}/Gemfile ]; then cd #{release_path} && bundle install --without=#{bundle_without} --binstubs #{release_path}/bin --path #{shared_path}/bundled_gems; fi"
-      run "if [ ! -h #{release_path}/bin ]; then ln -nfs #{release_path}/bin #{release_path}/ey_bundler_binstubs; fi"
+      parallel(options) do |session|
+        rvm_role = fetch(:rvm_require_role,"rvm")
+        session.when "in?(:#{rvm_role})", <<-SHELL.split("\n").map(&:strip).join("; ")
+          if [ -f #{release_path}/Gemfile ]
+          then cd #{release_path} && bundle install --without=#{bundle_without} --system
+          fi
+        SHELL
+        session.else <<-SHELL.split("\n").map(&:strip).join("; ")
+          mkdir -p #{shared_path}/bundled_gems
+          if [ -f #{release_path}/Gemfile ]
+          then cd #{release_path} && bundle install --without=#{bundle_without} --binstubs #{release_path}/bin --path #{shared_path}/bundled_gems
+          fi
+          if [ ! -h #{release_path}/bin ]
+          then ln -nfs #{release_path}/bin #{release_path}/ey_bundler_binstubs
+          fi
+        SHELL
+      end
     end
     after "deploy:symlink_configs","bundler:bundle_gems"
   end

data/lib/eycap/recipes/rvm.rb

@@ -0,0 +1,19 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :rvm do
+    desc <<-DESC
+      Create rvm wrappers for background tasks,
+      in any script adding rvm support looks like:
+
+      rvm_path=/usr/local/rvm
+      if [[ -s "$rvm_path/environments/${application}" ]]
+      then PATH="$rvm_path/wrappers/${application}:$PATH"
+      fi
+    DESC
+    task :create_wrappers, :roles => fetch(:rvm_require_role,"rvm") do
+      run "rvm alias create #{application} #{rvm_ruby_string}"
+      run "rvm wrapper #{application} --no-links --all" # works with 'rvm 1.19+'
+    end
+
+    after "bundler:bundle_gems","rvm:create_wrappers"
+  end
+end

data/lib/eycap/version.rb

@@ -1,4 +1,4 @@
 module Eycap
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: eycap
 version: !ruby/object:Gem::Version
-  version: 0.6.5
   prerelease: 
+  version: 0.6.6
 platform: ruby
 authors:
 - Engine Yard
@@ -21,17 +21,17 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -41,13 +41,13 @@ dependencies:
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rake
+  type: :development
   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
@@ -57,13 +57,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
+  type: :development
   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
@@ -73,13 +73,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-capistrano
+  type: :development
   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
@@ -122,6 +122,7 @@ files:
 - lib/eycap/recipes/nginx.rb
 - lib/eycap/recipes/passenger.rb
 - lib/eycap/recipes/resque.rb
+- lib/eycap/recipes/rvm.rb
 - lib/eycap/recipes/slice.rb
 - lib/eycap/recipes/solr.rb
 - lib/eycap/recipes/sphinx.rb