rvm 0.0.91 → 0.0.92

data/binscripts/rvm

@@ -6,9 +6,9 @@ if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 
 if [[ -z "$rvm_path" ]] ; then
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_path="${rvm_path:-/usr/local/rvm}"
+    rvm_path="/usr/local/rvm"
   else
-    rvm_path="${rvm_path:-$HOME/.rvm}"
+    rvm_path="$HOME/.rvm"
   fi
 fi
 

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 91
+:patch: 92

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.91"
+  s.version = "0.0.92"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-12-09}
+  s.date = %q{2009-12-11}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -62,6 +62,16 @@ Gem::Specification.new do |s|
      "scripts/utility"
   ]
   s.homepage = %q{http://github.com/wayneeseguin/rvm}
+  s.post_install_message = %q{********************************************************************************
+
+  In order to setup rvm for your user's environment you must now run rvm-install.
+  rvm-install will be found in your current gems bin directory corresponding to where the gem was installed.
+
+  rvm-install will install the scripts to your user account and append itself to your profiles in order to
+  inject the proper rvm functions into your shell so that you can manage multiple rubies.
+
+********************************************************************************
+}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rvm}

data/scripts/array

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-if [[ -z "$rvm_trace_flag" ]] ; then set +x ; else set -x ; fi
-
 if [[ ! -z "$ZSH_VERSION" ]] ; then __array_start=1 ; else __array_start=0 ; fi
 
 # Usage: contains "a_string" "${an_array[@]}"

data/scripts/cli

@@ -59,8 +59,7 @@ __rvm_parse_args() {
       gems|gemset)
         rvm_action="gems"
         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
+          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.
@@ -205,7 +204,7 @@ __rvm_parse_args() {
 
       -C|--configure)
         if [[ ! -z "$1" ]] ; then
-          rvm_ruby_configure_flags="$(echo $1 | tr ',' ' ')"
+          export rvm_ruby_configure_flags="$(echo $1 | tr ',' ' ')"
           shift
         else
           rvm_action="error"
@@ -262,7 +261,7 @@ __rvm_parse_args() {
       tests|specs)          rvm_action="tests"                  ;;
       --trace)              export rvm_trace_flag=1    ; set -x ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--load)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
         if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
       ;;

data/scripts/gems

@@ -2,10 +2,14 @@
 
 #source $rvm_path/scripts/rvm
 source $rvm_path/scripts/utility
-source $rvm_path/scripts/selector
-rvm_ruby_string="${rvm_ruby_string:-system}"
-__rvm_select
+#source $rvm_path/scripts/selector
 
+color_green=$($rvm_scripts_path/color "green")
+color_red=$($rvm_scripts_path/color "red")
+color_yellow=$($rvm_scripts_path/color "yellow")
+color_none=$($rvm_scripts_path/color "none")
+
+if [[ -z "$rvm_ruby_gem_home" ]] ; then rvm_ruby_gem_home="$(gem env home)" ; fi
 if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
 
 trap "rm -f $rvm_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
@@ -79,24 +83,29 @@ __rvm_gems_dump() {
 }
 
 __rvm_gems_load() {
+
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
-    GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME ;
-    GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH ;
+    export GEM_HOME="$rvm_ruby_gem_home"
+    export GEM_PATH="$rvm_ruby_gem_home"
   fi
 
-  if [[ -z "$rvm_file_name" ]] ; then
-    if [[ -f "$rvm_gem_set_name.gems" ]] ; then
-      rvm_file_name="$rvm_gem_set_name.gems"
-    elif [[ -f "default.gems" ]] ; then
-      rvm_file_name="default.gems"
-    elif [[ -f "system.gems" ]] ; then
-      rvm_file_name="system.gems"
-    elif [[ -f ".gems" ]] ; then
-      rvm_file_name=".gems"
-    else
-      $rvm_scripts_path/log "error" "No gem set file found."
-      return 1
-    fi
+  if [[ ! -z "$(echo "$gems_args" | awk '/\.gem.*$/')" ]] ; then
+    rvm_gem_set_name="$(echo "$gems_args" | sed 's#\.gem.*##g')"
+  else
+    rvm_gem_set_name="$gems_args"
+  fi ; shift
+
+  if [[ -f "$rvm_gem_set_name.gems" ]] ; then
+    rvm_file_name="$rvm_gem_set_name.gems"
+  elif [[ -f "default.gems" ]] ; then
+    rvm_file_name="default.gems"
+  elif [[ -f "system.gems" ]] ; then
+    rvm_file_name="system.gems"
+  elif [[ -f ".gems" ]] ; then
+    rvm_file_name=".gems"
+  else
+    $rvm_scripts_path/log "error" "No *.gems file found."
+    return 1
   fi
 
   mkdir -p "$rvm_gem_path/cache" # Ensure the base cache dir is initialized.
@@ -148,9 +157,10 @@ __rvm_gem_install() {
   #
   # Evaluate
   #
+
   if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/${gem_file_name}spec" ]] ; then
     unset gem
-    $rvm_scripts_path/log "info" "$($rvm_scripts_path/color "green")$gem_name $gem_version$($rvm_scripts_path/color "none") exists, skipping (--force to re-install)"
+    $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"
   else
     if [[ -f "$gem" ]] ; then
       cache_file="$gem"
@@ -207,9 +217,9 @@ __rvm_gem_install() {
     eval $command > /dev/null 2>&1
     result=$?
     if [[ $result -eq 0 ]] ; then
-    $rvm_scripts_path/log "info" "$($rvm_scripts_path/color "green")$gem_name $gem_version$($rvm_scripts_path/color "none") installed."
+    $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$color_none installed."
     else
-      $rvm_scripts_path/log "error" "$($rvm_scripts_path/color "red")$gem_name $gem_version$($rvm_scripts_path/color "none") failed to install."
+      $rvm_scripts_path/log "error" "$color_red$gem_name $gem_version$color_none failed to install."
     fi
   fi
   unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
@@ -232,29 +242,31 @@ __rvm_gems_gemdir() {
 
 unset GEM_PATH
 
-if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
-
 if [[ -z "$(which gem 2>/dev/null)" ]] ; then
   $rvm_scripts_path/log "error" "'gem' was not found, cannot perform gem actions."
   return 1
 fi
 
-if [[ "load" = "$1" ]] ; then
+action="$1" ; shift
+gems_args="$*"
+
+if [[ "load" = "$action" ]] ; then
   __rvm_gems_load
-elif [[ "dump" = "$1" ]] ; then
+elif [[ "dump" = "$action" ]] ; then
   __rvm_gems_dump
-elif [[ "delete" = "$1" ]] ; then
+elif [[ "delete" = "$action" ]] ; then
   __rvm_gems_delete
-elif [[ "name" = "$1" ]] ; then
+elif [[ "name" = "$action" ]] ; then
   __rvm_gems_name
-elif [[ "dir" = "$1" ]] ; then
+elif [[ "dir" = "$action" ]] ; then
   __rvm_gems_dir
-elif [[ "list" = "$1" ]] ; then
+elif [[ "list" = "$action" ]] ; then
   __rvm_gems_list
-elif [[ "gemdir" = "$1" ]] ; then
+elif [[ "gemdir" = "$action" ]] ; then
   __rvm_gems_gemdir
-elif [[ "install" = "$1" ]] ; then
+elif [[ "install" = "$action" ]] ; then
   __rvm_gem_install
 else
   $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

@@ -9,7 +9,7 @@ fi
 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}"
+rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-0}"
 if [[ -z "$rvm_scripts_path" ]] ; then
   if [[ -d "$HOME/scripts" ]] && [[ -f "/usr/local/rvm/scripts/rvm" ]]; then
     rvm_scripts_path="$HOME/scripts"

data/scripts/manage

@@ -32,6 +32,16 @@ __rvm_install_source() {
     # if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi # Don't barf on autoconf fail...
   fi
 
+  if [[ "1.8.5" = "$rvm_ruby_version" ]] ; then
+    # How to install ruby 1.8.5... "sneaky sneaky, sir"
+    if [[ ! -d "$HOME/.rvm/src/ruby-1.8.7-p174/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p174 1>/dev/null ; fi
+    if [[ ! -d "$HOME/.rvm/src/ruby-1.8.6-p383/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p383 1>/dev/null ; fi
+    cp ~/.rvm/src/ruby-1.8.7-p174/ext/openssl/extconf.rb ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+    cp ~/.rvm/src/ruby-1.8.7-p174/ext/openssl/openssl_missing.* ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+    cp ~/.rvm/src/ruby-1.8.7-p174/ext/openssl/ossl_hmac.c ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+    cp ~/.rvm/src/ruby-1.8.6-p383/ext/readline/* ~/.rvm/src/ruby-1.8.5-p231/ext/readline/
+  fi
+
   if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
     (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
   elif [[ ! -z "$rvm_ruby_configure" ]] ; then

data/scripts/rvm

@@ -16,7 +16,9 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
       rvm_path="/usr/local/rvm"
     else
       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
+      if [[ -d "/usr/local/bin/rvm" ]] && [[ -s "/usr/local/bin/rvm" ]] ; then
+        rvm_path="${rvm_path:-"/usr/local/rvm"}"
+      fi
     fi
   fi
 
@@ -35,6 +37,6 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
 
   alias rvm-restart="source '${rvm_path}/scripts/rvm'"
 
-  if [[ -f "$rvm_path/default" ]] ; then source "$rvm_path/default" ; fi
+  if [[ -s "$rvm_path/default" ]] ; then source "$rvm_path/default" ; fi
 fi
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.91
+  version: 0.0.92
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 -05:00
+date: 2009-12-11 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -68,7 +68,17 @@ has_rdoc: true
 homepage: http://github.com/wayneeseguin/rvm
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  ********************************************************************************
+  
+    In order to setup rvm for your user's environment you must now run rvm-install.
+    rvm-install will be found in your current gems bin directory corresponding to where the gem was installed.
+  
+    rvm-install will install the scripts to your user account and append itself to your profiles in order to
+    inject the proper rvm functions into your shell so that you can manage multiple rubies.
+  
+  ********************************************************************************
+
 rdoc_options: 
 - --inline-source
 - --charset=UTF-8