rvm 0.1.11 → 0.1.12

data/config/md5

@@ -39,8 +39,7 @@ GemStone-22816.Darwin-i386.tar.gz=b12426c17b3925f1c8c7086a3285f15f
 GemStone-22816.Linux-x86_64.tar.gz=21d1e8e7a4b10ac8a1c199eb0cbfaec1
 MagLev-22816.Darwin-i386.tar.gz=b1b3e6530e90d7dcf36f81e097776643
 MagLev-22816.Linux-x86_64.tar.gz=424ca92c34cfce6d0da63170755b000c
-zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
-curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
+MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
 jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
 jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
 libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
@@ -48,4 +47,6 @@ ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
 openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
 readline-5.2.tar.gz=e39331f32ad14009b9ff49cc10c5e751
 readline-6.0.tar.gz=b7f65a48add447693be6e86f04a63019
-MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
+zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
+curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
+pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744

data/lib/VERSION.yml

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

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   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-07}
+  s.date = %q{2010-02-09}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -39,7 +39,6 @@ Gem::Specification.new do |s|
      "scripts/cd",
      "scripts/cli",
      "scripts/color",
-     "scripts/completion",
      "scripts/db",
      "scripts/fetch",
      "scripts/functions",

data/scripts/cli

@@ -170,16 +170,15 @@ __rvm_parse_args() {
       ;;
 
       # For use with --patch
-      --patch-name) rvm_ruby_patch_name="$1" ; shift ;;
+      --patch-name) export rvm_ruby_patch_name="$1" ; shift ;;
 
       -h|--patch)
         if [[ -z "$rvm_ruby_patch" ]] ; then
-          rvm_ruby_patch="$1";
+          export rvm_ruby_patch="$1"
         else
-          rvm_ruby_patch="$rvm_ruby_patch,$1";
-        fi
+          export rvm_ruby_patch="$rvm_ruby_patch,$1";
+        fi ; shift
         rvm_action="${rvm_action:-use}"
-        shift
       ;;
 
       --head)
@@ -261,9 +260,8 @@ __rvm_parse_args() {
         rvm_ruby_string="$rvm_token"
       ;;
 
-      --install)            export rvm_install_on_use_flag=1           ;;
       -h|--help|usage|help) rvm_action=help                     ;;
-      -G|--gems)            rvm_gems_path="$1"          ; shift  ;;
+      -G|--gems)            rvm_gems_path="$1"         ; shift  ;;
       --source)             rvm_src_path="$1"          ; shift  ;;
       --archives)           rvm_archives_path="$1"     ; shift  ;;
       --make)               rvm_ruby_make="$1"         ; shift  ;;
@@ -274,11 +272,13 @@ __rvm_parse_args() {
       -m|--gem-set)         rvm_gem_set_name="$1"      ; shift  ;;
       --sdk)                rvm_sdk="$1"               ; shift  ;;
       --archflags)          rvm_archflags="$1"         ; shift  ;;
-      --trace)              export rvm_trace_flag=1    ; set -x ;;
       --symlink)            rvm_symlink_name="$1"      ; shift  ;;
       tests|specs)          rvm_action="tests"                  ;;
-      --disable-llvm|--disable-jit) export rvm_llvm_flag=0       ;;
-      --enable-llvm|--enable-jit)   export rvm_llvm_flag=1       ;;
+      --install)            export rvm_install_on_use_flag=1    ;;
+      --trace)              export rvm_trace_flag=1    ; set -x ;;
+      --proxy)              export rvm_proxy="$1"      ; shift  ;;
+      --disable-llvm|--disable-jit) export rvm_llvm_flag=0      ;;
+      --enable-llvm|--enable-jit)   export rvm_llvm_flag=1      ;;
 
       --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--load|--passenger|--editor)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1

data/scripts/fetch

@@ -16,6 +16,8 @@ record_md5() {
 if ! which curl &> /dev/null; then
   $rvm_scripts_path/log "fail" "rvm requires curl, which does not seem to exist in your path :("
   exit 1
+elif [[ ! -z ${rvm_proxy} ]] ; then
+  fetch_command="curl -x${rvm_proxy} -O -L --create-dirs -C - " # -s for silent
 else
   fetch_command="curl -O -L --create-dirs -C - " # -s for silent
 fi

data/scripts/gems

@@ -131,7 +131,7 @@ __rvm_gems_load() {
     while read -r line
     do # Keep this on 2nd line :(
       if [[ ! -z "$(echo $line | sed 's/\s//g')" ]] ; then
-        __rvm_gem_install $line
+        gems_args="$line" ; __rvm_gem_install
       fi
     done < <(awk '/^[^#]+/{print}' "${rvm_file_name}")
   else
@@ -139,10 +139,9 @@ __rvm_gems_load() {
   fi
 }
 
-__rvm_parse_gem_line() {
-  line="$*"
-  gem="$(echo $line | awk -F';' '{print $1}')"
-  gem_prefix="$(echo $line | awk -F';' '{print $2}')"
+__rvm_parse_gem_args() {
+  gem="$(echo $gems_args | awk -F';' '{print $1}')"
+  gem_prefix="$(echo $gems_args | awk -F';' '{print $2}')"
   if $rvm_scripts_path/match "$gem" "\.gem$" ; then
     gem_name="$(basename $gem | sed 's#\.gem##' | awk -F'-' '{$NF=NULL;print}')"
     gem_version="$(basename $gem | sed 's#\.gem##' | awk -F'-' '{print $NF}' )"
@@ -173,8 +172,10 @@ __rvm_parse_gem_line() {
 
 # Install a gem
 __rvm_gem_install() {
-  __rvm_parse_gem_line $*
+  # First we parse the gem args to pick apart the pieces.
+  __rvm_parse_gem_args
 
+  # Now we determine if a .gem cache file is already installed
   if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
     unset gem
     $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"
@@ -201,6 +202,7 @@ __rvm_gem_install() {
 
       if [[ -z "$rvm_force_flag" ]] && [[ -f "${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
         if [[ -s "$rvm_gems_path/cache/$(basename $gem_file_name)" ]] ; then
           mkdir -p "$rvm_tmp_path/$$/"
@@ -213,23 +215,24 @@ __rvm_gem_install() {
     fi
   fi
 
+  # If $gem is still set, go forward with the install.
   if [[ ! -z "$gem" ]] ; then
     # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
     if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
 
     if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ "$rvm_ruby_gem_home" != "$rvm_gems_path" ]] ; then
-      command="export GEM_HOME='$GEM_HOME' ; export GEM_PATH='$GEM_PATH' ; $gem_prefix gem install $rvm_gem_options $gem $gem_postfix $vars"
+      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home/bin:$rvm_gems_path/$rvm_ruby_string%global/bin' $gem_prefix gem install $gems_args $rvm_gem_options $gem_postfix $vars"
     else
-      command="$gem_prefix gem install $rvm_gem_options -q $gem $gem_postfix $vars"
+      command="$gem_prefix gem install $gems_args $rvm_gem_options -q $gem $gem_postfix $vars"
     fi
     __rvm_run "gem.install" "$command" "$gem_name $gem_version is not installed, installing..."
     result=$?
     if [[ $result -eq 0 ]] ; then
-      $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$color_none installed."
+      $rvm_scripts_path/log "info" "$gem_name $gem_version installed."
     else
-      $rvm_scripts_path/log "error" "$color_red$gem_name $gem_version$color_none failed to install, output has been logged to:\n$rvm_path/log/$rvm_ruby_string/gem.install.error.log"
+      $rvm_scripts_path/log "error" "$gem_name $gem_version failed to install, output has been logged to:\n$rvm_path/log/$rvm_ruby_string/gem.install.error.log"
     fi
-  fi ; unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
+  fi ; unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string gem_action
 
   return $result
 }

data/scripts/initialize

@@ -20,6 +20,7 @@ rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 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}"
 
 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

data/scripts/libraries

@@ -3,136 +3,122 @@
 #
 # ruby supporting libraries:
 #
-__rvm_readline_install() {
-  if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
-  __rvm_pushpop $rvm_src_path
-  package="readline" ; version="5.2" ; archive_format="tar.gz"
-  # TODO: Figure out how to list, grab and apply the patches
-  #ftp://ftp.cwru.edu/pub/bash/readline-6.0.tar.gz
-  for version in 5.2 6.0 ; do
-    $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-    $rvm_scripts_path/fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format" || (result=$? && return $result)
-    __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"
-    if [[ "Darwin" = "$(uname)" ]] ; then
-      #sdk=$(\ls -t /Developer/SDKs/ | head -n 1)
-      #CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
-      #LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
-      #export CFLAGS LDFLAGS
-      __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
-    else
-      __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
-    fi
-
-    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"
-    fi
-  done
-  __rvm_pushpop
-}
+__rvm_install_package() {
 
-__rvm_iconv_install() {
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
+
   __rvm_pushpop $rvm_src_path
-  __rvm_pushpop $rvm_src_path
-  package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
-  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format" || (result=$? && return $result)
-  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
+
+  $rvm_scripts_path/log "info" "Fetching $package-$version.$archive_format to $rvm_archives_path"
+
+  if [[ "$archive_format" = "tar.gz" ]] || [[ "$archive_format" = "tgz" ]] ; then
+    $rvm_scripts_path/fetch "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+    __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
+  elif [[ "$archive_format" = "tar.bz2" ]] ; then
+    $rvm_scripts_path/fetch "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+    __rvm_run "$package/extract" "tar jxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
+  elif [[ "$archive_format" = "zip" ]] ; then
+    $rvm_scripts_path/fetch "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+  __rvm_run "$package/extract" "unzip -q -o $rvm_archives_path/$package-$version.$archive_format -d $rvm_src_path/$package-$version" "Extracting $package-$version.$archive_format to $rvm_src_path"
+  else
+    echo -e "Unrecognized archive format '$archive_format'" ; return 1
+  fi
+
   builtin cd "$rvm_src_path/$package-$version"
-  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
+
+  __rvm_run "$package/configure" "${configure:-"./configure --prefix=$rvm_usr_path"} $configure_flags" "Configuring $package in $rvm_src_path/$package-$version."
+
+  unset configure_flags
+
   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"
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "Uninstalling $package from $rvm_usr_path"
   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"
+    __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package in $rvm_src_path/$package-$version."
+    __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_usr_path"
   fi
+
   __rvm_pushpop
+
+}
+
+__rvm_readline_install() {
+  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
+  done
+}
+
+__rvm_iconv_install() {
+  package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
+  package_url="http://ftp.gnu.org/pub/gnu/libiconv"
+  __rvm_install_package
 }
 
 __rvm_curl_install() {
-  if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
-  __rvm_pushpop $rvm_src_path
   package="curl" ; version=7.19.7 ; archive_format="tar.gz"
-  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "http://curl.haxx.se/download/$package-$version.$archive_format" || (result=$? && return $result)
-  __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_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"
-  fi
-  __rvm_pushpop
+  package_url="http://curl.haxx.se/download"
+  __rvm_install_package
 }
 
 __rvm_openssl_install() {
-  if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
-    openssl_os="os/compiler darwin64-x86_64-cc"
+    export openssl_os="os/compiler darwin64-x86_64-cc"
   else
-    openssl_os="os/compiler darwin-i386-cc"
+    export openssl_os="os/compiler darwin-i386-cc"
   fi
-  __rvm_pushpop $rvm_src_path
   package="openssl" ; version="0.9.8k" ; archive_format="tar.gz"
-  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "http://www.openssl.org/source/$package-$version.tar.gz" || (result=$? && return $result)
-  __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_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"
-  fi
-  __rvm_pushpop
+  package_url="http://www.openssl.org/source"
+  configure="./config --prefix=$rvm_usr_path zlib no-asm no-krb5 shared"
+  __rvm_install_package
 }
 
 __rvm_zlib_install() {
-  if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
-  __rvm_pushpop $rvm_src_path
   package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
-  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "http://www.zlib.net/$package-$version.tar.gz" || (result=$? && return $result)
-  __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_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"
-  fi
-  __rvm_pushpop
+  package_url="http://www.zlib.net"
+  __rvm_install_package
 }
 
 __rvm_ncurses_install() {
-  if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
-  __rvm_pushpop $rvm_src_path
+  package_url="ftp://invisible-island.net/ncurses/ncurses"
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
-  $rvm_scripts_path/log "info" "Retrieving $package"
-  $rvm_scripts_path/fetch "ftp://invisible-island.net/ncurses/ncurses.tar.gz" || (result=$? && return $result)
-  __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_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"
-  fi
-  __rvm_pushpop
+  configure_flags="--with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs"
+  __rvm_install_package
+}
+
+__rvm_pkgconfig_install() {
+  package_url="http://pkgconfig.freedesktop.org/releases"
+  package="pkg-config" ; version="0.23" archive_format="tar.gz"
+  __rvm_install_package
+}
+
+__rvm_gettext_install() {
+  package_url="ftp://ftp.gnu.org/pub/gnu/gettext"
+  package="gettext" ; version="0.17" ; archive_format="tar.gz"
+  __rvm_install_package
+}
+
+__rvm_glib_install() {
+  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
 }
 
-__rvm_install_llvm() {
+__rvm_mono_install() {
+  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
+}
+
+__rvm_llvm_install() {
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
-  builtin cd "$rvm_src_path"
+  __rvm_pushpop $rvm_src_path
   if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
     rm -rf "$rvm_src_path/llvm"
     svn co -r 89156 https://llvm.org/svn/llvm-project/llvm/trunk llvm
@@ -141,9 +127,5 @@ __rvm_install_llvm() {
     UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make -j2
     sudo env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make install
   fi
+  __rvm_pushpop
 }
-
-__rvm_install_mono() {
-  echo "Not implemented yet."
-}
-

data/scripts/log

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
 if [[ ! -z "$2" ]] ; then level=$1 ; shift ; else level="info" ; fi
 

data/scripts/manage

@@ -69,7 +69,7 @@ __rvm_install_source() {
 
   if [[ ! -z "$rvm_ruby_patch" ]] ; then
     for patch in $(echo $rvm_ruby_patch | tr ',' ' ') ; do
-      patch -p1 $patch
+      patch -p0 -f < $patch
     done
   fi
 

data/scripts/selector

@@ -459,11 +459,6 @@ __rvm_ruby_string() {
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_revision}"
   elif [[ ! -z "$rvm_ruby_tag" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_tag}"
-  elif [[ ! -z "$rvm_ruby_patch" ]]  ; then
-    if [[ -z "$rvm_ruby_patch_name" ]] ; then
-      rvm_ruby_patch_name="$(basename $rvm_ruby_patch | awk -F',' '{print $1}')"
-    fi
-    rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch}"
   elif [[ ! -z "$rvm_ruby_patch_level" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
   elif [[ ! -z "$rvm_ruby_user_tag" ]]  ; then

data/scripts/utility

@@ -150,12 +150,12 @@ __rvm_cleanup_variables() {
 
   if [[ "$rvm_sticky_gems" = "1" ]] ; then export rvm_gem_set_name ; else unset rvm_gem_set_name  ; fi
 
-  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message 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_llvm_flag rvm_ruby_bits
+  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message 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_llvm_flag rvm_ruby_bits rvm_ruby_patch
 }
 
 # Unset ruby-specific variables
 __rvm_unset_ruby_variables() {
-  unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_patch rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path
 }
 
 __rvm_load_rvmrc() {
@@ -247,6 +247,7 @@ __rvm_reset() {
 
   for file in system default ; do
     if [[ -f "$rvm_path/$file" ]] ; then rm -f $rvm_path/$file ; fi
+    if [[ -f "$rvm_config_path/$file" ]] ; then rm -f $rvm_config_path/$file ; fi
   done
   rvm_ruby_interpreter="system"
   __rvm_select
@@ -327,45 +328,35 @@ __rvm_list() {
       current_ruby="$(echo $ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
     fi
 
+    echo -e "rvm Rubies\n"
     for version in $(\ls $rvm_rubies_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
       if [[ ! -z "$(echo $version | awk '/^jruby-/')" ]] ; then
         string="[ $($rvm_rubies_path/$version/bin/ruby -v | awk '{print $NF}') ]"
-      elif [[ ! -z "$(echo $version | awk '/^maglev-/')" ]] ; then
+      elif [[ ! -z "$(echo $version | awk '/^maglev-|^macruby-/')" ]] ; then
         string="[ x86_64 ]"
       else
         string="[ $(file $rvm_rubies_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"
-        selected="1"
-      else
-        echo -e "   $(tput setaf 2)$version$(tput sgr0) $string"
-      fi
+      if [[ "$version" = "$current_ruby" ]] ; then echo -n "=> " ; else echo -n "   " ; fi
+      echo -e "$(tput setaf 2)$version$(tput sgr0) $string"
     done ; unset version
 
     if [[ -f "$rvm_config_path/default" ]] && [[ -s $rvm_config_path/default ]] ; then
       version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | awk -F"'" '{print $2}' | xargs basename)
       if [[ ! -z "$version" ]] ; then
+        echo -e "\nDefault Ruby (for new shells)\n"
         string="[ $(file $rvm_rubies_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"
-        else
-          echo -e "   $(tput setaf 3)(default)$(tput sgr0) $(tput setaf 2)$version$(tput sgr0) $string"
-        fi
+        echo -e "   $(tput setaf 2)$version$(tput sgr0) $string"
       fi ; unset version
     fi
 
     system_ruby="$(rvm system ; which ruby 2>/dev/null)"
     if [[ ! -z "$system_ruby" ]] && [[ -x "$system_ruby" ]]; then
-      #system_version=$($system_ruby -v | awk -F: '{print $2}' | grep 8 | awk '{print $NF}' | tr "\n" ' ')
+      echo -e "\nSystem Ruby\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"
-      else
-        echo -e "   $(tput setaf 2)system$(tput sgr0) $string"
-      fi
+      if [[ ! -z "$system_ruby" ]] && [[ "$current_ruby" = "$system_version" ]] ; then echo -n "=> " ; else echo -n "   " ; fi
+      echo -e "$(tput setaf 2)system$(tput sgr0) $string"
     else
       $rvm_scripts_path/log "info" "No system ruby found."
     fi
@@ -492,7 +483,6 @@ __rvm_ruby_do() {
     fi
     rvm_command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $rvm_ruby_args"
   elif [[ "gem" = "$(basename $binary)" ]] && $rvm_scripts_path/match "$rvm_ruby_args" '^install' ; then
-    #__rvm_gem_install
     #$rvm_scripts_path/gem install $rvm_ruby_args
     rvm_command="$rvm_scripts_path/gems $rvm_ruby_mode $rvm_ruby_args $rvm_gem_options"
   else
@@ -802,3 +792,11 @@ __rvm_gems_use() {
   fi
 }
 
+__rvm_mono_env() {
+  export DYLD_LIBRARY_PATH="$rvm_usr_path/lib:$DYLD_LIBRARY_PATH"
+  export C_INCLUDE_PATH="$rvm_usr_path/include:$C_INCLUDE_PATH"
+  export ACLOCAL_PATH="$rvm_usr_path/share/aclocal"
+  export ACLOCAL_FLAGS="-I $ACLOCAL_PATH"
+  export PKG_CONFIG_PATH="$rvm_usr_path/lib/pkgconfig:$PKG_CONFIG_PATH"
+  PATH="$rvm_usr_path/bin:$PATH"
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 -05:00
+date: 2010-02-09 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -43,7 +43,6 @@ files:
 - scripts/cd
 - scripts/cli
 - scripts/color
-- scripts/completion
 - scripts/db
 - scripts/fetch
 - scripts/functions

data/scripts/completion

@@ -1,174 +0,0 @@
-#!/usr/bin/env bash
-
-complete -o default -o nospace -F _rvm rvm
-
-_rvm ()
-{
-	local i c=1 command __git_dir
-
-	while [[ $c -lt $COMP_CWORD ]]; do
-		i="${COMP_WORDS[[c]]}"
-		case "$i" in
-		--git-dir=*) __git_dir="${i#--git-dir=}" ;;
-		--bare)      __git_dir="." ;;
-		--version|-p|--paginate) ;;
-		--help) command="help"; break ;;
-		*) command="$i"; break ;;
-		esac
-		c=$((++c))
-	done
-
-	if [[ -z "$command" ]]; then
-		case "${COMP_WORDS[[COMP_CWORD]]}" in
-		--*)   __gitcomp "
-			--paginate
-			--no-pager
-			--git-dir=
-			--bare
-			--version
-			--exec-path
-			--html-path
-			--work-tree=
-			--help
-			"
-			;;
-		*)     __gitcomp "$(__git_porcelain_commands) $(__git_aliases)" ;;
-		esac
-		return
-	fi
-
-	local expansion=$(__git_aliased_command "$command")
-	[[ "$expansion" ]] && command="$expansion"
-
-	case "$command" in
-      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|usage|help|implode|update|readline|iconv|benchmark|bench|use)
-      ;;
-
-      rm|remove)
-      ;;
-
-      system|default)
-      ;;
-
-      ruby|jruby|ree|macruby|rbx|rubinius|ironruby|default|all)
-      ;;
-
-      gemdir)
-      ;;
-
-      1.8.0|1.8.1|1.8.2|1.8.3|1.8.4|1.8.5|1.8.6|1.8.7|1.9.1|1.9.2)
-      ;;
-
-      1.2.0|1.3.1)
-      ;;
-
-      do|rubydo|rakedo|gemdo)
-      ;;
-      specs|tests)
-      ;;
-      rake|gem)
-      ;;
-      -S|--script|-e|--execute)
-      ;;
-      default|system)
-      ;;
-
-      --install)         rvm_install_on_use_flag=1         ;;
-      -G|--gems)         rvm_gems_path="$1"         ; shift ;;
-      --source)          rvm_src_path="$1"         ; shift ;;
-      --archives)        rvm_archives_path="$1"    ; shift ;;
-      --make)            rvm_ruby_make="$1"        ; shift ;;
-      --make-install)    rvm_ruby_make_install="$1"; shift ;;
-      --nice)            rvm_niceness="$1"         ; shift ;;
-      -l|--level)        rvm_ruby_patch_level="$1" ; shift ;;
-      -h|--help)         rvm_action=help           ; shift ;;
-      tests|specs)       rvm_action="tests"                ;;
-
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|yaml|--json|json)
-        eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1"
-      ;;
-
-	stash)       _git_stash ;;
-	stage)       _git_add ;;
-	submodule)   _git_submodule ;;
-	svn)         _git_svn ;;
-	tag)         _git_tag ;;
-	whatchanged) _git_log ;;
-	*)           COMPREPLY=() ;;
-	esac
-}
-
-# __gitcomp accepts 1, 2, 3, or 4 arguments
-# generates completion reply with compgen
-function __rvm_completion_reply
-{
-	local cur="${COMP_WORDS[[COMP_CWORD]]}"
-	if [[ $# -gt 2 ]]; then
-		cur="$3"
-	fi
-	case "$cur" in
-	--*=)
-		COMPREPLY=()
-		;;
-	*)
-		local IFS=$'\n'
-		COMPREPLY=($(compgen -P "${2-}" \
-			-W "$(__gitcomp_1 "${1-}" "${4-}")" \
-			-- "$cur"))
-		;;
-	esac
-}
-
-function _rvm {
-
-  __rvm_cleanup_variables
-  __rvm_load_rvmrc
-  __rvm_load_defaults
-  __rvm_parse_args $@
-
-  result=0
-  case "$rvm_action" in
-    install)    __rvm_install          ; result=$? ;;
-    uninstall)  __rvm_uninstall        ; result=$? ;;
-    remove)     __rvm_remove_ruby      ; result=$? ;;
-    use)        __rvm_use              ; result=$? ;;
-    gemdir)     __rvm_gem-dir          ; result=$? ;;
-    srcdir)     __rvm_src-dir          ; result=$? ;;
-    list)       __rvm_list             ; result=$? ;;
-    version)    __rvm_version          ; result=$? ;;
-    reset)      __rvm_reset            ; result=$? ;;
-                # TODO: how can we use bin_path here for reload, default file?
-    implode)    __rvm_implode          ; result=$? ;;
-    update)     __rvm_update           ; result=$? ;;
-    readline)   __rvm_readline_install ; result=$? ;;
-    iconv)      __rvm_iconv_install    ; result=$? ;;
-    reboot)     __rvm_reboot           ; result=$? ;;
-    usage|help) __rvm_usage            ; result=$? ;;
-    bench|benchmark)  __rvm_benchmark  ; result=$? ;;
-    rubydo|rakedo|gemdo) __rvm_do      ; result=$? ;;
-
-    tests|specs)
-      rvm_summary_flag=1
-    ;;
-
-    info|debug)
-      result=0
-    ;;
-
-    error)
-      $rvm_scripts_path/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
-      __rvm_pushpop
-      result=1;
-    ;;
-    *)
-      if [[ ! -z "$rvm_action" ]] ; then
-        $rvm_scripts_path/log "fail"  "unknown action '$rvm_action'"
-      else
-        __rvm_usage
-      fi
-      result=1
-  esac
-  return $result
-}
-
-