rvm 1.0.21 → 1.0.22

data/README

@@ -7,7 +7,7 @@ Flags
 
   --head        - with update, updates rvm to git head version.
   --rubygems    - with update, updates rubygems for selected ruby
-  --default     - with ruby select, sets a default ruby for new shells.
+  --default     - with 'rvm use X', sets the default ruby for new shells to X.
   --debug       - Toggle debug mode on for very verbose output.
   --trace       - Toggle trace mode on to see EVERYTHING rvm is doing.
   --force       - Force install, removes old install & source before install.

data/config/db

@@ -26,7 +26,7 @@ rubygems_version=1.3.7
 rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
 rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
 rubygems_1.3.7_url=http://rvm.beginrescueend.com/src/
-rbx_version=1.1.0
+rbx_version=head
 rbx_1.0.0_patch_level=20100514
 rbx_1.0.1_patch_level=20100603
 rbx_1.1.0_patch_level=20100923
@@ -41,7 +41,7 @@ ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
 ree_1.8.7_url=http://rvm.beginrescueend.com/src/
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
 ree_1.8.7_patch_level=2010.02
-jruby_version=1.5.3
+jruby_version=1.5.5
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.org.s3.amazonaws.com/downloads
 macruby_version=0.7.1

data/config/known

@@ -21,7 +21,8 @@ jruby-1.3.1
 jruby-1.4.0
 jruby-1.5.1
 jruby-1.5.2
-jruby[-1.5.3]
+jruby-1.5.3
+jruby[-1.5.5]
 jruby-head
 
 # Rubinius

data/config/md5

@@ -19,6 +19,7 @@ jruby-bin-1.5.0.tar.gz=ee2b4e326e8b87858e5dd0c8e94102e6
 jruby-bin-1.5.1.tar.gz=0196dcfb17354f12253eaddc1166a0ee
 jruby-bin-1.5.2.tar.gz=d239deb9a108a6abbfbd6cb79cf8255b
 jruby-bin-1.5.3.tar.gz=ccb0b2dbc300d8dd4ad1bd4da48b8320
+jruby-bin-1.5.5.tar.gz=8e00f7d40cbf221f733d6f7a15784e9a
 libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
 ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
 openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3

data/install

@@ -42,7 +42,7 @@ usage()
 
     --version : display rvm package version
 
-  "
+  \n"
 }
 
 check_rubyopt_conditions()
@@ -192,7 +192,15 @@ while [[ $# -gt 0 ]] ; do
       env | grep '^rvm_'
       set -o xtrace
       ;;
-    --help|*)  usage ;;
+    --help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unrecognized option: $token"
+      usage
+      exit 1
+      ;;
   esac
 done
 

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 21
+:patch: 22

data/rvm.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.21"
+  s.version = "1.0.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-11-05}
+  s.date = %q{2010-11-16}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -19,141 +19,141 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     "LICENCE",
-     "README",
-     "binscripts/rvm",
-     "binscripts/rvm-auto-ruby",
-     "binscripts/rvm-prompt",
-     "binscripts/rvm-shell",
-     "binscripts/rvm-update-head",
-     "binscripts/rvm-update-latest",
-     "binscripts/rvmsudo",
-     "config/db",
-     "config/known",
-     "config/md5",
-     "contrib/gemset_snapshot",
-     "contrib/install-system-wide",
-     "contrib/r",
-     "examples/rvmrc",
-     "gemsets/default.gems",
-     "gemsets/global.gems",
-     "help/alias",
-     "help/benchmark",
-     "help/cleanup",
-     "help/debug",
-     "help/disk-usage",
-     "help/docs",
-     "help/exec",
-     "help/fetch",
-     "help/gem",
-     "help/gemdir",
-     "help/gemset",
-     "help/implode",
-     "help/info",
-     "help/install",
-     "help/list",
-     "help/migrate",
-     "help/monitor",
-     "help/notes",
-     "help/package",
-     "help/rake",
-     "help/remove",
-     "help/repair",
-     "help/reset",
-     "help/ruby",
-     "help/rubygems",
-     "help/rvmrc",
-     "help/snapshot",
-     "help/specs",
-     "help/srcdir",
-     "help/tests",
-     "help/tools",
-     "help/uninstall",
-     "help/update",
-     "help/upgrade",
-     "help/use",
-     "help/wrapper",
-     "install",
-     "lib/VERSION.yml",
-     "lib/rvm.rb",
-     "lib/rvm/capistrano.rb",
-     "lib/rvm/environment.rb",
-     "lib/rvm/environment/alias.rb",
-     "lib/rvm/environment/cleanup.rb",
-     "lib/rvm/environment/configuration.rb",
-     "lib/rvm/environment/env.rb",
-     "lib/rvm/environment/gemset.rb",
-     "lib/rvm/environment/info.rb",
-     "lib/rvm/environment/list.rb",
-     "lib/rvm/environment/rubies.rb",
-     "lib/rvm/environment/sets.rb",
-     "lib/rvm/environment/tools.rb",
-     "lib/rvm/environment/utility.rb",
-     "lib/rvm/environment/wrapper.rb",
-     "lib/rvm/errors.rb",
-     "lib/rvm/install_command_dumper.rb",
-     "lib/rvm/shell.rb",
-     "lib/rvm/shell/abstract_wrapper.rb",
-     "lib/rvm/shell/calculate_rvm_path.sh",
-     "lib/rvm/shell/result.rb",
-     "lib/rvm/shell/shell_wrapper.sh",
-     "lib/rvm/shell/single_shot_wrapper.rb",
-     "lib/rvm/shell/utility.rb",
-     "lib/rvm/version.rb",
-     "man/man1/rvm.1",
-     "man/man1/rvm.1.gz",
-     "rvm.gemspec",
-     "scripts/alias",
-     "scripts/aliases",
-     "scripts/array",
-     "scripts/base",
-     "scripts/cd",
-     "scripts/cleanup",
-     "scripts/cli",
-     "scripts/color",
-     "scripts/completion",
-     "scripts/db",
-     "scripts/default",
-     "scripts/disk-usage",
-     "scripts/docs",
-     "scripts/env",
-     "scripts/environment-convertor",
-     "scripts/fetch",
-     "scripts/gemsets",
-     "scripts/get",
-     "scripts/hash",
-     "scripts/help",
-     "scripts/hook",
-     "scripts/info",
-     "scripts/initialize",
-     "scripts/install",
-     "scripts/irbrc",
-     "scripts/irbrc.rb",
-     "scripts/list",
-     "scripts/log",
-     "scripts/maglev",
-     "scripts/manage",
-     "scripts/match",
-     "scripts/md5",
-     "scripts/migrate",
-     "scripts/monitor",
-     "scripts/notes",
-     "scripts/override_gem",
-     "scripts/package",
-     "scripts/patches",
-     "scripts/patchsets",
-     "scripts/repair",
-     "scripts/rubygems",
-     "scripts/rvm",
-     "scripts/rvm-install",
-     "scripts/selector",
-     "scripts/set",
-     "scripts/snapshot",
-     "scripts/tools",
-     "scripts/update",
-     "scripts/upgrade",
-     "scripts/utility",
-     "scripts/version",
-     "scripts/wrapper"
+    "README",
+    "binscripts/rvm",
+    "binscripts/rvm-auto-ruby",
+    "binscripts/rvm-prompt",
+    "binscripts/rvm-shell",
+    "binscripts/rvm-update-head",
+    "binscripts/rvm-update-latest",
+    "binscripts/rvmsudo",
+    "config/db",
+    "config/known",
+    "config/md5",
+    "contrib/gemset_snapshot",
+    "contrib/install-system-wide",
+    "contrib/r",
+    "examples/rvmrc",
+    "gemsets/default.gems",
+    "gemsets/global.gems",
+    "help/alias",
+    "help/benchmark",
+    "help/cleanup",
+    "help/debug",
+    "help/disk-usage",
+    "help/docs",
+    "help/exec",
+    "help/fetch",
+    "help/gem",
+    "help/gemdir",
+    "help/gemset",
+    "help/implode",
+    "help/info",
+    "help/install",
+    "help/list",
+    "help/migrate",
+    "help/monitor",
+    "help/notes",
+    "help/package",
+    "help/rake",
+    "help/remove",
+    "help/repair",
+    "help/reset",
+    "help/ruby",
+    "help/rubygems",
+    "help/rvmrc",
+    "help/snapshot",
+    "help/specs",
+    "help/srcdir",
+    "help/tests",
+    "help/tools",
+    "help/uninstall",
+    "help/update",
+    "help/upgrade",
+    "help/use",
+    "help/wrapper",
+    "install",
+    "lib/VERSION.yml",
+    "lib/rvm.rb",
+    "lib/rvm/capistrano.rb",
+    "lib/rvm/environment.rb",
+    "lib/rvm/environment/alias.rb",
+    "lib/rvm/environment/cleanup.rb",
+    "lib/rvm/environment/configuration.rb",
+    "lib/rvm/environment/env.rb",
+    "lib/rvm/environment/gemset.rb",
+    "lib/rvm/environment/info.rb",
+    "lib/rvm/environment/list.rb",
+    "lib/rvm/environment/rubies.rb",
+    "lib/rvm/environment/sets.rb",
+    "lib/rvm/environment/tools.rb",
+    "lib/rvm/environment/utility.rb",
+    "lib/rvm/environment/wrapper.rb",
+    "lib/rvm/errors.rb",
+    "lib/rvm/install_command_dumper.rb",
+    "lib/rvm/shell.rb",
+    "lib/rvm/shell/abstract_wrapper.rb",
+    "lib/rvm/shell/calculate_rvm_path.sh",
+    "lib/rvm/shell/result.rb",
+    "lib/rvm/shell/shell_wrapper.sh",
+    "lib/rvm/shell/single_shot_wrapper.rb",
+    "lib/rvm/shell/utility.rb",
+    "lib/rvm/version.rb",
+    "man/man1/rvm.1",
+    "man/man1/rvm.1.gz",
+    "rvm.gemspec",
+    "scripts/alias",
+    "scripts/aliases",
+    "scripts/array",
+    "scripts/base",
+    "scripts/cd",
+    "scripts/cleanup",
+    "scripts/cli",
+    "scripts/color",
+    "scripts/completion",
+    "scripts/db",
+    "scripts/default",
+    "scripts/disk-usage",
+    "scripts/docs",
+    "scripts/env",
+    "scripts/environment-convertor",
+    "scripts/fetch",
+    "scripts/gemsets",
+    "scripts/get",
+    "scripts/hash",
+    "scripts/help",
+    "scripts/hook",
+    "scripts/info",
+    "scripts/initialize",
+    "scripts/install",
+    "scripts/irbrc",
+    "scripts/irbrc.rb",
+    "scripts/list",
+    "scripts/log",
+    "scripts/maglev",
+    "scripts/manage",
+    "scripts/match",
+    "scripts/md5",
+    "scripts/migrate",
+    "scripts/monitor",
+    "scripts/notes",
+    "scripts/override_gem",
+    "scripts/package",
+    "scripts/patches",
+    "scripts/patchsets",
+    "scripts/repair",
+    "scripts/rubygems",
+    "scripts/rvm",
+    "scripts/rvm-install",
+    "scripts/selector",
+    "scripts/set",
+    "scripts/snapshot",
+    "scripts/tools",
+    "scripts/update",
+    "scripts/upgrade",
+    "scripts/utility",
+    "scripts/version",
+    "scripts/wrapper"
   ]
   s.homepage = %q{http://github.com/wayneeseguin/rvm}
   s.post_install_message = %q{********************************************************************************

data/scripts/cd

@@ -45,29 +45,40 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
       return $result
     }
 
-    # If $CDPATH is set, bash should tab-complete based on directories in those paths,
-    # but with the cd function above, the built-in tab-complete ignores $CDPATH. This
-    # function returns that functionality.
-    _rvm_cd_complete ()
-    {
-      local directory current matches item index sep
-      sep="${IFS}"
-      declare -x IFS=$'\n'
-      COMPREPLY=()
-      current="${COMP_WORDS[COMP_CWORD]}"
-      if [[ -n "$CDPATH" && ${current:0:1} != "/" ]] ; then
-        index=0
-        for directory in $(printf "%s" "$CDPATH" | tr -s ':' ' ') ; do
-          for item in $( compgen -d "$directory/$current" ) ; do
-            COMPREPLY[index++]=${item#$directory/}
+    # This functionality is opt-in by setting rvm_cd_complete_flag=1 in ~/.rvmrc
+    # Generic bash cd completion seems to work great for most, so this is only
+    # for those that have some issues with that.
+    if [[ ${rvm_cd_complete_flag} = 1 ]] ; then
+
+      # If $CDPATH is set, bash should tab-complete based on directories in those paths,
+      # but with the cd function above, the built-in tab-complete ignores $CDPATH. This
+      # function returns that functionality.
+      _rvm_cd_complete ()
+      {
+        local directory current matches item index sep
+        sep="${IFS}"
+        declare -x IFS=$'\n'
+        COMPREPLY=()
+        current="${COMP_WORDS[COMP_CWORD]}"
+        if [[ -n "$CDPATH" && ${current:0:1} != "/" ]] ; then
+          index=0
+          # The change to IFS above means that the tr below should replace ':'
+          # with a newline rather than a space. A space would be ignored, breaking
+          # TAB completion based on CDPATH again
+          for directory in $(printf "%s" "$CDPATH" | tr -s ':' '\n') ; do
+            for item in $( compgen -d "$directory/$current" ) ; do
+              COMPREPLY[index++]=${item#$directory/}
+            done
           done
-        done
-      else
-        COMPREPLY=( $(compgen -d ${current}) )
-      fi
-      declare -x IFS="${sep}";
-    }
-    complete -o bashdefault -o default -o filenames -o dirnames -o nospace -F _rvm_cd_complete cd
+        else
+          COMPREPLY=( $(compgen -d ${current}) )
+        fi
+        declare -x IFS="${sep}";
+      }
+
+      complete -o bashdefault -o default -o filenames -o dirnames -o nospace -F _rvm_cd_complete cd
+
+    fi
 
   fi
 

data/scripts/cli

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-__rvm_usage() { ${PAGER:-less} "${rvm_path:-$HOME/.rvm}/README" ; }
+__rvm_usage() {
+  eval "${PAGER:-less -X} '${rvm_path:-$HOME/.rvm}/README'"
+}
 
 __rvm_run_script()
 {
@@ -575,7 +577,9 @@ __rvm_parse_args()
             if "$rvm_path/scripts/match" "$rvm_token" ".rb$" ; then # we have a specified ruby script
               rvm_ruby_args="$rvm_token"
               rvm_ruby_file="$rvm_token"
-              if [[ -z "${rvm_action:-""}" ]] ; then rvm_action="ruby" ; fi
+              if [[ -z "${rvm_action:-""}" || "$rvm_action" = "use" ]]; then
+                rvm_action="ruby"
+              fi
             else
               rvm_action="error"
               rvm_error_message="Unrecognized command line argument: '$rvm_token'"
@@ -725,7 +729,7 @@ rvm()
             rvm_ruby_gem_home="$gem_prefix"
             GEM_HOME="$rvm_ruby_gem_home"
             BUNDLE_PATH="$rvm_ruby_gem_home"
-            GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home${rvm_gemset_separator:-"@"}global/bin"
+            GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_gem_home${rvm_gemset_separator:-"@"}global"
             export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
           fi
           unset gem_prefix

data/scripts/gemsets

@@ -470,7 +470,7 @@ gemset_unpack()
 
   if [[ -n "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
-    export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin"
+    export GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
     export BUNDLE_PATH="$rvm_ruby_gem_home"
   fi
 
@@ -509,7 +509,7 @@ gemset_export()
 
   if [[ -n "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
-    export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin"
+    export GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
     export BUNDLE_PATH="$rvm_ruby_gem_home"
   fi
 
@@ -616,7 +616,8 @@ gemset_import()
     done < <(awk '/^[^#]+/{print}' "${rvm_file_name}")
 
   else
-    "$rvm_path/scripts/log" "error" "${rvm_file_name} does not exist to import from."
+    "$rvm_path/scripts/log" "error" \
+      "${rvm_file_name} does not exist to import from."
   fi
 }
 
@@ -748,7 +749,8 @@ gem_install()
 
     unset -f gem
 
-    __rvm_run "gem.install" "$command" "installing ${gem_name} ${gem_version}..."
+    __rvm_run "gem.install" "$command" \
+      "installing ${gem_name} ${gem_version}..."
     result=$?
 
     if [[ $result -eq 0 ]] ; then

data/scripts/help

@@ -15,23 +15,23 @@ args=(${args[@]})
 action="${args[$array_start]}"
 args[$__array_start]=""
 args=(${args[@]})
-pager="${PAGER:-less}"
+pager="${PAGER:-less -X}"
 
 if [[ -n "$command" && -s "${rvm_help_path}/${command}" ]] ; then
 
   if [[ -n "$action" && -s "${rvm_help_path}/${command}/${action}" ]] ; then
 
-    $pager "${rvm_help_path}/${command}/${action}"
+    eval "$pager '${rvm_help_path}/${command}/${action}'"
 
   else
 
-    $pager "${rvm_help_path}/${command}"
+    eval "$pager '${rvm_help_path}/${command}'"
 
   fi
 
 else
 
-  $pager "${rvm_path:-$HOME/.rvm}/README"
+  eval "$pager '${rvm_path:-$HOME/.rvm}/README'"
 
   "$rvm_path/scripts/log" "info" \
     "Commands available with 'rvm help':\n\n    $(builtin cd "${rvm_help_path}" ; find . -maxdepth 1 -mindepth 1 -type f -print | \tr "\n" ' ' | sed -e 's#./##g')"

data/scripts/install

@@ -42,7 +42,7 @@ usage()
 
     --version : display rvm package version
 
-  "
+  \n"
 }
 
 check_rubyopt_conditions()
@@ -192,7 +192,15 @@ while [[ $# -gt 0 ]] ; do
       env | grep '^rvm_'
       set -o xtrace
       ;;
-    --help|*)  usage ;;
+    --help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unrecognized option: $token"
+      usage
+      exit 1
+      ;;
   esac
 done
 

data/scripts/list

@@ -204,7 +204,7 @@ list_known()
 
   else
 
-    ${PAGER:-less} "$rvm_path/config/known"
+    eval "${PAGER:-less -X} '$rvm_path/config/known'"
 
   fi
 

data/scripts/log

@@ -16,21 +16,21 @@ if [[ ${rvm_pretty_print_flag:-0} -eq 0 ]] ; then
   fi
 
   case "$level" in
-    info)       printf "${message#*: }\n" ;;
-    debug|warn) printf "$message\n" ;;
-    error|fail) printf "$message\n" >&2  ;;
-    *) printf "$message"
+    info)       printf -- "${message#*: }\n" ;;
+    debug|warn) printf -- "$message\n" ;;
+    error|fail) printf -- "$message\n" >&2  ;;
+    *) printf "$message\n"
   esac
 
 else
 
   case "$level" in
