rvm 0.0.47 → 0.0.48

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 47
+:patch: 48

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.47"
+  s.version = "0.0.48"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-09-22}
+  s.date = %q{2009-09-23}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "scripts/rvm",
      "scripts/rvm-aliases",
      "scripts/rvm-cli",
+     "scripts/rvm-completion",
      "scripts/rvm-functions",
      "scripts/rvm-install",
      "scripts/rvm-prompt",

data/scripts/rvm-aliases

@@ -1,4 +1,4 @@
-alias rubydo="rvm rubydo"
-alias multiruby="rvm rubydo"
-alias gemdo="rvm gemdo"
-alias rakedo="rvm rakedo"
+alias rubydo="rvm ruby"
+alias gemdo="rvm gem"
+alias rakedo="rvm rake"
+alias multiruby="rvm ruby"

data/scripts/rvm-cli

@@ -14,99 +14,100 @@ function __rvm_usage {
 
   __rvm_meta
 
-  cat <<-Usage
-
+  echo -e "
   rvm ${rvm_meta_version} ${rvm_meta_website} by ${rvm_meta_author} (${rvm_meta_author_email})
 
-  Usage:
-
-    rvm Action [Implementation] [Options] [Flags]
-
-  Action:
-
-    * usage   - Show this usage information
-    use       - Switch to using a specific ruby version (new login shell)
-    info      - Show information for current ruby
-    list      - Show currently installed versions
-    gemdir    - Switch to gem directory for installation (new login shell)
-    srcdir    - Switch to src directory for the current ruby installation
-    gemdup    - Clone source version gems to current version
-                (highly expiramental) Example: rvm gemdup ~/.gem/ruby/1.8/
-    install   - Install a ruby version, default is from source
-    uninstall - Uninstall a ruby version
-    reset     - Remove default and current settings, exit the shell.
-                (If you experience odd behavior try this first)
-    rubydo    - Used with -S to run a ruby file against specified or all rubies
-    gemdo     - Used with -S to execute a command using selected ruby's 'gem'
-    debug     - Emit environment & configuration information for *current* ruby
-
-    reload    - Reload rvm source itself (useful after changing rvm source)
-    implode   - Removes all ruby installations it manages, everything in ~/.rvm
-    update    - Upgrades rvm to the latest version.
-    tests     - run 'rake test' across selected ruby versions
-    specs     - run 'rake spec' across selected ruby versions
-
-  Implementation:
-
-    * ruby    - MRI/YARV Ruby (The Standard), defaults to 1.8.6
-    jruby     - jRuby
-    rubinius  - Rubinius
-    ree       - Ruby Enterprise Edition
-    system    - Use the system ruby (eg. pre-rvm state)
-    default   - Use rvm set default ruby and system if it hasn't been set.
-
-  Options:
-
-    -v|--version    - Emit rvm version loaded for current shell
-    -h|--help       - Emit this output and exit
-    -l|--level      - patch level to use with rvm use / install
-       --tag        - subersion tag to use
-       --rev        - repository revision # to use or 'head' for
-
-       --prefix     - path for all rvm files (~/.rvm/), with trailing slash!
-       --bin        - path for binaries to be placed (~/.rvm/bin/)
-       --source     - src directory to use (~/.rvm/src/)
-       --archives   - directory for downladed files (~/.rvm/archives/)
-    -S|--script     - Specify a script file to attempt to load and run (rubydo)
-    -G|--gems       - root gem path to use
-    -C|--configure  - custom configure options, comma separated
-                      default: --enable-shared=true
-    --reconfigure   - Force installer to re-run configure if already run
-    --make          - custom make command
-    --make-install  - custom make install command
-    --nice          - process niceness (for slow computers, default 0)
-    -m|--gem-set    - use a named gem set, instead of the default set.
-    --rm-gem-set    - Remove a named gem set
-
-  Flags
-
-    --self        - with update, updates rvm itself
-    --rubygems    - with update, updates rubygems for selected ruby
-    --default     - with ruby select, sets a default ruby for new shells.
-    --debug       - Toggle debug mode on for very verbose output.
-    --force       - Force install, removes old install & source before install.
-    --all         - Used with 'rvm list' to display "most" available versions.
-    --dump        - Used with gemset to dump the current ruby's gemset.
-    --load        - Used with gemset to load a specified gemset file
-    --summary     - Used with rubydo to print out a summary of the commands run.
-    --jit         - Used with rubinius install to build with JIT
-    --latest      - with gemset --dump skips version strings for latest gem.
-    --reconfigure - Force ./configure on install even if Makefile already exists.
-
-  Resources:
-
-    http://rvm.beginrescueend.com/
-    https://www.pivotaltracker.com/projects/26822
-
 Usage
 
+  rvm Action [Implementation] [Flags] [Options]
+
+Action
+
+  * usage   - show this usage information
+  use       - setup current shell to use a specific ruby version
+  info      - show information for current ruby
+  list      - show currently installed versions
+  reload    - reload rvm source itself (useful after changing rvm source)
+  implode   - removes all ruby installations it manages, everything in ~/.rvm
+  update    - upgrades rvm to the latest version.
+  reset     - remove default and current settings, exit the shell.
+              (If you experience odd behavior try this first)
+  debug     - emit environment & configuration information for *current* ruby
+
+  install   - install one or many ruby versions
+  uninstall - uninstall one or many ruby versions, leaves their sources
+  remove    - uninstall one or many ruby versions and remove their sources
+
+  ruby      - runs a named ruby file against specified and/or all rubies
+  gem       - runs a gem command using selected ruby's 'gem'
+  rake      - runs a rake task against specified and/or all rubies
+  tests     - runs 'rake test' across selected ruby versions
+  specs     - runs 'rake spec' across selected ruby versions
+
+  gemsync   - sync gems from a specified version to current version
+  gemdir    - switch to gem directory for installation (new login shell)
+  srcdir    - switch to src directory for the current ruby installation
+
+Implementation
+
+  * ruby    - MRI/YARV Ruby (The Standard), defaults to 1.8.6
+  jruby     - jRuby
+  rbx       - rubinius
+  ree       - ruby Enterprise Edition
+  system    - use the system ruby (eg. pre-rvm state)
+  default   - use rvm set default ruby and system if it hasn't been set.
+
+Flags
+
+  --self        - with update, updates rvm itself
+  --rubygems    - with update, updates rubygems for selected ruby
+  --default     - with ruby select, sets a default ruby for new shells.
+  --debug       - Toggle debug mode on for very verbose output.
+  --force       - Force install, removes old install & source before install.
+  --all         - Used with 'rvm list' to display 'most' available versions.
+  --dump        - Used with gemset to dump the current ruby's gemset.
+  --load        - Used with gemset to load a specified gemset file
+  --summary     - Used with rubydo to print out a summary of the commands run.
+  --jit         - Used with rubinius install to build with JIT
+  --latest      - with gemset --dump skips version strings for latest gem.
+  --reconfigure - Force ./configure on install even if Makefile already exists.
+
+Options
+
+  -v|--version    - Emit rvm version loaded for current shell
+  -h|--help       - Emit this output and exit
+  -l|--level      - patch level to use with rvm use / install
+     --tag        - subersion tag to use
+     --rev        - repository revision # to use or 'head' for
+
+     --prefix     - path for all rvm files (~/.rvm/), with trailing slash!
+     --bin        - path for binaries to be placed (~/.rvm/bin/)
+     --source     - src directory to use (~/.rvm/src/)
+     --archives   - directory for downladed files (~/.rvm/archives/)
+  -S|--script     - Specify a script file to attempt to load and run (rubydo)
+  -G|--gems       - root gem path to use
+  -C|--configure  - custom configure options, comma separated
+                    default: --enable-shared=true
+  --reconfigure   - Force installer to re-run configure if already run
+  --make          - custom make command
+  --make-install  - custom make install command
+  --nice          - process niceness (for slow computers, default 0)
+  -m|--gem-set    - use a named gem set, instead of the default set.
+  --rm-gem-set    - Remove a named gem set
+
+Resources:
+
+  http://rvm.beginrescueend.com/
+  https://www.pivotaltracker.com/projects/26822
+
+" | ${PAGER:-/usr/bin/less}
 }
 
 function __rvm_parse-args {
   while [ $# -gt 0 ] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|usage|help|implode|update|readline|iconv|benchmark|bench|use|gemsync)
+      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|update|readline|iconv|use|gemsync)
         rvm_action=$rvm_token
       ;;
 
@@ -149,26 +150,42 @@ function __rvm_parse-args {
         fi
       ;;
 
-      do|rubydo|rakedo|gemdo)
-        rvm_action=$rvm_token
-        if [ "$rvm_action" = "do" ] ; then rvm_action="rubydo" ; fi
-        temp=$(echo $1 | awk '{print substr($1, 0, 1)}')
-        if [ "$temp" = "-" ] ; then
-          unset rvm_ruby_version
+      do|ruby|rake|gem|rubydo|rakedo|gemdo)
+        if [ "$rvm_action" = "do" ] ; then rvm_action="ruby" ; fi
+        rvm_action=$(echo $rvm_token | sed 's/do//g')
+
+        if [ "$rvm_action" = "rake" -o "$rvm_action" = "gem" ] ; then
+          rvm_action="ruby"
+          rvm_ruby_args="$rvm_token $@"
+          rvm_parse_break=1
         else
