eycap 0.6.6 → 0.6.7

data/.gitignore

@@ -1,4 +1,5 @@
 pkg
 *.gem
 .rbenv-version
-.DS_Store
+.DS_Store
+Gemfile.lock

data/Gemfile

@@ -1,2 +1,2 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 gemspec

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.7 / 2013-03-25
+  * follow up to #37, pull #40 works to ensure rvm and non-rvm work properly - Michal Papis.
+  * #39 Joe does some good house cleaning, thanks!
+  * and a Delayed Job tweak by Kevin on #41, thank you.
+
 == 0.6.6 / 2013-03-15
   * adding rvm support to eycap #37 - thank you Michal Papis!
 

data/Rakefile

@@ -9,8 +9,8 @@ Bundler::GemHelper.install_tasks
 require "rake/testtask"
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
+  t.libs << "test" << "lib"
   t.pattern = "test/**/*_test.rb"
 end
 
-task :default => :test
+task :default => :test

data/lib/eycap/recipes/bundler.rb

@@ -5,13 +5,15 @@ set :bundle_without, "test development" unless exists?(:bundle_without)
   namespace :bundler do
     desc "Automatically installed your bundled gems if a Gemfile exists"
     task :bundle_gems, :roles => :app, :except => {:no_bundle => true} do
-      parallel(options) do |session|
+      parallel 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
+        if exists?(:rvm_shell)
+          session.when "in?(:#{rvm_role})", command_with_shell(<<-SHELL.split("\n").map(&:strip).join("; "), fetch(:rvm_shell))
+            if [ -f #{release_path}/Gemfile ]
+            then cd #{release_path} && bundle install --without=#{bundle_without} --system
+            fi
+          SHELL
+        end
         session.else <<-SHELL.split("\n").map(&:strip).join("; ")
           mkdir -p #{shared_path}/bundled_gems
           if [ -f #{release_path}/Gemfile ]

data/lib/eycap/recipes/delayed_job.rb

@@ -4,21 +4,21 @@ Capistrano::Configuration.instance(:must_exist).load do
     Start the Delayed Job queue along with any in the same monit_group.
     DESC
     task :start, :roles => [:app], :only => {:dj => true} do
-      sudo "/usr/bin/monit start all -g #{monit_group}"
+      sudo "/usr/bin/monit start all -g dj_#{monit_group}"
     end
 
     desc <<-DESC
     Restart the Delayed Job queue along with any in the same monit_group.
     DESC
     task :restart, :roles => [:app], :only => {:dj => true} do
-      sudo "/usr/bin/monit restart all -g #{monit_group}"
+      sudo "/usr/bin/monit restart all -g dj_#{monit_group}"
     end
 
     desc <<-DESC
     Stop all monit group members, of which delayed job can be a part of.
     DESC
     task :stop, :roles => [:app], :only => {:dj => true} do
-      sudo "/usr/bin/monit stop all -g #{monit_group}"
+      sudo "/usr/bin/monit stop all -g dj_#{monit_group}"
     end
     
   end #namespace

data/lib/eycap/recipes/rvm.rb

@@ -9,9 +9,17 @@ Capistrano::Configuration.instance(:must_exist).load do
       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+'
+    task :create_wrappers, :roles => :app, :except => {:no_bundle => true} do
+      parallel do |session|
+        rvm_role = fetch(:rvm_require_role,"rvm")
+        if exists?(:rvm_shell)
+          session.when "in?(:#{rvm_role})", command_with_shell(<<-SHELL.split("\n").map(&:strip).join("; "), fetch(:rvm_shell))
+            rvm alias create #{application} #{fetch(:rvm_ruby_string,nil)}
+            rvm wrapper #{application} --no-links --all
+          SHELL
+        end
+        session.else "true" # minimal NOOP
+      end
     end
 
     after "bundler:bundle_gems","rvm:create_wrappers"

data/lib/eycap/version.rb

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

data/test/minitest_helper.rb

@@ -11,17 +11,17 @@
 # the <tt>autorun</tt> method.
 # https://github.com/seattlerb/minitest/blob/master/lib/minitest/autorun.rb
 
+require 'rubygems'
+require 'bundler/setup'
+
 require 'minitest/autorun'
 
 # This library has assertions and expectations already written that can help
 # to test capistrano recipes.
-
 require 'minitest-capistrano'
 
 # Let's add capistrano, since that's what we need to deploy.
-
 require 'capistrano'
 
 # Load a default fixture capistrano object.
-
-require File.expand_path(File.join(File.dirname(__FILE__), 'fixtures','recipes','default'))
+require 'fixtures/recipes/default'

metadata

@@ -2,7 +2,7 @@
 name: eycap
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Engine Yard
@@ -21,7 +21,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -97,7 +97,6 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - History.txt
 - README.markdown
 - Rakefile

data/Gemfile.lock

@@ -1,37 +0,0 @@
-PATH
-  remote: .
-  specs:
-    eycap (0.6.4)
-      capistrano (>= 2.2.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    capistrano (2.13.5)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
-    highline (1.6.15)
-    minitest (4.3.3)
-    minitest-capistrano (0.1.3)
-      capistrano (~> 2.9)
-      minitest
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.6.2)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    rake (10.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  eycap!
-  minitest
-  minitest-capistrano
-  rake