rvm 1.8.3 → 1.8.4

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.
@@ -30,5 +30,5 @@ lib/rvm/shell/shell_wrapper.sh
30
30
  lib/rvm/shell/single_shot_wrapper.rb
31
31
  lib/rvm/shell/utility.rb
32
32
  lib/rvm/version.rb
33
- releases/rvm-1.8.3.tar.gz
34
- releases/rvm-1.8.3.tar.gz.md5
33
+ releases/rvm-1.8.4.tar.gz
34
+ releases/rvm-1.8.4.tar.gz.md5
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.8.3
1
+ 1.8.4
data/lib/rvm.rb CHANGED
@@ -54,7 +54,7 @@
54
54
  # RVM::Environment.new, versus RVM.environment
55
55
  #
56
56
  module RVM
57
- VERSION = "1.8.3"
57
+ VERSION = "1.8.4"
58
58
 
59
59
  require "rvm/errors"
60
60
 
@@ -83,7 +83,7 @@ module RVM
83
83
  replace_env = options.delete(:replace_env)
84
84
  result = rvm(:gemset, :use, gemset, options)
85
85
  if result.successful?
86
- gemset_name = result[:rvm_gemset_name]
86
+ gemset_name = self.class.identifier_to_gemset_name(result[:rvm_env_string])
87
87
  @environment_name = self.class.environment_with_gemset(@environment_name, gemset_name)
88
88
  @expanded_name = nil
89
89
  self.class.reset_current!
@@ -31,6 +31,10 @@ module RVM
31
31
  def self.identifier_to_ruby_string(identifier)
32
32
  identifier.gsub(/@.*$/, '')
33
33
  end
34
+
35
+ def self.identifier_to_gemset_name(identifier)
36
+ identifier.gsub(/^.*@/, '')
37
+ end
34
38
 
35
39
  # Returns the currentl environment.
36
40
  # Note that when the ruby is changed, this is reset - Also,
@@ -92,8 +96,8 @@ module RVM
92
96
  end
93
97
 
94
98
  def ruby_string(result)
95
- if result && result[:rvm_ruby_string]
96
- result[:rvm_ruby_string]
99
+ if result && result[:rvm_env_string]
100
+ Environment.identifier_to_ruby_string result[:rvm_env_string]
97
101
  else
98
102
  self.class.identifier_to_ruby_string(expanded_name)
99
103
  end
Binary file
@@ -0,0 +1 @@
1
+ ac823903ced0749d7917ac3bc9386d67
data/sha1 CHANGED
@@ -1 +1 @@
1
- 6107036
1
+ ce874eb
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rvm
3
3
  version: !ruby/object:Gem::Version
4
- hash: 49
4
+ hash: 63
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 8
9
- - 3
10
- version: 1.8.3
9
+ - 4
10
+ version: 1.8.4
11
11
  platform: ruby
12
12
  authors:
13
13
  - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-09-10 00:00:00 Z
18
+ date: 2011-09-23 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: hoe
@@ -77,8 +77,8 @@ files:
77
77
  - lib/rvm/shell/single_shot_wrapper.rb
78
78
  - lib/rvm/shell/utility.rb
79
79
  - lib/rvm/version.rb
80
- - releases/rvm-1.8.3.tar.gz
81
- - releases/rvm-1.8.3.tar.gz.md5
80
+ - releases/rvm-1.8.4.tar.gz
81
+ - releases/rvm-1.8.4.tar.gz.md5
82
82
  - .gemtest
83
83
  homepage: http://github.com/wayneeseguin/rvm
84
84
  licenses: []
Binary file
@@ -1 +0,0 @@
1
- 8f0d68f08fdaa055774542d48d0279a4