-          if [ ! -z "$(echo $temp | grep '[0-9]')" ] ; then
-            rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift
-            unset rvm_ruby_interpreter
+          if [ ! -z "$(echo $1 | awk '/^-/')" ] ; then
+            unset rvm_ruby_version
           else
-            if [ "$1" = "jruby" -o "$1" = "rbx" -o "$1" = "rubinius" -o "$1" = "macruby" ] ; then
-              rvm_ruby_interpreter=$1 ; shift
+            if [ ! -z "$(echo $1 | awk '/^[0-9]/')" ] ; then
+              rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift
+              unset rvm_ruby_interpreter
             else
-              unset rvm_ruby_interpreter rvm_ruby_version
+              if [ "$1" = "jruby" -o "$1" = "rbx" -o "$1" = "rubinius" -o "$1" = "macruby" -o "$1" = "ree" -o "$1" = "ruby-enterprise" ] ; then
+                rvm_ruby_interpreter=$1 ; shift
+              else
+                unset rvm_ruby_interpreter rvm_ruby_version
+              fi
             fi
           fi
         fi
       ;;
 
+      benchmark|bench)
+        rvm_action="benchmark"
+      ;;
+
+      specs|tests)
+        rvm_action="do"
+        rvm_ruby_args="rake $rvm_token"
+      ;;
+
+
       1.8|1.8.0|1.8.1|1.8.2|1.8.3|1.8.4|1.8.5|1.8.6|1.8.7|1.9|1.9.1|1.9.2)
         rvm_ruby_interpreter="ruby"
         rvm_ruby_version="$rvm_token"
