capobvious 0.3.pre21 → 0.3.pre22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fd6f0aa667d4ad7e2ee910daed6ed5419231151
-  data.tar.gz: c02a245ea666ae07c2203de086366ff907e664aa
+  metadata.gz: 5065b663bc0c505f3a36eca8fee14085302f0bd4
+  data.tar.gz: 84c8bbee56dfe38a42f71d9ec699bf8b859e6560
 SHA512:
-  metadata.gz: 12549997ae8da9f8311f1d8fff00b9a6608354073f1450bed312983c7c10a04ff0390b8d7170ba6ba6add84aaf4ae1607182af70d010127e418f25c97a7b1f46
-  data.tar.gz: 31a52d9636529de7dca814531269bbb3c8416d439f9c496d6173ad58972f5a3fd96ebf8a539387778654b4500e593fad575d7fedb6d3e05e5fda990d6071eff0
+  metadata.gz: b78dbb55d3e13c69e1d3954ab620baabddbb0ace2c6b7ca063e1bd33d510d0dbcad6714e3544c31d75a930c185d10cb6f34036d3f591b46d9880d605de45f5be
+  data.tar.gz: 9298c074b39e7076d879a7baad4a5e182f6bef8e75aa85e1f36de0ae07936adb81f3bdbe07d973d931d2a8561c86f13a6f095ae6a7fd580edc1498d76592ad6a

data/lib/capobvious/recipes/bundle.rb

@@ -3,9 +3,11 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :bundle do
     desc "Run bundle install"
     task :install do
+      opts = []
+      opts << "-j#{server_cores.to_i}" if server_cores.to_i > 1
       deployment = "--deployment --quiet"
       without = ['development','test','production']-[rails_env]
-      run "cd #{latest_release} && bundle install --without #{without.join(" ")}"
+      run "cd #{latest_release} && bundle install #{opts.join(' ')} --without #{without.join(" ")}"
     end
   end
 end

data/lib/capobvious/recipes/main.rb

@@ -1,5 +1,7 @@
 Capistrano::Configuration.instance(:must_exist).load do
-  _cset(:ruby_version) { RUBY_VERSION }
+  set :bundle_dir, ''
+  set :bundle_flags, '--system --quiet'
+
   _cset :rvm_type, :user
   _cset :rails_env, 'production'
   _cset :branch, 'master'
@@ -16,8 +18,12 @@ Capistrano::Configuration.instance(:must_exist).load do
   _cset(:ssh) {"ssh -p #{fetch(:port)} #{user}@#{serv}"}
   _cset(:stage){ rails_env }
   _cset(:application_env){ "#{application}_#{rails_env}"}
+  _cset(:rvm_ruby_string){ "#{ruby_version}@#{application}" }
+
+  before 'deploy', 'rvm:install_rvm'  # install/update RVM
+  before 'deploy', 'rvm:install_ruby' # install Ruby and create gemset (both if missing)
 
-  after "deploy:update_code", "create:rvmrc"
+  #after "deploy:update_code", "create:rvmrc"
   after "deploy:update", "deploy:cleanup"
 
   #set :deploy_to, (exists?(:deploy_folder)? fetch(:deploy_folder) : "/home/#{user}/www/#{application}")
@@ -25,7 +31,6 @@ Capistrano::Configuration.instance(:must_exist).load do
   default_run_options[:pty] = true
   ssh_options[:forward_agent] = true
 
-
   def gem_use?(name)
     gemfile_lock = File.read("Gemfile.lock")
     return (gemfile_lock =~ /^\s*#{name}\s+\(/)? true : false
@@ -82,8 +87,8 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :create do
     desc "Create .rvmrc"
-    task :rvmrc do
-      rvmrc_string = "rvm use #{ruby_version} --create"
+    task :rvmrc, :roles => :web, :except => { :no_release => true }  do
+      rvmrc_string = "rvm use #{rvm_ruby_string} --create"
       logger.info rvmrc_string
       put rvmrc_string, "#{latest_release}/.rvmrc"
     end

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = '0.3.pre21'
+  VERSION = '0.3.pre22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.3.pre21
+  version: 0.3.pre22
 platform: ruby
 authors:
 - Dmitry Gruzd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano