rvm 0.1.12 → 0.1.13

data/install

@@ -178,7 +178,10 @@ if [[ "root" != "$(whoami)" ]] ; then
   echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
   echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
   echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-  echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+  echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must split your .bashrc"
+  echo -e "\n   Put everything below and above that line into your .bash_profile, and delete that line and below from .bashrc"
+  echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
+  echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 fi
 
 exit 0

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 12
+:patch: 13

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.12"
+  s.version = "0.1.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-02-09}
+  s.date = %q{2010-02-12}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -41,7 +41,6 @@ Gem::Specification.new do |s|
      "scripts/color",
      "scripts/db",
      "scripts/fetch",
-     "scripts/functions",
      "scripts/gems",
      "scripts/hash",
      "scripts/hook",

data/scripts/cli

@@ -50,8 +50,8 @@ __rvm_parse_args() {
 
       gems|gemset)
         rvm_action="gems"
-        if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "dump" = "$1" ]] || [[ "load" = "$1" ]] ; then
-          rvm_ruby_args="$*" ; export rvm_${1}_flag=1 ; shift
+        if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "dump" = "$1" ]] || [[ "load" = "$1" ]] || [[ "nuke" = "$1" ]] ; then
+          export rvm_ruby_args="$*" ; export rvm_${1}_flag=1 ; shift
         elif [[ "clear" = "$1" ]] ; then
           unset rvm_gem_set_name ; shift
           export rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')"

data/scripts/gems

@@ -12,7 +12,7 @@ if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 rvm_ruby_gem_home="${rvm_ruby_gem_home:-$GEM_HOME}"
 if [[ -d "$rvm_ruby_gem_home" ]] && which gem &> /dev/null ; then rvm_ruby_gem_home="$(gem env home)" ; fi
 
-trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+trap "if [[ -d $rvm_tmp_path/ ]] && [[ -s $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
 
 __rvm_gems_name() {
   echo "$(gem env gemdir)" | awk -F'%' '{print $2}'
@@ -47,11 +47,34 @@ __rvm_gems_delete() {
     if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
         rm -rf  "$gemdir"
     elif [[ -d "$gemdir" ]] ; then
-      $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gems '$rvm_gem_set_name' ($gemdir)?"
+      $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the entire gemset '$rvm_gem_set_name' ($gemdir)?"
       echo -n "(anything other than 'yes' will cancel) > "
       read response
       if [[ "yes" = "$response" ]] ; then
-        rm -rf  "$gemdir"
+        rm -f $gemdir/cache && rm -rf $gemdir
+      else
+        $rvm_scripts_path/log "info" "Not doing anything, phew... close call that one eh?"
+      fi
+    else
+      $rvm_scripts_path/log "info" "$gemdir already does not exist."
+    fi ; unset gemdir
+  else
+    $rvm_scripts_path/log "error" "A gems name must be specified in order to delete a gems."
+  fi
+}
+
+__rvm_gems_nuke() {
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
+  if [[ ! -z "$rvm_gem_set_name" ]] ; then
+    gemdir="$rvm_gems_path/$rvm_ruby_string%$rvm_gem_set_name"
+    if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
+      cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
+    elif [[ -d "$gemdir" ]] ; then
+      $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gems for gemset '%$rvm_gem_set_name' ($gemdir)?"
+      echo -n "(anything other than 'yes' will cancel) > "
+      read response
+      if [[ "yes" = "$response" ]] ; then
+        cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
       else
         $rvm_scripts_path/log "info" "Not doing anything, phew... close call that one eh?"
       fi
@@ -104,18 +127,18 @@ __rvm_gems_load() {
   fi
 
   if [[ ! -z "$(echo "$gems_args" | awk '/\.gem.*$/')" ]] ; then
-    rvm_gem_set_name="$(echo "$gems_args" | sed 's#\.gem.*##g')"
+    rvm_gem_set_name="$(echo "$gems_args" | sed 's#\.gem.*##g' | sed 's# ##g')"
   else
-    rvm_gem_set_name="$gems_args"
+    rvm_gem_set_name="$(echo "$gems_args" | sed 's# ##g')"
   fi
 
-  if [[ -f "$rvm_gem_set_name.gems" ]] ; then
+  if [[ -s "$rvm_gem_set_name.gems" ]] ; then
     rvm_file_name="$rvm_gem_set_name.gems"
-  elif [[ -f "default.gems" ]] ; then
+  elif [[ -s "default.gems" ]] ; then
     rvm_file_name="default.gems"
-  elif [[ -f "system.gems" ]] ; then
+  elif [[ -s "system.gems" ]] ; then
     rvm_file_name="system.gems"
-  elif [[ -f ".gems" ]] ; then
+  elif [[ -s ".gems" ]] ; then
     rvm_file_name=".gems"
   else
     $rvm_scripts_path/log "error" "No *.gems file found."
@@ -124,7 +147,7 @@ __rvm_gems_load() {
 
   mkdir -p "$rvm_gems_path/cache" # Ensure the base cache dir is initialized.
 
-  if [[ -f "$rvm_file_name" ]] ; then
+  if [[ -s "$rvm_file_name" ]] ; then
     echo "Loading $rvm_file_name file..."
     rvm_ruby_gem_list=$(\ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's#.gems.*$##' 2> /dev/null)
 
@@ -159,7 +182,7 @@ __rvm_parse_gem_args() {
     fi
   fi
 
-  if [[ -f "$gem" ]] ; then
+  if [[ -s "$gem" ]] ; then
     gem_file_name="$gem"
   elif $rvm_scripts_path/match "$gem" ".gem$" ; then
     gem_file_name="$gem"
@@ -180,16 +203,16 @@ __rvm_gem_install() {
     unset gem
     $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"
   else
-    if [[ -f "$gem" ]] ; then
+    if [[ -s "$gem" ]] ; then
       cache_file="$gem"
-    elif [[ -f "$rvm_gems_path/cache/${gem_file_name}" ]] ; then
+    elif [[ -s "$rvm_gems_path/cache/${gem_file_name}" ]] ; then
       cache_file="$rvm_gems_path/cache/${gem_file_name}"
     else
       cache_file="${cache_file:-$(\ls ${rvm_gems_path}/cache/${gem_file_name} 2> /dev/null | sort | head -n1)}"
     fi
 
-    if [[ ! -f "$cache_file" ]] ; then
-      if [[ -f "$gem_file_name" ]] ; then
+    if [[ ! -s "$cache_file" ]] ; then
+      if [[ -s "$gem_file_name" ]] ; then
         gem="$gem_file_name"
       elif [[ -z "${gem_version/ /}" ]] ; then
         gem="${gem_name/ /}"
@@ -200,7 +223,7 @@ __rvm_gem_install() {
       gem_file_name="$(basename "$cache_file")"
       gem_string="$(echo "$gem_file_name" | sed 's#\.gem$##')"
 
-      if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
+      if [[ -z "$rvm_force_flag" ]] && [[ -s "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
         unset gem # already installed, not forcing reinstall.
         $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"
       else
@@ -260,12 +283,14 @@ if [[ -z "$(which gem 2>/dev/null)" ]] ; then
 fi
 
 action="$(echo $* | awk '{print $1}')"
-gems_args="$(echo $* | awk '{$1="" ; print}' | sed 's/^[ \t]*//')"
+gems_args="$(echo $* | awk '{$1="" ; print}' | sed 's/^\s*//')"
 
 if [[ "load" = "$action" ]] ; then
   __rvm_gems_load
 elif [[ "dump" = "$action" ]] ; then
   __rvm_gems_dump
+elif [[ "nuke" = "$action" ]] ; then
+  __rvm_gems_nuke
 elif [[ "delete" = "$action" ]] ; then
   __rvm_gems_delete
 elif [[ "name" = "$action" ]] ; then

data/scripts/install

@@ -178,7 +178,10 @@ if [[ "root" != "$(whoami)" ]] ; then
   echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
   echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
   echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-  echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+  echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must split your .bashrc"
+  echo -e "\n   Put everything below and above that line into your .bash_profile, and delete that line and below from .bashrc"
+  echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
+  echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 fi
 
 exit 0

data/scripts/manage

@@ -69,7 +69,10 @@ __rvm_install_source() {
 
   if [[ ! -z "$rvm_ruby_patch" ]] ; then
     for patch in $(echo $rvm_ruby_patch | tr ',' ' ') ; do
-      patch -p0 -f < $patch
+      __rvm_run "patch" "patch -p0 -f < $patch" "Applying patch '$patch'..."
+      if [[ $? -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "Patch $patch did not apply cleanly... back to the patching board :(" ; exit 1
+      fi
     done
   fi
 
@@ -289,8 +292,7 @@ RubyWrapper
       #  __rvm_run "rake.distclean" "\$(rvm 1.8.7 ; rake distclean --trace)" "Running distclean."
       #fi
 
-      builtin cd "$rvm_ruby_src_path"
-      chmod +x ./configure
+      builtin cd "$rvm_ruby_src_path" ; chmod +x ./configure
       rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
       if [[ "$rvm_llvm_flag" = "0" ]] ; then
         rvm_ruby_configure="$rvm_ruby_configure --disable-llvm"
@@ -305,9 +307,9 @@ RubyWrapper
       fi
 
       if [[ "$rvm_trace_flag" -eq 1 ]] ; then
-        rvm_ruby_make="$rvm_bin_path/rvm 1.8.7 rake install --trace" ; message="Compiling rbx"
+        rvm_ruby_make="$rvm_bin_path/ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level") -S rake install --trace" ; message="Compiling rbx (with --trace)"
       else
-        rvm_ruby_make="$rvm_bin_path/rvm 1.8.7 rake install" ; message="Compiling rbx"
+        rvm_ruby_make="$rvm_bin_path/ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level") -S rake install" ; message="Compiling rbx"
       fi
       __rvm_run "rake" "$rvm_ruby_make" "$message"
       result=$? ; if [[ "$result" -gt 0 ]] ; then

data/scripts/rvm-install

@@ -178,7 +178,10 @@ if [[ "root" != "$(whoami)" ]] ; then
   echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
   echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
   echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-  echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+  echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must split your .bashrc"
+  echo -e "\n   Put everything below and above that line into your .bash_profile, and delete that line and below from .bashrc"
+  echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
+  echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 fi
 
 exit 0

data/scripts/update

@@ -178,7 +178,10 @@ if [[ "root" != "$(whoami)" ]] ; then
   echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
   echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
   echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-  echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+  echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must split your .bashrc"
+  echo -e "\n   Put everything below and above that line into your .bash_profile, and delete that line and below from .bashrc"
+  echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
+  echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 fi
 
 exit 0

data/scripts/utility

@@ -139,7 +139,7 @@ __rvm_run() {
   else
     eval "nice -n $rvm_niceness $command" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
   fi
-  if [[ $? -gt 0 ]] ; then $rvm_scripts_path/log "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name.error.log" ; __rvm_pushpop ; return 1 ; fi
+  if [[ $? -gt 0 ]] ; then $rvm_scripts_path/log "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name*.log" ; __rvm_pushpop ; return 1 ; fi
   unset log_file command
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -05:00
+date: 2010-02-12 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -45,7 +45,6 @@ files:
 - scripts/color
 - scripts/db
 - scripts/fetch
-- scripts/functions
 - scripts/gems
 - scripts/hash
 - scripts/hook

data/scripts/functions

@@ -1 +0,0 @@
-#!/usr/bin/env bash