@@ -263,24 +280,13 @@ function __rvm_parse-args {
       ;;
 
       -f|--file)
-        rvm_action="rubydo"
+        rvm_action="ruby"
         rvm_ruby_file="$1"
         shift
       ;;
 
-      specs|tests)
-        rvm_action="rubydo"
-        rvm_ruby_args="rake $rvm_token"
-      ;;
-
-      rake|gem)
-        rvm_action="rubydo"
-        rvm_ruby_args="$rvm_token $@"
-        rvm_parse_break=1
-      ;;
-
       -S|--script|-e|--execute)
-        rvm_action="rubydo"
+        rvm_action="ruby"
         rvm_ruby_args="$@"
         rvm_parse_break=1
       ;;
@@ -302,19 +308,19 @@ function __rvm_parse-args {
         rvm_ruby_interpreter="system"
       ;;
 
-      --install)         rvm_install_on_use_flag=1         ;;
-      --prefix)          rvm_prefix_path="$1"      ; shift ;;
-      -G|--gems)         rvm_gem_path="$1"         ; shift ;;
-      --source)          rvm_source_path="$1"      ; shift ;;
-      --archives)        rvm_archives_path="$1"    ; shift ;;
-      --make)            rvm_ruby_make="$1"        ; shift ;;
-      --make-install)    rvm_ruby_make_install="$1"; shift ;;
-      --nice)            rvm_niceness="$1"         ; shift ;;
-      -l|--level)        rvm_ruby_patch_level="$1" ; shift ;;
-      -h|--help)         rvm_action=help           ; shift ;;
-      -m|--gem-set)      rvm_gem_set_name="$1"     ; shift ;;
-         --rm-gem-set)   rvm_gem_set_name_rm="$1"  ; shift ;;
-      tests|specs)       rvm_action="tests"                ;;
+      --install)            rvm_install_on_use_flag=1         ;;
+      --prefix)             rvm_prefix_path="$1"      ; shift ;;
+      -G|--gems)            rvm_gem_path="$1"         ; shift ;;
+      --source)             rvm_source_path="$1"      ; shift ;;
+      --archives)           rvm_archives_path="$1"    ; shift ;;
+      --make)               rvm_ruby_make="$1"        ; shift ;;
+      --make-install)       rvm_ruby_make_install="$1"; shift ;;
+      --nice)               rvm_niceness="$1"         ; shift ;;
+      -l|--level)           rvm_ruby_patch_level="$1" ; shift ;;
+      -h|--help|usage|help) rvm_action=help         ; shift ;;
+      -m|--gem-set)         rvm_gem_set_name="$1"     ; shift ;;
+         --rm-gem-set)      rvm_gem_set_name_rm="$1"  ; shift ;;
+      tests|specs)          rvm_action="tests"                ;;
 
       --self|--gem|--rubygems|--reconfigure|--default|--debug|debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|yaml|--json|json)
         eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1"
@@ -326,11 +332,10 @@ function __rvm_parse-args {
 
       *)
         if [ ! -z "$rvm_token" ] ; then
-          echo "$rvm_token" | grep ',' > /dev/null
-          if [ $? -eq 0 ] ; then
+          if [ ! -z "`echo $rvm_token | awk '/,/'`" ] ; then
             rvm_ruby_version="$rvm_token"
             if [ -z "$rvm_action" ] ; then
-              rvm_action="rubydo" # Not sure if we really want to do this but we'll try it out.
+              rvm_action="ruby" # Not sure if we really want to do this but we'll try it out.
             fi
           else
 
@@ -338,7 +343,7 @@ function __rvm_parse-args {
               rvm_ruby_args=$rvm_token
               rvm_ruby_file=$rvm_token
               if [ -z "$rvm_action" ] ; then
-                rvm_action="rubydo" # Not sure if we really want to do this but we'll try it out.
+                rvm_action="ruby" # Not sure if we really want to do this but we'll try it out.
               fi
             else
               rvm_action="error"
@@ -371,13 +376,10 @@ function rvm {
   if [ -z "$rvm_debug_flag" ] ; then set +x ; else set -x ; fi
   result=0
   case "$rvm_action" in
-    install)    __rvm_install          ; result=$? ;;
-    uninstall)  __rvm_uninstall        ; result=$? ;;
-    remove)     __rvm_remove           ; result=$? ;;
     use)        __rvm_use              ; result=$? ;;
     gemdir)     __rvm_gem-dir          ; result=$? ;;
-    srcdir)     __rvm_src-dir          ; result=$? ;;
     gemdup)     __rvm_gem-dup          ; result=$? ;;
+    srcdir)     __rvm_src-dir          ; result=$? ;;
     list)       __rvm_list             ; result=$? ;;
     version)    __rvm_version          ; result=$? ;;
     reset)      __rvm_reset            ; result=$? ;;
@@ -389,8 +391,13 @@ function rvm {
     iconv)      __rvm_iconv_install    ; result=$? ;;
     reboot)     __rvm_reboot           ; result=$? ;;
     usage|help) __rvm_usage            ; result=$? ;;
-    bench|benchmark)  __rvm_benchmark  ; result=$? ;;
-    rubydo|rakedo|gemdo) __rvm_do      ; result=$? ;;
+    benchmark)  __rvm_benchmark        ; result=$? ;;
+    ruby)       __rvm_do               ; result=$? ;;
+
+    install|uninstall|remove)
+      __rvm_manage_rubies
+      result=$?
+    ;;
 
     gemsync)
       result=0

data/scripts/rvm-completion

@@ -0,0 +1,213 @@
+#!/bin/bash
+
+complete -o default -o nospace -F _rvm rvm
+
+_rvm ()
+{
+	local i c=1 command __git_dir
+
+	while [ $c -lt $COMP_CWORD ]; do
+		i="${COMP_WORDS[c]}"
+		case "$i" in
+		--git-dir=*) __git_dir="${i#--git-dir=}" ;;
+		--bare)      __git_dir="." ;;
+		--version|-p|--paginate) ;;
+		--help) command="help"; break ;;
+		*) command="$i"; break ;;
+		esac
+		c=$((++c))
+	done
+
+	if [ -z "$command" ]; then
+		case "${COMP_WORDS[COMP_CWORD]}" in
+		--*)   __gitcomp "
+			--paginate
+			--no-pager
+			--git-dir=
+			--bare
+			--version
+			--exec-path
+			--html-path
+			--work-tree=
+			--help
+			"
+			;;
+		*)     __gitcomp "$(__git_porcelain_commands) $(__git_aliases)" ;;
+		esac
+		return
+	fi
+
+	local expansion=$(__git_aliased_command "$command")
+	[ "$expansion" ] && command="$expansion"
+
+	case "$command" in
+      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|usage|help|implode|update|readline|iconv|benchmark|bench|use|gemsync)
+      ;;
+
+      rm|remove)
+      ;;
+
+      system|default)
+      ;;
+
+      ruby|jruby|ree|macruby|rbx|rubinius|default|all)
+      ;;
+
+      gemdir)
+      ;;
+
+      gemdup)
+        "system"
+        "user"
+        "default"
+      ;;
+
+
+      1.8|1.8.0|1.8.1|1.8.2|1.8.3|1.8.4|1.8.5|1.8.6|1.8.7|1.9|1.9.1|1.9.2)
+      ;;
+
+      1.2.0|1.3.1)
+      ;;
+
+      do|rubydo|rakedo|gemdo)
+      ;;
+      specs|tests)
+      ;;
+      rake|gem)
+      ;;
+      -S|--script|-e|--execute)
+      ;;
+      default|system)
+      ;;
+
+      --install)         rvm_install_on_use_flag=1         ;;
+      --prefix)          rvm_prefix_path="$1"      ; shift ;;
+      -G|--gems)         rvm_gem_path="$1"         ; shift ;;
+      --source)          rvm_source_path="$1"      ; shift ;;
+      --archives)        rvm_archives_path="$1"    ; shift ;;
+      --make)            rvm_ruby_make="$1"        ; shift ;;
+      --make-install)    rvm_ruby_make_install="$1"; shift ;;
+      --nice)            rvm_niceness="$1"         ; shift ;;
+      -l|--level)        rvm_ruby_patch_level="$1" ; shift ;;
+      -h|--help)         rvm_action=help           ; shift ;;
+      -m|--gem-set)      rvm_gem_set_name="$1"     ; shift ;;
+         --rm-gem-set)   rvm_gem_set_name_rm="$1"  ; shift ;;
+      tests|specs)       rvm_action="tests"                ;;
+
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|yaml|--json|json)
+        eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1"
+      ;;
+
+      reboot|flush|asdf|damnit|wtf|argh|work|workdamnit|BOOM|boom|wth)
+
+	push)        _git_push ;;
+	rebase)      _git_rebase ;;
+	remote)      _git_remote ;;
+	reset)       _git_reset ;;
+	revert)      _git_revert ;;
+	rm)          _git_rm ;;
+	send-email)  _git_send_email ;;
+	shortlog)    _git_shortlog ;;
+	show)        _git_show ;;
+	show-branch) _git_show_branch ;;
+	stash)       _git_stash ;;
+	stage)       _git_add ;;
+	submodule)   _git_submodule ;;
+	svn)         _git_svn ;;
+	tag)         _git_tag ;;
+	whatchanged) _git_log ;;
+	*)           COMPREPLY=() ;;
+	esac
+}
+
+
+# __gitcomp accepts 1, 2, 3, or 4 arguments
+# generates completion reply with compgen
+function __rvm_completion_reply
+{
+	local cur="${COMP_WORDS[COMP_CWORD]}"
+	if [ $# -gt 2 ]; then
+		cur="$3"
+	fi
+	case "$cur" in
+	--*=)
+		COMPREPLY=()
+		;;
+	*)
+		local IFS=$'\n'
+		COMPREPLY=($(compgen -P "${2-}" \
+			-W "$(__gitcomp_1 "${1-}" "${4-}")" \
+			-- "$cur"))
+		;;
+	esac
+}
+
+function rvm {
+
+  __rvm_cleanup_variables
+  __rvm_load-rvmrc
+  __rvm_initialize
+  __rvm_load_defaults
+  __rvm_parse-args $@
+
+  if [ -z "$rvm_debug_flag" ] ; then set +x ; else set -x ; fi
+  result=0
+  case "$rvm_action" in
+    install)    __rvm_install          ; result=$? ;;
+    uninstall)  __rvm_uninstall        ; result=$? ;;
+    remove)     __rvm_remove           ; result=$? ;;
+    use)        __rvm_use              ; result=$? ;;
+    gemdir)     __rvm_gem-dir          ; result=$? ;;
+    srcdir)     __rvm_src-dir          ; result=$? ;;
+    gemdup)     __rvm_gem-dup          ; result=$? ;;
+    list)       __rvm_list             ; result=$? ;;
+    version)    __rvm_version          ; result=$? ;;
+    reset)      __rvm_reset            ; result=$? ;;
+                # TODO: how can we use bin_path here for reload, default file?
+    reload)     __rvm_reload           ; result=$? ;;
+    implode)    __rvm_implode          ; result=$? ;;
+    update)     __rvm_update           ; result=$? ;;
+    readline)   __rvm_readline_install ; result=$? ;;
+    iconv)      __rvm_iconv_install    ; result=$? ;;
+    reboot)     __rvm_reboot           ; result=$? ;;
+    usage|help) __rvm_usage            ; result=$? ;;
+    bench|benchmark)  __rvm_benchmark  ; result=$? ;;
+    rubydo|rakedo|gemdo) __rvm_do      ; result=$? ;;
+
+    gemsync)
+      result=0
+      rvm_source_gem_path=`__rvm_select ; echo $rvm_gem_home`
+      __rvm_gem_sync
+    ;;
+
+    tests|specs)
+      rvm_summary_flag=1
+      rvm_action="rake"
+      __rvm_do
+    ;;
+
+    info|debug)
+      __rvm_version
+      __rvm_info
+      if [ "$rvm_action" = "debug" ] ; then __rvm_debug ; fi
+      result=0
+    ;;
+
+    error)
+      __rvm_log "fail" "$rvm_error_message ( see: 'rvm usage' )"
+      __rvm_pushpop
+      result=1;
+    ;;
+    *)
+      if [ ! -z "$rvm_action" ] ; then
+        __rvm_log "fail"  "unknown action '$rvm_action'"
+      else
+        __rvm_usage
+      fi
+      result=1
+  esac
+  if [ "$rvm_debug_flag" = "1" ] ; then set +x ; unset rvm_debug_flag ; fi
+  return $result
+}
+
+

data/scripts/rvm-ruby-installer

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 function __rvm_install_source {
-
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
   result=0
@@ -126,31 +125,6 @@ function __rvm_install_source {
   __rvm_pushpop
 }
 
-function __rvm_install {
-# TODO: Extract the outer looping mechanism with ruby_do's
-  rubies=() ; successes=() ; errors=() ; statuses=()
-  # TODO: Extract the common functionality out of the if below
-  if [ ! -z "$(echo "$rvm_ruby_version" | awk '/,/')" ] ; then
-    rvm_ruby_versions=`echo $rvm_ruby_version | tr ',' ' '`
-    for rvm_ruby_string in $rvm_ruby_versions ; do
-      unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_home rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected
-      if [ ! -z "$(echo $rvm_ruby_selector | awk '/^[0-9]/')" ] ; then
-        rvm_ruby_interpreter="ruby"
-        rvm_ruby_version="$rvm_ruby_selector"
-      else
-        rvm_ruby_interpreter="$rvm_ruby_selector"
-        unset rvm_ruby_version
-      fi
-      __rvm_log "debug" $rvm_ruby_string
-      __rvm_select
-      __rvm_install_ruby
-    done
-  else
-    __rvm_select
-    __rvm_install_ruby
-  fi
-}
-
 function __rvm_install_ruby {
 
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
@@ -301,8 +275,7 @@ RubyWrapper
       if [ ! -z "$rvm_ruby_rev" ] ; then
         if [ ! -d $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version -o ! -d $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version/.git ] ; then
           git clone --depth 1 $rvm_jruby_repo_url $rvm_ruby_src_path
-          # TODO: Test if 'ant' is installed, if not throw error.
-          cd $rvm_ruby_src_path && ant
+          cd $rvm_ruby_src_path && ant # TODO: Test if 'ant' is installed, if not throw error.
         fi
       else
         if [ -d $rvm_ruby_src_path ]  ; then
@@ -325,33 +298,32 @@ RubyWrapper
         fi
       fi
 
+      for binary in jirb jruby jgem ; do
+        cp -f $rvm_ruby_src_path/bin/$binary $rvm_ruby_src_path/bin/${binary#j}
+      done ; unset binary
+
       __rvm_log "info" "Installing $rvm_ruby_package_name..."
       mkdir -p $rvm_ruby_home/bin/
-      __rvm_run "sync" rsync -ag $rvm_ruby_src_path/ $rvm_ruby_home/
       __rvm_run "nailgun" "cd $rvm_ruby_src_path/tool/nailgun && make $rvm_make_flags"
       __rvm_pushpop
       chmod +x $rvm_ruby_home/bin/*
 
-
-      for binary in jirb jruby jgem ; do
-        ln -fs $rvm_ruby_home/bin/$binary $rvm_ruby_home/bin/${binary#j}
-      done ; unset binary
+      if [ -z "$rvm_ruby_home" -o "$rvm_ruby_home" = "/" ] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
+      rm -rf $rvm_ruby_home
+      __rvm_run "sync" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home"
 
       for binary in rake rdoc ri spec autospec ; do
         __rvm_inject_ruby_shebang $rvm_ruby_home/bin/$binary
         __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
         chmod +x $rvm_ruby_home/bin/$binary
       done ; unset binary
-
+      __rvm_rubygems_setup
       __rvm_irbrc
       __rvm_bin_script
 
-      ln -fs $rvm_ruby_home/bin/ruby $rvm_path/bin/$rvm_ruby_package_name # Is this necessary?
-
-      __rvm_use
       for rvm_gem_name in jruby-openssl ; do
         __rvm_log "info" "Installing $rvm_gem_name"
-        __rvm_run "gems" gem install $rvm_gem_name --no-rdoc --no-ri -q
+        __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
       done ; unset rvm_gem_name
 
     ;;
@@ -374,17 +346,49 @@ RubyWrapper
   if [ ! -z "$ruby_options" ] ; then RUBYOPT=$ruby_options ; export RUBYOPT ; fi
 }
 
-# TODO: DRY up __rvm_remove and __rvm_uninstall
-function __rvm_remove {
+function __rvm_manage_rubies {
+  rubies=() ; successes=() ; errors=() ; statuses=()
+  # TODO: Extract the common functionality out of the if below
+  if [ ! -z "$rvm_ruby_string" ] ; then
+    unset rvm_ruby_interpreter rvm_ruby_version
+    __rvm_${rvm_action}_ruby
+  elif [ ! -z "$rvm_ruby_version" ] ;then
+    for rvm_ruby_selector in `echo $rvm_ruby_version | tr ',' ' '` ; do
+      unset rvm_ruby_string
+      __rvm_${rvm_action}_ruby
+      __rvm_unset_ruby_variables
+    done
+  elif [ ! -z "$rvm_ruby_interpreter" ] ; then
+    unset rvm_ruby_string rvm_ruby_version
+    __rvm_${rvm_action}_ruby
+  else # all
+    if [ "$rvm_action" != "install" ] ; then
+      while read bin_line # Question: Should we prompt here? ;)
+      do # Keep this on second line damnit!
+        if [ -x $bin_line ] ; then
+          rvm_ruby_string="`dirname $bin_line | xargs dirname | xargs basename`"
+          __rvm_${rvm_action}_ruby
+          __rvm_unset_ruby_variables
+        fi
+      done < <(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null)
+    fi
+  fi
+
+  if [ ! -z "$rvm_summary_flag" ] ; then __rvm_summary ; fi
+  if [ ! -z "$rvm_yaml_flag" ]    ; then __rvm_yaml    ; fi
+  if [ ! -z "$rvm_json_flag" ]    ; then __rvm_json    ; fi
+}
+
+function __rvm_uninstall_ruby {
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
   if [ ! -z "$rvm_ruby_package_name" ] ; then
-    for dir in $rvm_source_path $rvm_path ; do
+    for dir in $rvm_path ; do
       if [ -d $dir/$rvm_ruby_package_name ] ; then
         __rvm_log "info" "Removing $dir/$rvm_ruby_package_name..."
         rm -rf $dir/$rvm_ruby_package_name
       else
-        __rvm_log "info" "it seems that $dir/$rvm_ruby_package_name is already non existent."
+        __rvm_log "info" "$dir/$rvm_ruby_package_name has already been removed."
       fi
       if [ -e $rvm_bin_path/$rvm_ruby_package_name ] ; then
         rm -f $rvm_bin_path/$rvm_ruby_package_name
@@ -396,11 +400,11 @@ function __rvm_remove {
   fi
 }
 
-function __rvm_uninstall {
+function __rvm_remove_ruby {
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
   if [ ! -z "$rvm_ruby_package_name" ] ; then
-    for dir in $rvm_path ; do
+    for dir in $rvm_source_path $rvm_path ; do
       if [ -d $dir/$rvm_ruby_package_name ] ; then
         __rvm_log "info" "Removing $dir/$rvm_ruby_package_name..."
         rm -rf $dir/$rvm_ruby_package_name
@@ -467,7 +471,6 @@ function __rvm_rubygems_setup {
     if [ $result -eq 0 ] ; then
       __rvm_log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
     fi
-
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
   else
     # 1.9 has it's own built-in gem command
@@ -489,16 +492,17 @@ function __rvm_inject_ruby_shebang {
 function __rvm_inject_gem_env {
   __rvm_actual_file $1
   if [ -f $actual_file ] ; then
-    set -x
     if [ ! -z "`head -n 1 $actual_file | awk '/[j]*ruby/'`" ] ; then
       string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_gem_home/bin:' + ENV['PATH']"
     elif [ ! -z "`head -n 1 $actual_file | awk '/bash/'`" ] ; then
       string="GEM_HOME=\${GEM_HOME:-'$rvm_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_gem_home'}\nPATH=$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH"
     fi
-    set +x
-    awk "NR==2 {print \"$string\"} {print}" $actual_file > $actual_file.new
-    mv $actual_file.new $actual_file ; chmod +x $actual_file
-  fi ; unset string actual_file
+    if [ ! -z "$string" ] ; then
+      awk "NR==2 {print \"$string\"} {print}" $actual_file > $actual_file.new
+      mv $actual_file.new $actual_file ; chmod +x $actual_file
+      unset string
+    fi
+  fi ; unset actual_file
 }
 
 function __rvm_actual_file {

data/scripts/rvm-selector

@@ -159,6 +159,7 @@ function __rvm_use {
     if [ -s $rvm_path/default ] ; then
       source $rvm_path/default
     else
+      rvm_ruby_interpreter="system"
       __rvm_log "error" "no default rvm specified, defaulting to pre-rvm sytem."
       unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
       if [ -s $rvm_path/system ] ; then source $rvm_path/system ; fi
@@ -201,7 +202,13 @@ function __rvm_use {
     PATH=$rvm_bin_path:$PATH ; export PATH
     PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:$PATH ; export PATH
 
-    if [ ! -z "$rvm_default_flag" ] ; then
+  fi
+
+  if [ ! -z "$rvm_default_flag" -a "$rvm_ruby_interpreter" != "default" ] ; then
+    if [ "$rvm_ruby_interpreter" = "system" ] ; then
+      rm -f $rvm_path/default
+      rm -f $rvm_path/bin/default*
+    else
       RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's/^\(.*\) (.*$/\1/')"
       export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
 
@@ -210,12 +217,12 @@ function __rvm_use {
       for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC ; do
         eval "export $variable"
         eval value=\$${variable}
-        if [ ! -z "$variable" ] ; then
+        if [ ! -z "$value" ] ; then
           echo "${variable}='$value' ; export ${variable}" >> $rvm_path/default
         else
           echo "unset ${variable}" >> $rvm_path/default
         fi
-      done
+      done ; unset variable value
 
       if [ -s $rvm_path/bin/$rvm_ruby_package_name ] ; then
         ln -fs $rvm_path/bin/$rvm_ruby_package_name $rvm_path/bin/default-ruby # So that people know what it's for :)
@@ -224,8 +231,8 @@ function __rvm_use {
       else
         rm -f $rvm_path/bin/default*
       fi
-      unset rvm_default_flag
     fi
+    unset rvm_default_flag
   fi
 
   if [ ! -z "$rvm_load_flag" ] ; then __rvm_gemset_load ; fi

data/scripts/rvm-utility

@@ -96,6 +96,10 @@ function __rvm_cleanup_variables {
   unset rvm_selected rvm_action rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_irbrc_file rvm_ruby_irbrc rvm_source_path rvm_path rvm_prefix_path rvm_ruby_package_name rvm_gem_path rvm_command rvm_error_message rvm_ruby_home rvm_ruby_binary rvm_gem_set_name rvm_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_configure rvm_ruby_make_install rvm_config_path rvm_ruby_string rvm_bin_path rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag
 }
 
+function __rvm_unset_ruby_variables {
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_home rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected rvm_ruby_selector
+}
+
 # TODO: root user loadng of /etc/rvmrc
 function __rvm_load-rvmrc {
   if [ -s ~/.rvmrc ] ; then source ~/.rvmrc ; fi
@@ -447,7 +451,6 @@ function __rvm_update {
     __rvm_version
   fi
   __rvm_reload
-  __rvm_select
   # if [ "$rvm_gem_flag" ]      ; then __rvm_gem_scripts    ; fi
   if [ "$rvm_bin_flag" ]      ; then __rvm_bin_scripts    ; fi
   if [ "$rvm_rubygems_flag" ] ; then __rvm_rubygems_setup ; fi
@@ -633,7 +636,7 @@ RubyCode
   echo -e "\n  end\nend\n" >> /tmp/$$.rb
   unset rvm_code
   rvm_ruby_args="/tmp/$$.rb"
-  rvm_action="rubydo"
+  rvm_action="ruby"
   if [ ! -z "$rvm_debug_flag" ] ; then echo -e "/tmp/$$.rb:\n$(cat /tmp/$$.rb)" ; fi
   __rvm_do
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.47
+  version: 0.0.48
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 -04:00
+date: 2009-09-23 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - scripts/rvm
 - scripts/rvm-aliases
 - scripts/rvm-cli
+- scripts/rvm-completion
 - scripts/rvm-functions
 - scripts/rvm-install
 - scripts/rvm-prompt