-    debug) printf "$(tput setaf 5)$level$(tput sgr0): $message\n"     ;;
-    info)  printf "$(tput setaf 2)$level$(tput sgr0): $message\n"     ;;
-    warn)  printf "$(tput setaf 3)$level$(tput sgr0): $message\n"     ;;
-    error) printf "$(tput setaf 1)$level$(tput sgr0): $message\n" >&2 ;;
-    fail)  printf "$(tput setaf 1)$level$(tput sgr0): $message\n" >&2 ;;
-    *)     printf "$message"
+    debug) printf -- "$(tput setaf 5)$level$(tput sgr0): $message\n"     ;;
+    info)  printf -- "$(tput setaf 2)$level$(tput sgr0): $message\n"     ;;
+    warn)  printf -- "$(tput setaf 3)$level$(tput sgr0): $message\n"     ;;
+    error) printf -- "$(tput setaf 1)$level$(tput sgr0): $message\n" >&2 ;;
+    fail)  printf -- "$(tput setaf 1)$level$(tput sgr0): $message\n" >&2 ;;
+    *)     printf -- "$message\n"
   esac
 
 fi

data/scripts/manage

@@ -648,8 +648,7 @@ RubyWrapper
 
       if [[ "$result" -gt 0 ]] ; then
         "$rvm_path/scripts/log" "error" \
-          "There has been an error while running '$rvm_ruby_configure'. \
-          \nHalting the installation."
+          "There has been an error while running '$rvm_ruby_configure'.\nHalting the installation."
         return $result
       fi ; unset ruby
 

data/scripts/package

@@ -297,6 +297,6 @@ else
   "$rvm_path/scripts/log" "info" \
     "  'ree_dependencies' installs zlib, ncurses, readline, openssl and iconv in this order."
   "$rvm_path/scripts/log" "info" \
-    "  still need to add '-C --with-readline-dir=\$rvm_path/usr,--with-iconv-dir=\$rvm_path/usr,--with-zlib-dir=\$rvm_path/usr,--with-openssl-dir=\$rvm_path/usr' to 'rvm install ree'"
+    "  still need to add ' --with-readline-dir=\$rvm_path/usr --with-iconv-dir=\$rvm_path/usr --with-zlib-dir=\$rvm_path/usr --with-openssl-dir=\$rvm_path/usr' to 'rvm install ree'"
   exit 1
 fi

data/scripts/rvm

@@ -4,9 +4,8 @@
 # http://rvm.beginrescueend.com
 # http://github.com/wayneeseguin/rvm
 
-grep -q '^rvm ()' < <( declare -f ) # Is RVM is a shell function?
-
-if [[ $? -gt 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
+# Is RVM loaded as a shell function already?
+if ! declare -f rvm > /dev/null || [[ ${rvm_reload_flag:-0} -eq 1 ]] ; then
 
   if [[ ${rvm_ignore_rvmrc:-0} -eq 0 ]]; then
 

data/scripts/rvm-install

@@ -42,7 +42,7 @@ usage()
 
     --version : display rvm package version
 
-  "
+  \n"
 }
 
 check_rubyopt_conditions()
@@ -192,7 +192,15 @@ while [[ $# -gt 0 ]] ; do
       env | grep '^rvm_'
       set -o xtrace
       ;;
-    --help|*)  usage ;;
+    --help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unrecognized option: $token"
+      usage
+      exit 1
+      ;;
   esac
 done
 

data/scripts/selector

@@ -529,7 +529,7 @@ __rvm_ruby_string()
 
         case "$string" in
 
-          0.*|1.*)
+          0.[[:digit:]]|0.[[:digit:]]\.[[:digit:]]|1.[[:digit:]]\.[[:digit:]])
             rvm_ruby_version="$string"
             rvm_ruby_revision=""
             rvm_ruby_tag=""
@@ -659,11 +659,17 @@ __rvm_ruby_string()
 
     if [[ -n "${patch_level:-""}" ]] ; then
 
-      if [[ "ree" = "$rvm_ruby_interpreter" ]] || [[ "rbx" = "$rvm_ruby_interpreter" ]] ; then
-        rvm_ruby_patch_level="${patch_level}"
-      else
-        rvm_ruby_patch_level="p${patch_level}"
-      fi
+      case "$rvm_ruby_interpreter" in
+        ree|rbx)
+          # REE & Rubinius use dates for their patch levels.
+          rvm_ruby_patch_level="${patch_level}"
+          ;;
+        *)
+          # MRI uses -pN+ to specify the patch level.
+          rvm_ruby_patch_level="p${patch_level}"
+          ;;
+      esac
+
     fi
 
     if [[ -n "${rvm_ruby_patch_level:-""}" ]] ; then
@@ -671,13 +677,19 @@ __rvm_ruby_string()
       rvm_ruby_patch_level="${rvm_ruby_patch_level/#pp/p}"
       rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
 
-      if [[ "ree" = "${rvm_ruby_interpreter:-""}" || "rbx" = "${rvm_ruby_interpreter:-""}" ]] ; then
-        rvm_ruby_string="${rvm_ruby_string//-p*/-}"
+      case "$rvm_ruby_interpreter" in
+
+        ree|rbx)
+          rvm_ruby_string="${rvm_ruby_string//-p*/-}"
+          ;;
+
+        *)
+          rvm_ruby_string="${rvm_ruby_string//-pp/-p}"
+          rvm_ruby_string="${rvm_ruby_string//-prc/-rc}"
+          ;;
+
+      esac
 
