rvm 0.1.44 → 0.1.45

data/scripts/upgrade

@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+
+unset GREP_OPTIONS
+source "$rvm_scripts_path/base"
+
+usage() {
+  echo "Usage: rvm upgrade prefix [existing-ruby]" >&2
+  echo "Upgrades the latest installed ruby with a given prefix (e.g. ree) to a new version." >&2
+  exit 1
+}
+
+confirm() {
+  printf "$1 (Y/n): "
+  local confirmation_response
+  read -r confirmation_response
+  [[ -z "$confirmation_response" ]] || echo "$confirmation_response" | grep -qi '^y'
+}
+
+die_with_error() {
+  $rvm_scripts_path/log "fail" "$1"
+  exit "${2:-1}"
+}
+
+expand_ruby_name() {
+  $rvm_scripts_path/tools strings "$1" | awk -F"$rvm_gemset_separator" '{print $1}'
+}
+
+expand_existing_ruby() {
+  local prefix="$(expand_ruby_name "$1" | awk -F'-' '{print $1"-"$2}')"
+  local ruby_name
+  while read -r ruby_name; do
+    if [[ "$ruby_name" != "$expanded_destination"* ]]; then
+      echo "$ruby_name"
+      return 0
+    fi
+  done < <($rvm_scripts_path/list strings | tr ' ' '\n'  | sort -ur | grep "^$prefix" | grep -v '-head$' | head -n1)
+  return 1
+}
+
+upgrade_ruby() {
+  [[ -z "$source_ruby" ]] && die_with_error "Unable to find a source ruby. Please manually provide one."
+  
+  expanded_source="$(expand_ruby_name "$source_ruby")"
+  [[ -z "$expanded_source" ]] && die_with_error "The source ruby was not a valid ruby string."
+  
+  confirm "Are you sure you wish to upgrade from $expanded_source to $expanded_destination?" || die_with_error "Cancelling upgrade."
+  
+  if [[ ! -d "$rvm_rubies_path/$expanded_destination" ]]; then
+    $rvm_scripts_path/log "info" "Installing new ruby $expanded_destination"
+    $rvm_bin_path/rvm install "$expanded_destination"
+    result="$?"
+    [[ "$result" -gt 0 ]] && die_with_error "Unable to install ruby $expanded_destination. Please install it manually to continue." "$result"
+  fi
+  
+  $rvm_scripts_path/log "info" "Migrating gems from $expanded_source to $expanded_destination"
+  $rvm_scripts_path/migrate "$expanded_source" "$expanded_destination"
+  result="$?"
+  [[ "$result" -gt 0 ]] && die_with_error "Error migrating gems." "$result"
+  
+  $rvm_scripts_path/log "info" "Upgrade complete!"
+}
+
+[[ -z "$1" ]] && usage
+
+destination_ruby="$1"; shift
+expanded_destination="$(expand_ruby_name "$destination_ruby")"
+[[ -z "$expanded_destination" ]] && die_with_error "The destination ruby was not a valid ruby string."
+
+source_ruby="${1:-"$(expand_existing_ruby "$destination_ruby")"}"
+
+upgrade_ruby

data/scripts/utility

@@ -54,7 +54,7 @@ __rvm_dump_environment() {
   fi
   unset rvm_dump_environment_flag
 }
-  
+
 # Return a list of directories under a given base path.
 # Derived from rvm_ruby_string.
 __rvm_ruby_string_paths_under() {
@@ -214,12 +214,12 @@ __rvm_cleanup_variables() {
 
   if [[ "$rvm_sticky_flag" = "1" ]] ; then export rvm_gemset_name ; else unset rvm_gemset_name  ; fi
 
-  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_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 rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_sticky_flag rvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag rvm_ruby_aliases rvm_ruby_aliases rvm_patch_names rvm_clang_flag rvm_install_arguments rvm_dump_environment_flag
+  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_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 rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_sticky_flag rvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag rvm_ruby_aliases rvm_patch_names rvm_clang_flag rvm_install_arguments rvm_dump_environment_flag rvm_ruby_alias
 }
 
 # Unset ruby-specific variables
 __rvm_unset_ruby_variables() {
-  unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_release_version rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path rvm_ruby_name rvm_ruby_alias rvm_ruby_strings rvm_ruby_repo_path
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_release_version rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path rvm_ruby_name rvm_ruby_strings rvm_ruby_repo_path
 }
 
 # Usage: __rvm_with_env 'env-name' 'command'
@@ -292,7 +292,7 @@ __rvm_set_rvmrc() {
     fi
 
     local identifier=$(__rvm_environment_identifier)
-    printf "if [[ -s \"$rvm_environments_path/$identifier\" ]] ; then\n  . \"$rvm_environments_path/$identifier\"" > .rvmrc
+    printf "if [[ -n \"\$rvm_environments_path\" && -s \"\$rvm_environments_path/$identifier\" ]] ; then\n  . \"\$rvm_environments_path/$identifier\"" > .rvmrc
     printf "\nelse\n  rvm --create $flags \"$identifier\"\nfi" >> .rvmrc
 
     unset flags
@@ -455,7 +455,7 @@ __rvm_update_rvm() {
     if [[ -d "$rvm_src_path/rvm/.git" ]] ; then
       builtin cd "$rvm_src_path/rvm/" && git pull origin master && ./scripts/install
     else
-      builtin cd "$rvm_src_path" && git clone http://github.com/wayneeseguin/rvm.git && builtin cd rvm/ && ./scripts/install
+      builtin cd "$rvm_src_path" && ( git clone --depth 1 git://github.com/wayneeseguin/rvm.git || git clone http://github.com/wayneeseguin/rvm.git ) && builtin cd rvm/ && ./scripts/install
     fi
   else
     stable_version="$(curl -s http://rvm.beginrescueend.com/releases/stable-version.txt)"
@@ -587,15 +587,15 @@ __rvm_become() {
   { __rvm_ruby_string && __rvm_select && __rvm_use; } > /dev/null 2>&1
 }
 
-__rvm_ensure_has_enviroment_files() {
+__rvm_ensure_has_environment_files() {
   local environment_identifier="$(__rvm_environment_identifier)"
   file_name="${rvm_environments_path}/$environment_identifier"
 
   # Ensure system is a blank file.
   if [[ "$environment_identifier" == "system" ]]; then
-    rm -f "$file_name"
+    rm -f "$file_name" 2>&1 | grep -v 'rm: cannot remove .* Permission denied'
     mkdir -p "$(dirname "$file_name")"
-    touch "$file_name"
+    touch "$file_name" 2>&1 | grep -v 'touch: cannot touch .* Permission denied'
     return
   fi
 
@@ -724,7 +724,6 @@ __rvm_recorded_install_command() {
   fi
 }
 
-
 __rvm_environment_identifier() {
   ruby_string="$(command -v ruby)"
   if [ -n "$ruby_string" ] && echo "$ruby_string" | grep -q -F "$rvm_rubies_path"; then
@@ -733,4 +732,19 @@ __rvm_environment_identifier() {
     echo "system"
   fi
   unset ruby_string
-}
+}
+
+__rvm_expand_ruby_string() {
+  if [[ -z "$1" || "$1" = "all" || "$1" == "all-gemsets" ]]; then
+    $rvm_scripts_path/list gemsets strings
+  elif [[ "$1" == "all-rubies" || "$1" == "rubies" ]]; then
+    $rvm_scripts_path/list strings | tr ' ' "\n"
+  elif [[ "$1" == "current" || "$1" == "gemsets" ]]; then
+    local current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
+    rvm_silence_logging=1 $rvm_scripts_path/gemsets list | sed "s/^/$current_ruby$rvm_gemset_separator/"
+  elif [[ "$1" == "aliases" ]]; then
+    cat "$rvm_config_path/alias" | awk -F= '{print $1}'
+  else
+    echo "$1" | tr "," "\n" | __rvm_strip
+  fi
+}

data/scripts/wrapper

@@ -7,7 +7,7 @@ unset rvm_default_flag rvm_wrapper_name
 source "$rvm_scripts_path/base"
 
 full_binary_name() {
-  echo "$binary_name" | __rvm_strip 
+  echo "$binary_name" | __rvm_strip
 }
 
 wrap() {
@@ -80,7 +80,7 @@ fi
 # Use the correct ruby.
 __rvm_become "$ruby_string"
 
-__rvm_ensure_has_enviroment_files
+__rvm_ensure_has_environment_files
 
 environment_identifier="$(__rvm_environment_identifier)"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 65
   prerelease: false
   segments: 
   - 0
   - 1
-  - 44
-  version: 0.1.44
+  - 45
+  version: 0.1.45
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -04:00
+date: 2010-08-11 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -130,6 +130,7 @@ files:
 - scripts/manpages
 - scripts/match
 - scripts/md5
+- scripts/migrate
 - scripts/monitor
 - scripts/notes
 - scripts/package
@@ -144,6 +145,7 @@ files:
 - scripts/snapshot
 - scripts/tools
 - scripts/update
+- scripts/upgrade
 - scripts/utility
 - scripts/version
 - scripts/wrapper