rvm 0.1.43 → 0.1.44

data/scripts/cd

@@ -11,13 +11,17 @@ if [[ "$rvm_project_rvmrc" -ne 0 ]] ; then
     else
       cd() {
         builtin cd "$@"
+        result=$?
         __rvm_project_rvmrc
+        return $result
       }
     fi
   else
     cd() {
       builtin cd "$@"
+        result=$?
       __rvm_project_rvmrc
+      return $result
     }
   fi
 fi

data/scripts/cli

@@ -114,12 +114,18 @@ __rvm_parse_args() {
         if [[ "user" = "$1"  ]]   ; then rvm_user_flag=1  ;  shift ; fi
       ;;
 
-      rubygems|inspect|list|info|alias|docs)
+      inspect|list|info)
         rvm_action="$rvm_token"
         rvm_ruby_args="$@"
         rvm_parse_break=1
       ;;
 
+      docs|alias|rubygems)
+        rvm_action="$rvm_token"
+        rvm_ruby_args="$(__rvm_quote_args "$@")"
+        rvm_parse_break=1
+      ;;
+
       -S)
         rvm_action="ruby"
         rvm_ruby_args="$rvm_token $(__rvm_quote_args "$@")"
@@ -132,7 +138,7 @@ __rvm_parse_args() {
         rvm_parse_break=1
       ;;
 
-      exec|cleanup|tools|disk-usage|snapshot)
+      exec|cleanup|tools|disk-usage|snapshot|repair)
         rvm_action="$rvm_token"
         rvm_ruby_args="$(__rvm_quote_args "$@")"
         rvm_parse_break=1
@@ -178,7 +184,7 @@ __rvm_parse_args() {
             unset rvm_ruby_strings
           else
             if $rvm_scripts_path/match "$1" "^[0-9]" ; then
-              rvm_ruby_strings=$(echo "$1" | tr ',' ' ') ; shift
+              rvm_ruby_strings=$(echo "$1" | \tr ',' ' ') ; shift
               unset rvm_ruby_interpreter
             else
               if $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby" "$1" ; then
@@ -217,7 +223,7 @@ __rvm_parse_args() {
 
       --ree-options)
         if [[ ! -z "$1" ]] ; then
-          export rvm_ree_options="$(echo $1 | tr ',' ' ')" ; shift
+          export rvm_ree_options="$(echo $1 | \tr ',' ' ')" ; shift
         else
           rvm_action="error"
           rvm_error_message="--ree-options *must* be followed by... well... options."
@@ -279,7 +285,7 @@ __rvm_parse_args() {
 
       --alias)
         if [[ -n "$1" ]]; then
-          export rvm_ruby_aliases="$(echo "$1" | tr ',' ' ')"
+          export rvm_ruby_aliases="$(echo "$1" | \tr ',' ' ')"
           shift
         fi
       ;;
@@ -300,9 +306,9 @@ __rvm_parse_args() {
       ;;
 
       -h|--help|usage)      rvm_action=help                     ;;
-      -G)                   rvm_gems_path="$1"         ; shift  ;;
-      --source)             rvm_src_path="$1"          ; shift  ;;
-      --archives)           rvm_archives_path="$1"     ; shift  ;;
+      -G)                   path_variable="rvm_gems_path"     ; __rvm_set_path_variable ; shift  ;;
+      --source)             path_variable="rvm_src_path"      ; __rvm_set_path_variable ; shift  ;;
+      --archives)           path_variable="rvm_archives_path" ; __rvm_set_path_variable ; shift  ;;
       --make)               rvm_ruby_make="$1"         ; shift  ;;
       --make-install)       rvm_ruby_make_install="$1" ; shift  ;;
       --nice)               rvm_niceness="$1"          ; shift  ;;
@@ -316,17 +322,16 @@ __rvm_parse_args() {
       --disable-llvm|--disable-jit) rvm_llvm_flag=0      ;;
       --enable-llvm|--enable-jit)   rvm_llvm_flag=1      ;;
 
-      --name)
-        rvm_ruby_name="$1"
-        shift
-      ;;
-
       reboot|damnit|wtf|argh|BOOM|boom|wth) $rvm_action="reboot" ;;
 
       --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--sticky|--create|--rvmrc|--gems|--docs)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
       ;;
 
+      --dump-environment)
+        export rvm_dump_environment_flag="$1"; shift
+      ;;
+
       --clang)
         export rvm_clang_flag=1
         export rvm_prior_cc="$CC"
@@ -461,7 +466,7 @@ rvm() {
   fi
 
   # Check that this is the current version.
-  disk_version=$(cat "${rvm_path:-$HOME/.rvm}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')
+  disk_version=$(cat "${rvm_path:-$HOME/.rvm}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | \tr "\n" '.' | sed 's/\.$//')
   if [[ "${rvm_version}" != "${disk_version}" ]] && [[ "reload" != "$1" ]]; then
     printf "\nA RVM version ${disk_version} is installed yet ${rvm_version} is loaded.\n Please do one of the following:\n  * 'rvm reload'\n  * open a new shell\n  * source your shell init scripts"
     return 1
@@ -501,10 +506,7 @@ rvm() {
       fi
       result=$?
     ;;
-    docs)            $rvm_scripts_path/docs     $rvm_ruby_args ; result=$? ;;
-    alias)           $rvm_scripts_path/alias    $rvm_ruby_args ; result=$? ;;
     help)            $rvm_scripts_path/help     $rvm_ruby_args ; result=$? ;;
-    rubygems)        $rvm_scripts_path/rubygems $rvm_ruby_args ; result=$? ;;
 
     answer) __rvm_Answer_to_the_Ultimate_Question_of_Life_the_Universe_and_Everything ; result=42 ;;
     question) __rvm_ultimate_question ; result=42 ;;
@@ -521,7 +523,7 @@ rvm() {
     ;;
 
     gemdir|gemhome|gempath)
-      $rvm_scripts_path/gemsets $rvm_action
+      $rvm_scripts_path/gemsets "$rvm_action"
       result=$?
     ;;
 
@@ -536,7 +538,7 @@ rvm() {
       unset old_rvm_ruby_string
     ;;
 
-    cleanup|tools|snapshot|disk-usage)
+    cleanup|tools|snapshot|disk-usage|repair|alias|docs|rubygems)
       __rvm_run_script "$rvm_action"
       result=$?
     ;;

data/scripts/completion

@@ -41,27 +41,7 @@ _rvm_commands ()
         version use reload implode 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'
+        gemdir srcdir fetch list package notes snapshot'
 
   case "${cur}" in
   -*)       _rvm_opts ;;
@@ -71,11 +51,37 @@ _rvm_commands ()
 
 _rvm_opts ()
 {
-  local rvm_opts='\
-	-v --version\
-	-h --help'
-
-  __rvm_comp "$rvm_opts"
+  RVM_OPTS='\
+    -h\
+    --help\
+    -v\
+    --version\
+    -l --level\
+    --prefix\
+    --bin\
+    --gems\
+    --archive\
+    --patch
+    -S\
+    -e\
+    -G\
+    -C\
+    --configure\
+    --nice\
+    --ree-options\
+    --head\
+    --rubygems\
+    --default\
+    --debug\
+    --trace\
+    --force\
+    --summary\
+    --latest\
+    --docs\
+    --reconfigure
+    --create'
+
+  __rvm_comp "$RVM_OPTS"
 }
 
 _rvm_use ()

data/scripts/environment-convertor

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+# Usage: $rvm_scripts_path/environment-convertor <shell> <environment>
+
+unset GREP_COLOR
+unset GREP_OPTIONS
+
+source "$rvm_scripts_path/base"
+
+convert_path_to_fish() {
+  local path_part="$1"
+  local parts="$(echo "$path_part" | sed -e 's#:\$PATH##' -e "s#:#\" \"#g" -e "s#^export \\([^[:space:]]*\\)=##")"
+  echo "for path_part in $parts"
+  echo '  if test -d $path_part'
+  echo '    set PATH $path_parth $PATH'
+  echo '  end'
+  echo 'end'
+}
+
+convert_unset_to_fish() {
+  sed 's#^unset #set -e #'
+}
+
+convert_exports_to_fish() {
+  sed -e "s#:#' '#g" -e "s#^\\(export \\)\\{0,1\\}\\([^[:space:]]*\\)=#set -x \\2 #"
+}
+
+contents_of_environment_file() {
+  cat "$rvm_environments_path/$(__rvm_environment_identifier)"
+}
+
+convert_to_shell() {
+  convert_path_to_fish "$(contents_of_environment_file | grep '^export PATH=')"
+  while read -r shell_line; do
+    if echo "$shell_line" | grep -q '^unset '; then
+      echo "$shell_line" | convert_unset_to_fish
+    else
+      echo "$shell_line" | convert_exports_to_fish
+    fi
+  done < <(contents_of_environment_file | grep -v '^export [^=]*$' | grep -v '^export PATH=')
+  unset shell_line
+}
+
+ensure_has_shell() {
+  for item in "path" "unset" "exports"; do
+    command -v "convert_${item}_to_${1}" >/dev/null || return 1
+  done; unset item
+}
+
+shell_name="$1"
+environment_name="${2:-"$(__rvm_environment_identifier)"}"
+
+[[ -n "$shell_name" && -n "$environment_name" ]] || exit 1
+ensure_has_shell "$shell_name"                   || exit 1
+# Check we're loading a different shell.
+if [[ "$(__rvm_environment_identifier)" != "$environment_name" ]]; then
+  __rvm_become "$environment_name" || exit 1
+fi
+
+convert_to_shell

data/scripts/gemsets

@@ -16,7 +16,7 @@ usage() {
 gemset_update() {
   if [[ -z "$rvm_ruby_strings" ]]; then
     $rvm_scripts_path/log "info" "Running gem update for all rubies and gemsets."
-    rvm_ruby_strings="$(\ls "$rvm_gems_path" | grep -v '^\(doc\|cache\|@\|system\)' | tr '\n' ',')"
+    rvm_ruby_strings="$(\ls "$rvm_gems_path" | grep -v '^\(doc\|cache\|@\|system\)' | \tr '\n' ',')"
   else
     $rvm_scripts_path/log "info" "Running gem update for the specified rubies."
   fi
@@ -154,16 +154,27 @@ gemset_empty() {
 
 # Migrate gemsets from ruby X to ruby Y
 gemset_copy() {
-  source_ruby="$(echo $gems_args | awk '{print $1}')"
-  destination_ruby="$(echo $gems_args | awk '{print $2}')"
-  if [[ -z "$source_ruby" ]] ; then
+  local source_ruby="$(echo "$gems_args" | awk '{print $1}')"
+  local destination_ruby="$(echo "$gems_args" | awk '{print $2}')"
+  
+  if [[ -z "$destination_ruby" || -z "$source_ruby" ]] ; then
     $rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gemset copy X Y'"
+    return 1
   fi
-  if [[ -z "$destination_ruby" ]] ; then
-    $rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gemset copy X Y'"
+  
+  local source_path="$(rvm_silence_logging=1 rvm "$source_ruby" gem env gemdir)"
+  local destination_path="$(rvm_silence_logging=1 rvm "$destination_ruby" gem env gemdir)"
+  
+  if [[ -z "$source_path" ]]; then
+    $rvm_scripts_path/log "error" "Unable to expand ruby '$source_ruby'"
+    return 1
   fi
-  source_path="$(rvm $source_ruby gem env gemdir | tail -n 1)"
-  destination_path="$(rvm $destination_ruby gem env gemdir | tail -n 1)"
+  
+  if [[ -z "$destination_path" ]]; then
+    $rvm_scripts_path/log "error" "Unable to expand ruby '$destination_ruby'"
+    return 1
+  fi
+  
   if [[ -d "$source_path" ]] ; then
     if [[ ! -d "$destination_path" ]] ; then mkdir -p $destination_path ; fi
     $rvm_scripts_path/log "info" "Copying gemset from $source_ruby to $destination_ruby"
@@ -177,8 +188,6 @@ gemset_copy() {
     $rvm_scripts_path/log "error" "Gems directory does not exist for $source_path ($source_path)"
     return 1
   fi
-
-  unset source_ruby destination_ruby source_path destination_path
 }
 
 gemset_export() {
@@ -202,7 +211,7 @@ gemset_export() {
 
   touch $rvm_file_name
   echo "# $rvm_file_name generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_file_name
-  for gem in $(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | tr ' ' ';') ; do
+  for gem in $(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | \tr ' ' ';') ; do
     name="$(echo $gem | awk -F';' '{print $1}')"
     if [[ -z "$rvm_latest_flag" ]] ; then
       versions="$(echo $gem | awk -F';' '{print $2}' | sed 's#,# #g')"
@@ -381,7 +390,7 @@ gemset_prune() {
   $rvm_scripts_path/log "info" "Moving active gems into temporary cache..."
   while read -r used_gem; do
     gem_name="$(echo "$used_gem" | sed -e 's/ .*//')"
-    versions="$(echo "$used_gem" | sed -e 's/.* (//' -e 's/)//' | tr ', ' ' ')"
+    versions="$(echo "$used_gem" | sed -e 's/.* (//' -e 's/)//' | \tr ', ' ' ')"
     for version in $versions; do
       cached_gem_name="${gem_name}-${version}.gem"
       cached_file_path="${live_cache_path}/${cached_gem_name}"
@@ -403,7 +412,7 @@ gemset_pristine() {
 # Loads the default gemsets for the current interpreter and gemset.
 gemset_initial() {
   $rvm_scripts_path/log "info" "Importing initial gemsets for $(__rvm_environment_identifier)."
-  mkdir -p "$rvm_gemsets_path/$(echo "$rvm_ruby_string" | tr '-' '/')" 2>/dev/null
+  mkdir -p "$rvm_gemsets_path/$(echo "$rvm_ruby_string" | \tr '-' '/')" 2>/dev/null
   for gemsets_path in $(__rvm_ruby_string_paths_under "$rvm_gemsets_path") ; do
     if [[ -n "$rvm_gemset_name" ]] ; then
       if [[ -s "${gemsets_path}/${rvm_gemset_name}.gems" ]] ; then
@@ -437,7 +446,7 @@ if [[ "import" = "$action" ]] || [[ "load" = "$action" ]] ; then
     gemset_import
   else
     original_env="$(__rvm_environment_identifier)"
-    for rvm_ruby_string in $(echo "$rvm_ruby_strings" | tr "," " "); do
+    for rvm_ruby_string in $(echo "$rvm_ruby_strings" | \tr "," " "); do
       __rvm_become
       gemset_import
     done

data/scripts/help

@@ -17,7 +17,7 @@ if [[ ! -z "$command" ]] && [[ -s "${rvm_help_path}/${command}" ]] ; then
   fi
 else
   cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less}
-  $rvm_scripts_path/log "info" "\nCommands available with 'rvm help':\n\n $(builtin cd "${rvm_help_path}" ; \ls | tr "\n" ' ')"
+  $rvm_scripts_path/log "info" "\nCommands available with 'rvm help':\n\n $(builtin cd "${rvm_help_path}" ; \ls | \tr "\n" ' ')"
 fi
 
 $rvm_scripts_path/log "info" "\nFor additional information please visit RVM's documentation website:\n\n    http://rvm.beginrescueend.com/"

data/scripts/info

@@ -22,7 +22,7 @@ info_system() {
 
 info_rvm() {
   rvm_info="$rvm_info\n  rvm:"
-  rvm_info="$rvm_info\n    version:      \"$(__rvm_version | tr "\n" ' ' | __rvm_strip)\""
+  rvm_info="$rvm_info\n    version:      \"$(__rvm_version | \tr "\n" ' ' | __rvm_strip)\""
   rvm_info="$rvm_info\n"
 }
 
@@ -82,11 +82,11 @@ info_debug() {
   if [[ "Darwin" = "$(uname)" ]] ; then
     rvm_info="$rvm_info\nuname -r: $(uname -r)"
     rvm_info="$rvm_info\nuname -m: $(uname -m)"
-    rvm_info="$rvm_info\nsw_vers: $(sw_vers | tr "\n" ',')"
+    rvm_info="$rvm_info\nsw_vers: $(sw_vers | \tr "\n" ',')"
     rvm_info="$rvm_info\nARCHFLAGS: $ARCHFLAGS"
     rvm_info="$rvm_info\nLDFLAGS: $LDFLAGS"
     rvm_info="$rvm_info\nCFLAGS: $CFLAGS"
-    rvm_info="$rvm_info\n/Developer/SDKs/*:$(/usr/bin/basename -a /Developer/SDKs/* | tr "\n" ',')"
+    rvm_info="$rvm_info\n/Developer/SDKs/*:$(/usr/bin/basename -a /Developer/SDKs/* | \tr "\n" ',')"
   fi
 
   for file_name in $(echo $rc_files) ; do
@@ -95,7 +95,7 @@ info_debug() {
     fi
   done
 
-  if [[ "root" = "$(whoami)" ]] ; then
+  if [[ "$rvm_sandboxed" = "0" ]] ; then
     debug_files="$rvm_config_path/alias $rvm_config_path/system $rvm_config_path/db /etc/rvmrc /etc/gemrc"
   else
     debug_files="$rvm_config_path/alias $rvm_config_path/system $rvm_config_path/db $HOME/.rvmrc $HOME/.gemrc"
@@ -111,7 +111,7 @@ info_debug() {
 }
 
 info_sections() {
-  for section in $(echo $sections | tr ',' ' ') ; do
+  for section in $(echo $sections | \tr ',' ' ') ; do
     unset rvm_info ; "info_${section}" ; printf "$rvm_info"
   done
 }
@@ -132,7 +132,7 @@ if [[ -z "$ruby_strings" ]] ; then
   printf "$(__rvm_environment_identifier):\n"
   info_sections
 else
-  for ruby_string in $(printf $ruby_strings | tr ',' ' ') ; do
+  for ruby_string in $(printf $ruby_strings | \tr ',' ' ') ; do
     __rvm_become "$ruby_string"
     printf "$(__rvm_environment_identifier):\n"
     info_sections

data/scripts/initialize

@@ -1,24 +1,19 @@
 #!/usr/bin/env bash
 
-if [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME/"* ]] || [[ "root" = "$(whoami)" ]] ; then
+rvm_sandboxed="${rvm_sandboxed:-1}"
+
+if [[ "$rvm_sandboxed" = "0" ]] ; then
+  rvm_bin_path="${rvm_bin_path:-"$rvm_prefix/bin"}"
+  rvm_man_path="${rvm_man_path:-"$rvm_prefix/share/man"}"
   rvm_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
 else
+  rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"
+  rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
   rvm_rc_files="${rvm_rc_files:-"$HOME/.bash_profile $HOME/.bashrc $HOME/.zshenv"}"
 fi
 
 [[ -n "$rvm_archflags" ]] && rvm_make_flags_flag=1
 
-rvm_project_rvmrc="${rvm_project_rvmrc:-1}"
-rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-0}"
-
-if [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME/"* ]] || [[ "root" = "$(whoami)" ]] ; then
-  rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
-  rvm_man_path="${rvm_man_path:-"/usr/local/share/man"}"
-else
-  rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"
-  rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
-fi
-
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_repo_path="${rvm_repo_path:-"$rvm_path/repos"}"
@@ -38,5 +33,8 @@ rvm_patches_path="${rvm_patches_path:-"$rvm_path/patches"}"
 rvm_patchsets_path="${rvm_patchsets_path:-"$rvm_path/patchsets"}"
 rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
 
-export rvm_path rvm_patches_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_gemsets_path rvm_repo_path rvm_patchsets_path
+rvm_project_rvmrc="${rvm_project_rvmrc:-1}"
+rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-0}"
+
+export rvm_path rvm_patches_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_gemsets_path rvm_repo_path rvm_patchsets_path rvm_sandboxed