rvm1-capistrano3 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84284ff699e70f2aee8d335c4d7c258e5eccb140
-  data.tar.gz: a01980341268e372728fffd86c588f029140a6bb
+  metadata.gz: 2c9794f94a6791769a690840bfa61711bec1d779
+  data.tar.gz: 2d003c85169585c993b6672c906c01e52d183641
 SHA512:
-  metadata.gz: a230cac9e9ecbfc0b710992f66bb8f8f912573539e1d1ce7b730898231e0a40124d7a75b0f6fe0add538c6b0fb454e4b213d406a0f3f1b193f78fb098026dfe3
-  data.tar.gz: 905bd99c9505d4c3296d67f07b493bfa2371c0721efc9500db54e7e4c2b2719dd3ba67e1fa1fdb037977eb6c1692510c78f6fc804ce22060d7f6dc681227d15a
+  metadata.gz: 20137ac0765e89203a86cb85eeab38c1ce7ce2ab9f7ad921430337ffa915861a0dfd18b439588bf6638efa51608792ca6c560b487d3123693c249ef31c36d76a
+  data.tar.gz: f99294eb05261c421769d2f8044d21d12c7584caa19f64d51928d4a6c9745d3db690c61d7fde56b02f6f7e895f88d678d28e0c32caeff5da9a674ef39d905e4f

data/lib/rvm1/capistrano3/version.rb

@@ -1,5 +1,5 @@
 module RVM1
   class Capistrano3
-    VERSION="1.2.4"
+    VERSION="1.2.5"
   end
 end

data/lib/rvm1/tasks/capistrano3.rake

@@ -2,17 +2,17 @@ namespace :rvm1 do
   desc "Runs the RVM1 hook - use it before any custom tasks if necessary"
   task :hook do
     on roles(fetch(:rvm1_roles, :all)) do
-      execute :mkdir, "-p", "#{fetch(:tmp_dir)}/#{fetch(:application)}/"
-      upload! File.expand_path("../../../../script/rvm-auto.sh", __FILE__), "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh"
-      execute :chmod, "+x", "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh"
+      execute :mkdir, "-p", "#{fetch(:rvm1_auto_script_path)}/"
+      upload! File.expand_path("../../../../script/rvm-auto.sh", __FILE__), "#{fetch(:rvm1_auto_script_path)}/rvm-auto.sh"
+      execute :chmod, "+x", "#{fetch(:rvm1_auto_script_path)}/rvm-auto.sh"
     end
 
     if
       roles(fetch(:rvm1_roles, :all)).any?
     then
-      SSHKit.config.command_map.prefix[:rvm].unshift("#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh")
+      SSHKit.config.command_map.prefix[:rvm].unshift("#{fetch(:rvm1_auto_script_path)}/rvm-auto.sh")
 
-      rvm_prefix = "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh #{fetch(:rvm1_ruby_version)}"
+      rvm_prefix = "#{fetch(:rvm1_auto_script_path)}/rvm-auto.sh #{fetch(:rvm1_ruby_version)}"
       fetch(:rvm1_map_bins).each do |command|
         SSHKit.config.command_map.prefix[command.to_sym].unshift(rvm_prefix)
       end
@@ -39,6 +39,13 @@ namespace :load do
   task :defaults do
     set :rvm1_ruby_version, "."
     set :rvm1_map_bins, %w{rake gem bundle ruby}
+
+    temp_auto_script_path = "#{fetch(:tmp_dir)}/#{fetch(:application)}"
+    if fetch(:ssh_options) && fetch(:ssh_options)[:user]
+      temp_auto_script_path = "#{temp_auto_script_path}-#{fetch(:ssh_options)[:user]}"
+    end
+
+    set :rvm1_auto_script_path, temp_auto_script_path
   end
 end
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rvm1-capistrano3
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Michal Papis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: tf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
 description: RVM 1.x / Capistrano 3.x Integration Gem
@@ -59,10 +59,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rvm1/capistrano3/version.rb
 - lib/rvm1/capistrano3.rb
-- lib/rvm1/tasks/capistrano3/install.rake
+- lib/rvm1/capistrano3/version.rb
 - lib/rvm1/tasks/capistrano3.rake
+- lib/rvm1/tasks/capistrano3/install.rake
 - script/install-rvm.sh
 - script/rvm-auto.sh
 - test/script_rvm-auto_comment_test.sh
@@ -76,17 +76,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RVM 1.x / Capistrano 3.x Integration Gem