rvm 0.0.92 → 0.0.93

data/lib/VERSION.yml

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

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.92"
+  s.version = "0.0.93"
 
   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-11}
+  s.date = %q{2009-12-13}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/gems

@@ -154,11 +154,9 @@ __rvm_gems_load() {
   fi
 }
 __rvm_gem_install() {
-  #
-  # Evaluate
-  #
 
-  if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/${gem_file_name}spec" ]] ; then
+  installed_gem="$(ls ${rvm_ruby_gem_home}/specifications/${gem_file_name}*spec | head -n 1)"
+  if [[ -z "$rvm_force_flag" ]] && [[ -f "$installed_gem" ]] ; then
     unset gem
     $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"
   else
@@ -205,13 +203,9 @@ __rvm_gem_install() {
 
     $rvm_scripts_path/log "warn" "$gem_name $gem_version is not installed, installing..."
     if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
-      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
+      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
     else
-      if [[ ! -z "$rvm_ruby_home" ]] ; then
-        command="$gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
-      else
-        command="$gem_prefix gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
-      fi
+      command="$gem_prefix gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
     fi
     if [[ -f "$gem" ]] ; then command="${command} -l" ; fi
     eval $command > /dev/null 2>&1
@@ -265,6 +259,7 @@ elif [[ "list" = "$action" ]] ; then
 elif [[ "gemdir" = "$action" ]] ; then
   __rvm_gems_gemdir
 elif [[ "install" = "$action" ]] ; then
+  gem_file_name="$1"
   __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}"

data/scripts/manage

@@ -414,6 +414,8 @@ RubyWrapper
 
     ruby)
       if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
+      if [[ -z "$rvm_ruby_configure_flags" ]] ; then rvm_ruby_configure_flags="--enable_shared" ; fi
+
       __rvm_install_source $*
     ;;
 

data/scripts/rvm

@@ -16,27 +16,30 @@ 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" ]] && [[ -s "/usr/local/bin/rvm" ]] ; then
+      if [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
         rvm_path="${rvm_path:-"/usr/local/rvm"}"
       fi
     fi
   fi
+  if [[ -d "$rvm_path" ]] ; then
+    source $rvm_path/scripts/array
+    source $rvm_path/scripts/initialize
+    source $rvm_path/scripts/utility
+    source $rvm_path/scripts/selector
+    source $rvm_path/scripts/cli
+    #source $rvm_path/scripts/gems
+    source $rvm_path/scripts/libraries
+    source $rvm_path/scripts/cd
 
-  source $rvm_path/scripts/array
-  source $rvm_path/scripts/initialize
-  source $rvm_path/scripts/utility
-  source $rvm_path/scripts/selector
-  source $rvm_path/scripts/cli
-  #source $rvm_path/scripts/gems
-  source $rvm_path/scripts/libraries
-  source $rvm_path/scripts/cd
+    rvm_loaded_flag=1
 
-  rvm_loaded_flag=1
+    rvm_version="$(cat "${rvm_path}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')" ; export rvm_version
 
-  rvm_version="$(cat "${rvm_path}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')" ; export rvm_version
+    alias rvm-restart="source '${rvm_path}/scripts/rvm'"
 
-  alias rvm-restart="source '${rvm_path}/scripts/rvm'"
-
-  if [[ -s "$rvm_path/default" ]] ; then source "$rvm_path/default" ; fi
+    if [[ -s "$rvm_path/default" ]] ; then source "$rvm_path/default" ; fi
+  else
+    echo -e "\$rvm_path is not set. rvm cannot load."
+  fi
 fi
 

data/scripts/selector

@@ -166,8 +166,8 @@ __rvm_use() {
 
   if [[ "default" = "$rvm_ruby_interpreter" ]] ; then
 
-    PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
-    PATH=$rvm_bin_path:$PATH ; export PATH
+    new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
+    new_path=$rvm_bin_path:$new_path
 
     if [[ -s $rvm_path/default ]] ; then
       source $rvm_path/default
@@ -185,8 +185,8 @@ __rvm_use() {
   elif [[ "system" = "$rvm_ruby_interpreter" ]] ; then
 
     unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
-    PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
-    PATH=$rvm_bin_path:$PATH ; export PATH
+    new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
+    new_path=$rvm_bin_path:$new_path
     if [[ -s $rvm_path/system ]] ; then
       grep "^MY_RUBY_HOME='$rvm_path" "$rvm_path/system" > /dev/null
       if [[ $? -eq 0 ]] ; then
@@ -206,7 +206,7 @@ __rvm_use() {
       $rvm_scripts_path/log "info" "Now using system ruby."
     fi
 
-    rvm_ruby_string="system"
+    export rvm_ruby_string="system"
 
   else
     GEM_HOME=$rvm_ruby_gem_home
@@ -233,11 +233,8 @@ __rvm_use() {
       $rvm_scripts_path/log "info" "Now using $(echo $rvm_ruby_string | tr '-' ' ')"
     fi
 
-    __rvm_irbrc
-
-    PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
-    PATH=$rvm_bin_path:$PATH ; export PATH
-    PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:$PATH ; export PATH
+    new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
+    new_path=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:$rvm_bin_path:$new_path
 
     if [[ "root" = "$(whoami)" ]] ; then
       for binary in erb gem irb rake rdoc ri ruby testrb ; do
@@ -285,8 +282,9 @@ __rvm_use() {
   if [[ ! -z "$rvm_ruby_string" ]] ; then export rvm_ruby_string ; fi
   if [[ ! -z "$rvm_gem_set_name" ]] ; then export rvm_gem_set_name ; fi
 
-  if [[ ! -z "$rvm_load_flag" ]] ; then __rvm_gems_load ; fi
-  if [[ ! -z "$rvm_dump_flag" ]] ; then __rvm_gems_dump ; fi
+  if [[ ! -z "$new_path" ]] ; then
+    export PATH="$new_path" ; unset new_path
+  fi
 
   __rvm_hook "after_use"
 }

data/scripts/utility

@@ -289,7 +289,7 @@ __rvm_list() {
       if [[ ! -z "$(echo $version | awk '/^jruby-/')" ]] ; then
         string="$($version -v | awk '{print $NF}')"
       else
-        string="[$(file $rvm_path/$version/bin/ruby | awk -F: '{print $2}' | awk '{print $NF}')]"
+        string="[ $(file $rvm_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
       fi
       if [[ "$version" = "$current_ruby" ]] ; then
         echo -e "=> $(tput setaf 2)$version$(tput sgr0) $string"
@@ -302,7 +302,7 @@ __rvm_list() {
     if [[ -f "$rvm_path/default" ]] && [[ -s $rvm_path/default ]] ; then
       version=$(grep '^MY_RUBY_HOME' $rvm_path/default | awk -F"'" '{print $2}' | xargs basename)
       if [[ ! -z "$version" ]] ; then
-        string=$(file $rvm_path/$version/bin/ruby)
+        string="[ $(file $rvm_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
         if [[ "$version" = "$current_ruby" ]] ; then
           echo -e "=> $(tput setaf 3)(default)$(tput sgr0) $(tput setaf 2)$version$(tput sgr0) $string"
           selected="1"
@@ -313,12 +313,14 @@ __rvm_list() {
     fi
 
     system_ruby="$(rvm system ; which ruby 2>/dev/null)"
-    if [[ ! -z "$system_ruby" ]] ; then
-      system_version=$(file $(which ruby) | awk -F: '{print $2}' | grep 8 | awk '{print $NF}' | tr "\n" ' ')
-      if [[ ! -z "$(which ruby 2>/dev/null)" ]] && [[ "$($(which ruby 2>/dev/null) -v)" = "$system_version" ]] ; then
-        echo -e "=> $(tput setaf 2)system$(tput sgr0) [$system_version]\n"
+    if [[ ! -z "$system_ruby" ]] && [[ -x "$system_ruby" ]]; then
+      #system_version=$($system_ruby -v | awk -F: '{print $2}' | grep 8 | awk '{print $NF}' | tr "\n" ' ')
+      system_version=$($system_ruby -v)
+      string="[ $(file $system_ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+      if [[ ! -z "$system_ruby" ]] && [[ "$system_ruby -v)" = "$system_version" ]] ; then
+        echo -e "=> $(tput setaf 2)system$(tput sgr0) $string\n"
       else
-        echo -e "   $(tput setaf 2)system$(tput sgr0) [$system_version]\n"
+        echo -e "   $(tput setaf 2)system$(tput sgr0) $string\n"
       fi
     else
       $rvm_scripts_path/log "info" "No system ruby found."
@@ -357,7 +359,7 @@ __rvm_update_rvm() {
   mkdir -p "$rvm_src_path"
   __rvm_pushpop "$rvm_src_path"
 
-  ruby="$(which ruby)"
+  ruby="$(which ruby 2>/dev/null)"
   system_ruby="$(rvm system ; which ruby 2>/dev/null)"
   if [[ ! -x "$ruby" ]] ; then
     if [[ ! -x "$system" ]] ; then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.92
+  version: 0.0.93
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 -05:00
+date: 2009-12-13 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []