rvm1-capistrano3 1.0.0 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rvm1/capistrano3/version.rb +1 -1
  3. data/lib/rvm1/tasks/capistrano3.rake +13 -23
  4. metadata +16 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1602b624aabc15402fff15cbe48c5debf0579e89
4
- data.tar.gz: c649c754fb280fa7b784d6168bf75df9625861e5
3
+ metadata.gz: 670e99768ad754ae35e22ffeaaa3ad56f4befeab
4
+ data.tar.gz: 97908cf786d1a6d19a64613e37def3a26593f9db
5
5
  SHA512:
6
- metadata.gz: 46a5f4460875bf47947af2c3fa844005f29fdfd7ae7d4f45f0b16962d1e73b079bd9b506ee8120659a37e49f9632166a3a8d7e04c5e7c86371c1e8df7d546e53
7
- data.tar.gz: 63057d626f9af19996c5a216ef0953551467f54955f397c134ae6d2a554a0188ddd81595d13eb886f709e16d896c3a6ad5548fc33056a37bfdf7f575321befa0
6
+ metadata.gz: 5562e2415edde30d0b603b270480fb6e2c70ce5879424dfc2553bce7bc53e00f63886aaad11115b23fe74650543a7c2d007f71766b84bfc45fb30cd708971d9c
7
+ data.tar.gz: abf20cd8f52de75aeca0060e4b0c9020996154d092ea32616cd205ba62b46a54ee47ff2d1119a6b5611bcf4a61b4ffaa075f2fdd391707dfca4d9c98a9398187
data/lib/rvm1/capistrano3/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module RVM1
2
2
  class Capistrano3
3
- VERSION="1.0.0"
3
+ VERSION="1.1.0"
4
4
  end
5
5
  end
data/lib/rvm1/tasks/capistrano3.rake CHANGED
@@ -1,19 +1,17 @@
1
- SSHKit.config.command_map = Hash.new do |hash, key|
2
- if fetch(:rvm1_map_bins).include?(key.to_s)
3
- hash[key] = "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh #{fetch(:rvm1_ruby_version)} #{key}"
4
- elsif key.to_s == "rvm"
5
- hash[key] = "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh #{key}"
6
- else
7
- hash[key] = key
8
- end
9
- end
10
-
11
1
  namespace :rvm1 do
12
2
  desc "Runs the RVM1 hook - use it before any custom tasks if necessary"
13
3
  task :hook do
14
- unless fetch(:rvm1_hooked)
15
- invoke :'rvm1:init'
16
- set :rvm1_hooked, true
4
+ on roles(:all) do
5
+ execute :mkdir, "-p", "#{fetch(:tmp_dir)}/#{fetch(:application)}/"
6
+ upload! File.expand_path("../../../../script/rvm-auto.sh", __FILE__), "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh"
7
+ execute :chmod, "+x", "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh"
8
+ end
9
+
10
+ SSHKit.config.command_map[:rvm] = "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh"
11
+
12
+ rvm_prefix = "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh #{fetch(:rvm1_ruby_version)}"
13
+ fetch(:rvm1_map_bins).each do |command|
14
+ SSHKit.config.command_map.prefix[command.to_sym].unshift(rvm_prefix)
17
15
  end
18
16
  end
19
17
 
@@ -31,14 +29,6 @@ namespace :rvm1 do
31
29
  before :check, "deploy:updating"
32
30
  before :check, 'rvm1:hook'
33
31
 
34
- task :init do
35
- on roles(:all) do
36
- execute :mkdir, "-p", "#{fetch(:tmp_dir)}/#{fetch(:application)}/"
37
- upload! File.expand_path("../../../../script/rvm-auto.sh", __FILE__), "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh"
38
- execute :chmod, "+x", "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh"
39
- end
40
- end
41
-
42
32
  end
43
33
 
44
34
  namespace :load do
@@ -48,6 +38,6 @@ namespace :load do
48
38
  end
49
39
  end
50
40
 
51
- namespace :deploy do
52
- after :starting, 'rvm1:hook'
41
+ Capistrano::DSL.stages.each do |stage|
42
+ after stage, 'rvm1:hook'
53
43
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rvm1-capistrano3
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michal Papis
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2013-12-02 00:00:00 Z
12
+ date: 2013-12-03 00:00:00 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: capistrano
@@ -22,15 +22,25 @@ dependencies:
22
22
  type: :runtime
23
23
  version_requirements: *id001
24
24
  - !ruby/object:Gem::Dependency
25
- name: tf
25
+ name: sshkit
26
26
  prerelease: false
27
27
  requirement: &id002 !ruby/object:Gem::Requirement
28
+ requirements:
29
+ - - ">="
30
+ - !ruby/object:Gem::Version
31
+ version: "1.2"
32
+ type: :runtime
33
+ version_requirements: *id002
34
+ - !ruby/object:Gem::Dependency
35
+ name: tf
36
+ prerelease: false
37
+ requirement: &id003 !ruby/object:Gem::Requirement
28
38
  requirements:
29
39
  - - ~>
30
40
  - !ruby/object:Gem::Version
31
41
  version: 0.4.3
32
42
  type: :development
33
- version_requirements: *id002
43
+ version_requirements: *id003
34
44
  description: RVM 1.x / Capistrano 3.x Integration Gem
35
45
  email:
36
46
  - mpapis@gmail.com
@@ -60,13 +70,13 @@ require_paths:
60
70
  - lib
61
71
  required_ruby_version: !ruby/object:Gem::Requirement
62
72
  requirements:
63
- - &id003
73
+ - &id004
64
74
  - ">="
65
75
  - !ruby/object:Gem::Version
66
76
  version: "0"
67
77
  required_rubygems_version: !ruby/object:Gem::Requirement
68
78
  requirements:
69
- - *id003
79
+ - *id004
70
80
  requirements: []
71
81
 
72
82
  rubyforge_project: