rvm 0.1.24 → 0.1.26

data/scripts/utility

@@ -43,7 +43,7 @@ __rvm_environment_info() {
   if [[ ! -z "$ZSH_VERSION" ]] ; then echo -e "  shell:         \"zsh\"\n  version:     \"$ZSH_VERSION\"" ; fi
   if [[ ! -z "$BASH_VERSION" ]] ; then echo -e "  shell:        \"bash\"\n  version:      \"$BASH_VERSION\"" ; fi
 
-  cat <<Info
+  cat <<Ruby
 
 ruby:
   interpreter:  "$(echo $full_version | awk '{print $1}')"
@@ -53,15 +53,23 @@ ruby:
   patchlevel:   "$(echo $full_version | sed 's/^.*(//' | sed 's/).*$//')"
   full_version: "$full_version"
 
+Ruby
+
+  cat <<Homes
 homes:
   gem:          "${GEM_HOME:-'not set'}"
   ruby:         "${MY_RUBY_HOME:-'not set'}"
+Homes
 
+  cat <<Binaries
 binaries:
   ruby:         "$(which ruby 2>/dev/null)"
   irb:          "$(which irb 2>/dev/null)"
   gem:          "$(which gem 2>/dev/null)"
   rake:         "$(which rake 2>/dev/null)"
+Binaries
+
+  cat <<Environment
 
 environment:
   GEM_HOME:     "$GEM_HOME"
@@ -69,8 +77,11 @@ environment:
   BUNDLE_PATH:  "$BUNDLE_PATH"
   MY_RUBY_HOME: "$MY_RUBY_HOME"
   IRBRC:        "$IRBRC"
+Environment
+
+  gemset="$(echo $GEM_HOME | awk -F${rvm_gemset_separator:-'@'} '{print $2}')"
+  echo -e "  gemset:       \"$gemset\"\n"
 
-Info
   if [[ ! -z "$MAGLEV_HOME" ]] ; then info="$info\n  MAGLEV_HOME: \"$MAGLEV_HOME\"" ; fi
 
   unset full_version
@@ -183,7 +194,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_ruby_patch rvm_sticky_flagrvm_rvmrc_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_ruby_patch rvm_sticky_flagrvm_rvmrc_flag rvm_gems_flag
 }
 
 # Unset ruby-specific variables
@@ -222,7 +233,7 @@ __rvm_benchmark() {
   echo -e "\n end \nend\n" >> "$rvm_tmp_path/$$.rb"
   rvm_ruby_args="$rvm_tmp_path/$$.rb"
   rvm_benchmark_flag=1
-  action="ruby"
+  rvm_action="ruby"
   if [[ ! -z "$rvm_debug_flag" ]] ; then echo -e "$rvm_tmp_path/$$.rb:\n$(cat $rvm_tmp_path/$$.rb)" ; fi
   $rvm_scripts_path/set $rvm_action $rvm_ruby_args
 }
@@ -414,7 +425,7 @@ __rvm_list_known() {
   echo -e "jruby-1.2.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head"
   echo -e "rbx(-prc1) # default\nrbx-head"
   echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
-  echo -e "maglev(-23082)\nmaglev-head"
+  echo -e "maglev(-23101)\nmaglev-head"
   echo -e "mput(-head) # shyouhei head, the default mput"
   echo -e "ironruby-0.9.3\nironruby-1.0-rc2\nironruby-head"
   if [[ "Darwin" = "$(uname)" ]] ; then
@@ -627,24 +638,25 @@ __rvm_make_flags() {
 # Select a gemset based on CLI set options and environment.
 # This only sets 'rvm_ruby_gem_home'
 __rvm_gemset_select() {
-  if ! which gem > /dev/null 2>&1 ; then return 0 ; fi
+  which gem > /dev/null 2>&1
+  if [[ $? -gt 0 ]] ; then return 0 ; fi # Stop if no 'gem' command is available.
 
-  rvm_ruby_global_gems_path="$rvm_gems_path/$rvm_ruby_string%global"
+  rvm_ruby_global_gems_path="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global"
 
   if [[ -z "$rvm_gemset_name" ]] ; then
     # No longer defaulting to 'sticky' gem sets.
     # Set 'rvm_sticky_flag=1' in ~/.rvmrc to enable.
     if [[ ! -z "$rvm_sticky_flag" ]] ; then
       if [[ ! -z "$GEM_HOME" ]] ; then
-        rvm_gemset_name=$(echo $GEM_HOME | xargs basename | awk -F'%' '{print $2}')
+        rvm_gemset_name=$(echo $GEM_HOME | xargs basename | awk -F${rvm_gemset_separator} '{print $2}')
       fi
       if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
-        rvm_gemset_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F'%' '{print $2}')
+        rvm_gemset_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F${rvm_gemset_separator} '{print $2}')
       fi
     fi
 
     if [[ ! -z "$rvm_gemset_name" ]] && ! $rvm_scripts_path/match "$rvm_gemset_name" "^[0-9]\.[0-9]" ; then
-      rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gemset_name"
+      rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
     else
       if [[ ! -z "$rvm_ruby_string" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
         rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
@@ -658,19 +670,26 @@ __rvm_gemset_select() {
     fi
     if [[ -z "$rvm_gemset_name" ]] ; then unset rvm_gemset_name ; fi
   else
-    if [[ -z "$rvm_ruby_gem_home" ]] || [[ ! -z "$(echo $rvm_ruby_gem_home | grep '%')" ]] ; then
-      rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gemset_name"
+    if [[ -z "$rvm_ruby_gem_home" ]] || [[ ! -z "$(echo $rvm_ruby_gem_home | grep ${rvm_gemset_separator})" ]] ; then
+      rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
     fi
   fi
 
   # If the gemset does not exist, then notify the user as such and abort the action.
-  if [[ ! -z "$rvm_gemset_name" ]] && [[ ! -d "$rvm_ruby_gem_home" ]] && [[ "$rvm_gemset_create_on_use_flag" -ne 1 ]] && [[ "$rvm_create_flag" -ne 1 ]] && [[ "$rvm_delete_flag" -ne 1 ]] ; then
-    $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
-    return 1
+  if [[ ! -z "$rvm_gemset_name" ]] && [[ ! -d "$rvm_ruby_gem_home" ]] ; then
+    if [[ "$rvm_gemset_create_on_use_flag" -ne 1 ]] && [[ "$rvm_create_flag" -ne 1 ]] && [[ "$rvm_delete_flag" -ne 1 ]] ; then
+      $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+      return 1
+    fi
   elif [[ "$rvm_delete_flag" -eq 1 ]] ; then
     return 1
   fi
 
+  if [[ -z "$rvm_ruby_gem_home" ]] && [[ ! -z $rvm_ruby_string ]] ; then
+    rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
+    rvm_ruby_global_gems_path="$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator}global"
+  fi
+
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
   # Careful not to nuke system gems cache.
@@ -710,10 +729,10 @@ __rvm_gemset_use() {
       $rvm_scripts_path/log "info" "Now using gemset '${rvm_gemset_name:-default}'"
     fi
 
-    rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')%$rvm_gemset_name"
+    rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}${rvm_gemset_name}"
     GEM_HOME="$rvm_ruby_gem_home"
     BUNDLE_PATH="$rvm_ruby_gem_home"
-    GEM_PATH="$rvm_ruby_gem_home/bin:$(echo $GEM_HOME | sed 's/%.*$//')%global/bin"
+    GEM_PATH="$rvm_ruby_gem_home/bin:$(echo $GEM_HOME | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}global/bin"
     export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
 
     __rvm_use # Now ensure the selection takes effect for the environment.
@@ -721,6 +740,17 @@ __rvm_gemset_use() {
   return 0
 }
 
+__rvm_gemset_clear() {
+  unset rvm_gemset_name ; shift
+  rvm_ruby_gem_home="$(echo $GEM_HOME | sed "s#${rvm_gemset_separator:-'@'}.*\$##g")"
+  rvm_ruby_global_gems_path="$(echo $GEM_HOME | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}global"
+  GEM_HOME=$rvm_ruby_gem_home
+  BUNDLE_PATH="$rvm_ruby_gem_home"
+  GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin"
+  export rvm_ruby_gem_home rvm_ruby_global_gems_path GEM_HOME BUNDLE_PATH GEM_PATH
+  __rvm_use # Now ensure the selection takes effect for the environment.
+}
+
 __rvm_mono_env() {
   export DYLD_LIBRARY_PATH="$rvm_usr_path/lib:$DYLD_LIBRARY_PATH"
   export C_INCLUDE_PATH="$rvm_usr_path/include:$C_INCLUDE_PATH"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 24
-  version: 0.1.24
+  - 26
+  version: 0.1.26
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-21 00:00:00 -04:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -31,6 +31,8 @@ files:
 - README
 - binscripts/rvm
 - binscripts/rvm-prompt
+- binscripts/rvm-update-head
+- binscripts/rvm-update-latest
 - binscripts/rvmsudo
 - config/db
 - config/md5
@@ -73,7 +75,7 @@ files:
 - scripts/update
 - scripts/utility
 - scripts/version
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/wayneeseguin/rvm
 licenses: []