rvm 1.0.9 → 1.0.10

data/scripts/update

@@ -40,6 +40,15 @@ check_rubyopt_conditions() {
   fi
 }
 
+# Regenerates a users wrappers as part of the update.
+regenerate_wrappers() {
+  printf "\n"
+  if command -v __rvm_regenerate_wrappers >/dev/null; then
+    __rvm_regenerate_wrappers
+  fi
+  printf "\n"
+}
+
 andand_return_instructions() {
   printf "
   This means that if you see something like:
@@ -493,6 +502,15 @@ for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
 
 done
 
+# Cleanup any .swp files that might have appeared.
+files=($( find "$rvm_path/" -mindepth 1 -maxdepth 2 -iname '*.swp' -type f ))
+
+for file in "${files[@]}" ; do
+
+  [[ -f "$file" ]] && rm -f "$file"
+
+done
+
 printf "\n    Copying manpages into place."
 
 files=($(builtin cd "$install_source_path/man" ; find . -maxdepth 1 -mindepth 1 -type f -print))
@@ -514,6 +532,8 @@ if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
   upgrade_notes
 
   check_rubyopt_conditions
+  
+  regenerate_wrappers
 
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 

data/scripts/utility

@@ -14,13 +14,16 @@ __rvm_setup() {
 }
 
 __rvm_teardown() {
+
   if [[ -n "${ZSH_VERSION:-""}" ]] ; then
 
-    if [[ "$rvm_zsh_clobber" -eq 0 ]] ; then
+    if [[ ${rvm_zsh_clobber:-0} -eq 0 ]] ; then
 
       setopt noclobber
 
-    fi ; unset rvm_zsh_clobber
+    fi
+
+    unset rvm_zsh_clobber
 
   else
     : # currently we are not doing any option setting for bash.
@@ -44,8 +47,7 @@ __rvm_teardown() {
 
   fi
 
-  unset rvm_ruby_strings rvm_head_flag rvm_prior_cc next_token rvm_bin_path rvm_error_message rvm_gems_cache_path rvm_gems_path rvm_gemset_name rvm_interactive_flag rvm_man_path rvm_parse_break rvm_rc_files rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_tag rvm_ruby_version rvm_selfcontained rvm_token
-
+  unset rvm_ruby_strings rvm_head_flag rvm_prior_cc next_token rvm_bin_path rvm_error_message rvm_gems_cache_path rvm_gems_path rvm_gemset_name rvm_interactive_flag rvm_man_path rvm_parse_break rvm_rc_files rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_selfcontained rvm_token rvm_ruby_load_path rvm_path_flag rvm_ruby_require rvm_project_rvmrc_default rvm_action
 
   [[ ${rvm_dump_environment_flag:-0} -eq 1 ]] && __rvm_dump_environment
 
@@ -248,8 +250,8 @@ __rvm_run() {
 
   log="$path/$name.log"
 
-  if [[ ! -d "$path" ]] ; then
-    \mkdir -p "$path"
+  if [[ ! -d "${log%\/*}" ]] ; then
+    \mkdir -p "${log%\/*}"
   fi
 
   \touch "$log" "${log/%.log/.error.log}" # for zsh :(
@@ -405,18 +407,22 @@ __rvm_ensure_has_18_compat_ruby() {
 # Cleans up temp folders for a given prefix ($1),
 # typically the current process id.
 __rvm_cleanup_temp_for() {
+
   result=$? # Capture last command status
 
   [[ -z "${1:-""}" ]] && return 1
 
   if [[ -d "${rvm_tmp_path:-"$rvm_path/tmp"}/" ]]; then
+
     \rm -rf "${rvm_tmp_path:-"$rvm_path/tmp"}/$1"* >/dev/null 2>&1
+
   fi
 
   return $result
 }
 
 __rvm_set_rvmrc() {
+
   local flags
 
   if [[ "$HOME" != "$PWD" ]] ; then
@@ -436,7 +442,13 @@ __rvm_set_rvmrc() {
 
     local identifier=$(__rvm_environment_identifier)
 
-    printf "if [[ -n \"\$rvm_path/environments\" && -s \"\$rvm_path/environments/$identifier\" ]] ; then\n  \\. \"\$rvm_path/environments/$identifier\"\nelse\n  rvm --create $flags \"$identifier\"\nfi" >> .rvmrc
+    printf "
+if [[ -d \"\$rvm_path/environments\" && -s \"\$rvm_path/environments/$identifier\" ]] ; then
+  \\. \"\$rvm_path/environments/$identifier\"
+else
+  rvm --create $flags \"$identifier\"
+fi
+" >> .rvmrc
 
   else
     "$rvm_path/scripts/log" "error" \
@@ -550,10 +562,17 @@ __rvm_conditionally_add_bin_path() {
 
   if echo "${PATH//:/ }" | \grep -vqF "${rvm_bin_path:-"$rvm_path/bin"} " ; then
 
-    PATH="${rvm_bin_path:-"$rvm_path/bin"}:$PATH"
+    if [[ "${rvm_ruby_string:-"system"}" != "system" ]] ; then
 
-    builtin hash -r
+      PATH="${rvm_bin_path:-"$rvm_path/bin"}:$PATH"
+
+    else
 
+      PATH="$PATH:${rvm_bin_path:-"$rvm_path/bin"}"
+
+    fi
+
+    builtin hash -r
   fi
 
   return 0
@@ -906,11 +925,11 @@ __rvm_become() {
 }
 
 __rvm_ensure_has_environment_files() {
-  local environment_identifier file_name directory_name wrapper_identifier variable value
+  local environment_id file_name directory_name wrapper_identifier variable value
 
-  environment_identifier="$(__rvm_environment_identifier)"
+  environment_id="$(__rvm_environment_identifier)"
 
-  file_name="${rvm_path}/environments/$environment_identifier"
+  file_name="${rvm_path}/environments/$environment_id"
 
   if [[ ! -s "$file_name" ]] ; then
 
@@ -918,7 +937,7 @@ __rvm_ensure_has_environment_files() {
 
     echo "export PATH=\"${rvm_ruby_gem_home}/bin:${rvm_ruby_global_gems_path}/bin:${rvm_ruby_home}/bin:${rvm_bin_path:-"$rvm_path/bin"}:\$PATH\"" > "$file_name"
 
-    for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gemset_name MAGLEV_HOME ; do
+    for variable in rvm_path RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gemset_name MAGLEV_HOME ; do
 
       eval "export $variable"
       eval "value=\${${variable}:-""}"
@@ -933,12 +952,12 @@ __rvm_ensure_has_environment_files() {
   fi
 
   # Next, ensure we have default wrapper files. Also, prevent it from recursing.
-  if [[ ${rvm_creating_default_wrappers:-0} -eq 1 ]]; then
+  if [[ ${rvm_create_default_wrappers:-0} -eq 1 || ! -f "$rvm_path/wrappers/$environment_id/ruby" ]] ; then
 
     # We need to generate wrappers for both the default gemset and the global gemset.
-    for wrapper_identifier in "$environment_identifier" "${environment_identifier}@global" ; do
+    for wrapper_identifier in "$environment_id" "${environment_id//@*/}@global" ; do
 
-      rvm_creating_default_wrappers=1
+      rvm_create_default_wrappers=1
 
       directory_name="$rvm_path/wrappers/$wrapper_identifier"
 
@@ -947,8 +966,10 @@ __rvm_ensure_has_environment_files() {
 
         "$rvm_path/scripts/wrapper" "$wrapper_identifier" &> /dev/null
       fi
-      rvm_creating_default_wrappers=0
+
     done
+
+    rvm_create_default_wrappers=0
   fi
 
   return 0
@@ -1290,41 +1311,70 @@ __rvm_environment_identifier() {
   string="${path//*gems\//}"
   string="${string//\/*/}"
 
-  echo "${string:-system}"
+  printf "${string:-system}"
 
   return $?
 }
 
 __rvm_expand_ruby_string() {
 
-  local string="$1"
+  local string current_ruby
+
+  string="$1"
+
+  if [[ -z "$string" ]] ; then
 
-  if [[ -z "$string" || "$string" = "all" ]]; then
     "$rvm_path/scripts/list" strings | tr ' ' "\n"
 
-  elif [[ "$string" = "all-gemsets" ]]; then
-    "$rvm_path/scripts/list" gemsets strings
+    return $?
 
-  elif [[ "$string" = "default-with-rvmrc" || "$string" = "rvmrc" ]]; then
-    "$rvm_path/scripts/tools" path-identifier "$PWD"
+  fi
 
-  elif [[ "$string" == "all-rubies" || "$string" = "rubies" ]]; then
-    "$rvm_path/scripts/list" rubies strings
+  case "$string" in
 
-  elif [[ "$string" == "current-ruby" || "$string" = "gemsets" ]]; then
-    local current_ruby="$(__rvm_environment_identifier | awk -F"${rvm_gemset_separator:-"@"}" '{print $string}')"
-    rvm_silence_logging=1 "$rvm_path/scripts/gemsets" list | sed "s/^/$current_ruby${rvm_gemset_separator:-"@"}/"
+    all)
+      "$rvm_path/scripts/list" strings | tr ' ' "\n"
+      ;;
 
-  elif [[ "$string" = "current" ]]; then
-    __rvm_environment_identifier
+    all-gemsets)
+      "$rvm_path/scripts/list" gemsets strings
+      ;;
 
-  elif [[ "$string" = "aliases" ]]; then
-    awk -F= '{print $string}' < "$rvm_path/config/alias"
+    default-with-rvmrc|rvmrc)
+      "$rvm_path/scripts/tools" path-identifier "$PWD"
+      ;;
 
-  else
+    all-rubies|rubies)
+      "$rvm_path/scripts/list" rubies strings
+      ;;
+
+    current-ruby|gemsets)
+      current_ruby="$(__rvm_environment_identifier | awk -F"${rvm_gemset_separator:-"@"}" '{print $string}')"
+
+      rvm_silence_logging=1 "$rvm_path/scripts/gemsets" list | sed "s/^/$current_ruby${rvm_gemset_separator:-"@"}/"
+      ;;
+
+    current)
+      __rvm_environment_identifier
+      ;;
+
+    aliases)
+      awk -F= '{print $string}' < "$rvm_path/config/alias"
+      ;;
+
+    *)
+      echo "$string" | tr "," "\n" | __rvm_strip
+      ;;
+
+  esac
 
-    echo "$string" | tr "," "\n" | __rvm_strip
-  fi
   return $?
 }
 
+__rvm_regenerate_wrappers() {
+  echo "Regenerating all wrappers..."
+  while read -r wrapper_ruby_name; do
+    __rvm_run "wrappers.regenerate" "\"$rvm_path/scripts/wrapper\" '$wrapper_ruby_name'"
+  done < <(rvm list gemsets strings)
+  unset wrapper_ruby_name
+}

data/scripts/wrapper

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 default_flag="$rvm_default_flag"
+rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
 
 # Prevent recursion
 unset rvm_default_flag rvm_wrapper_name prefix
@@ -18,26 +19,31 @@ usage() {
     ruby, gem, rake, irb, rdoc, ri, testrb
 
   For more information, see 'rvm help wrapper'
-"
-}
 
-full_binary_name() {
-  echo "$binary_name" | __rvm_strip
+"
 }
 
 wrap() {
+
   if [[ -n "${file_name:-""}" ]] ;then
+
     mkdir -p "$(dirname "$file_name")"
 
     rm -f "$file_name"
 
+    if [[ "root" = "$USER" ]] ; then
+      path="${rvm_path:-"/usr/local/rvm"}"
+    else
+      path="\$HOME/.rvm"
+    fi
+
     printf "#!/usr/bin/env bash
 
-if [[ -s \"$rvm_path/environments/${environment_identifier}\" ]] ; then
-  \\. \"$rvm_path/environments/${environment_identifier}\"
+if [[ -s \"$path/environments/${environment_identifier}\" ]] ; then
+  \\. \"$path/environments/${environment_identifier}\"
   exec $binary_name \"\$@\"
 else
-  echo \"ERROR: Missing RVM environment file: '$rvm_path/environments/${environment_identifier}'\"
+  echo \"ERROR: Missing RVM environment file: '$path/environments/${environment_identifier}'\"
   exit 1
 fi
   " > "$file_name"
@@ -45,9 +51,13 @@ fi
     if [[ -f "$file_name" ]] ; then chmod +x "$file_name" ; fi
 
     return 0
+
   else
+
     "$rvm_path/scripts/log" "error" "wrap() : file_name unset variable."
+
     return 1
+
   fi
 }
 
@@ -57,9 +67,9 @@ symlink_binary() {
   # we then symlink it into place.
   if wrap_binary && [[ -f "$file_name" ]]; then
 
-    rm -f "${rvm_bin_path:-"$rvm_path/bin"}/${prefix}_${binary_name}"
+    rm -f "$rvm_bin_path/${prefix}_${binary_name}"
 
-    ln -fs "$file_name" "${rvm_bin_path:-"$rvm_path/bin"}/${prefix}_${binary_name}"
+    ln -fs "$file_name" "$rvm_bin_path/${prefix}_${binary_name}"
 
   fi
 }
@@ -114,6 +124,12 @@ for binary_name in "${binaries[@]}"; do
 
   file_name="$rvm_path/wrappers/${environment_identifier}/${binary_name}"
 
+  if [[ ${rvm_default_flag:-0} -gt 0 ]] ; then
+
+    prefix="default"
+
+  fi
+
   if [[ -z "$prefix" ]] ; then
 
     override_check=1
@@ -125,11 +141,11 @@ for binary_name in "${binaries[@]}"; do
 
       if [[ "$binary_name" == "ruby" ]] ; then
 
-        destination="${rvm_bin_path:-"$rvm_path/bin"}/$environment_identifier"
+        destination="$rvm_bin_path/$environment_identifier"
 
       else
 
-        destination="${rvm_bin_path:-"$rvm_path/bin"}/${binary_name}-${environment_identifier}"
+        destination="$rvm_bin_path/${binary_name}-${environment_identifier}"
 
       fi
 
@@ -139,6 +155,7 @@ for binary_name in "${binaries[@]}"; do
 
     fi; unset destination
 
+
   elif [[ "$prefix" == "--no-prefix" ]]; then
 
     override_check=1
@@ -147,18 +164,24 @@ for binary_name in "${binaries[@]}"; do
 
     if [[ -f  "$file_name" ]]; then
 
-      destination="${rvm_bin_path:-"$rvm_path/bin"}/$binary_name"
+      destination="$rvm_bin_path/$binary_name"
 
       if [[ -s "$destination" ]] ; then
+
         rm -rf "$destination"
+
       fi
 
       ln -nsf "$file_name" "$destination"
-    fi ; unset destination
+    fi
 
   else
+
     symlink_binary
+
   fi
+
+
 done
 
 exit $?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 10
+  version: 1.0.10
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 -04:00
+date: 2010-09-18 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -42,6 +42,7 @@ files:
 - config/md5
 - contrib/gemset_snapshot
 - contrib/install-system-wide
+- contrib/r
 - examples/rvmrc
 - gemsets/default.gems
 - gemsets/global.gems
@@ -102,6 +103,7 @@ files:
 - 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