rvm 0.1.32 → 0.1.33

Sign up to get free protection for your applications and to get access to all the features.
data/README CHANGED
@@ -59,6 +59,10 @@ Action
59
59
  uninstall - uninstall one or many ruby versions, leaves their sources
60
60
  remove - uninstall one or many ruby versions and remove their sources
61
61
 
62
+ wrapper - generates a set of wrapper executables for a given ruby with the
63
+ specified ruby and gemset combination. Used under the hood for
64
+ passenger support and the like.
65
+
62
66
  ruby - runs a named ruby file against specified and/or all rubies
63
67
  gem - runs a gem command using selected ruby's 'gem'
64
68
  rake - runs a rake task against specified and/or all rubies
data/binscripts/rvm CHANGED
@@ -3,7 +3,7 @@
3
3
  for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
4
4
  if [[ -f "$rvmrc" ]] ; then
5
5
  if grep -q '^\s*rvm .*$' $rvmrc ; then
6
- echo -e "Error: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
6
+ printf "\nError: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
7
7
  exit 1
8
8
  else
9
9
  source "$rvmrc"
@@ -88,7 +88,7 @@ if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; the
88
88
  else
89
89
  command="prompt=\"$format\""
90
90
  eval "$command"
91
- echo "$prompt" | sed 's#-\s*$##' | sed 's#-'${rvm_gemset_separator}'#'${rvm_gemset_separator}'#'
91
+ echo "$prompt" | sed -e 's#^\s*-*##g' -e 's#--*#-#g' -e 's#-*\s*$##' -e 's#-'${rvm_gemset_separator}'#'${rvm_gemset_separator}'#'
92
92
  fi
93
93
  else
94
94
  echo "system"
data/config/db CHANGED
@@ -1,9 +1,24 @@
1
1
  niceness=0
2
- ruby_repo_url=http://svn.ruby-lang.org/repos/ruby
3
- ruby_configure=--enable-shared
4
2
  interpreter=ruby
5
- ruby_version=1.8.6
6
- ruby_patchlevel=383
3
+ ruby_version=1.8.7
4
+ ruby_patchlevel=249
5
+ ruby_configure=--enable-shared
6
+ ruby_repo_url=http://svn.ruby-lang.org/repos/ruby
7
+ ruby_1.0_url=ftp://ftp.ruby-lang.org/pub/ruby/1.0
8
+ ruby_1.2_url=ftp://ftp.ruby-lang.org/pub/ruby/1.2
9
+ ruby_1.3_url=ftp://ftp.ruby-lang.org/pub/ruby/1.3
10
+ ruby_1.4_url=ftp://ftp.ruby-lang.org/pub/ruby/1.4
11
+ ruby_1.5_url=ftp://ftp.ruby-lang.org/pub/ruby/1.5
12
+ ruby_1.6_url=ftp://ftp.ruby-lang.org/pub/ruby/1.6
13
+ ruby_1.7_url=ftp://ftp.ruby-lang.org/pub/ruby/1.7
14
+ ruby_1.8_url=ftp://ftp.ruby-lang.org/pub/ruby/1.8
15
+ ruby_1.9_url=ftp://ftp.ruby-lang.org/pub/ruby/1.9
16
+ ruby_2.0_url=ftp://ftp.ruby-lang.org/pub/ruby/2.0
17
+ ruby_1.9.1_patch_level=378
18
+ ruby_1.9.2_patch_level=preview1
19
+ ruby_1.8.5_patch_level=231
20
+ ruby_1.8.6_patch_level=399
21
+ ruby_1.8.7_patch_level=249
7
22
  rubygems_version=1.3.7
8
23
  rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
9
24
  rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
@@ -18,11 +33,6 @@ ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
18
33
  ree_1.8.7_url=http://rubyforge.org/frs/download.php/68719
19
34
  ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
20
35
  ree_1.8.7_patch_level=2010.01
21
- ruby_1.9.1_patch_level=378
22
- ruby_1.9.2_patch_level=preview1
23
- ruby_1.8.5_patch_level=231
24
- ruby_1.8.6_patch_level=399
25
- ruby_1.8.7_patch_level=249
26
36
  jruby_version=1.5.0
27
37
  jruby_repo_url=git://github.com/jruby/jruby.git
28
38
  jruby_url=http://jruby.org.s3.amazonaws.com/downloads
@@ -30,7 +40,7 @@ macruby_version=0.6
30
40
  macruby_url=http://www.macruby.org/files
31
41
  macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
32
42
  macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
33
- maglev_version=23464
43
+ maglev_version=23530
34
44
  maglev_url=http://glass-downloads.gemstone.com/maglev
35
45
  maglev_repo_url=git://github.com/MagLev/maglev.git
36
46
  rubinius_repo_url=git://github.com/evanphx/rubinius.git
data/config/md5 CHANGED
@@ -42,7 +42,7 @@ zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
42
42
  curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
43
43
  pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
44
44
  ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
45
- GemStone-23464.Darwin-i386.tar.gz=9e5d393d3daecad39404644b5384fec0
46
- GemStone-23464.Linux-x86_64.tar.gz=93947d3b8dd651cf8b61753c2387cd19
47
- MagLev-23464.Darwin-i386.tar.gz=0e10217c4a881b9e4f1fac3e969d0439
48
- MagLev-23464.Linux-x86_64.tar.gz=bfdc0eab81d467e869b0ec837a44b047
45
+ GemStone-23530.Darwin-i386.tar.gz=90f395d169693b5c4b5a37785e7a5c99
46
+ GemStone-23530.Linux-x86_64.tar.gz=66366bf82d4a7ba66e430bccc722392c
47
+ MagLev-23530.Darwin-i386.tar.gz=c051f512c62da9f4bd90ef5d4bc83eae
48
+ MagLev-23530.Linux-x86_64.tar.gz=ae6be22534625777965ee3124c38b3aa
@@ -0,0 +1 @@
1
+ rake
File without changes
data/help/info CHANGED
@@ -0,0 +1,64 @@
1
+
2
+ ∴ rvm info [ruby_string[,ruby_string[,...] [section,[section[,...]
3
+
4
+ where sections are one of:
5
+
6
+ system rvm ruby homes binaries environment debug
7
+
8
+ Both ruby strings and sections are optional arguments.
9
+
10
+ By default with no parameters rvm info will output all sections except debug.
11
+
12
+ To display system rvm debug information:
13
+
14
+ ∴ rvm debug
15
+
16
+ which will display all sections including debug for the current or specified interpreters.
17
+
18
+ Example:
19
+
20
+ ∴ rvm info 1.9.2-head,1.8.7 homes,binaries,environment
21
+
22
+ ruby-1.9.2-head:
23
+
24
+ homes:
25
+ gem: "/Users/wayne/.rvm/gems/ruby-1.9.2-head"
26
+ ruby: "/Users/wayne/.rvm/rubies/ruby-1.9.2-head"
27
+
28
+ binaries:
29
+ ruby: "/Users/wayne/.rvm/rubies/ruby-1.9.2-head/bin/ruby"
30
+ irb: "/Users/wayne/.rvm/rubies/ruby-1.9.2-head/bin/irb"
31
+ gem: "/Users/wayne/.rvm/rubies/ruby-1.9.2-head/bin/gem"
32
+ rake: "/Users/wayne/.rvm/gems/ruby-1.9.2-head/bin/rake"
33
+
34
+ environment:
35
+ GEM_HOME: "/Users/wayne/.rvm/gems/ruby-1.9.2-head"
36
+ GEM_PATH: "/Users/wayne/.rvm/gems/ruby-1.9.2-head:/Users/wayne/.rvm/gems/ruby-1.9.2-head@global"
37
+ BUNDLE_PATH: "/Users/wayne/.rvm/gems/ruby-1.9.2-head"
38
+ MY_RUBY_HOME: "/Users/wayne/.rvm/rubies/ruby-1.9.2-head"
39
+ IRBRC: "/Users/wayne/.rvm/rubies/ruby-1.9.2-head/.irbrc"
40
+ RUBYOPT: ""
41
+ gemset: ""
42
+
43
+ ruby-1.8.7-p249:
44
+
45
+ homes:
46
+ gem: "/Users/wayne/.rvm/gems/ruby-1.8.7-p249"
47
+ ruby: "/Users/wayne/.rvm/rubies/ruby-1.8.7-p249"
48
+
49
+ binaries:
50
+ ruby: "/Users/wayne/.rvm/rubies/ruby-1.8.7-p249/bin/ruby"
51
+ irb: "/Users/wayne/.rvm/rubies/ruby-1.8.7-p249/bin/irb"
52
+ gem: "/Users/wayne/.rvm/rubies/ruby-1.8.7-p249/bin/gem"
53
+ rake: "/Users/wayne/.rvm/gems/ruby-1.8.7-p249/bin/rake"
54
+
55
+ environment:
56
+ GEM_HOME: "/Users/wayne/.rvm/gems/ruby-1.8.7-p249"
57
+ GEM_PATH: "/Users/wayne/.rvm/gems/ruby-1.8.7-p249:/Users/wayne/.rvm/gems/ruby-1.8.7-p249@global"
58
+ BUNDLE_PATH: "/Users/wayne/.rvm/gems/ruby-1.8.7-p249"
59
+ MY_RUBY_HOME: "/Users/wayne/.rvm/rubies/ruby-1.8.7-p249"
60
+ IRBRC: "/Users/wayne/.rvm/rubies/ruby-1.8.7-p249/.irbrc"
61
+ RUBYOPT: ""
62
+ gemset: ""
63
+
64
+
data/help/wrapper ADDED
@@ -0,0 +1,41 @@
1
+
2
+ ∴ rvm wrapper [ruby_string] [wrapper_prefix] [binary[ binary[ ...]]]
3
+
4
+ Where ruby_string is the ruby version and gemset combination to wrap,
5
+ wrapper prefix is what to prepend to the name of the generated wrapper
6
+ binaries and binaries is the names of the binaries you wish to provide
7
+ a wrapper for (e.g. gem).
8
+
9
+ When no binaries are provided, rvm will by default generate wrappers for
10
+ ruby, gem, rake, irb, rdoc, ri, and testrb.
11
+
12
+ Examples:
13
+
14
+ If you wish to provide an environment-specific wrapper for rspec with a
15
+ rails 3 gemset, you could do:
16
+
17
+ ∴ rvm --create ree@rails3
18
+ ∴ rvm wrapper ree@rails3 r3 spec
19
+
20
+ Which would add r3_spec with the specified environment to your the bin
21
+ directory where you installed rvm.
22
+
23
+ Alternatively, if you do:
24
+
25
+ ∴ rvm wrapper ruby-1.9.2-head
26
+
27
+ It will create binaries named ruby,gem, rake, irb, rdoc, ri and tesrb
28
+ in the rvm bin directory.
29
+
30
+ Finally, to show another real and common use, you can use wrapper
31
+ to generate ruby executables and gems for passenger to use. Namely:
32
+
33
+ ∴ rvm use ree@rails3 --passenger
34
+
35
+ is equivelant to:
36
+
37
+ ∴ rvm use ree@rails3
38
+ ∴ rvm wrapper ree@rails3 passenger
39
+
40
+ Which creates passenger_* binaries in the rvm bin directory using
41
+ ree and the rails3 gemset.
data/install CHANGED
@@ -11,7 +11,7 @@ source scripts/version
11
11
  source scripts/utility
12
12
 
13
13
  usage() {
14
- echo -e "
14
+ printf "
15
15
  Usage:
16
16
  ${0} [options]
17
17
 
@@ -27,7 +27,7 @@ spinner_counter=0
27
27
  spinner() {
28
28
  array=('/' '-' '\\' '|' '/' '-' '\\' '|')
29
29
  index=$((($spinner_counter % 8)))
30
- echo -e -n "\r${array[$index]}"
30
+ printf "\r${array[$index]}"
31
31
  let "spinner_counter=spinner_counter+1"
32
32
  command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
33
33
  }
@@ -86,19 +86,17 @@ rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
86
86
  rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
87
87
  rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
88
88
  rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
89
- rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
90
89
 
91
90
  export rvm_gemset_separator="@" # TODO: Remove this after a while.
92
91
 
93
- echo -e "\n$(tput setaf 2)RVM$(tput sgr0) - shell scripts which allow management of multiple ruby interpreters and environments."
94
- echo -e "\n $(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
95
- echo -e "\n $(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm (#rvm on irc.freenode.net)"
92
+ printf "\n$(tput setaf 2)RVM:$(tput sgr0) shell scripts which allow management of multiple ruby interpreters and environments."
93
+ printf "\n$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
94
+ printf "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm (#rvm on irc.freenode.net)"
96
95
 
97
- echo -e "\n********************************************************************************"
98
96
  if [[ "$upgrade_flag" -eq 1 ]] ;then
99
- echo -e -n " Upgrading the RVM installation in $rvm_path/"
97
+ printf "\n\n Upgrading the RVM installation in $rvm_path/"
100
98
  else
101
- echo -e -n " Installing rvm to $rvm_path/"
99
+ printf "\n\n Installing rvm to $rvm_path/"
102
100
  fi
103
101
 
104
102
  spinner
@@ -150,19 +148,19 @@ chmod +x $rvm_bin_path/*
150
148
  #
151
149
  spinner
152
150
  if [[ ! -z "$rvm_auto_flag" ]] ; then
153
- echo -e "Checking rc files... ($rvm_rc_files)"
151
+ printf "Checking rc files... ($rvm_rc_files)"
154
152
  if [[ "$rvm_loaded_flag" != "1" ]] ; then
155
153
  for rcfile in $(echo $rvm_rc_files) ; do
156
154
  if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
157
155
  if [[ -s "$HOME/.profile" ]] ; then
158
156
  if ! grep -q '.profile' "$rcfile" ; then
159
157
  echo " Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
160
- echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
158
+ printf "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
161
159
  fi
162
160
  fi
163
161
  if ! grep -q "scripts\/rvm" "$rcfile" ; then
164
162
  echo " Adding 'if [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi' to $rcfile."
165
- echo -e "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
163
+ printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
166
164
  fi
167
165
  done
168
166
  fi
@@ -196,12 +194,12 @@ done
196
194
  # Migrate old gemset directories to new gemset pattern.
197
195
  #
198
196
  spinner
199
- echo -e -n "\r*" # Stop spinner.
197
+ printf "\r*" # Stop spinner.
200
198
 
201
199
  for gemset in $rvm_path/gems/*\%* ; do
202
200
  new_path=${gemset/\%/${rvm_gemset_separator}}
203
201
  if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
204
- echo -e " Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
202
+ printf "\n Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
205
203
  mv $gemset $new_path
206
204
  fi
207
205
  done
@@ -209,22 +207,26 @@ done
209
207
  for gemset in $rvm_path/gems/*\+* ; do
210
208
  new_path=${gemset/\+/${rvm_gemset_separator}}
211
209
  if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
212
- echo -e " Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
210
+ printf "\n Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
213
211
  mv $gemset $new_path
214
212
  fi
215
213
  done
216
214
  for gemset in $rvm_path/gems/*\@ ; do
217
215
  new_path=$(echo $gemset | sed -e 's#\@$##')
218
216
  if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
219
- echo -e " Fixing: $(basename $gemset) to $(basename $new_path) for new gemset separator."
217
+ printf "\n Fixing: $(basename $gemset) to $(basename $new_path) for new gemset separator."
220
218
  mv $gemset $new_path
221
219
  fi
222
220
  done
223
221
 
224
- # Upgrade any default file.
225
- if [[ -s $rvm_config_path/default ]] && grep -q '\%' $rvm_config_path/default ; then
226
- sed -e "s#\%#${rvm_gemset_separator}#g" $rvm_config_path/default > $rvm_config_path/default.new
227
- mv $rvm_config_path/default.new $rvm_config_path/default
222
+ # Move from legacy defaults to the new, alias based system.
223
+ if [[ -s "$rvm_config_path/default" ]]; then
224
+ original_version="$(basename "$(grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
225
+ if [[ -n "$original_version" ]]; then
226
+ $rvm_scripts_path/alias create default "$original_version" &> /dev/null
227
+ fi
228
+ unset original_version
229
+ rm -rf "$rvm_config_path/default"
228
230
  fi
229
231
 
230
232
  #
@@ -232,64 +234,60 @@ fi
232
234
  #
233
235
 
234
236
  if [[ "root" = "$(whoami)" ]] ; then
235
- echo -e "\n Symlinking rvm to $rvm_symlink_path/rvm ..."
236
- mkdir -p $rvm_symlink_path
237
- ln -nfs $rvm_bin_path/rvm $rvm_symlink_path/rvm
238
- ln -nfs $rvm_bin_path/rvmsudo $rvm_symlink_path/rvmsudo
239
- chmod +x $rvm_symlink_path/rvm
240
- chmod +x $rvm_symlink_path/rvmsudo
237
+ printf "\n Symlinking rvm to $rvm_bin_path/rvm ..."
238
+ mkdir -p $rvm_bin_path
239
+ chmod +x $rvm_bin_path/rvm
240
+ chmod +x $rvm_bin_path/rvmsudo
241
241
  fi
242
242
 
243
243
  if [[ "$upgrade_flag" -eq 0 ]] ; then
244
- echo -e "\n********************************************************************************"
245
244
  ./scripts/notes
246
245
  fi
247
246
 
248
- echo -e "\n********************************************************************************"
249
247
  name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
250
- echo -e "\n${name:-"$(whoami)"},\n"
251
- echo -e "\nThank you for using rvm. I hope that it makes your work easier and more enjoyable."
252
- echo -e "If you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
253
- echo -e "My irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
254
- echo -e "If I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
255
- echo -e "Be sure to get head often as rvm development happens fast, you can do this by typing 'rvm update --head'."
256
- echo -e "\n w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
257
- echo -e "\n ~ Wayne"
258
- echo -e "\n********************************************************************************"
248
+ printf "\n\n${name:-"$(whoami)"},\n"
249
+ printf "\nThank you for using rvm. I hope that it makes your work easier and more enjoyable."
250
+ printf "\nIf you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
251
+ printf "\nMy irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
252
+ printf "\nIf I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
253
+ printf "\nBe sure to get head often as rvm development happens fast, you can do this by typing 'rvm update --head'."
254
+ printf "\n w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
255
+ printf "\n ~ Wayne\n"
259
256
 
260
257
  if [[ "$upgrade_flag" -eq 1 ]] ; then
261
- echo -e "\n$(tput setaf 6)**** NOTICE *************************************************************************************"
262
- echo -e "* Gemset separator has changed, it is now @ and will remain unless any rubies error using it. *"
263
- echo -e "* If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' *"
264
- echo -e "*************************************************************************************************$(tput sgr0)\n"
265
- echo -e "Upgrade of RVM in $rvm_path/ is complete.\n"
258
+ printf "\n$(tput setaf 6)Upgrade Notes\n"
259
+ printf "\n * Gemset separator is '@' and will remain unless any rubies error using it."
260
+ printf "\n * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
261
+ printf "\n * Do not forget that 'rvm notes' tells you OS dependency packages for installing rubies."
262
+ printf "\n$(tput sgr0)\n"
263
+ printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
266
264
  else
267
265
  if [[ "root" != "$(whoami)" ]] ; then
268
- echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
269
- echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
270
- echo -e "\n if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
271
- echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
272
- echo -e "\n This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
273
- echo -e "\n if [[ ! -z "$PS1" ]] ; then"
274
- echo -e "\n ... original content that was below the && return line ..."
275
- echo -e "\n fi # <= be sure to close the if."
276
- echo -e "\n #EOF .bashrc"
277
- echo -e "\n Be absolutely *sure* to REMOVE the '&& return'."
278
- echo -e "\n If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
279
- echo -e "\n placing all non-interactive items in the .bashrc"
280
- echo -e "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
266
+ printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
267
+ printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
268
+ printf "\n if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
269
+ printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
270
+ printf "\n This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
271
+ printf "\n if [[ ! -z "$PS1" ]] ; then"
272
+ printf "\n ... original content that was below the && return line ..."
273
+ printf "\n fi # <= be sure to close the if."
274
+ printf "\n #EOF .bashrc"
275
+ printf "\n Be absolutely *sure* to REMOVE the '&& return'."
276
+ printf "\n If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
277
+ printf "\n placing all non-interactive items in the .bashrc"
278
+ printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
281
279
  fi
282
280
  if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
283
- echo -e "\n\nWARNING: you have a 'return' statement in your .bashrc, likely this will cause untold havoc.
284
- This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:
285
- if [[ -n "\$PS1" ]] ; then
286
- ... original content that was below the && return line ...
287
- fi # <= be sure to close the if.
288
- #EOF .bashrc
289
-
290
- If you have any questions about this please visit #rvm on irc.freenode.net.\n"
281
+ printf "\n\nWARNING: you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
282
+ printf "\n This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
283
+ printf "\n if [[ -n "\$PS1" ]] ; then"
284
+ printf "\n ... original content that was below the && return line ..."
285
+ printf "\n fi # <= be sure to close the if."
286
+ printf "\n #EOF .bashrc"
287
+ printf "\nEven if you use zsh you should still adjust the .bashrc as above."
288
+ printf "\nIf you have any questions about this please visit #rvm on irc.freenode.net.\n"
291
289
  fi
292
- echo -e "Installation of RVM to $rvm_path/ is complete.\n\n"
290
+ printf "\nInstallation of RVM to $rvm_path/ is complete.\n\n"
293
291
  fi
294
292
 
295
293
  exit 0
data/lib/VERSION.yml CHANGED
@@ -1,4 +1,4 @@
1
1
  ---
2
2
  :major: 0
3
3
  :minor: 1
4
- :patch: 32
4
+ :patch: 33
data/rvm.gemspec CHANGED
@@ -5,13 +5,13 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{rvm}
8
- s.version = "0.1.32"
8
+ s.version = "0.1.33"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Wayne E. Seguin"]
12
- s.date = %q{2010-05-16}
12
+ s.date = %q{2010-05-27}
13
13
  s.default_executable = %q{rvm-install}
14
- s.description = %q{Manages Ruby Environments.}
14
+ s.description = %q{Manages Ruby interpreter environments and switching between them.}
15
15
  s.email = %q{wayneeseguin@gmail.com}
16
16
  s.executables = ["rvm-install"]
17
17
  s.extra_rdoc_files = [
@@ -28,6 +28,34 @@ Gem::Specification.new do |s|
28
28
  "config/db",
29
29
  "config/md5",
30
30
  "examples/rvmrc",
31
+ "gemsets/default.gems",
32
+ "gemsets/global.gems",
33
+ "help/alias",
34
+ "help/benchmark",
35
+ "help/debug",
36
+ "help/fetch",
37
+ "help/gem",
38
+ "help/gemdir",
39
+ "help/gemset",
40
+ "help/implode",
41
+ "help/info",
42
+ "help/install",
43
+ "help/list",
44
+ "help/monitor",
45
+ "help/notes",
46
+ "help/package",
47
+ "help/rake",
48
+ "help/remove",
49
+ "help/reset",
50
+ "help/ruby",
51
+ "help/rvmrc",
52
+ "help/specs",
53
+ "help/srcdir",
54
+ "help/tests",
55
+ "help/uninstall",
56
+ "help/update",
57
+ "help/use",
58
+ "help/wrapper",
31
59
  "install",
32
60
  "lib/VERSION.yml",
33
61
  "lib/rvm.rb",
@@ -36,6 +64,7 @@ Gem::Specification.new do |s|
36
64
  "lib/rvm/shell.rb",
37
65
  "lib/rvm/version.rb",
38
66
  "rvm.gemspec",
67
+ "scripts/alias",
39
68
  "scripts/aliases",
40
69
  "scripts/array",
41
70
  "scripts/cd",
@@ -43,14 +72,19 @@ Gem::Specification.new do |s|
43
72
  "scripts/color",
44
73
  "scripts/completion",
45
74
  "scripts/db",
75
+ "scripts/docs",
76
+ "scripts/env",
46
77
  "scripts/fetch",
47
78
  "scripts/gemsets",
48
79
  "scripts/hash",
80
+ "scripts/help",
49
81
  "scripts/hook",
82
+ "scripts/info",
50
83
  "scripts/initialize",
51
84
  "scripts/install",
52
85
  "scripts/irbrc",
53
86
  "scripts/irbrc.rb",
87
+ "scripts/list",
54
88
  "scripts/log",
55
89
  "scripts/maglev",
56
90
  "scripts/manage",
@@ -63,35 +97,10 @@ Gem::Specification.new do |s|
63
97
  "scripts/rvm-install",
64
98
  "scripts/selector",
65
99
  "scripts/set",
66
- "scripts/symlink",
67
100
  "scripts/update",
68
101
  "scripts/utility",
69
102
  "scripts/version",
70
- "help/alias",
71
- "help/benchmark",
72
- "help/debug",
73
- "help/fetch",
74
- "help/gem",
75
- "help/gemdir",
76
- "help/gemset",
77
- "help/implode",
78
- "help/info",
79
- "help/install",
80
- "help/list",
81
- "help/monitor",
82
- "help/notes",
83
- "help/package",
84
- "help/rake",
85
- "help/remove",
86
- "help/reset",
87
- "help/ruby",
88
- "help/rvmrc",
89
- "help/specs",
90
- "help/srcdir",
91
- "help/tests",
92
- "help/uninstall",
93
- "help/update",
94
- "help/use"
103
+ "scripts/wrapper"
95
104
  ]
96
105
  s.homepage = %q{http://github.com/wayneeseguin/rvm}
97
106
  s.post_install_message = %q{********************************************************************************
@@ -114,7 +123,7 @@ Gem::Specification.new do |s|
114
123
  current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
115
124
  s.specification_version = 3
116
125
 
117
- if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
126
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
118
127
  else
119
128
  end
120
129
  else