-      else
-        rvm_ruby_string="${rvm_ruby_string//-pp/-p}"
-        rvm_ruby_string="${rvm_ruby_string//-prc/-rc}"
-      fi
     fi
   fi
 
@@ -740,13 +752,16 @@ __rvm_gemset_select()
     if [[ -n "${rvm_ruby_string:-""}" ]] ; then
 
       if [[ -z "${rvm_ruby_gem_home:-""}" || -n "${gemset:-""}" ]] ; then
+
         rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
 
       elif [[ -n "${gemset:-""}" && "${rvm_gemset_name:-""}" != "${gemset:-""}" ]] ; then
+
         rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
       fi
     else
-      "$rvm_path/scripts/log" "error" "Gemsets can not be used with non rvm controlled rubies (currently)."
+      "$rvm_path/scripts/log" "error" \
+        "Gemsets can not be used with non rvm controlled rubies (currently)."
       return 1
     fi
   fi
@@ -758,7 +773,10 @@ __rvm_gemset_select()
 
     if [[ ${rvm_gemset_create_on_use_flag:-0} -ne 1 && ${rvm_create_flag:-0} -ne 1 && ${rvm_delete_flag:-0} -ne 1 ]] ; then
 
-      "$rvm_path/scripts/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+      "$rvm_path/scripts/log" "error" \
+        "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+
+      unset rvm_gemset_name gemset_name
 
       return 1
     fi
