capper 0.9.2 → 0.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capper (0.6.8)
+    capper (0.9.2)
       capistrano
       capistrano_colors
       erubis
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    capistrano (2.8.0)
+    capistrano (2.9.0)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -17,7 +17,7 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     capistrano_colors (0.5.5)
     erubis (2.7.0)
-    highline (1.6.2)
+    highline (1.6.8)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -30,5 +30,4 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
   capper!

data/README.rst

@@ -26,8 +26,9 @@ Capper recipes should be loaded via ``Capfile`` like this::
 
   require "capper"
 
-  load "capper/git"
+  load "capper/bundler"
   load "capper/rails"
+  load "capper/rvm"
   load "capper/unicorn"
 
   load "config/deploy"
@@ -102,8 +103,8 @@ The following recipes are included in capper.
 base
 ----
 
-The base is an enhanced version of capistranos default deploy recipe. It is
-loaded automatically and provides the basic opinions capper has about
+The base recipe is an enhanced version of capistranos default deploy recipe. It
+is loaded automatically and provides the basic opinions capper has about
 deployment:
 
 - The application is deployed to a dedicated user account with the same name as
@@ -137,7 +138,7 @@ bundler
 
 The bundler recipe is an extension of bundlers native capistrano integration:
 
-- During ``deploy:setup`` it is ensured that a known-to-work bundler version
+- During ``bundle:install`` it is ensured that a known-to-work bundler version
   (specified via ``bundler_version``) is installed.
 
 - When used together with the rvm recipe bundles are not installed globally to

data/lib/capper/base.rb

@@ -170,7 +170,7 @@ namespace :deploy do
   DESC
   task :setup, :except => { :no_release => true } do
     shared = fetch(:internal_shared_children, []) | fetch(:shared_children, [])
-    dirs = [deploy_to, releases_path, shared_path]
+    dirs = [deploy_to, bin_path, releases_path, shared_path]
     dirs += shared.map { |d| File.join(shared_path, d) }
     run "mkdir -p #{dirs.join(' ')}"
   end

data/lib/capper/rvm.rb

@@ -6,13 +6,30 @@ require 'rvm/capistrano'
 set(:rvm_type, :user)
 set(:rvm_ruby_string, File.read(".rvmrc").gsub(/^rvm use --create (.*)/, '\1').strip)
 
+_cset(:rvm_version, "1.9.2")
+_cset(:rvm_installer_url, "https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer")
+
 before "deploy:setup", "rvm:setup"
 after "deploy:symlink", "rvm:trust_rvmrc"
 
 namespace :rvm do
-  # install the requested ruby if missing
-  desc "Install the selected ruby version using RVM."
+  desc "Install RVM and Ruby"
   task :setup, :except => {:no_release => true} do
+    # install rvm
+    run("if ! test -d #{deploy_to}/.rvm; then " +
+        "curl -s #{rvm_installer_url} > #{deploy_to}/rvm-installer; " +
+        "chmod +x #{deploy_to}/rvm-installer; " +
+        "#{deploy_to}/rvm-installer --version #{rvm_version}; " +
+        "rm -f #{deploy_to}/rvm-installer; fi",
+        :shell => "/bin/bash")
+
+    # update rvm if version differs
+    run("source ~/.rvm/scripts/rvm && " +
+        "if ! rvm version | grep -q 'rvm #{rvm_version}'; then " +
+        "rvm get #{rvm_version}; fi",
+        :shell => "/bin/bash")
+
+    # install requested ruby version
     wo_gemset = rvm_ruby_string.gsub(/@.*/, '')
 
     run("echo silent > ~/.curlrc", :shell => "/bin/bash")

data/lib/capper/version.rb

@@ -1,3 +1,3 @@
 module Capper
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -2,7 +2,7 @@
 name: capper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - "Benedikt B\xC3\xB6hm"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-05 00:00:00 +01:00
+date: 2011-12-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency