rvm-capistrano 1.5.4 → 1.5.5

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 (5) hide show
  1. checksums.yaml +7 -7
  2. data/README.md +1 -1
  3. data/lib/rvm/capistrano/base.rb +6 -1
  4. data/lib/rvm/capistrano/version.rb +1 -1
  5. metadata +75 -103
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
- ---
2
- SHA1:
3
- metadata.gz: be7cbf9c67a51c3fef3f9b91d9910caed7b1f049
4
- data.tar.gz: e13f45a33b85d164ca60e98f23943c5ef1ab5d2d
5
- SHA512:
6
- metadata.gz: e67ccdff104480741ef18ed18c13e3b7bac5c251d8ef9e5c2f57af97b0dc054e78ea7b0149146006dadf5b08b53b6aa307759f5be3cb5b9f43a64c7da3a6cc4b
7
- data.tar.gz: 7e4e8e39d461c68506cd121f53e4757ec14d6e584b52d3a3cd5e87a5d652ac056a64e446b4fca340ef037f4d1d5e2dfd212bccf74353be598a90c9cd35ee7fa5
1
+ ---
2
+ SHA1:
3
+ metadata.gz: dbab24edf590e278fa49fcc36dad9bd2eaabc474
4
+ data.tar.gz: 6c9e3932ec337e2d502387f426a703524e131da0
5
+ SHA512:
6
+ metadata.gz: a921f6f40cb5bba8ce0dcab4b0860abbe43a6c8a895fcf4e4651592183804f81b0eb2db2ebf0768f0c5482cd7d96261c91c5874266a18813f1aab365d15c3c17
7
+ data.tar.gz: 4a53aee545a63963c265721044f46f63e0a625de36da50c55932096d1bedf86561d306e7c34c84bbccc3d878a0f72bfc5c245545ac9c0b724284401465372aa9
data/README.md CHANGED
@@ -17,7 +17,7 @@ RVM / Capistrano integration is available as a separate gem
17
17
  $ gem install rvm-capistrano
18
18
  ```
19
19
 
20
- Or, if the **capistrano** gem is aleady in your `Gemfile`, then add **rvm-capistrano**:
20
+ Or, if the **capistrano** gem is already in your `Gemfile`, then add **rvm-capistrano**:
21
21
 
22
22
  ```bash
23
23
  $ echo "gem 'rvm-capistrano'" >> Gemfile
data/lib/rvm/capistrano/base.rb CHANGED
@@ -77,7 +77,12 @@ rvm_with_capistrano do
77
77
  set :rvm_ruby_string_evaluated do
78
78
  value = fetch(:rvm_ruby_string, :default)
79
79
  if value.to_sym == :local
80
- value = ENV['GEM_HOME'].gsub(/.*\//,"")
80
+ if ENV['RBENV_VERSION']
81
+ gem_set = ENV['GEM_HOME'].to_s.match(/(?:\/gemsets\/(.*))$/).to_a[1]
82
+ value = [ENV['RBENV_VERSION'], gem_set].compact.join("@")
83
+ else
84
+ value = ENV['GEM_HOME'].gsub(/.*\//,"")
85
+ end
81
86
  end
82
87
  value.to_s
83
88
  end
data/lib/rvm/capistrano/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module RVM
2
2
  class Capistrano
3
- VERSION="1.5.4"
3
+ VERSION="1.5.5"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,113 +1,86 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: rvm-capistrano
3
- version: !ruby/object:Gem::Version
4
- version: 1.5.4
3
+ version: !ruby/object:Gem::Version
4
+ version: 1.5.5
5
5
  platform: ruby
6
- authors:
6
+ authors:
7
7
  - Wayne E. Seguin
8
8
  - Michal Papis
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-09-09 00:00:00.000000000 Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
12
+
13
+ date: 2014-11-15 00:00:00 Z
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
15
16
  name: capistrano
16
- requirement: !ruby/object:Gem::Requirement
17
- requirements:
18
- - - "~>"
19
- - !ruby/object:Gem::Version
20
- version: 2.15.4
21
- type: :runtime
22
17
  prerelease: false
23
- version_requirements: !ruby/object:Gem::Requirement
24
- requirements:
25
- - - "~>"
26
- - !ruby/object:Gem::Version
18
+ requirement: &id001 !ruby/object:Gem::Requirement
19
+ requirements:
20
+ - - ~>
21
+ - !ruby/object:Gem::Version
27
22
  version: 2.15.4
28
- - !ruby/object:Gem::Dependency
23
+ type: :runtime
24
+ version_requirements: *id001
25
+ - !ruby/object:Gem::Dependency
29
26
  name: rake
30
- requirement: !ruby/object:Gem::Requirement
31
- requirements:
32
- - - ">="
33
- - !ruby/object:Gem::Version
34
- version: '0'
35
- type: :development
36
27
  prerelease: false
37
- version_requirements: !ruby/object:Gem::Requirement
38
- requirements:
39
- - - ">="
40
- - !ruby/object:Gem::Version
41
- version: '0'
42
- - !ruby/object:Gem::Dependency
43
- name: rspec
44
- requirement: !ruby/object:Gem::Requirement
45
- requirements:
46
- - - ">="
47
- - !ruby/object:Gem::Version
48
- version: '0'
28
+ requirement: &id002 !ruby/object:Gem::Requirement
29
+ requirements:
30
+ - &id003
31
+ - ">="
32
+ - !ruby/object:Gem::Version
33
+ version: "0"
49
34
  type: :development
35
+ version_requirements: *id002
36
+ - !ruby/object:Gem::Dependency
37
+ name: rspec
50
38
  prerelease: false
51
- version_requirements: !ruby/object:Gem::Requirement
52
- requirements:
53
- - - ">="
54
- - !ruby/object:Gem::Version
55
- version: '0'
56
- - !ruby/object:Gem::Dependency
57
- name: capistrano-spec
58
- requirement: !ruby/object:Gem::Requirement
59
- requirements:
60
- - - ">="
61
- - !ruby/object:Gem::Version
62
- version: '0'
39
+ requirement: &id004 !ruby/object:Gem::Requirement
40
+ requirements:
41
+ - *id003
63
42
  type: :development
43
+ version_requirements: *id004
44
+ - !ruby/object:Gem::Dependency
45
+ name: capistrano-spec
64
46
  prerelease: false
65
- version_requirements: !ruby/object:Gem::Requirement
66
- requirements:
67
- - - ">="
68
- - !ruby/object:Gem::Version
69
- version: '0'
70
- - !ruby/object:Gem::Dependency
71
- name: guard-rspec
72
- requirement: !ruby/object:Gem::Requirement
73
- requirements:
74
- - - ">="
75
- - !ruby/object:Gem::Version
76
- version: '0'
47
+ requirement: &id005 !ruby/object:Gem::Requirement
48
+ requirements:
49
+ - *id003
77
50
  type: :development
51
+ version_requirements: *id005
52
+ - !ruby/object:Gem::Dependency
53
+ name: guard-rspec
78
54
  prerelease: false
79
- version_requirements: !ruby/object:Gem::Requirement
80
- requirements:
81
- - - ">="
82
- - !ruby/object:Gem::Version
83
- version: '0'
84
- - !ruby/object:Gem::Dependency
85
- name: guard-bundler
86
- requirement: !ruby/object:Gem::Requirement
87
- requirements:
88
- - - ">="
89
- - !ruby/object:Gem::Version
90
- version: '0'
55
+ requirement: &id006 !ruby/object:Gem::Requirement
56
+ requirements:
57
+ - *id003
91
58
  type: :development
59
+ version_requirements: *id006
60
+ - !ruby/object:Gem::Dependency
61
+ name: guard-bundler
92
62
  prerelease: false
93
- version_requirements: !ruby/object:Gem::Requirement
94
- requirements:
95
- - - ">="
96
- - !ruby/object:Gem::Version
97
- version: '0'
63
+ requirement: &id007 !ruby/object:Gem::Requirement
64
+ requirements:
65
+ - *id003
66
+ type: :development
67
+ version_requirements: *id007
98
68
  description: RVM / Capistrano Integration Gem
99
- email:
69
+ email:
100
70
  - wayneeseguin@gmail.com
101
71
  - mpapis@gmail.com
102
72
  executables: []
73
+
103
74
  extensions: []
75
+
104
76
  extra_rdoc_files: []
105
- files:
77
+
78
+ files:
106
79
  - History.md
107
- - LICENSE
108
80
  - Manifest.yml
109
81
  - README.md
110
82
  - Rakefile
83
+ - LICENSE
111
84
  - lib/rvm/capistrano.rb
112
85
  - lib/rvm/capistrano/alias_and_wrapp.rb
113
86
  - lib/rvm/capistrano/base.rb
@@ -115,13 +88,6 @@ files:
115
88
  - lib/rvm/capistrano/empty_gemset.rb
116
89
  - lib/rvm/capistrano/gem_install_uninstall.rb
117
90
  - lib/rvm/capistrano/gemset_import_export.rb
118
- - lib/rvm/capistrano/helpers/_cset.rb
119
- - lib/rvm/capistrano/helpers/base.rb
120
- - lib/rvm/capistrano/helpers/quote_and_escape.rb
121
- - lib/rvm/capistrano/helpers/run_silent_curl.rb
122
- - lib/rvm/capistrano/helpers/rvm_if_sudo.rb
123
- - lib/rvm/capistrano/helpers/rvm_methods.rb
124
- - lib/rvm/capistrano/helpers/with_rvm_group.rb
125
91
  - lib/rvm/capistrano/info_list.rb
126
92
  - lib/rvm/capistrano/install_pkgs.rb
127
93
  - lib/rvm/capistrano/install_ruby.rb
@@ -129,38 +95,44 @@ files:
129
95
  - lib/rvm/capistrano/selector.rb
130
96
  - lib/rvm/capistrano/selector_mixed.rb
131
97
  - lib/rvm/capistrano/version.rb
98
+ - lib/rvm/capistrano/helpers/_cset.rb
99
+ - lib/rvm/capistrano/helpers/base.rb
100
+ - lib/rvm/capistrano/helpers/quote_and_escape.rb
101
+ - lib/rvm/capistrano/helpers/run_silent_curl.rb
102
+ - lib/rvm/capistrano/helpers/rvm_if_sudo.rb
103
+ - lib/rvm/capistrano/helpers/rvm_methods.rb
104
+ - lib/rvm/capistrano/helpers/with_rvm_group.rb
105
+ - spec/support/abort_matcher.rb
106
+ - spec/support/capistrano.rb
132
107
  - spec/create_gemset_spec.rb
133
108
  - spec/empty_gemset_spec.rb
134
109
  - spec/install_ruby_spec.rb
135
110
  - spec/rvm_paths_spec.rb
136
111
  - spec/spec_helper.rb
137
- - spec/support/abort_matcher.rb
138
- - spec/support/capistrano.rb
139
112
  homepage: https://github.com/wayneeseguin/rvm-capistrano
140
- licenses:
113
+ licenses:
141
114
  - MIT
142
115
  metadata: {}
116
+
143
117
  post_install_message:
144
118
  rdoc_options: []
145
- require_paths:
119
+
120
+ require_paths:
146
121
  - lib
147
- required_ruby_version: !ruby/object:Gem::Requirement
148
- requirements:
149
- - - ">="
150
- - !ruby/object:Gem::Version
151
- version: '0'
152
- required_rubygems_version: !ruby/object:Gem::Requirement
153
- requirements:
154
- - - ">="
155
- - !ruby/object:Gem::Version
156
- version: '0'
122
+ required_ruby_version: !ruby/object:Gem::Requirement
123
+ requirements:
124
+ - *id003
125
+ required_rubygems_version: !ruby/object:Gem::Requirement
126
+ requirements:
127
+ - *id003
157
128
  requirements: []
129
+
158
130
  rubyforge_project:
159
- rubygems_version: 2.2.2
131
+ rubygems_version: 2.0.14
160
132
  signing_key:
161
133
  specification_version: 4
162
134
  summary: RVM / Capistrano Integration Gem
163
- test_files:
135
+ test_files:
164
136
  - spec/support/abort_matcher.rb
165
137
  - spec/support/capistrano.rb
166
138
  - spec/create_gemset_spec.rb