rvm 0.1.26 → 0.1.27

data/config/db

@@ -30,7 +30,7 @@ macruby_version=0.5
 macruby_url=http://www.macruby.org/files
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.pkg
-maglev_version=23101
+maglev_version=23191
 maglev_url=http://glass-downloads.gemstone.com/maglev
 maglev_repo_url=git://github.com/MagLev/maglev.git
 rubinius_repo_url=git://github.com/evanphx/rubinius.git

data/config/md5

@@ -73,3 +73,7 @@ GemStone-23101.Darwin-i386.tar.gz=09b2c6fbb17b5571d31f2539779a2c24
 GemStone-23101.Linux-x86_64.tar.gz=9710555efbeb3563c607f09db1d33090
 MagLev-23101.Darwin-i386.tar.gz=281c9615cb2ef94f720b67fb893f1e26
 MagLev-23101.Linux-x86_64.tar.gz=3294165bd510129fcf591920573c3af1
+GemStone-23191.Darwin-i386.tar.gz=d3137c1996b9a599d58fa77b9c0573b0
+GemStone-23191.Linux-x86_64.tar.gz=030b8b4951168142436ff958c222f7f1
+MagLev-23191.Darwin-i386.tar.gz=04b71b607392da54cc7366616483cfc9
+MagLev-23191.Linux-x86_64.tar.gz=479917622dd8605393e43e7c18c3fa44

data/install

@@ -180,8 +180,8 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
     for file in gem rake ; do
       spinner
       if [[ -s "$new_path/bin/$file" ]] ; then
-        sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
-        rm -f "$new_path/bin/$file.orig"
+        sed -e '1,1s=.*=#!'"${new_path}/bin/ruby=" "${new_path}/bin/${file}" > "${new_path}/bin/${file}.new"
+        mv -f "$new_path/bin/$file.new" "$new_path/bin/$file"
         chmod +x "$new_path/bin/$file"
       fi
     done

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 26
+:patch: 27

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.26"
+  s.version = "0.1.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-04-05}
+  s.date = %q{2010-04-11}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
      "scripts/cd",
      "scripts/cli",
      "scripts/color",
+     "scripts/completion",
      "scripts/db",
      "scripts/fetch",
      "scripts/gemsets",
@@ -81,7 +82,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rvm}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ruby Version Manager (rvm)}
 
   if s.respond_to? :specification_version then

data/scripts/completion

@@ -0,0 +1,115 @@
+# bash completion for Ruby Version Manager (RVM)
+
+__rvm_comp() 
+{
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  COMPREPLY=($(compgen -W "$1" -- "$cur"))
+  return 0
+}
+
+__rvm_subcommand()
+{
+  local word subcommand c=1
+
+  while [ $c -lt $COMP_CWORD ]; do
+    word="${COMP_WORDS[c]}"
+    for subcommand in $1; do
+      if [ "$subcommand" = "$word" ]; then
+        echo "$subcommand"
+        return
+      fi
+    done
+    c=$((++c))
+  done
+}
+
+__rvm_rubies ()
+{
+  echo "$(rvm list strings) default system"
+}
+
+__rvm_gemsets ()
+{
+  echo "$(rvm gemset list | grep -v gemset 2>/dev/null)"
+}
+
+_rvm_commands ()
+{
+  local cur=${COMP_WORDS[COMP_CWORD]}
+
+  COMMANDS='\
+        version use reload impload update reset info debug\
+        install uninstall remove\
+        ruby gem rake tests specs monitor gemset\
+        gemdir srcdir fetch list package notes'
+
+  RVM_OPTS='\
+    -v --version\
+    -h --help\
+    -l --level\
+    --tag\
+    --rev\
+    --prefix\
+    --bin\
+    --source\
+    --archives\
+    -S --script\
+    -G --gems\
+    -C --configure\
+    --reconfigure\
+    --make\
+    --make-install\
+    --nice\
+    -m --gem-set\
+    --rm-gem-set'
+
+  case "${cur}" in
+  -*)       _rvm_opts ;;
+  *)        __rvm_comp "$COMMANDS $(__rvm_rubies)" ;;
+  esac
+}
+
+_rvm_opts ()
+{
+  local rvm_opts='\
+	-v --version\
+	-h --help'
+
+  __rvm_comp "$rvm_opts"
+}
+
+_rvm_use ()
+{
+  local command="${COMP_WORDS[COMP_CWORD-2]}"
+
+  case "${command}" in
+  gemset) __rvm_comp "$(__rvm_gemsets)" ;;
+  *)      __rvm_comp "$(__rvm_rubies)" ;;
+  esac
+}
+
+_rvm_gemset ()
+{
+  local subcommands="use create"
+  local subcommand="$(__rvm_subcommand "$subcommands")"
+
+  if [ -z "$subcommand" ]; then
+    __rvm_comp "$subcommands"
+    return
+  fi
+}
+
+_rvm ()
+{
+  local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+  case "${prev}" in
+  use)      _rvm_use ;;
+  gemset)   _rvm_gemset ;;
+  *)        _rvm_commands ;;
+  esac
+
+  return 0
+}
+
+complete -o default -o nospace -F _rvm rvm

data/scripts/install

@@ -180,8 +180,8 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
     for file in gem rake ; do
       spinner
       if [[ -s "$new_path/bin/$file" ]] ; then
-        sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
-        rm -f "$new_path/bin/$file.orig"
+        sed -e '1,1s=.*=#!'"${new_path}/bin/ruby=" "${new_path}/bin/${file}" > "${new_path}/bin/${file}.new"
+        mv -f "$new_path/bin/$file.new" "$new_path/bin/$file"
         chmod +x "$new_path/bin/$file"
       fi
     done

data/scripts/manage

@@ -39,22 +39,24 @@ __rvm_install_source() {
     fi
   fi
 
-  if [[ "1.8.5" = "$rvm_ruby_version" ]] ; then
-    # How to install ruby 1.8.5... "sneaky sneaky, sir"
-    src_dir="ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level")"
-    if [[ ! -d "$HOME/.rvm/src/$src_dir/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p248 > /dev/null ; fi
-    cp ~/.rvm/src/$src_dir/ext/openssl/extconf.rb ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
-    cp ~/.rvm/src/$src_dir/ext/openssl/openssl_missing.* ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
-    cp ~/.rvm/src/$src_dir/ext/openssl/ossl_hmac.c ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
-    src_dir="ruby-1.8.6-p$(__rvm_db "ruby_1.8.6_patch_level")"
-    if [[ ! -d "$HOME/.rvm/src/$src_dir/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p383 > /dev/null ; fi
-    cp ~/.rvm/src/$src_dir/ext/readline/* ~/.rvm/src/ruby-1.8.5-p231/ext/readline/
-    unset src_dir
-  fi
-
-  if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
-    (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
-  elif [[ ! -z "$rvm_ruby_configure" ]] ; then
+  #if [[ "1.8.5" = "$rvm_ruby_version" ]] ; then
+  #  # How to install ruby 1.8.5... "sneaky sneaky, sir"
+  #  src_dir="ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level")"
+  #  if [[ ! -d "$HOME/.rvm/src/$src_dir/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p248 > /dev/null ; fi
+  #  cp ~/.rvm/src/$src_dir/ext/openssl/extconf.rb ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+  #  cp ~/.rvm/src/$src_dir/ext/openssl/openssl_missing.* ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+  #  cp ~/.rvm/src/$src_dir/ext/openssl/ossl_hmac.c ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+  #  src_dir="ruby-1.8.6-p$(__rvm_db "ruby_1.8.6_patch_level")"
+  #  if [[ ! -d "$HOME/.rvm/src/$src_dir/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p383 > /dev/null ; fi
+  #  cp ~/.rvm/src/$src_dir/ext/readline/* ~/.rvm/src/ruby-1.8.5-p231/ext/readline/
+  #  unset src_dir
+  #fi
+
+  #
+  #if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
+  #  (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
+  #el
+  if [[ ! -z "$rvm_ruby_configure" ]] ; then
     __rvm_run "configure" "$rvm_ruby_configure"
     result=$? ; if [[ "$result" -gt 0 ]] ; then
       $rvm_scripts_path/log "error" "There has been an error while configuring. Aborting the installation." ; __rvm_pushpop ; return $result
@@ -63,10 +65,9 @@ __rvm_install_source() {
     __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..."
     result=$? ; if [[ "$result" -gt 0 ]] ; then
       $rvm_scripts_path/log "error" "There has been an error while running configure. Aborting the installation." ; __rvm_pushpop ; return $result
-    fi
-    unset configure_parameters
+    fi ; unset configure_parameters
   else
-    $rvm_scripts_path/log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
+    $rvm_scripts_path/log "error" "Skipping configure step, 'configure' does not exist, did autoconf not run successfully?"
   fi
 
   if [[ ! -z "$rvm_ruby_patch" ]] ; then
@@ -84,6 +85,8 @@ __rvm_install_source() {
     $rvm_scripts_path/log "error" "There has been an error while running make. Aborting the installation." ; __rvm_pushpop ; return $result
   fi
 
+  if [[ -d .ext/rdoc ]] ; then rm -rf .ext/rdoc ; fi
+
   rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
   __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string"
   result=$? ; if [[ "$result" -gt 0 ]] ; then
@@ -771,7 +774,7 @@ __rvm_fetch_ruby() {
         fi
       else
         rm -rf $rvm_ruby_src_path
-        __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_url $rvm_ruby_src_path"
+        __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_url $rvm_ruby_src_path" "Downloading source from ${rvm_url}."
       fi
       result=$? ; if [[ "$result" -gt 0 ]] ; then
         $rvm_scripts_path/log "error" "There has been an error while trying to fetch / update the source. Aborting the installation." ; __rvm_pushpop ; return $result
@@ -816,6 +819,9 @@ __rvm_remove_ruby() {
       if [[ -e $rvm_bin_path/$rvm_ruby_string ]] ; then
         rm -f $rvm_bin_path/$rvm_ruby_string
       fi
+      if grep -q "$rvm_ruby_string" "$rvm_config_path/default" ; then
+        rm -f "$rvm_config_path/default"
+      fi
     done ; unset dir
     __rvm_remove_gemsets
   else
@@ -861,7 +867,7 @@ __rvm_post_install() {
         fi
         __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$rvm_gem_name"
         __rvm_inject_gem_env "$rvm_ruby_home/bin/$rvm_gem_name"
-      fi ; unset rvm_gem_name
+      fi
     done ; unset home path dir
     GEM_HOME="$home" ; GEM_PATH="$path" ; BUNDLE_PATH="$home"
     export GEM_HOME GEM_PATH BUNDLE_PATH
@@ -970,9 +976,8 @@ __rvm_inject_ruby_shebang() {
   __rvm_actual_file $1
 
   if [[ -f "$actual_file" ]] ; then
-    #sed -i.orig -e '1,1s=.*=#!'"$rvm_ruby_home/bin/ruby=" $actual_file
-    sed -e '1,1s=.*=#!'"/usr/bin/env ruby=" $actual_file > $actual+file.orig
-    rm -f $actual_file.orig ; chmod +x "$actual_file"
+    sed -e '1,1s=.*=#!'"/usr/bin/env ruby=" ${actual_file} > "${actual_file}.new"
+    mv "${actual_file}.new" "${actual_file}" ; chmod +x "$actual_file"
   fi ; unset actual_file
 }
 

data/scripts/rvm-install

@@ -180,8 +180,8 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
     for file in gem rake ; do
       spinner
       if [[ -s "$new_path/bin/$file" ]] ; then
-        sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
-        rm -f "$new_path/bin/$file.orig"
+        sed -e '1,1s=.*=#!'"${new_path}/bin/ruby=" "${new_path}/bin/${file}" > "${new_path}/bin/${file}.new"
+        mv -f "$new_path/bin/$file.new" "$new_path/bin/$file"
         chmod +x "$new_path/bin/$file"
       fi
     done

data/scripts/update

@@ -180,8 +180,8 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
     for file in gem rake ; do
       spinner
       if [[ -s "$new_path/bin/$file" ]] ; then
-        sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
-        rm -f "$new_path/bin/$file.orig"
+        sed -e '1,1s=.*=#!'"${new_path}/bin/ruby=" "${new_path}/bin/${file}" > "${new_path}/bin/${file}.new"
+        mv -f "$new_path/bin/$file.new" "$new_path/bin/$file"
         chmod +x "$new_path/bin/$file"
       fi
     done

data/scripts/utility

@@ -276,7 +276,7 @@ RubyWrapper
 
 # Load default ruby, if default is not set load system ruby.
 __rvm_load_defaults() {
-  if [[ ! -s "$rvm_config_path/system" ]] ; then
+  if [[ ! -s "$rvm_config_path/system" ]] && [[ "root" != "$(whoami)" ]] ; then
     for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME ; do
       eval value=\$${variable}
       if [[ -z "${value/ /}" ]] ; then
@@ -425,7 +425,7 @@ __rvm_list_known() {
   echo -e "jruby-1.2.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head"
   echo -e "rbx(-prc1) # default\nrbx-head"
   echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
-  echo -e "maglev(-23101)\nmaglev-head"
+  echo -e "maglev(-23191)\nmaglev-head"
   echo -e "mput(-head) # shyouhei head, the default mput"
   echo -e "ironruby-0.9.3\nironruby-1.0-rc2\nironruby-head"
   if [[ "Darwin" = "$(uname)" ]] ; then
@@ -643,6 +643,10 @@ __rvm_gemset_select() {
 
   rvm_ruby_global_gems_path="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global"
 
+  #if [[ -z "$(echo $rvm_ruby_gem_home | grep "$rvm_path")" ]] ; then
+  #  $rvm_scripts_path/log "warn" "Gemsets cannot be used with system ruby installs (yet)."
+  #fi
+
   if [[ -z "$rvm_gemset_name" ]] ; then
     # No longer defaulting to 'sticky' gem sets.
     # Set 'rvm_sticky_flag=1' in ~/.rvmrc to enable.
@@ -715,6 +719,9 @@ __rvm_gemset_select() {
 
 # Use a gemset specified by 'rvm_ruby_gem_home'
 __rvm_gemset_use() {
+  #if [[ -z "$(echo $rvm_ruby_gem_home | grep "rvm")" ]] ; then
+  #  $rvm_scripts_path/log "warn" "Gemsets cannot be used with system ruby installs (yet)."
+  #fi
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
       if [[ "$rvm_gemset_create_on_use_flag" -eq 1 ]] || [[ "$rvm_create_flag" -eq 1 ]]; then

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 26
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -14,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -04:00
+date: 2010-04-11 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -50,6 +45,7 @@ files:
 - scripts/cd
 - scripts/cli
 - scripts/color
+- scripts/completion
 - scripts/db
 - scripts/fetch
 - scripts/gemsets
@@ -99,20 +95,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: rvm
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby Version Manager (rvm)