rvm 0.1.18 → 0.1.19

data/scripts/{gems → gemsets}

@@ -14,15 +14,15 @@ if [[ ! -d "$rvm_ruby_gem_home" ]] && which gem &> /dev/null ; then rvm_ruby_gem
 
 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() {
+__rvm_gemset_name() {
   echo "$(gem env gemdir)" | awk -F'%' '{print $2}'
 }
 
-__rvm_gems_dir() {
+__rvm_gemset_dir() {
   echo "$rvm_ruby_gem_home"
 }
 
-__rvm_gems_create() {
+__rvm_gemset_create() {
   for gemset in $(echo $gems_args) ; do
     gem_home="$rvm_ruby_gem_home%${gems_args/ /}"
     mkdir -p $gem_home 
@@ -31,7 +31,7 @@ __rvm_gems_create() {
   done ; unset gem_home
 }
 
-__rvm_gems_list() {
+__rvm_gemset_list() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   $rvm_scripts_path/log "info" "gems(ets) : for $rvm_ruby_string (found in $rvm_gems_path/)"
@@ -49,14 +49,14 @@ __rvm_gems_list() {
   fi
 }
 
-__rvm_gems_delete() {
+__rvm_gemset_delete() {
   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 [[ ! -z "$rvm_gemset_name" ]] ; then
+    gemdir="$rvm_gems_path/$rvm_ruby_string%$rvm_gemset_name"
     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 entire gemset directory '$rvm_gem_set_name' ($gemdir)?"
+      $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the entire gemset directory '$rvm_gemset_name' ($gemdir)?"
       echo -n "(anything other than 'yes' will cancel) > "
       read response
       if [[ "yes" = "$response" ]] ; then
@@ -72,13 +72,13 @@ __rvm_gems_delete() {
   fi
 }
 
-__rvm_gems_empty() {
+__rvm_gemset_empty() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
   gemdir="$rvm_ruby_gem_home"
   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)?"
+    $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gems for gemset '%$rvm_gemset_name' ($gemdir)?"
     echo -n "(anything other than 'yes' will cancel) > "
     read response
     if [[ "yes" = "$response" ]] ; then
@@ -92,7 +92,7 @@ __rvm_gems_empty() {
 }
 
 # Migrate gemsets from ruby X to ruby Y
-__rvm_gems_copy() {
+__rvm_gemset_copy() {
   source_ruby="$(echo $gems_args | awk '{print $1}')"
   destination_ruby="$(echo $gems_args | awk '{print $2}')"
   if [[ -z "$source_ruby" ]] ; then
@@ -118,7 +118,7 @@ __rvm_gems_copy() {
   unset source_ruby destination_ruby source_path destination_path
 }
 
-__rvm_gems_export() {
+__rvm_gemset_export() {
   rvm_file_name="${rvm_file_name:-$gems_args}"
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
@@ -128,8 +128,8 @@ __rvm_gems_export() {
   fi
 
   if [[ -z "$rvm_file_name" ]] ; then
-    if [[ ! -z "$rvm_gem_set_name" ]] ; then
-      rvm_file_name="$rvm_gem_set_name.gems"
+    if [[ ! -z "$rvm_gemset_name" ]] ; then
+      rvm_file_name="$rvm_gemset_name.gems"
     else
       rvm_file_name="default.gems"
     fi
@@ -152,7 +152,7 @@ __rvm_gems_export() {
   done ; unset file_name
 }
 
-__rvm_gems_import() {
+__rvm_gemset_import() {
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
@@ -161,13 +161,13 @@ __rvm_gems_import() {
   fi
 
   if [[ ! -z "$(echo "$gems_args" | awk '/\.gem.*$/')" ]] ; then
-    rvm_gem_set_name="$(echo "$gems_args" | sed 's#\.gem.*##g' | sed 's# ##g')"
+    rvm_gemset_name="$(echo "$gems_args" | sed 's#\.gem.*##g' | sed 's# ##g')"
   else
-    rvm_gem_set_name="$(echo "$gems_args" | sed 's# ##g')"
+    rvm_gemset_name="$(echo "$gems_args" | sed 's# ##g')"
   fi
 
-  if [[ -s "$rvm_gem_set_name.gems" ]] ; then
-    rvm_file_name="$rvm_gem_set_name.gems"
+  if [[ -s "$rvm_gemset_name.gems" ]] ; then
+    rvm_file_name="$rvm_gemset_name.gems"
   elif [[ -s "default.gems" ]] ; then
     rvm_file_name="default.gems"
   elif [[ -s "system.gems" ]] ; then
@@ -295,7 +295,7 @@ __rvm_gem_install() {
 }
 
 # Output the user's current gem directory.
-__rvm_gems_gemdir() {
+__rvm_gemset_gemdir() {
   if [[ "$rvm_user_flag" -eq 1 ]] ; then
     echo $(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')
   elif [[ "$rvm_system_flag" -eq 1 ]] ; then
@@ -312,37 +312,37 @@ __rvm_gems_gemdir() {
 unset GEM_PATH
 
 if [[ -z "$(which gem 2>/dev/null)" ]] ; then
-  $rvm_scripts_path/log "error" "'gem' was not found, cannot perform gem actions."
-  return 1
+  $rvm_scripts_path/log "error" "'gem' was not found, cannot perform gem actions (Do you have an RVM ruby selected?)"
+  exit 1
 fi
 
 action="$(echo $* | awk '{print $1}')"
 gems_args=$(echo "$*" | awk '{$1="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
 
 if [[ "import" = "$action" ]] || [[ "load" = "$action" ]] ; then
-  __rvm_gems_import
+  __rvm_gemset_import
 elif [[ "export" = "$action" ]] || [[ "dump" = "$action" ]] ; then
-  __rvm_gems_export
+  __rvm_gemset_export
 elif [[ "create" = "$action" ]] ; then
-  __rvm_gems_create
+  __rvm_gemset_create
 elif [[ "copy" = "$action" ]] ; then
-  __rvm_gems_copy
+  __rvm_gemset_copy
 elif [[ "empty" = "$action" ]] ; then
-  __rvm_gems_empty
+  __rvm_gemset_empty
 elif [[ "delete" = "$action" ]] ; then
-  __rvm_gems_delete
+  __rvm_gemset_delete
 elif [[ "name" = "$action" ]] ; then
-  __rvm_gems_name
+  __rvm_gemset_name
 elif [[ "dir" = "$action" ]] ; then
-  __rvm_gems_dir
+  __rvm_gemset_dir
 elif [[ "list" = "$action" ]] ; then
-  __rvm_gems_list
+  __rvm_gemset_list
 elif [[ "gemdir" = "$action" ]] ; then
-  __rvm_gems_gemdir
+  __rvm_gemset_gemdir
 elif [[ "install" = "$action" ]] ; then
   __rvm_gem_install $*
 elif [[ "clear" = "$action" ]] ; then
-  $rvm_scripts_path/log "info" "gems(et) cleared."
+  $rvm_scripts_path/log "info" "gemset cleared."
   exit 0
 else
   $rvm_scripts_path/log "error" "Unrecognized gems action '$action'.\n\nValid gems actions are: {create,use,import,export,copy,delete,empty,name,list,gemdir,install}"

data/scripts/initialize

@@ -18,8 +18,10 @@ rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
 
 if [[ "root" = "$(whoami)" ]] ; then
   rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
+  rvm_gems_cache_path="${rvm_gems_cache_path:-"$rvm_gems_path/cache"}"
 else
   rvm_gems_path="${rvm_gems_path:-"$HOME/.rvm/gems"}"
+  rvm_gems_cache_path="${rvm_gems_cache_path:-"$HOME/.gem/cache"}"
 fi
 
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
@@ -27,7 +29,7 @@ rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_usr_path="${rvm_usr_path:-"$rvm_path/usr"}"
-rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
+rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
 
-export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path
+export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path
 

data/scripts/install

@@ -35,17 +35,17 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-__rvm_load_rvmrc
-
-if [[ -z "$rvm_path" ]] ; then
-  unset rvm_path
+if [[ -z "$rvm_prefix" ]] ; then
+  __rvm_load_rvmrc
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_path="/usr/local/rvm"
+    rvm_prefix="/usr/local/"
   else
-    rvm_path="$HOME/.rvm"
+    rvm_prefix="$HOME/."
   fi
 fi
 
+if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
+
 source scripts/initialize
 __rvm_initialize
 
@@ -69,7 +69,7 @@ rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
-rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
+rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
 
 mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path $HOME/.gem/cache
 
@@ -92,6 +92,11 @@ if [[ ! -s "$rvm_config_path/user" ]] ; then
   echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
+scripts="monitor match log install color db fetch log set libraries"
+for script_name in $(echo $scripts) ; do
+  chmod +x $rvm_scripts_path/$script_name
+done
+
 #
 # Bin Scripts
 #
@@ -167,6 +172,7 @@ echo -e "\nThank you for using rvm. I hope that it makes your work easier and mo
 echo -e "If you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
 echo -e "My irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
 echo -e "If I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
+echo -e "Be sure to get head often as rvm development happens fast, you can do this by typing 'rvm update --head'."
 echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne"
 echo -e "\n********************************************************************************"
@@ -176,13 +182,14 @@ 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 "\n   This means that if you see '[ -z "$PS1" ] && return' then you must split your .bashrc"
+  echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must remove it and split your .bashrc"
   echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
+  echo -e "\n   Be *sure* to REMOVE the '&& return' statement line."
   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
 
-if grep '&& return' ~/.bashrc ; then
+if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
   echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n\n"
 fi
 

data/scripts/manage

@@ -6,7 +6,6 @@ original_ruby_string=$rvm_ruby_string
 source $rvm_scripts_path/initialize
 source $rvm_scripts_path/utility
 source $rvm_scripts_path/selector
-source $rvm_scripts_path/libraries
 
 trap "rm -f $rvm_tmp_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 
@@ -113,7 +112,9 @@ __rvm_install_ruby() {
     macruby)
       if [[ "Darwin" = "$(uname)" ]] ; then
         if [[ "$rvm_head_flag" = 1 ]] ; then
-          if [[ ! -z "$rvm_llvm_flag" ]] ; then __rvm_install_llvm ; fi
+          if [[ ! -z "$rvm_llvm_flag" ]] ; then
+            $rvm_scripts_path/package llvm install
+          fi
           macruby_path="/usr/local/bin"
           # TODO: configure & make variables should be set here.
           rvm_ruby_configure=" true "
@@ -370,7 +371,11 @@ RubyWrapper
       if [[ ! -z "$rvm_head_flag" ]] ; then __rvm_run "ant.dist" "ant dist" "Running 'ant dist' (this could take a few minutes) ..." ; fi
 
       mkdir -p "$rvm_ruby_home/bin/"
-      __rvm_run "nailgun" "builtin cd \"$rvm_ruby_src_path/tool/nailgun\" && ./configure --prefix=$rvm_ruby_home && make $rvm_make_flags" "Building Nailgun"
+      if $rvm_scripts_path/match "$rvm_ruby_version" "1\.3" || $rvm_scripts_path/match "$rvm_ruby_version" "1\.2" ; then
+        __rvm_run "nailgun" "builtin cd \"$rvm_ruby_src_path/tool/nailgun\" &&  make $rvm_make_flags" "Building Nailgun"
+      else
+        __rvm_run "nailgun" "builtin cd \"$rvm_ruby_src_path/tool/nailgun\" && ./configure --prefix=$rvm_ruby_home && make $rvm_make_flags" "Building Nailgun"
+      fi
 
       __rvm_pushpop
 
@@ -860,7 +865,6 @@ __rvm_rubygems_setup() {
     install=1
   fi
 
-
   if [[ "$install" -eq 0 ]] ; then
     # 1.9.X has it's own built-in gem command
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
@@ -967,7 +971,7 @@ __rvm_actual_file() {
 __rvm_manage_rubies() {
   rubies=() ; successes=() ; errors=() ; statuses=()
 
-  unset rvm_gem_set_name rvm_ruby_selected_flag
+  unset rvm_gemset_name rvm_ruby_selected_flag
 
   rvm_ruby_gem_home=$(echo $rvm_ruby_gem_home | awk -F'%' '{print $1}')
   rvm_ruby_string=$(echo $rvm_ruby_string | awk -F'%' '{print $1}')
@@ -1010,3 +1014,4 @@ __rvm_manage_rubies() {
 rvm_action="$1" ; rubies_string="$2"
 __rvm_manage_rubies
 exit $?
+

data/scripts/{libraries → package}

@@ -1,9 +1,18 @@
 #!/usr/bin/env bash
 
 #
-# ruby supporting libraries:
+# ruby dependency packages:
 #
-__rvm_install_package() {
+
+source $rvm_scripts_path/initialize
+source $rvm_scripts_path/utility
+
+trap "rm -f $rvm_tmp_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+
+action="$1" ; shift ; library="$1" ; shift ; args="$*"
+
+install_package() {
 
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
 
@@ -41,28 +50,28 @@ __rvm_install_package() {
 
 }
 
-__rvm_readline_install() {
+readline() {
   package="readline" ; archive_format="tar.gz"
   package_url="ftp://ftp.gnu.org/gnu/readline"
   for version in 5.2 6.0 ; do
     configure_flags="--disable-dependency-tracking --disable-static --enable-shared"
-    __rvm_install_package
+    install_package
   done
 }
 
-__rvm_iconv_install() {
+iconv() {
   package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
   package_url="http://ftp.gnu.org/pub/gnu/libiconv"
-  __rvm_install_package
+  install_package
 }
 
-__rvm_curl_install() {
+curl() {
   package="curl" ; version=7.19.7 ; archive_format="tar.gz"
   package_url="http://curl.haxx.se/download"
-  __rvm_install_package
+  install_package
 }
 
-__rvm_openssl_install() {
+openssl() {
   if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
     export openssl_os="os/compiler darwin64-x86_64-cc"
   else
@@ -71,52 +80,55 @@ __rvm_openssl_install() {
   package="openssl" ; version="0.9.8k" ; archive_format="tar.gz"
   package_url="http://www.openssl.org/source"
   configure="./config --prefix=$rvm_usr_path zlib no-asm no-krb5 shared"
-  __rvm_install_package
+  install_package
 }
 
-__rvm_zlib_install() {
+zlib() {
   package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
   package_url="http://www.zlib.net"
-  __rvm_install_package
+  install_package
 }
 
-__rvm_ncurses_install() {
+ncurses() {
   package_url="ftp://invisible-island.net/ncurses/ncurses"
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
   configure_flags="--with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs"
-  __rvm_install_package
+  install_package
 }
 
-__rvm_pkgconfig_install() {
+pkgconfig() {
   package_url="http://pkgconfig.freedesktop.org/releases"
   package="pkg-config" ; version="0.23" archive_format="tar.gz"
-  __rvm_install_package
+  install_package
 }
 
-__rvm_gettext_install() {
+gettext() {
   package_url="ftp://ftp.gnu.org/pub/gnu/gettext"
   package="gettext" ; version="0.17" ; archive_format="tar.gz"
-  __rvm_install_package
+  install_package
 }
 
-__rvm_glib_install() {
+glib() {
   package="glib" ; version="2.23.1" ; archive_format="tar.gz"
   package_url="http://ftp.gnome.org/pub/gnome/sources/glib/2.23"
   configure="CC=\"cc -L$rvm_usr_path/lib\" ./configure --prefix=$rvm_usr_path"
 
-  __rvm_install_package
+  install_package
 }
 
-__rvm_mono_install() {
+mono() {
+  gettext
+  pkgconfig
+  glib
+
+  __rvm_mono_env
   package="mono" ; version="2.6.1" ; archive_format="tar.bz2"
   packge_url="http://ftp.novell.com/pub/mono/sources/mono/"
-  __rvm_mono_env
-  __rvm_gettext_install
-  __rvm_pkgconfig_install
-  __rvm_glib_install
+
+  install_package
 }
 
-__rvm_llvm_install() {
+llvm() {
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
@@ -129,3 +141,13 @@ __rvm_llvm_install() {
   fi
   __rvm_pushpop
 }
+
+if [[ ! -z "$library" ]] && is_a_function  ${library} ; then
+  ${library}
+else
+  if [[ ! -z "$library" ]] ; then
+    $rvm_scripts_path/log "error" "Package '${library}' is unknown."
+  fi
+  $rvm_scripts_path/log "info" "Usage: 'rvm package {install,uninstall} {openssl,zlib,readline,iconv,ncurses}'"
+  exit 1
+fi