rvm 0.0.56 → 0.0.57

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.
data/lib/VERSION.yml CHANGED
@@ -1,4 +1,4 @@
1
1
  ---
2
2
  :major: 0
3
3
  :minor: 0
4
- :patch: 56
4
+ :patch: 57
data/rvm.gemspec ADDED
@@ -0,0 +1,61 @@
1
+ # Generated by jeweler
2
+ # DO NOT EDIT THIS FILE
3
+ # Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
4
+ # -*- encoding: utf-8 -*-
5
+
6
+ Gem::Specification.new do |s|
7
+ s.name = %q{rvm}
8
+ s.version = "0.0.57"
9
+
10
+ s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
+ s.authors = ["Wayne E. Seguin"]
12
+ s.date = %q{2009-10-10}
13
+ s.default_executable = %q{rvm-install}
14
+ s.description = %q{Manages Ruby interpreter installations and switching between them.}
15
+ s.email = %q{wayneeseguin@gmail.com}
16
+ s.executables = ["rvm-install"]
17
+ s.extra_rdoc_files = [
18
+ "README"
19
+ ]
20
+ s.files = [
21
+ "LICENCE",
22
+ "README",
23
+ "config/db",
24
+ "examples/rvmrc",
25
+ "install",
26
+ "lib/VERSION.yml",
27
+ "lib/rvm.rb",
28
+ "lib/rvm/version.rb",
29
+ "rvm.gemspec",
30
+ "scripts/aliases",
31
+ "scripts/cli",
32
+ "scripts/completion",
33
+ "scripts/functions",
34
+ "scripts/gems",
35
+ "scripts/gemsync",
36
+ "scripts/install",
37
+ "scripts/ruby-installer",
38
+ "scripts/rvm",
39
+ "scripts/rvm-install",
40
+ "scripts/rvm-prompt",
41
+ "scripts/selector",
42
+ "scripts/update",
43
+ "scripts/utility"
44
+ ]
45
+ s.homepage = %q{http://github.com/wayneeseguin/rvm}
46
+ s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
47
+ s.require_paths = ["lib"]
48
+ s.rubyforge_project = %q{rvm}
49
+ s.rubygems_version = %q{1.3.5}
50
+ s.summary = %q{Ruby Version Manager (rvm)}
51
+
52
+ if s.respond_to? :specification_version then
53
+ current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
54
+ s.specification_version = 3
55
+
56
+ if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
57
+ else
58
+ end
59
+ else
60
+ end
61
+ end
data/scripts/cli CHANGED
@@ -5,7 +5,7 @@ function __rvm_meta {
5
5
  rvm_meta_author_email="wayneeseguin@gmail.com"
6
6
  rvm_meta_website="http://rvm.beginrescueend.com/"
7
7
  rvm_meta_version="`cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
8
- rvm_meta_updated="2009.10.09"
8
+ rvm_meta_updated="2009.10.10"
9
9
  }
10
10
 
11
11
  function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -107,7 +107,7 @@ function __rvm_parse_args {
107
107
  while [ $# -gt 0 ] ; do
108
108
  rvm_token="$1" ; shift
109
109
  case "$rvm_token" in
110
- install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|update|readline|iconv|gemsync)
110
+ install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|iconv|gemsync|update)
111
111
  rvm_action=$rvm_token
112
112
  ;;
113
113
 
@@ -190,9 +190,15 @@ function __rvm_parse_args {
190
190
  rvm_action=$(echo $rvm_token | sed 's/do//g')
191
191
 
192
192
  if [ "$rvm_action" = "rake" -o "$rvm_action" = "gem" -o "$rvm_action" = "ruby" ] ; then
193
- rvm_action="ruby"
194
- rvm_ruby_args="$rvm_token $@"
195
- rvm_parse_break=1
193
+ if [ -z "$1" ] ; then
194
+ rvm_action="error"
195
+ rvm_error_message="the 'ruby' and 'gem' actions must be followed by arguments."
196
+ rvm_parse_break=1
197
+ else
198
+ rvm_action="ruby"
199
+ rvm_ruby_args="$rvm_token $@"
200
+ rvm_parse_break=1
201
+ fi
196
202
  else
197
203
  if [ ! -z "$(echo $1 | awk '/^-/')" ] ; then
198
204
  unset rvm_ruby_version
data/scripts/gems CHANGED
@@ -23,26 +23,24 @@ __rvm_gems() {
23
23
 
24
24
  __rvm_gems_select() {
25
25
  if [ -z "$rvm_gem_set_name" ] ; then
26
- if [ -z "$GEM_HOME" ] ; then
27
- rvm_ruby_gem_home=$(gem env gemdir)
28
- elif [ ! -z "$GEM_HOME" ] ; then
29
- rvm_ruby_gem_home="$GEM_HOME"
30
- elif [ ! -z "$rvm_ruby_interpreter" -a ! -z "$rvm_ruby_version" -a "$rvm_ruby_interpreter" != "system" ] ; then
31
- rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
32
- else
33
- __rvm_log "error" "Cannot select gem home, something definitely wrong :/"
34
- fi
35
-
36
26
  if [ -z "$rvm_gem_set_name" -a ! -z "$rvm_ruby_gem_home" -a ! -z "$rvm_ruby_version" ] ; then
37
27
  rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | sed "s/${rvm_ruby_version}-//")
38
28
  fi
39
29
 
40
30
  if [ -z "$rvm_gem_set_name" ] ; then unset rvm_gem_set_name ; fi
41
31
 
42
- if [ ! -z "$rvm_gem_set_name" -a ! -z "$(echo $rvm_gem_set_name | awk '/^'$rvm_ruby_version'/')" ] ; then
32
+ if [ ! -z "$rvm_gem_set_name" -a ! -z "$(echo $rvm_gem_set_name | awk '/^\d\.\d/')" ] ; then
43
33
  rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
44
34
  else
45
- rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
35
+ if [ ! -z "$rvm_ruby_interpreter" -a ! -z "$rvm_ruby_version" -a "$rvm_ruby_interpreter" != "system" ] ; then
36
+ rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
37
+ elif [ -z "$GEM_HOME" ] ; then
38
+ rvm_ruby_gem_home=$(gem env gemdir)
39
+ elif [ ! -z "$GEM_HOME" ] ; then
40
+ rvm_ruby_gem_home="$GEM_HOME"
41
+ else
42
+ __rvm_log "error" "Cannot select gem home, something definitely wrong :/"
43
+ fi
46
44
  fi
47
45
  else
48
46
  rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
@@ -118,7 +116,7 @@ __rvm_gems_load() {
118
116
  gem_file_name="$gem_name-$gem_version.gem"
119
117
  fi
120
118
 
121
- cache_file=$(/bin/ls -t $rvm_gem_path/*/*/cache/${gem_file_name}* 2> /dev/null | head -n1)
119
+ cache_file=$(/bin/ls -t "$rvm_gem_path/*/*/cache/${gem_file_name}*" 2> /dev/null | head -n1)
122
120
  if [ -z "$cache_file" ] ; then
123
121
  if [ -z "$gem_version" ] ; then
124
122
  gem="$gem_name"
@@ -425,7 +425,6 @@ function __rvm_remove_ruby {
425
425
  rm -f $rvm_bin_path/$rvm_ruby_package_name
426
426
  fi
427
427
  done ; unset dir
428
- rm -rf $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version*/
429
428
  else
430
429
  __rvm_log "fail" "Cannot uninstall unknown package '$rvm_ruby_package_name'"
431
430
  fi
data/scripts/utility CHANGED
@@ -484,7 +484,7 @@ function __rvm_initialize {
484
484
  }
485
485
 
486
486
  function __rvm_update {
487
- if [ "$rvm_ruby_revision" = "head" -o ! -z "$rvm_self_flag" -o ! -z "$rvm_update_flag" ] ; then
487
+ if [ "$rvm_ruby_revision" = "head" -o ! -z "$rvm_self_flag" -o "$rvm_action" = "update" -o ! -z "$rvm_update_flag" ] ; then
488
488
  __rvm_version
489
489
  __rvm_update_rvm
490
490
  __rvm_version
@@ -505,7 +505,8 @@ function __rvm_update_rvm {
505
505
  fi
506
506
  else
507
507
  # TODO: rvm_install_path:
508
- gem install rvm --no-rdoc --no-ri -q && rvm-install && source ~/.rvm/scripts/rvm
508
+ GEM_HOME="${GEM_HOME:-$(gem env gemdir user)}"
509
+ gem install rvm --no-rdoc --no-ri -q && $GEM_HOME/bin/rvm-install && source ~/.rvm/scripts/rvm
509
510
  fi
510
511
  }
511
512
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rvm
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.56
4
+ version: 0.0.57
5
5
  platform: ruby
6
6
  authors:
7
7
  - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-10-09 00:00:00 -04:00
12
+ date: 2009-10-10 00:00:00 -04:00
13
13
  default_executable: rvm-install
14
14
  dependencies: []
15
15
 
@@ -30,6 +30,7 @@ files:
30
30
  - lib/VERSION.yml
31
31
  - lib/rvm.rb
32
32
  - lib/rvm/version.rb
33
+ - rvm.gemspec
33
34
  - scripts/aliases
34
35
  - scripts/cli
35
36
  - scripts/completion