rvm 0.1.42 → 0.1.43

data/README

@@ -68,6 +68,9 @@ Action
               specified ruby and gemset combination. Used under the hood for
               passenger support and the like.
 
+  cleanup   - Lets you remove stale source folders / archives and other miscellaneous
+              data associated with rvm.
+
   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
@@ -87,6 +90,8 @@ Action
               http://rvm.beginrescueend.com/packages/
   notes     - Display notes, with operating system specifics.
 
+  snapshot  - Let's your backup / restore an rvm installation in a lightweight manner.
+
 Implementation
 
   * ruby    - MRI/YARV Ruby (The Gold Standard) {1.8.6,1.8.7,1.9.1,1.9.2...}

data/install

@@ -114,7 +114,7 @@ fi
 
 spinner
 
-mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_patches_path $rvm_tmp_path
+mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path
 
 for file in README LICENCE ; do
   spinner

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 42
+:patch: 43

data/lib/rvm/environment/tools.rb

@@ -11,6 +11,19 @@ module RVM
       normalize rvm(:tools, "path-identifier", path.to_s).stdout
     end
 
+    def tools_strings(*rubies)
+      rubies = rubies.flatten.join(",").split(",").uniq
+      names = {}
+      value = rvm(:tools, :strings, *rubies)
+      if value.successful?
+        parts = value.stdout.split("\n").map { |l| l.split }
+        rubies.each_with_index do |key, index|
+          names[key] = normalize(parts[index])
+        end
+      end
+      names
+    end
+
     # Return the tools wrapper.
     def tools
       @tools_wrapper ||= ToolsWrapper.new(self)
@@ -35,6 +48,14 @@ module RVM
       end
       alias identifier_for_path path_identifier
 
+      def strings(*rubies)
+        @parent.tools_strings(*rubies)
+      end
+
+      def expand_string(ruby)
+        strings(ruby)[ruby]
+      end
+
     end
 
   end

data/lib/rvm/install_command_dumper.rb

@@ -0,0 +1,51 @@
+# Prints out the rvm command (minus rvm install) to install this ruby.
+
+RUBY_NAME = File.basename(ENV['MY_RUBY_HOME'])
+RVM_HOME  = ENV['rvm_path']
+
+def ruby?(*names)
+  names.map { |n| n.to_s }.include?(RUBY_NAME.split("-").first)
+end
+
+def quote(value)
+  value = value.to_s.strip
+  value.empty? ? "" : "'#{value.gsub("'", "'\'\'")}'"
+end
+
+def normalize_argument(arg)
+  real_value, arg_value = arg.split("=", 2)
+  if !arg_value.nil?
+    real_value << "=#{quote(arg_value)}"
+  end
+  real_value.gsub("'#{RVM_HOME}", "'\"$rvm_path\"'")
+end
+
+def arguments_for_install
+  if ruby?(:ruby, :mput, :ree)
+    begin
+      require 'rbconfig'
+      require 'shellwords'
+      # Get the full arguments
+      config_args = Shellwords.shellwords(Config::CONFIG['configure_args'].to_s.strip)
+      real_arguments = []
+      config_args.each do |arg|
+        if ruby?(:ree) && arg == "--enable-mbari-api"
+          next
+        elsif arg =~ /^--prefix/
+          next
+        elsif arg =~ /^[^\-]/
+          next
+        else
+          real_arguments << normalize_argument(arg)
+        end
+      end
+      config_args = real_arguments.join(",")
+      return "-C #{quote(config_args)}" unless config_args.strip.empty?
+    rescue LoadError
+    end
+  end
+  return ""
+end
+
+# Finally, print the string to install it.
+puts "rvm install #{RUBY_NAME} #{arguments_for_install.gsub(/''+/, "'")}".strip

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.42"
+  s.version = "0.1.43"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-07-20}
+  s.date = %q{2010-07-21}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -78,6 +78,7 @@ Gem::Specification.new do |s|
      "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/result.rb",
@@ -127,6 +128,7 @@ Gem::Specification.new do |s|
      "scripts/rvm-install",
      "scripts/selector",
      "scripts/set",
+     "scripts/snapshot",
      "scripts/tools",
      "scripts/update",
      "scripts/utility",

data/scripts/cli

@@ -10,6 +10,12 @@ __rvm_usage() { cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less} ; }
   #fi
 #}
 
+__rvm_run_script() {
+  local rvm_script_name="${1:-"$rvm_action"}"
+  eval "$rvm_scripts_path/$rvm_script_name $rvm_ruby_args"
+  return $?
+}
+
 __rvm_parse_args() {
 
   # TODO:
@@ -44,6 +50,7 @@ __rvm_parse_args() {
       install|uninstall)
         export ${rvm_token}_flag=1
         rvm_action=$rvm_token
+        export rvm_install_arguments="$(__rvm_quote_args_with_shift 1 "$@")"
       ;;
 
       rm|remove)
@@ -125,7 +132,7 @@ __rvm_parse_args() {
         rvm_parse_break=1
       ;;
 
-      exec|cleanup|tools|disk-usage)
+      exec|cleanup|tools|disk-usage|snapshot)
         rvm_action="$rvm_token"
         rvm_ruby_args="$(__rvm_quote_args "$@")"
         rvm_parse_break=1
@@ -137,7 +144,6 @@ __rvm_parse_args() {
         rvm_parse_break=1
       ;;
 
-
       do|ruby|rake|gem|rubydo|rakedo|gemdo)
         if [[ "do" = "$rvm_action" ]] ; then rvm_action="ruby" ; fi
         rvm_action=$(echo $rvm_token | sed 's#do##g')
@@ -466,7 +472,7 @@ rvm() {
   __rvm_initialize
   __rvm_parse_args "$@"
 
-  export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_ruby_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag
+  export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_ruby_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag rvm_install_arguments
   export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_patches_path rvm_patches_path rvm_patchsets_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
 
   result=0
@@ -530,18 +536,8 @@ rvm() {
       unset old_rvm_ruby_string
     ;;
 
-    cleanup)
-      eval "$rvm_scripts_path/cleanup $rvm_ruby_args"
-      result=$?
-    ;;
-
-    tools)
-      eval "$rvm_scripts_path/tools $rvm_ruby_args"
-      result=$?
-    ;;
-
-    disk-usage)
-      eval "$rvm_scripts_path/disk-usage $rvm_ruby_args"
+    cleanup|tools|snapshot|disk-usage)
+      __rvm_run_script "$rvm_action"
       result=$?
     ;;
 
@@ -620,7 +616,7 @@ rvm() {
   if [[ ! -z "$rvm_reload_flag" ]] ; then
     source "$rvm_scripts_path/rvm"
     # Note: Not using builtin on purpose. Done so we can trigger a reload the rvmrc.
-    cd .
+    __rvm_project_rvmrc
   fi
 
   if [[ ! -z "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi

data/scripts/disk-usage

@@ -49,4 +49,3 @@ case "$1" in
   all|archives|repos|sources|logs|total|packages) eval "$1_disk_usage" ;;
   *)        usage ;;
 esac
-

data/scripts/install

@@ -114,7 +114,7 @@ fi
 
 spinner
 
-mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_patches_path $rvm_tmp_path
+mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path
 
 for file in README LICENCE ; do
   spinner

data/scripts/list

@@ -5,17 +5,19 @@ if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 source "$rvm_scripts_path/utility"
 
 list_gemsets() {
-  if [[ "$(echo $rvm_ruby_args | awk '{print $2}')" = "strings" ]]; then
+  if [[ "$1" = "strings" ]]; then
     list_gemset_strings
     return 0
   fi
   echo
 
   current_ruby="$(__rvm_environment_identifier)"
+  local all_rubies="$(list_strings)"
 
   printf "rvm gemsets\n"
   for version in $(\ls $rvm_gems_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
     ruby_version_name="$(echo "$version" | awk -F"$rvm_gemset_separator" '{print $1}')"
+    [[ "$all_rubies" != *"$ruby_version_name"* ]] && continue
     if [[ -n "$(echo $version | awk '/^jruby-/')" ]] ; then
       string="[ $($rvm_rubies_path/$ruby_version_name/bin/ruby -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
     elif [[ -n "$(echo $version | awk '/^maglev-|^macruby-/')" ]] ; then
@@ -48,8 +50,7 @@ list_gemsets() {
 }
 
 list_default() {
-  strings="$(echo $rvm_ruby_args | awk '{print $2}')"
-  if [[ "$strings" = "string" ]] ; then
+  if [[ "$1" = "string" ]] ; then
     $rvm_scripts_path/alias show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename
   else
     if [[ -L "$rvm_rubies_path/default" ]]; then
@@ -80,7 +81,12 @@ list_strings() {
 
 # This is meant to be used with scripting.
 list_gemset_strings() {
-  \ls $rvm_gems_path/ 2>/dev/null | xargs -- basename | grep -v '^\(@\|doc$\|cache$\|system$\)' | sort
+  local all_rubies="$(list_strings)"
+  for gemset in $(\ls $rvm_gems_path/ 2>/dev/null | xargs -- basename | grep -v '^\(@\|doc$\|cache$\|system$\)' | sort); do
+    local ruby_name="$(echo "$gemset" | awk -F$rvm_gemset_separator '{print $1}')"
+    [[ "$all_rubies" != *"$ruby_name"* ]] && continue
+    echo "$gemset"
+  done
 }
 
 # This is meant to be used with scripting.
@@ -137,18 +143,19 @@ list_rubies() {
 # List all rvm installed rubies, default ruby and system ruby.
 # Display the rubies, indicate their architecture and indicate which is currently used.
 # This is not meant to be used with scripting. This is for interactive mode usage only.
-action="$(echo "$1" | awk '{print $1}')"
+action="$1"
+[[ $# -gt 0 ]] && shift
 
 if [[ "known" = "$action" ]] ; then
   list_known
 elif [[ "known_strings" = "$action" ]] ; then
   list_known_strings
 elif [[ "gemsets" = "$action" ]] ; then
-  list_gemsets
+  list_gemsets "$@"
 elif [[ "default" = "$action" ]] ; then
   list_default
 elif [[ -z "$action" ]] || [[ "rubies" = "$action" ]] ; then
-  list_rubies
+  list_rubies "$@"
 elif [[ "strings" = "$action" ]] ; then
   list_strings
 elif [[ "ruby_svn_tags" = "$action" ]] ; then

data/scripts/manage

@@ -867,6 +867,9 @@ __rvm_uninstall_ruby() {
         rm -f $rvm_bin_path/$rvm_ruby_string
       fi
     done ; unset dir
+
+    __rvm_remove_install_record "$rvm_ruby_string"
+
     __rvm_remove_gemsets
 
     __rvm_check_default
@@ -895,6 +898,7 @@ __rvm_remove_ruby() {
       __rvm_check_default
 
     done ; unset dir
+    __rvm_remove_install_record "$rvm_ruby_string"
     __rvm_remove_gemsets
     __rvm_remove_archives
     __rvm_remove_aliases
@@ -1152,7 +1156,14 @@ __rvm_manage_rubies() {
 
   if [[ -n "$rubies_string" ]] ;then
     for rvm_ruby_string in $(echo "$rubies_string" | tr ',' ' ') ; do
+      current_manage_ruby_string="$rvm_ruby_string"
       eval "__rvm_${rvm_action}_ruby"
+      result="$?"
+      if [[ "$result" -gt 0 && "$manage_result" = 0 ]]; then
+        manage_result="$result"
+      fi
+      [[ "$result" = 0 && "$rvm_action" = "install" ]] && __rvm_record_install "$current_manage_ruby_string"
+      unset current_manage_ruby_string
       __rvm_unset_ruby_variables
     done
   else # all
@@ -1160,8 +1171,16 @@ __rvm_manage_rubies() {
       while read -r bin_line
       do # Keep this on second line damnit!
         if [[ -x "$bin_line" ]] ; then
-          rvm_ruby_string="$(dirname "$bin_line" | xargs dirname | xargs basename)"
+          current_manage_ruby_string="$(dirname "$bin_line" | xargs dirname | xargs basename)"
+          rvm_ruby_string="$current_manage_ruby_string"
           eval "__rvm_${rvm_action}_ruby"
+          result="$?"
+          if [[ "$result" -gt 0 && "$manage_result" = 0 ]]; then
+            manage_result="$result"
+          fi
+          # record as current_manage_string to prevent it being overridden.
+          [[ "$result" = 0 && "$rvm_action" = "install" ]] && __rvm_record_install "$current_manage_ruby_string"
+          unset current_manage_ruby_string
           __rvm_unset_ruby_variables
         fi
       done < <(\ls $rvm_rubies_path/*/bin/ruby 2> /dev/null)

data/scripts/rvm-install

@@ -114,7 +114,7 @@ fi
 
 spinner
 
-mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_patches_path $rvm_tmp_path
+mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path
 
 for file in README LICENCE ; do
   spinner

data/scripts/snapshot

@@ -0,0 +1,189 @@
+#!/usr/bin/env bash
+
+unset GREP_COLOR
+unset GREP_OPTIONS
+
+source "$rvm_scripts_path/base"
+
+__error_on_result() {
+  if [[ "$1" -gt 0 ]]; then
+    $rvm_scripts_path/log "fail" "$2 - Aborting now."
+    return 0
+  else
+    return 1
+  fi
+}
+
+snapshot_save() {
+
+  if [[ -z "$1" ]]; then
+    echo "Usage: rvm snapshot save name" >&2
+    echo "Saves a snapshot to <name>.tar.gz in the current directory." >&2
+    return 1
+  fi
+
+  # Create the temporary directory.
+  local snapshot_temp_path="$rvm_tmp_path/$$-snapshot"
+  rm -rf "$snapshot_temp_path"
+  mkdir -p "$snapshot_temp_path"
+
+  $rvm_scripts_path/log "info" "Backing up a list of aliases"
+  cp "$rvm_config_path/alias" "$snapshot_temp_path/"
+
+  $rvm_scripts_path/log "info" "Backing up your user preferences"
+  cp "$rvm_config_path/user" "$snapshot_temp_path/"
+
+  $rvm_scripts_path/log "info" "Backing up your installed packages"
+  cat "$rvm_config_path/packages" | sed -e 's/-//' -e 's/^lib//' | awk -F= '{print $1}' | sort | uniq > "$snapshot_temp_path/packages"
+
+  $rvm_scripts_path/log "info" "Backing up all of your gemsets"
+  mkdir -p "$snapshot_temp_path/gems"
+  __rvm_pushpop "$snapshot_temp_path/gems"
+  for snapshot_gemset in $($rvm_scripts_path/list gemsets strings) ; do
+    __rvm_become "$snapshot_gemset"
+    result="$?"
+    __error_on_result "$result" "Error becoming ruby $snapshot_gemset" && return "$result"
+    $rvm_scripts_path/gemsets export "${snapshot_gemset}.gems" >/dev/null
+    result="$?"
+    __error_on_result "$result" "Error exporting gemset contents for $snapshot_gemset" && return "$result"
+    mkdir -p "./$snapshot_gemset/"
+    [[ -d "$GEM_HOME/cache/" ]] && cp -R "$GEM_HOME/cache/" "./$snapshot_gemset/"
+  done; unset snapshot_gemset
+  __rvm_pushpop
+
+  $rvm_scripts_path/log "info" "Backing up all of your installed rubies"
+  echo '#!/usr/bin/env bash -e' > "$snapshot_temp_path/install-rubies.sh"
+  echo "source \"\$rvm_scripts_path/rvm\" || true" >> "$snapshot_temp_path/install-rubies.sh"
+  local snapshot_ruby_name_file="$rvm_tmp_path/$$-rubies"
+  local snapshot_alias_name_file="$rvm_tmp_path/$$-aliases"
+  local snapshot_installable_file="$rvm_tmp_path/$$-installable"
+
+  $rvm_scripts_path/alias list | awk -F ' => ' '{print $1}' | sort | uniq 2>/dev/null > "$snapshot_alias_name_file"
+  $rvm_scripts_path/list strings | tr ' ' '\n' | sort | uniq > "$snapshot_ruby_name_file"  
+  comm -2 -3 "$snapshot_ruby_name_file" "$snapshot_alias_name_file" > "$snapshot_installable_file"
+  rm -rf "$snapshot_ruby_name_file" "$snapshot_alias_name_file"
+
+  local snapshot_primary_ruby="$(cat "$snapshot_installable_file" | grep '^\(ree\|ruby-1.8.7\)' | grep -v '-head$' | sort -r | head -n1)"
+  local snapshot_ruby_order="$snapshot_primary_ruby $(cat "$snapshot_installable_file" | grep -v "$snapshot_primary_ruby")"
+  for snapshot_ruby_name in $snapshot_ruby_order ; do
+    snapshot_install_command="$(__rvm_recorded_install_command "$snapshot_ruby_name")"
+    if [[ -n "$snapshot_install_command" ]]; then
+      echo "rvm install $snapshot_install_command" | sed "s#$rvm_path#'\\\"\$rvm_path\\\"'#" >> "$snapshot_temp_path/install-rubies.sh"
+    else
+      __rvm_become "$snapshot_ruby_name"
+      ruby "$rvm_path/lib/rvm/install_command_dumper.rb" >> "$snapshot_temp_path/install-rubies.sh"
+    fi
+    unset snapshot_install_command
+  done; unset snapshot_ruby_name snapshot_primary_ruby
+
+  rm -rf "$snapshot_installable_file"
+
+  $rvm_scripts_path/log "info" "Compressing snapshotting"
+  local destination_path="$PWD"
+  __rvm_pushpop "$snapshot_temp_path"
+  rm -rf "$destination_path/$1.tar.gz"
+  tar czf "$destination_path/$1.tar.gz" .
+  result="$?"
+  __error_on_result "$result" "Error creating archive $destination_path/$1.tar.gz" && return "$result"
+  __rvm_pushpop
+
+  $rvm_scripts_path/log "info" "Cleaning up"
+  rm -rf "$snapshot_temp_path"
+
+  $rvm_scripts_path/log "info" "Snapshot complete"
+
+}
+
+snapshot_load() {
+  if [[ -z "$1" ]]; then
+    echo "Usage: rvm snapshot load name" >&2
+    echo "Loads a snapshot from <name>.tar.gz in the current directory." >&2
+    return 1
+  fi
+
+  local snapshot_archive="$PWD/$(echo "$1" | sed 's/.tar.gz$//').tar.gz"
+
+  if ! [[ -s "$snapshot_archive" ]]; then
+    echo "The provides snapshot '$(basename "$snapshot_archive")' doesn't exist." >&2
+    return 1
+  fi
+
+  local snapshot_temp_path="$rvm_tmp_path/$$-snapshot"
+
+  rm -rf "$snapshot_temp_path"
+  mkdir -p "$snapshot_temp_path"
+
+  $rvm_scripts_path/log "info" "Extracting snapshot"
+  __rvm_pushpop "$snapshot_temp_path"
+  tar xzf "$snapshot_archive"
+  result="$?"
+  __error_on_result "$result" "Error extracting the archive '$snapshot_archive'" && return "$result"
+  __rvm_pushpop
+
+  $rvm_scripts_path/log "info" "Restoring user settings"
+  cp -f "$snapshot_temp_path/user" "$rvm_config_path/user"
+
+  $rvm_scripts_path/log "info" "Installing rvm-managed packages"
+  for snapshot_package in $(cat "$snapshot_temp_path/packages"); do
+    $rvm_scripts_path/package install "$snapshot_package"
+    result="$?"
+    __error_on_result "$result" "Error installing package '$snapshot_package'" && return "$result"
+  done; unset snapshot_package
+
+  $rvm_scripts_path/log "info" "Installing rubies"
+  chmod +x "$snapshot_temp_path/install-rubies.sh"
+  $snapshot_temp_path/install-rubies.sh
+  result="$?"
+  __error_on_result "$result" "Error importing rubies." && return "$result"
+
+  export rvm_create_flag=1
+  $rvm_scripts_path/log "info" "Setting up gemsets"
+  __rvm_pushpop "$snapshot_temp_path/gems"
+  for snapshot_gemset in $(\ls | grep '\.gems$' | sed 's/.gems$//'); do
+    __rvm_become "$snapshot_gemset"
+    result="$?"
+    __error_on_result "$result" "Error becoming '$snapshot_gemset'" && return "$result"
+    mkdir -p "$GEM_HOME/cache/"
+    cp -Rf "$snapshot_gemset/" "$GEM_HOME/cache/"
+    result="$?"
+    __error_on_result "$result" "Error copying across cache for $snapshot_gemset" && return "$result"
+    $rvm_scripts_path/gemsets import "$snapshot_gemset" >/dev/null 2>&1
+    result="$?"
+    __error_on_result "$result" "Error importing gemset for $snapshot_gemset" && return "$result"
+  done; unset snapshot_gemset
+  __rvm_pushpop
+
+  $rvm_scripts_path/log "info" "Restoring aliases"
+  while read -r package_info; do
+    local alias_name="$(echo "$package_info" | awk -F= '{print $1}')"
+    local alias_ruby="$(echo "$package_info" | awk -F= '{print $2}')"
+    $rvm_scripts_path/alias create "$alias_name" "$alias_ruby"
+    if [[ "$alias_name" = "default" ]]; then
+      (source "$rvm_scripts_path/rvm" && rvm use "$alias_ruby" --default) >/dev/null 2>&1
+      result="$?"
+      __error_on_result "$result" "Error setting default to $alias_ruby" && return "$result"
+    fi
+  done < "$snapshot_temp_path/alias"
+  unset package_info
+
+  $rvm_scripts_path/log "info" "Cleaning up load process"
+  rm -rf "$snapshot_temp_path"
+
+  $rvm_scripts_path/log "info" "Loaded snapshot from $(basename "$snapshot_archive")"
+}
+
+snapshot_usage() {
+  echo "Usage: rvm snapshot {save,load} file" >&2
+  return 1
+}
+
+action="$1"
+[[ "$#" -gt 0 ]] && shift
+
+case "$action" in
+  save) snapshot_save "$@" ;;
+  load) snapshot_load "$@" ;;
+  *)    snapshot_usage ;;
+esac
+
+exit $?

data/scripts/tools

@@ -1,7 +1,9 @@
+#!/usr/bin/env bash
+
 source "$rvm_scripts_path/base"
 
 usage() {
-  echo "Usage: rvm tools {identifier,path-identifier}" 1>&2
+  echo "Usage: rvm tools {identifier,path-identifier,strings}" 1>&2
   exit 1
 }
 
@@ -21,6 +23,18 @@ tools_path_identifier() {
     __rvm_environment_identifier)
 }
 
+tools_strings() {
+  for ruby_name in "$@"; do
+    __rvm_unset_ruby_variables
+    rvm_ruby_string="$ruby_name"
+    if { __rvm_ruby_string && __rvm_select; } >/dev/null 2>&1; then
+      basename "$rvm_ruby_gem_home"
+    else
+      echo ""
+    fi
+  done
+}
+
 [[ -z "$1" ]] && usage
 
 action="$1"; shift
@@ -28,6 +42,7 @@ action="$1"; shift
 case "$action" in
   identifier)      tools_identifier ;;
   path-identifier) tools_path_identifier "$@" ;;
+  strings)         tools_strings "$@" ;;
   *)               usage ;;
 esac
 

data/scripts/update

@@ -114,7 +114,7 @@ fi
 
 spinner
 
-mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_patches_path $rvm_tmp_path
+mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path
 
 for file in README LICENCE ; do
   spinner

data/scripts/utility

@@ -85,6 +85,12 @@ __rvm_quote_args() {
   echo "$quoted_string" | sed -e 's/^ *//g' -e 's/ *$//g'
 }
 
+__rvm_quote_args_with_shift() {
+  local shift_value="$1"; shift
+  local program_args=( "$@" )
+  __rvm_quote_args "${program_args[@]:$shift_value}"
+}
+
 __rvm_warn_on_rubyopt() {
   if [[ -n "$RUBYOPT" ]]; then
     $rvm_scripts_path/log "warn" "Please note: You have the RUBYOPT environment variable set and this may interfere with normal rvm operations. We sugges unsetting it."
@@ -180,7 +186,7 @@ __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
+  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
 }
 
 # Unset ruby-specific variables
@@ -217,9 +223,9 @@ __rvm_ensure_has_18_compat_ruby() {
   if [[ -z "$(__rvm_18_compat_ruby)" ]]; then
     # TODO: install currently doesn't return the correct status.
     local compat_result=0
-    if ! ( rvm install 1.8.7 ); then
-      $rvm_scripts_path/log "fatal" "To proceed rvm requires a 1.8-compatible ruby is installed. We attempted to install 1.8.7 automatically but it failed."
-      $rvm_scripts_path/log "fatal" "Please install it manually (or a compatible alternative) to proceed."
+    if ! ( $rvm_scripts_path/manage install 1.8.7 ); then
+      $rvm_scripts_path/log "fail" "To proceed rvm requires a 1.8-compatible ruby is installed. We attempted to install 1.8.7 automatically but it failed."
+      $rvm_scripts_path/log "fail" "Please install it manually (or a compatible alternative) to proceed."
       compat_result=1
     fi
     unset original_ruby
@@ -786,3 +792,37 @@ __rvm_project_rvmrc() {
     fi
   done
 }
+
+__rvm_record_install() {
+  [[ -z "$1" ]] && return
+  local recorded_ruby_name="$($rvm_scripts_path/tools strings "$1")"
+  local rvm_install_record_file="$rvm_config_path/installs"
+  local rvm_install_command="$(echo "$recorded_ruby_name $rvm_install_arguments" | __rvm_strip)"
+  touch "$rvm_install_record_file"
+  rm -f "$rvm_install_record_file.tmp"
+  cat "$rvm_install_record_file" | grep -v "^$recorded_ruby_name " > "$rvm_install_record_file.tmp"
+  echo "$rvm_install_command" >> "$rvm_install_record_file.tmp"
+  rm -f "$rvm_install_record_file"
+  mv "$rvm_install_record_file.tmp" "$rvm_install_record_file"
+}
+
+__rvm_remove_install_record() {
+  local recorded_ruby_name="$($rvm_scripts_path/tools strings "$1")"
+  local rvm_install_record_file="$rvm_config_path/installs"
+  if [[ -s "$rvm_install_record_file" ]]; then
+    mv "$rvm_install_record_file" "$rvm_install_record_file.tmp"
+    cat "$rvm_install_record_file.tmp" | grep -v "^$recorded_ruby_name " > "$rvm_install_record_file"
+    rm -f "$rvm_install_record_file.tmp"
+  fi
+}
+
+__rvm_recorded_install_command() {
+  local recorded_ruby_name="$($rvm_scripts_path/tools strings "$1" | awk -F"$rvm_gemset_separator" '{print $1}')"
+  [[ -z "$recorded_ruby_name" ]] && return 1
+  local recorded_ruby_match="^$recorded_ruby_name "
+  if [[ -s "$rvm_config_path/installs" ]] && grep -q "$recorded_ruby_match" "$rvm_config_path/installs" ; then
+    cat "$rvm_config_path/installs" | grep "$recorded_ruby_match" | head -n1
+  else
+    return 1
+  fi
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 77
   prerelease: false
   segments: 
   - 0
   - 1
-  - 42
-  version: 0.1.42
+  - 43
+  version: 0.1.43
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 -04:00
+date: 2010-07-21 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -88,6 +88,7 @@ files:
 - 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/result.rb
@@ -137,6 +138,7 @@ files:
 - scripts/rvm-install
 - scripts/selector
 - scripts/set
+- scripts/snapshot
 - scripts/tools
 - scripts/update
 - scripts/utility