rvm 0.0.89 → 0.0.90

data/install

@@ -2,13 +2,14 @@
 
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 
 if [[ -z "$rvm_path" ]] ; then
+  unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_path="${rvm_path:-/usr/local/rvm}"
+    rvm_path="/usr/local/rvm"
   else
-    rvm_path="${rvm_path:-$HOME/.rvm}"
+    if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
+    if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
   fi
 fi
 

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 89
+:patch: 90

data/rvm.gemspec

@@ -1,11 +1,11 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.89"
+  s.version = "0.0.90"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
@@ -78,4 +78,3 @@ Gem::Specification.new do |s|
   else
   end
 end
-

data/scripts/cli

@@ -58,26 +58,22 @@ __rvm_parse_args() {
 
       gems|gemset)
         rvm_action="gems"
-        if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "delete" = "$1" ]] ; then
-          export rvm_${1}_flag=1 ; shift
-        elif [[ "dump" = "$1" ]] || [[ "$1" = "load" ]] ; then
-          export rvm_${1}_flag=1 ; shift
+        if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "delete" = "$1" ]] || [[ "dump" = "$1" ]] || [[ "load" = "$1" ]] ; then
+          rvm_ruby_args="$*"
+          #export rvm_${1}_flag=1 ; shift
         else
+          rvm_gem_set_name="$1" ; shift
           export rvm_use_flag=1 # Default is to use the (named) gem set.
         fi
       ;;
 
       gemdir)
         rvm_action=$rvm_token
+        rvm_gemdir_flag=1
         if [[ "system" = "$1" ]] ; then export rvm_system_flag=1 ; shift ; fi
         if [[ "user" = "$1"  ]]   ; then export rvm_user_flag=1  ;  shift ; fi
       ;;
 
-      --load|load|dump|clear)
-        rvm_action="gems"
-        export rvm_${rvm_token}_flag=1
-      ;;
-
       -S|-e)
         rvm_action="ruby"
         rvm_ruby_args="$rvm_token $@"
@@ -361,7 +357,6 @@ rvm() {
   result=0
   case "$rvm_action" in
     use)           __rvm_use                 ; result=$?  ;;
-    gemdir)        __rvm_gemdir              ; result=$?  ;;
     srcdir)        __rvm_source_dir          ; result=$?  ;;
     list)          __rvm_list                ; result=$?  ;;
     version)       __rvm_version             ; result=$?  ;;
@@ -372,8 +367,18 @@ rvm() {
     usage|help)    __rvm_usage               ; result=$?  ;;
     benchmark)     __rvm_benchmark           ; result=$?  ;;
     inspect)       __rvm_inspect             ; result=$?  ;;
-    gems)          $rvm_scripts_path/gems ${rvm_ruby_file:-$rvm_ruby_args} ; result=$?  ;;
     ruby|gem|rake) __rvm_do                  ; result=$?  ;;
+    gemdir)        $rvm_scripts_path/gems gemdir ; result=$?  ;;
+    gems)
+      if [[ "$rvm_use_flag" -eq 1 ]] ; then
+        __rvm_gems_select
+        __rvm_gems_use
+      else
+        $rvm_scripts_path/gems $rvm_ruby_args
+      fi
+      result=$?
+    ;;
+
     monitor)
       export rvm_ruby_version rvm_ruby_string
       $rvm_scripts_path/monitor ; result=$?

data/scripts/gems

@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 
-source $rvm_path/scripts/initialize
+#source $rvm_path/scripts/rvm
 source $rvm_path/scripts/utility
 source $rvm_path/scripts/selector
+rvm_ruby_string="${rvm_ruby_string:-system}"
+__rvm_select
 
 if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
 
@@ -17,15 +19,11 @@ __rvm_gems_dir() {
 }
 
 __rvm_gems_list() {
-  for gemdir in "$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%"* ; do
-    echo "$gemdir" | awk -F'%' '{print $2}'
-  done
-}
-
-__rvm_gems_clear() {
-  unset rvm_ruby_gem_home rvm_gem_set_name GEM_HOME GEM_PATH
-  __rvm_gems_select
-  __rvm_gems_use
+  if [[ $rvm_dir =~ rvm ]] ; then
+    for gemdir in $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%* ; do
+      echo "$gemdir" | awk -F'%' '{print $2}'
+    done
+  fi
 }
 
 __rvm_gems_delete() {
@@ -217,7 +215,7 @@ __rvm_gem_install() {
   unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
 }
 
-__rvm_gemdir() {
+__rvm_gems_gemdir() {
 
   if [[ "$rvm_user_flag" -eq 1 ]] ; then
     echo $(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')
@@ -241,22 +239,22 @@ if [[ -z "$(which gem 2>/dev/null)" ]] ; then
   return 1
 fi
 
-if [[ "$rvm_clear_flag" -eq 1 ]] ; then
-  __rvm_gems_clear
-elif [[ "$rvm_load_flag" -eq 1 ]] ; then
+if [[ "load" = "$1" ]] ; then
   __rvm_gems_load
-elif [[ "$rvm_dump_flag" -eq 1 ]] ; then
+elif [[ "dump" = "$1" ]] ; then
   __rvm_gems_dump
-elif [[ "$rvm_delete_flag" -eq 1 ]] ; then
+elif [[ "delete" = "$1" ]] ; then
   __rvm_gems_delete
-elif [[ "$rvm_name_flag" -eq 1 ]] ; then
+elif [[ "name" = "$1" ]] ; then
   __rvm_gems_name
-elif [[ "$rvm_dir_flag" -eq 1 ]] ; then
+elif [[ "dir" = "$1" ]] ; then
   __rvm_gems_dir
-elif [[ "$rvm_list_flag" -eq 1 ]] ; then
+elif [[ "list" = "$1" ]] ; then
   __rvm_gems_list
-elif [[ "$rvm_install_flag" -eq 1 ]] ; then
+elif [[ "gemdir" = "$1" ]] ; then
+  __rvm_gems_gemdir
+elif [[ "install" = "$1" ]] ; then
   __rvm_gem_install
 else
-  gem $*
+  $rvm_scripts_path/log "error" "gems must be passed an action as the first parameter {load,dump,delete,name,list,gemdir,install}"
 fi

data/scripts/initialize

@@ -11,9 +11,9 @@ if [[ ! -z "$rvm_archflags" ]] ; then rvm_make_flags_flag=1 ; fi
 rvm_project_rvmrc="${rvm_project_rvmrc:-1}"
 rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-1}"
 if [[ -z "$rvm_scripts_path" ]] ; then
-  if [[ -d "$HOME/scripts" ]] ; then
+  if [[ -d "$HOME/scripts" ]] && [[ -f "/usr/local/rvm/scripts/rvm" ]]; then
     rvm_scripts_path="$HOME/scripts"
-  elif [[ -d "/usr/local/rvm/scripts" ]] ; then
+  elif [[ -d "/usr/local/rvm/scripts" ]] && [[ -f "/usr/local/rvm/scripts/rvm" ]] ; then
     rvm_scripts_path="/usr/local/rvm/scripts"
   else
     rvm_scripts_path="$rvm_path/scripts"

data/scripts/install

@@ -2,13 +2,14 @@
 
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 
 if [[ -z "$rvm_path" ]] ; then
+  unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_path="${rvm_path:-/usr/local/rvm}"
+    rvm_path="/usr/local/rvm"
   else
-    rvm_path="${rvm_path:-$HOME/.rvm}"
+    if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
+    if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
   fi
 fi
 

data/scripts/libraries

@@ -25,12 +25,13 @@ __rvm_readline_install() {
       __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
     fi
 
-    if [[ "$rvm_install_flag" -eq 1 ]] ; then
+    if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+      __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+    else
       __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
       __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
-    elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
-      __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
     fi
+
   done
   __rvm_pushpop
 }
@@ -45,12 +46,13 @@ __rvm_iconv_install() {
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
-  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+  if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  else
     __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
     __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
-  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
-    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
   fi
+
   __rvm_pushpop
 }
 
@@ -64,12 +66,13 @@ __rvm_curl_install() {
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
-  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+  if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  else
     __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
     __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
-  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
-    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
   fi
+
   __rvm_pushpop
 }
 
@@ -88,12 +91,13 @@ __rvm_openssl_install() {
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/config" "./config --prefix=$rvm_path/usr zlib no-asm no-krb5 shared" "Configuring $package."
-  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+  if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  else
     __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
     __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
-  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
-    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
   fi
+
   __rvm_pushpop
 }
 
@@ -107,12 +111,13 @@ __rvm_zlib_install() {
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
-  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+  if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  else
     __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
     __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
-  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
-    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
   fi
+
   __rvm_pushpop
 }
 
@@ -126,11 +131,11 @@ __rvm_ncurses_install() {
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package.$archive_format -C $rvm_src_path" "Extracting $package.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs" "Configuring $package."
-  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+  if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  else
     __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
     __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
-  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
-    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
   fi
   __rvm_pushpop
 }

data/scripts/rvm

@@ -9,15 +9,14 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
 
   if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
   if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-  if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 
-  if [[ "root" = "$(whoami)" ]] ; then
-    rvm_path="${rvm_path:-/usr/local/rvm}"
-  else
-    if [[ -d "$HOME/.rvm" ]] ; then
-      rvm_path="${rvm_path:-$HOME/.rvm}"
+  if [[ -z "$rvm_path" ]] ; then
+    unset rvm_path
+    if [[ "root" = "$(whoami)" ]] ; then
+      rvm_path="/usr/local/rvm"
     else
-      rvm_path="${rvm_path:-/usr/local/rvm}"
+      if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
+      if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
     fi
   fi
 

data/scripts/rvm-install

@@ -2,13 +2,14 @@
 
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 
 if [[ -z "$rvm_path" ]] ; then
+  unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_path="${rvm_path:-/usr/local/rvm}"
+    rvm_path="/usr/local/rvm"
   else
-    rvm_path="${rvm_path:-$HOME/.rvm}"
+    if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
+    if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
   fi
 fi
 

data/scripts/update

@@ -2,13 +2,14 @@
 
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 
 if [[ -z "$rvm_path" ]] ; then
+  unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_path="${rvm_path:-/usr/local/rvm}"
+    rvm_path="/usr/local/rvm"
   else
-    rvm_path="${rvm_path:-$HOME/.rvm}"
+    if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
+    if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
   fi
 fi
 

data/scripts/utility

@@ -131,7 +131,7 @@ __rvm_run() {
 
 __rvm_cleanup_variables() {
   __rvm_unset_ruby_variables
-  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_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
+  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_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_unset_ruby_variables() {
@@ -681,9 +681,19 @@ __rvm_gems_select() {
 }
 
 __rvm_gems_use() {
-  mkdir -p "$rvm_ruby_gem_home"
-  GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-  GEM_PATH="$GEM_HOME" ; export GEM_PATH
-  __rvm_use
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
+
+  if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
+    mkdir -p "$rvm_ruby_gem_home"
+    GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
+    GEM_PATH="$GEM_HOME" ; export GEM_PATH
+    __rvm_use
+  fi
+}
+
+__rvm_gems_clear() {
+  unset rvm_ruby_gem_home rvm_gem_set_name GEM_HOME GEM_PATH
+  __rvm_gems_select
+  __rvm_gems_use
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.89
+  version: 0.0.90
 platform: ruby
 authors: 
 - Wayne E. Seguin