@@ -776,12 +794,18 @@ __rvm_gemset_select()
 
   # Ensure that the ruby gem home exists.
   \mkdir -p "$rvm_ruby_gem_home"
-  if [[ -n "${rvm_ruby_gem_home:-""}" ]] && echo "$rvm_ruby_gem_home" | \grep -q 'rvm'; then
+
+  if [[ -n "${rvm_ruby_gem_home:-""}" ]] &&
+    echo "$rvm_ruby_gem_home" | \grep -q 'rvm'; then
+
     if __rvm_using_gemset_globalcache && [[ ! -L "$rvm_ruby_gem_home/cache" ]]; then
+
       \mv "$rvm_ruby_gem_home/cache/"*.gem "$rvm_gems_cache_path/" 2>/dev/null
       \rm -rf "$rvm_ruby_gem_home/cache"
       \ln -nfs "$rvm_gems_cache_path" "$rvm_ruby_gem_home/cache"
+
     fi
+
   fi
 
   export rvm_ruby_gem_path rvm_ruby_gem_home
@@ -791,9 +815,12 @@ __rvm_gemset_select()
 __rvm_gemset_use()
 {
   if [[ -z "${rvm_gemset_name:-""}" ]] ; then
+
     "$rvm_path/scripts/log" "error" \
       "Gemset was not given.\n  Usage:\n    rvm gemset use <gemsetname>\n"
+
     return 1
+
   fi
 
   if [[ -n "${rvm_ruby_gem_home:-""}" ]] ; then
@@ -816,6 +843,7 @@ __rvm_gemset_use()
     fi
 
     rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
+
     rvm_ruby_global_gems_path="${rvm_ruby_gem_home%%${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}global"
 
     GEM_HOME="$rvm_ruby_gem_home"
@@ -847,6 +875,5 @@ __rvm_gemset_clear()
   export rvm_ruby_gem_home rvm_ruby_global_gems_path GEM_HOME BUNDLE_PATH GEM_PATH
 
   __rvm_use # Now ensure the selection takes effect for the environment.
-
 }
 

data/scripts/set

@@ -23,7 +23,7 @@ __rvm_ruby_do()
 
   if [[ "$action" = "exec" ]]; then
     # Exec is a special case.
-    rvm_command="${args[@]}"
+    command="${args[@]}"
 
   else
 
@@ -70,22 +70,21 @@ __rvm_ruby_do()
     # TODO: the else case below should be run if $args =~ /\.rb$/
     if [[ "ruby" = "$(basename $binary)" && "$rvm_benchmark_flag" -ne 1 ]] ; then
 
-      if "$rvm_path/scripts/match" "${args[@]}" "\.rb$" ; then
+      case "${args[@]}" in
 
-        if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
+        *[:space:]-S[:space:]*)
+          command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path ${args[@]}"
+          ;;
 
-        if ! "$rvm_path/scripts/match" "${args[@]}" "$prefix" ; then
+        *)
+          command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path -S ${args[@]}"
+          ;;
 
-          args=($prefix ${args[@]})
-
-        fi
-      fi
-
-      rvm_command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path ${args[@]}"
+      esac
 
     else
 
-      rvm_command="$binary $rvm_ruby_mode ${args[@]}"
+      command="$binary $rvm_ruby_mode ${args[@]}"
 
     fi
 
@@ -99,7 +98,7 @@ __rvm_ruby_do()
 
     touch ./log/$rvm_ruby_string/$action.log ./log/$rvm_ruby_string/$action.error.log
 
-    eval "$rvm_command" \
+    eval "$command" \
       >> ./log/$rvm_ruby_string/$action.log \
       2>> ./log/$rvm_ruby_string/$action.error.log
 
@@ -119,7 +118,7 @@ __rvm_ruby_do()
 
       unset current_env
     fi
-    eval "$rvm_command"
+    eval "$command"
   fi
   result=$?
 

data/scripts/tools

@@ -23,7 +23,7 @@ tools_path_identifier()
 
   source "$rvm_path/scripts/rvm"
   builtin cd "$1"
-  rvm_promptless=1 __rvm_project_rvmrc
+  rvm_promptless=1 __rvm_project_rvmrc >/dev/null 2>&1
   rvmrc_result="$?"
   __rvm_environment_identifier
   exit $rvmrc_result

data/scripts/update

@@ -42,7 +42,7 @@ usage()
 
     --version : display rvm package version
 
-  "
+  \n"
 }
 
 check_rubyopt_conditions()
@@ -192,7 +192,15 @@ while [[ $# -gt 0 ]] ; do
       env | grep '^rvm_'
       set -o xtrace
       ;;
-    --help|*)  usage ;;
+    --help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unrecognized option: $token"
+      usage
+      exit 1
+      ;;
   esac
 done
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 1
   - 0
-  - 21
-  version: 1.0.21
+  - 22
+  version: 1.0.22
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 -04:00
+date: 2010-11-16 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []