wayneeseguin-rvm 0.0.38 → 0.0.39

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.38"
+  s.version = "0.0.39"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-09-14}
+  s.date = %q{2009-09-15}
   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/rvm-cli

@@ -1,5 +1,105 @@
 #!/bin/bash
 
+function __rvm_meta {
+  rvm_meta_author="Wayne E. Seguin"
+  rvm_meta_author_email="wayneeseguin@gmail.com"
+  rvm_meta_website="http://rvm.beginrescueend.com/"
+  rvm_meta_version="`cat $rvm_path/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
+  rvm_meta_updated="2009.09.15"
+}
+
+function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
+
+function __rvm_usage {
+
+  __rvm_meta
+
+  cat <<-Usage
+
+  rvm ${rvm_meta_version} ${rvm_meta_website} by ${rvm_meta_author} (${rvm_meta_author_email})
+
+  Usage:
+
+    rvm Action [Implementation] [Options]
+
+  Action:
+
+    * usage   - Show this usage information
+    use       - Switch to using a specific ruby version (new login shell)
+    info      - Show information for current ruby
+    list      - Show currently installed versions
+    gemdir    - Switch to gem directory for installation (new login shell)
+    srcdir    - Switch to src directory for the current ruby installation
+    gemdup    - Clone source version gems to current version
+                (highly expiramental) Example: rvm gemdup ~/.gem/ruby/1.8/
+    install   - Install a ruby version, default is from source
+    uninstall - Uninstall a ruby version
+    reset     - Remove default and current settings, exit the shell.
+                (If you experience odd behavior try this first)
+    rubydo    - Used with -f to run a ruby file against specified or all rubies
+    gemdo     - Used with -f to execute a command using selected ruby's 'gem'
+    debug     - Emit environment & configuration information for *current* ruby
+
+    reload    - Reload rvm source itself (useful after changing rvm source)
+    implode   - Removes all ruby installations it manages, everything in ~/.rvm
+    update    - Upgrades rvm to the latest version.
+
+  Implementation:
+
+    * ruby    - MRI/YARV Ruby (The Standard), defaults to 1.8.6
+    jruby     - jRuby
+    rubinius  - Rubinius
+    ree       - Ruby Enterprise Edition
+    system    - Use the system ruby (eg. pre-rvm state)
+    default   - Use rvm set default ruby and system if it hasn't been set.
+
+  Options:
+
+    -v|--version    - Ruby Package Version, defaults to 'latest'
+    -l|--level      - Patch level for the specified Ruby version
+    -p|--prefix     - Package and source directory prefix, with trailing slash!
+                      Default is a users home directory and /usr/local/ for root
+    -a|--archives   - Directory to place downladed files into (~/.rvm/archives/)
+    -n|--nice       - Specify a process niceness (for slow computers, default 0)
+    -m|--gem-set    - Named gem set for switching between different gem sets
+    --rm-gem-set    - Removes a named gemset.
+
+    -l|--level      - Specify a patch level to use
+    -t|--tag        -
+    -r|--rev        - Specify the repository revision # to use or 'head' for
+
+    -P|--prefix     - Sets the prefix path for installs to be installed to
+       --bin        - Specify path for binaries to be placed
+       --source     - Specify src directory to use
+       --archive    - Specify archive directory to use (tabralls / zips)
+    -G|--gems       - Specify root gem path to use
+    -C|--configure  - Specify custom configure options, comma separated
+                      default: --enable-shared=true
+    --re-configure  - Force installer to re-run configure if already run
+    -M|--make       - Specify a custom make command
+    -I|--make-install - "     a custom make install command
+
+    -f|--file       - Specify a ruby file to run with 'rubydo' command
+    -h|--help       - Emit this output and exit
+    -d|--default    - Set the default Ruby to a specified version
+    -m|--gem-set    - Use a named gem set instead of the default set.
+    -S|--script     - Specify a script file to attempt to load and run (rubydo)
+    --all           - Used with 'rvm list' to list "most" installable versions.
+    --rm-gem-set    - Remove a named gem set
+    --jit           - Enable JIT for the Rubinius build
+    --force         - Force install, removes old install & source directories.
+    --set-prompt    - Set prompt to have the selected ruby prepended.
+    --debug|--trace - Toggle debug mode on for very verbose output.
+
+  Resources:
+
+    http://rvm.beginrescueend.com/
+    https://www.pivotaltracker.com/projects/26822
+
+Usage
+
+}
+
 function __rvm_parse-args {
   while [ $# -gt 0 ] ; do
     rvm_token="$1" ; shift
@@ -25,13 +125,8 @@ function __rvm_parse-args {
       gemdir)
         rvm_action=$rvm_token
 
-        if [ "$1" = "system" ] ; then
-          rvm_ruby_interpreter="system" ; shift
-        fi
-
-        if [ "$1" = "user" ] ; then
-          rvm_ruby_interpreter="user"  ; shift
-        fi
+        if [ "$1" = "system" ] ; then rvm_ruby_interpreter="system" ; shift ; fi
+        if [ "$1" = "user" ]   ; then rvm_ruby_interpreter="user"   ; shift ; fi
 
         rvm_ruby_interpreter="${rvm_ruby_interpreter:-current}"
       ;;
@@ -300,3 +395,4 @@ function rvm {
   return $status
 }
 
+

data/scripts/rvm-install

@@ -154,7 +154,7 @@ if [ "$system" = "Linux" ] ; then
     echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
     echo -e "\033[0;32m <i> \033[0mThe SUN java runtime environment and development kit."
   fi
-elif [ "$sytem" = "Darwin" ] ; then
+elif [ "$system" = "Darwin" ] ; then
   echo -e "\033[0;32m <i> \033[0mBe sure that you have XCode Tools installed in order to use rvm."
   echo -e "\033[0;32m <i> \033[0mIf you intend on installing MacRuby you must install LLVM first."
 fi

data/scripts/rvm-ruby-installer

@@ -20,11 +20,11 @@ function __rvm_install-source {
       rvm_url="${rvm_url:-"ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_name.tar.gz"}"
       __rvm_log "info" "\tDownloading $rvm_ruby_package_name, this may take a while depending on your connection..."
       __rvm_fetch $rvm_url
-      if [ $status -eq 0 ] ; then status=$? ; fi
+      if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
       __rvm_log "info" "\tExtracting $rvm_ruby_package_name ..."
       mkdir -p $rvm_ruby_src_path # Is this line necessary considering -C below?    v
       __rvm_run "extract" tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path
-      if [ $status -eq 0 ] ; then status=$? ; fi
+      if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
     fi
   else
     __rvm_log "info" "\tRetrieving Ruby from $rvm_url"
@@ -33,14 +33,14 @@ function __rvm_install-source {
         cd $rvm_ruby_src_path
         if [ -z "$rvm_ruby_rev" ] ; then
           git pull origin master
-          if [ $status -eq 0 ] ; then status=$? ; fi
+          if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
         else
           git checkout ${rvm_ruby_rev:-HEAD}
-          if [ $status -eq 0 ] ; then status=$? ; fi
+          if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
         fi
       else
         git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path
-        if [ $status -eq 0 ] ; then status=$? ; fi
+        if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
       fi
     else
       if [ -z "$rvm_ruby_rev" ] ; then
@@ -67,30 +67,35 @@ function __rvm_install-source {
       else
         svn checkout -q $rvm_rev --force $rvm_url $rvm_ruby_src_path
       fi
-      if [ $status -eq 0 ] ; then status=$? ; fi
+      if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
     fi
   fi
 
   cd $rvm_ruby_src_path
-  if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return 1 ; fi
+  if [ $? -gt 0 ] ; then status=$? ; __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return $status ; fi
+
+  # Readline
+  if [ ! -d $rvm_path/usr/include/readline ] ; then __rvm_readline_install ; fi
 
   if [ ! -s "$rvm_ruby_src_path/configure" -a "$rvm_ruby_interpreter" = "ruby" ] ; then
     rvm_autoconf=`which autoconf`
-    if [ $? -ne 0 ] ; then __rvm_log "fail" "rvm expects autoconf" ; fi
+    if [ $? -gt 0 ] ; then __rvm_log "fail" "rvm expects autoconf" ; status=$? ; return $status ; fi
     __rvm_run "autoconf" $rvm_autoconf
-    if [ $status -eq 0 ] ; then status=$? ; fi
+    if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
   fi
 
-  if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return 1 ; fi
-
   if [ -s ./Makefile -a -z "$rvm_re_configure" ] ; then
     __rvm_log "warn" "\tSkipping configure step, Makefile exists so configure must have already been run."
   elif [ -s ./configure ] ; then
     __rvm_log "info" "\tConfiguring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
-    __rvm_run "configure" ./configure --prefix=$rvm_ruby_home $rvm_ruby_configure
-    if [ $status -eq 0 ] ; then status=$? ; fi
+    if [ -d $rvm_path/usr/include/readline/ ] ; then
+      __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure --with-readline-dir=$rvm_path/usr/include/readline/"
+    else
+      __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure"
+    fi
+    if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
   else
-    __rvm_log "warn" "\tSkipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
+    __rvm_log "error" "\tSkipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
   fi
 
   __rvm_log "info" "\tCompiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
@@ -99,7 +104,7 @@ function __rvm_install-source {
   else
     __rvm_run "make" $rvm_ruby_make
   fi
-  if [ $status -eq 0 ] ; then status=$? ; fi
+  if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
 
   if [ -z "$rvm_ruby_make" ] ; then
     __rvm_log "info" "\tInstalling $rvm_ruby_package_name"
@@ -107,24 +112,17 @@ function __rvm_install-source {
   else
     __rvm_run "install" $rvm_ruby_make_install
   fi
-  if [ $status -eq 0 ] ; then status=$? ; fi
-  __rvm_run "chmod.bin" chmod +x $rvm_ruby_home/bin/*
+  if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
 
+  __rvm_run "chmod.bin" chmod +x $rvm_ruby_home/bin/*
   __rvm_bin_script
   __rvm_log "info" "Installation of $rvm_ruby_package_name is complete."
 
   GEM_HOME="$rvm_gem_home" ; export GEM_HOME
   GEM_PATH="$rvm_gem_home" ; export GEM_PATH
 
-  echo $rvm_ruby_vesion | grep '^1\.9' > /dev/null
-  if [ $? -gt 0 ] ; then
-    __rvm_rubygems_install
-    if [ $status -eq 0 ] ; then status=$? ; fi
-  else
-    mv $rvm_ruby_src_path/bin/gem $rvm_ruby_src_path/bin/gem.orig
-    cat $rvm_ruby_src_path/bin/gem.orig | sed -e "s=!# */usr/bin/env ruby=!#/usr/bin/$rvm_ruby_home/bin/ruby=" > $rvm_ruby_src_path/bin/gem
-    chmod +x $rvm_ruby_home/bin/gem
-  fi
+  __rvm_rubygems_setup
+
   popd > /dev/null
 
   __rvm_post_install
@@ -195,23 +193,8 @@ function __rvm_install-ruby {
       chmod +x $rvm_ruby_home/bin/*
 
       __rvm_bin_script
+      __rvm_rubygems_setup
 
-      __rvm_log "info" "\tInstalling rubygems dedicated to $rvm_ruby_package_name..."
-      rvm_gem_package_name="rubygems-1.3.5"
-      rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
-      if [ -d $rvm_source_path/$rvm_gem_package_name ]  ; then
-        cd $rvm_source_path/$rvm_gem_package_name
-      else
-        __rvm_fetch $rvm_gem_url
-        mkdir -p $rvm_source_path/$rvm_gem_package_name
-      __rvm_run "extract" tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_source_path
-      fi
-      # Well this is fun... fix nil error on require_paths:
-      sed -i.orig "s/require_paths\.join/require_paths.to_a.join/" $rvm_source_path/$rvm_gem_package_name/lib/rubygems/gem_path_searcher.rb > $rvm_ruby_log_path/rubygems.install.log 2> $rvm_ruby_log_path/rubygems.install.error.log
-      rm -f $rvm_source_path/$rvm_gem_package_name/lib/rubygems/gem_path_searcher.rb.orig
-
-      __rvm_run "rubygems.install" $rvm_ruby_home/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb
-      __rvm_log "info" "Installation of $rvm_ruby_package_name complete."
       popd > /dev/null
 
       for rvm_gem_name in rake ; do
@@ -295,7 +278,7 @@ function __rvm_install-ruby {
     ;;
 
     ruby)
-      if [ -z "rvm_ruby_configure" ] ; then rvm_ruby_configure="--enable-shared=true" ; fi
+      if [ -z "rvm_ruby_configure" ] ; then rvm_ruby_configure="--enable-shared=true --enable-pthread=true " ; fi
       __rvm_install-source $*
     ;;
 
@@ -377,25 +360,37 @@ function __rvm_post_install {
   unset binary
 }
 
-function __rvm_rubygems_install {
-  __rvm_log "info" "\tInstalling rubygems dedicated to $rvm_ruby_package_name..."
-  rvm_gem_package_name="rubygems-1.3.5"
-  rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
-  if [ -d $rvm_source_path/$rvm_gem_package_name ]  ; then
-    cd $rvm_source_path/$rvm_gem_package_name
+function __rvm_rubygems_setup {
+
+  if [ "`echo $rvm_ruby_version | awk '{print substr($1, 0, 3)}'`" != "1.9" ] ; then
+    __rvm_log "info" "\tInstalling rubygems dedicated to $rvm_ruby_package_name..."
+    rvm_gem_package_name="rubygems-1.3.5"
+    rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
+    if [ -d $rvm_source_path/$rvm_gem_package_name ]  ; then
+      cd $rvm_source_path/$rvm_gem_package_name
+    else
+      __rvm_fetch $rvm_gem_url
+      mkdir -p $rvm_source_path/$rvm_gem_package_name
+      __rvm_run "rubygems.extract" tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_source_path
+    fi
+    # Well this is fun... fix nil error on require_paths:
+    # Q: Is this necessary any longer?
+    #sed -i.orig "s/require_paths\.join/require_paths.to_a.join/" $rvm_source_path/$rvm_gem_package_name/lib/rubygems/gem_path_searcher.rb
+    #rm -f $rvm_source_path/$rvm_gem_package_name/lib/rubygems/gem_path_searcher.rb.orig
+    __rvm_run "rubygems.install" GEM_HOME=$rvm_gem_path GEM_HOME=$rvm_gem_home $rvm_ruby_home/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb
+    status=$?
+    if [ $status -eq 0 ] ; then
+      __rvm_log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
+    fi
+    if [ $status -eq 0 ] ; then status=$? ; fi
   else
-    __rvm_fetch $rvm_gem_url
-    mkdir -p $rvm_source_path/$rvm_gem_package_name
-    __rvm_run "rubygems.extract" tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_source_path
-  fi
-  # Well this is fun... fix nil error on require_paths:
-  sed -i.orig "s/require_paths\.join/require_paths.to_a.join/" $rvm_source_path/$rvm_gem_package_name/lib/rubygems/gem_path_searcher.rb
-  rm -f $rvm_source_path/$rvm_gem_package_name/lib/rubygems/gem_path_searcher.rb.orig
-  __rvm_run "rubygems.install" GEM_HOME=$rvm_gem_home $rvm_ruby_home/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb
-  status=$?
-  if [ $status -eq 0 ] ; then
-    __rvm_log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
+    # 1.9 has it's own built gem command, let's adjust the shebang line.
+    mv $rvm_ruby_src_path/bin/gem $rvm_ruby_src_path/bin/gem.orig
+    cat $rvm_ruby_src_path/bin/gem.orig | sed -e "s=!# */usr/bin/env ruby=!#/usr/bin/$rvm_ruby_home/bin/ruby=" > $rvm_ruby_src_path/bin/gem
+    chmod +x $rvm_ruby_home/bin/gem
+    __rvm_run "rubygems.update" $rvm_ruby_home/bin/gem update --system
   fi
+
   return $status
 }
 

data/scripts/rvm-selector

@@ -77,8 +77,8 @@ function __rvm_select {
       fi
     ;;
 
-    default|system|current)
-      #noop?
+    default|system|current|user)
+      #no-op?
     ;;
     *)
       __rvm_log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
@@ -116,6 +116,9 @@ function __rvm_select {
       rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version"}"
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"}"
     else
+      if [ "`echo $rvm_ruby_patch_level | awk '{print substr($1, 0, 1)}'`" != "p" ] ; then
+        rvm_ruby_patch_level="p$rvm_ruby_patch_level"
+      fi
       rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
     fi
@@ -145,21 +148,29 @@ function __rvm_use {
       source $rvm_path/default
     else
       __rvm_log "error" "no default rvm specified, defaulting to pre-rvm sytem."
-      unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
+      unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
       PATH="$rvm_system_path" ; export PATH
       if [ -s $rvm_path/system ] ; then source $rvm_path/system ; fi
     fi
 
   elif [ "$rvm_ruby_interpreter" = "system" ] ; then
 
-    unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
+    unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
     PATH="$rvm_system_path" ; export PATH
-    if [ -s $rvm_path/system ] ; then source $rvm_path/system ; fi
+    if [ -s $rvm_path/system ] ; then
+      grep "^MY_RUBY_HOME='$rvm_path" "$rvm_path/system" > /dev/null
+      if [ $? -eq 0 ] ; then
+        rm -f $rvm_path/system # 'system' should *not* point to an rvm ruby.
+      else
+        source $rvm_path/system
+      fi
+    fi
 
   else
     GEM_HOME=$rvm_gem_home ; export GEM_HOME
     GEM_PATH=$rvm_gem_home ; export GEM_PATH
     MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
+    RUBY_VERSION=$rvm_ruby_package_name ; export RUBY_VERSION
     IRBRC="$rvm_ruby_irbrc" ; export IRBRC
     if [ -z "$IRBRC" ] ; then unset IRBRC ; fi
 
@@ -195,6 +206,19 @@ function __rvm_use {
           echo "unset ${variable}" >> $rvm_path/default
         fi
       done
+
+      if [ -s $rvm_path/bin/$rvm_ruby_package_name ] ; then
+        ln -fs $rvm_path/bin/$rvm_ruby_package_name $rvm_path/bin/ruby
+        ln -fs $rvm_path/bin/$rvm_ruby_package_name $rvm_path/bin/default-ruby # So that people know what it's for :)
+        ln -fs $rvm_path/bin/gem-$rvm_ruby_package_name $rvm_path/bin/gem
+        ln -fs $rvm_path/bin/irb-$rvm_ruby_package_name $rvm_path/bin/irb
+      else
+        rm -f $rvm_path/bin/ruby
+        rm -f $rvm_path/bin/default-ruby
+        rm -f $rvm_path/bin/gem
+        rm -f $rvm_path/bin/irb
+      fi
+
       unset rvm_set_default
     fi
   fi

data/scripts/rvm-update

@@ -154,7 +154,7 @@ if [ "$system" = "Linux" ] ; then
     echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
     echo -e "\033[0;32m <i> \033[0mThe SUN java runtime environment and development kit."
   fi
-elif [ "$sytem" = "Darwin" ] ; then
+elif [ "$system" = "Darwin" ] ; then
   echo -e "\033[0;32m <i> \033[0mBe sure that you have XCode Tools installed in order to use rvm."
   echo -e "\033[0;32m <i> \033[0mIf you intend on installing MacRuby you must install LLVM first."
 fi

data/scripts/rvm-utility

@@ -1,105 +1,5 @@
 #!/bin/bash
 
-function __rvm_meta {
-  rvm_meta_author="Wayne E. Seguin"
-  rvm_meta_author_email="wayneeseguin@gmail.com"
-  rvm_meta_website="http://rvm.beginrescueend.com/"
-  rvm_meta_version="`cat $rvm_path/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
-  rvm_meta_updated="2009.09.14"
-}
-
-function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
-
-function __rvm_usage {
-
-  __rvm_meta
-
-  cat <<-Usage
-
-  rvm ${rvm_meta_version} ${rvm_meta_website} by ${rvm_meta_author} (${rvm_meta_author_email})
-
-  Usage:
-
-    rvm Action [Implementation] [Options]
-
-  Action:
-
-    * usage   - Show this usage information
-    use       - Switch to using a specific ruby version (new login shell)
-    info      - Show information for current ruby
-    list      - Show currently installed versions
-    gemdir    - Switch to gem directory for installation (new login shell)
-    srcdir    - Switch to src directory for the current ruby installation
-    gemdup    - Clone source version gems to current version
-                (highly expiramental) Example: rvm gemdup ~/.gem/ruby/1.8/
-    install   - Install a ruby version, default is from source
-    uninstall - Uninstall a ruby version
-    reset     - Remove default and current settings, exit the shell.
-                (If you experience odd behavior try this first)
-    rubydo    - Used with -f to run a ruby file against specified or all rubies
-    gemdo     - Used with -f to execute a command using selected ruby's 'gem'
-    debug     - Emit environment & configuration information for *current* ruby
-
-    reload    - Reload rvm source itself (useful after changing rvm source)
-    implode   - Removes all ruby installations it manages, everything in ~/.rvm
-    update    - Upgrades rvm to the latest version.
-
-  Implementation:
-
-    * ruby    - MRI/YARV Ruby (The Standard), defaults to 1.8.6
-    jruby     - jRuby
-    rubinius  - Rubinius
-    ree       - Ruby Enterprise Edition
-    system    - Use the system ruby (eg. pre-rvm state)
-    default   - Use rvm set default ruby and system if it hasn't been set.
-
-  Options:
-
-    -v|--version    - Ruby Package Version, defaults to 'latest'
-    -l|--level      - Patch level for the specified Ruby version
-    -p|--prefix     - Package and source directory prefix, with trailing slash!
-                      Default is a users home directory and /usr/local/ for root
-    -a|--archives   - Directory to place downladed files into (~/.rvm/archives/)
-    -n|--nice       - Specify a process niceness (for slow computers, default 0)
-    -m|--gem-set    - Named gem set for switching between different gem sets
-    --rm-gem-set    - Removes a named gemset.
-
-    -l|--level      - Specify a patch level to use
-    -t|--tag        -
-    -r|--rev        - Specify the repository revision # to use or 'head' for
-
-    -P|--prefix     - Sets the prefix path for installs to be installed to
-       --bin        - Specify path for binaries to be placed
-       --source     - Specify src directory to use
-       --archive    - Specify archive directory to use (tabralls / zips)
-    -G|--gems       - Specify root gem path to use
-    -C|--configure  - Specify custom configure options, comma separated
-                      default: --enable-shared=true
-    --re-configure  - Force installer to re-run configure if already run
-    -M|--make       - Specify a custom make command
-    -I|--make-install - "     a custom make install command
-
-    -f|--file       - Specify a ruby file to run with 'rubydo' command
-    -h|--help       - Emit this output and exit
-    -d|--default    - Set the default Ruby to a specified version
-    -m|--gem-set    - Use a named gem set instead of the default set.
-    -S|--script     - Specify a script file to attempt to load and run (rubydo)
-    --all           - Used with 'rvm list' to list "most" installable versions.
-    --rm-gem-set    - Remove a named gem set
-    --jit           - Enable JIT for the Rubinius build
-    --force         - Force install, removes old install & source directories.
-    --set-prompt    - Set prompt to have the selected ruby prepended.
-    --debug|--trace - Toggle debug mode on for very verbose output.
-
-  Resources:
-
-    http://rvm.beginrescueend.com/
-    https://www.pivotaltracker.com/projects/26822
-
-Usage
-
-}
-
 function __rvm_info {
 cat <<Info
 
@@ -181,7 +81,7 @@ function __rvm_run {
   if [ $rvm_debug ] ; then __rvm_log "debug" "Executing: $command" ; fi
   touch $rvm_ruby_log_path/$log_file_name.log $rvm_ruby_log_path/$log_file_name.error.log # for zsh :(
   echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee $rvm_ruby_log_path/$log_file_name.log > $rvm_ruby_log_path/$log_file_name.error.log
-  if [ -z "$rvm_niceness" ] ; then
+  if [ -z "$rvm_niceness" -o "$rvm_niceness" = "0" ] ; then
     eval "$command" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
   else
     eval "nice -n $rvm_niceness /bin/bash -l -c '$command'" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
@@ -215,13 +115,12 @@ function __rvm_bin_script {
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 ruby_wrapper=$(cat <<RubyWrapper
 #!/bin/bash
-if [ "`whoami`" = "root" ] ; then
-  echo "rvm installed ruby binaries should *not* be run as the root user, yet: http://rvm.beginrescueend.com/faq/"
-fi
+
 GEM_HOME=$rvm_gem_home ; export GEM_HOME
 GEM_PATH=$rvm_gem_home ; export GEM_PATH
 MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
 PATH=$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH ; export PATH
+
 exec "$rvm_ruby_binary" "\$@"
 RubyWrapper
 )
@@ -234,9 +133,16 @@ function __rvm_fetch {
 
   pushd $rvm_archives_path > /dev/null
   eval $rvm_fetch "$1"
-  if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return 1 ; fi
+  status=$?
+  if [ $status -gt 0 ] ; then
+    if [ $status -eq 78 ] ; then
+      __rvm_log "error" "The requested url does not exist: '$1'"
+    else
+      __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
+    fi
+  fi
   popd 2> /dev/null
-
+  return $status
 }
 
 function __rvm_load-defaults {
@@ -333,9 +239,7 @@ function __rvm_implode {
 }
 
 function __rvm_gem-dir {
-
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
-
   mkdir -p $rvm_gem_home
   echo $rvm_gem_home
 }
@@ -509,8 +413,6 @@ function __rvm_initialize {
     rvm_fetch="$rvm_fetch -O -L -s --create-dirs -C - "
   fi
 
-  rvm_niceness=${rvm_niceness:-0}
-
   # TODO: Sanitize user input, ensure that there is a / a the end...
   if [ "`whoami`" = "root" ] ; then
     __rvm_log "fail" "root user support is not yet implemented."
@@ -555,8 +457,9 @@ function __rvm_update {
     __rvm_version
   fi
   __rvm_reload
-  if [ "$rvm_bin_flag" ] ; then __rvm_bin_scripts ; fi
-  if [ "$rvm_rubygems_flag" ] ; then __rvm_rubygems_install ; fi
+  __rvm_select
+  if [ "$rvm_bin_flag" ]      ; then __rvm_bin_scripts    ; fi
+  if [ "$rvm_rubygems_flag" ] ; then __rvm_rubygems_setup ; fi
 }
 
 function __rvm_update_rvm {
@@ -812,9 +715,17 @@ function __rvm_readline_install {
   version=5.2
   # TODO: Figure out how to list, grab and apply the patches
   __rvm_fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.tar.gz"
-  __rvm_run "extract" tar zxf $rvm_archives_path/$package-$version.tar.gz -C $rvm_path/src/
+  __rvm_run "$package.extract" tar zxf $rvm_archives_path/$package-$version.tar.gz -C $rvm_path/src/
   cd $rvm_path/src/$package-$version
-  __rvm_run "configure" ./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared
+  if [ "`uname`" = "Darwin" ] ; 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
+  else
+    __rvm_run "$package.configure" ./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared
+  fi
   __rvm_run "$package.make" make
   __rvm_run "$package.make.install" make install
   popd > /dev/null
@@ -834,4 +745,3 @@ function __rvm_iconv_install {
 
   popd > /dev/null
 }
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wayneeseguin-rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.38
+  version: 0.0.39
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-14 00:00:00 -07:00
+date: 2009-09-15 00:00:00 -07:00
 default_executable: rvm-install
 dependencies: []