rvm-capistrano 1.2.4 → 1.2.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/History.md +5 -1
  2. data/lib/rvm/capistrano.rb +25 -10
  3. data/lib/rvm/capistrano/version.rb +1 -1
  4. metadata +59 -72
data/History.md CHANGED
@@ -1,3 +1,7 @@
1
+ ### 1.2.5 / 2012-07-17
2
+
3
+ * silence `rvm:rvm_install`, closes #22
4
+
1
5
  ### 1.2.4 / 2012-07-17
2
6
 
3
7
  * fix detecting Capistrano constant in Ruby 1.8.7, fix #28, closes #23
@@ -9,7 +13,7 @@
9
13
 
10
14
  ### 1.2.2 / 2012-05-24
11
15
 
12
- * Default rvm_install_ruby_params to an empty string - fixes #15
16
+ * Default `rvm_install_ruby_params` to an empty string - fixes #15
13
17
 
14
18
  ### 1.2.1 / 2012-05-22
15
19
 
data/lib/rvm/capistrano.rb CHANGED
@@ -85,19 +85,34 @@ module Capistrano
85
85
  set :rvm_install_shell, :zsh
86
86
  EOF
87
87
  task :install_rvm do
88
- command_fetch="curl -L get.rvm.io | "
89
- case rvm_type
90
- when :root, :system
91
- if use_sudo == false && rvm_install_with_sudo == false
92
- raise ":use_sudo is set to 'false' but sudo is needed to install rvm_type: #{rvm_type}. You can enable use_sudo within rvm for use only by this install operation by adding to deploy.rb: set :rvm_install_with_sudo, true"
88
+ command_curl_start = <<-EOF.gsub(/^\s*/, '')
89
+ export CURL_HOME=${TMPDIR:-${HOME}}/.rvm-curl-config;
90
+ mkdir ${CURL_HOME}/;
91
+ {
92
+ [[ -r ${HOME}/.curlrc ]] && cat ${HOME}/.curlrc;
93
+ echo "silent";
94
+ echo "show-error";
95
+ } > $CURL_HOME/.curlrc
96
+ EOF
97
+ command_curl_end = "rm -rf $CURL_HOME"
98
+ command_fetch = "curl -L get.rvm.io"
99
+ command_install = case rvm_type
100
+ when :root, :system
101
+ if use_sudo == false && rvm_install_with_sudo == false
102
+ raise ":use_sudo is set to 'false' but sudo is needed to install rvm_type: #{rvm_type}. You can enable use_sudo within rvm for use only by this install operation by adding to deploy.rb: set :rvm_install_with_sudo, true"
103
+ else
104
+ "#{sudo} "
105
+ end
93
106
  else
94
- command_install = "#{sudo} "
107
+ ''
95
108
  end
96
- else
97
- command_install = ''
98
- end
99
109
  command_install << "#{rvm_install_shell} -s #{rvm_install_type} --path #{rvm_path}"
100
- run "#{command_fetch} #{command_install}", :shell => "#{rvm_install_shell}"
110
+ _command = <<-EOF
111
+ #{command_curl_start};
112
+ #{command_fetch} | #{command_install};
113
+ #{command_curl_end}
114
+ EOF
115
+ run "#{_command}".gsub(/[\s\n]+/, ' '), :shell => "#{rvm_install_shell}"
101
116
  end
102
117
 
103
118
  desc <<-EOF
data/lib/rvm/capistrano/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module RVM
2
2
  class Capistrano
3
- VERSION="1.2.4"
3
+ VERSION="1.2.5"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,78 +1,73 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: rvm-capistrano
3
- version: !ruby/object:Gem::Version
4
- hash: 23
3
+ version: !ruby/object:Gem::Version
4
+ version: 1.2.5
5
5
  prerelease:
6
- segments:
7
- - 1
8
- - 2
9
- - 4
10
- version: 1.2.4
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Wayne E. Seguin
14
9
  - Michal Papis
15
10
  autorequire:
16
11
  bindir: bin
17
12
  cert_chain: []
18
-
19
- date: 2012-07-17 00:00:00 Z
20
- dependencies:
21
- - !ruby/object:Gem::Dependency
13
+ date: 2012-07-17 00:00:00.000000000 Z
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
22
16
  name: capistrano
23
- prerelease: false
24
- requirement: &id001 !ruby/object:Gem::Requirement
17
+ requirement: !ruby/object:Gem::Requirement
25
18
  none: false
26
- requirements:
27
- - - ">="
28
- - !ruby/object:Gem::Version
29
- hash: 15
30
- segments:
31
- - 2
32
- - 0
33
- - 0
19
+ requirements:
20
+ - - ! '>='
21
+ - !ruby/object:Gem::Version
34
22
  version: 2.0.0
35
23
  type: :runtime
36
- version_requirements: *id001
37
- - !ruby/object:Gem::Dependency
38
- name: rake
39
24
  prerelease: false
40
- requirement: &id002 !ruby/object:Gem::Requirement
25
+ version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
27
+ requirements:
28
+ - - ! '>='
29
+ - !ruby/object:Gem::Version
30
+ version: 2.0.0
31
+ - !ruby/object:Gem::Dependency
32
+ name: rake
33
+ requirement: !ruby/object:Gem::Requirement
41
34
  none: false
42
- requirements:
43
- - - ">="
44
- - !ruby/object:Gem::Version
45
- hash: 3
46
- segments:
47
- - 0
48
- version: "0"
35
+ requirements:
36
+ - - ! '>='
37
+ - !ruby/object:Gem::Version
38
+ version: '0'
49
39
  type: :development
50
- version_requirements: *id002
51
- - !ruby/object:Gem::Dependency
52
- name: minitest
53
40
  prerelease: false
54
- requirement: &id003 !ruby/object:Gem::Requirement
41
+ version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ! '>='
45
+ - !ruby/object:Gem::Version
46
+ version: '0'
47
+ - !ruby/object:Gem::Dependency
48
+ name: minitest
49
+ requirement: !ruby/object:Gem::Requirement
55
50
  none: false
56
- requirements:
57
- - - ">="
58
- - !ruby/object:Gem::Version
59
- hash: 3
60
- segments:
61
- - 0
62
- version: "0"
51
+ requirements:
52
+ - - ! '>='
53
+ - !ruby/object:Gem::Version
54
+ version: '0'
63
55
  type: :development
64
- version_requirements: *id003
56
+ prerelease: false
57
+ version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
59
+ requirements:
60
+ - - ! '>='
61
+ - !ruby/object:Gem::Version
62
+ version: '0'
65
63
  description: RVM / Capistrano Integration Gem
66
- email:
64
+ email:
67
65
  - wayneeseguin@gmail.com
68
66
  - mpapis@gmail.com
69
67
  executables: []
70
-
71
68
  extensions: []
72
-
73
69
  extra_rdoc_files: []
74
-
75
- files:
70
+ files:
76
71
  - History.md
77
72
  - Manifest.yml
78
73
  - README.md
@@ -82,37 +77,29 @@ files:
82
77
  - lib/rvm/capistrano/version.rb
83
78
  - spec/spec_helper.rb
84
79
  homepage: https://rvm.beginrescueend.com/integration/capistrano
85
- licenses:
80
+ licenses:
86
81
  - MIT
87
82
  post_install_message:
88
83
  rdoc_options: []
89
-
90
- require_paths:
84
+ require_paths:
91
85
  - lib
92
- required_ruby_version: !ruby/object:Gem::Requirement
86
+ required_ruby_version: !ruby/object:Gem::Requirement
93
87
  none: false
94
- requirements:
95
- - - ">="
96
- - !ruby/object:Gem::Version
97
- hash: 3
98
- segments:
99
- - 0
100
- version: "0"
101
- required_rubygems_version: !ruby/object:Gem::Requirement
88
+ requirements:
89
+ - - ! '>='
90
+ - !ruby/object:Gem::Version
91
+ version: '0'
92
+ required_rubygems_version: !ruby/object:Gem::Requirement
102
93
  none: false
103
- requirements:
104
- - - ">="
105
- - !ruby/object:Gem::Version
106
- hash: 3
107
- segments:
108
- - 0
109
- version: "0"
94
+ requirements:
95
+ - - ! '>='
96
+ - !ruby/object:Gem::Version
97
+ version: '0'
110
98
  requirements: []
111
-
112
99
  rubyforge_project:
113
100
  rubygems_version: 1.8.24
114
101
  signing_key:
115
102
  specification_version: 3
116
103
  summary: RVM / Capistrano Integration Gem
117
- test_files:
104
+ test_files:
118
105
  - spec/spec_helper.rb