rvm 0.1.38 → 0.1.39

data/README

@@ -12,7 +12,6 @@ Flags
   --trace       - Toggle trace mode on to see EVERYTHING rvm is doing.
   --force       - Force install, removes old install & source before install.
   --summary     - Used with rubydo to print out a summary of the commands run.
-  --jit         - Used with rubinius install to build with JIT
   --latest      - with gemset --dump skips version strings for latest gem.
   --gems        - with uninstall/remove removes gems with the interpreter.
   --docs        - with install, attempt to generate ri after installation.
@@ -29,10 +28,15 @@ Options
      --archives   - directory for downladed files (~/.rvm/archives/)
   -S              - Specify a script file to attempt to load and run (rubydo)
   -e              - Execute code from the command line.
-  -G|--gems       - root gem path to use
+  -G              - root gem path to use
+  --gems          - Used to set the 'gems_flag', use with 'remove' to remove gems
+  --archive       - Used to set the 'archive_flag', use with 'remove' to remove archive
   --patch         - With MRI Rubies you may specify one or more full paths to patches
                     for multiple, specify comma separated:
-                    --patch /.../.../a.patch,/.../.../.../b.patch
+                    --patch /.../.../a.patch[%prefix],/.../.../.../b.patch
+                    'prefix' is an optional argument, which will be bypassed
+                    to the '-p' argument of the 'patch' command. It is separated
+                    from patch file name with '%' symbol.
   -C|--configure  - custom configure options. If you need to pass several configure
                     options then append them comma separated: -C --...,--...,--...
   --nice          - process niceness (for slow computers, default 0)

data/binscripts/rvm-prompt

@@ -23,7 +23,8 @@ if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; the
       r|revision)     add "revision"     ;;
       a|architecture) add "architecture" ;;
       g|gemset)       add "gemset"       ;;
-      u|unicode)      unicode_flag=1     ;;
+      u|unicode)      add "unicode"      ;;
+      s|system)       add "system"       ;;
       *) echo "Unrecognized command line option '$token' for $0" ; exit 1 ;;
     esac
   done
@@ -37,11 +38,11 @@ if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; the
 
   ruby_string=$(dirname "$ruby" | xargs dirname | xargs basename)
 
-  if [[ ! -z "$interpreter_flag" ]] ; then
+  if [[ ! -z "$interpreter_flag" ]] || [[ ! -z "$unicode_flag" ]] ; then
     interpreter="$(echo $ruby_string | awk -F'-' '{print $1}')"
   fi
 
-  if [[ ! -z "$version_flag" ]] ; then
+  if [[ ! -z "$version_flag" ]] || [[ ! -z "$unicode_flag" ]] ; then
     version="$(echo $ruby_string | awk -F'-' '{print $2}')"
   fi
 
@@ -82,16 +83,19 @@ if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; the
     if [[ ! -z "$(echo $ruby_string | awk '/-head/')" ]] ; then
       unicode="${unicode}〠"
     fi
-    # TODO: Architecture
-    # TODO: gemset
-    echo $unicode
-  else
-    command="prompt=\"$format\""
-    eval "$command"
-    echo "$prompt" | sed -e 's#^\s*-*##g' -e 's#--*#-#g' -e 's#-*\s*$##' -e 's#-'${rvm_gemset_separator}'#'${rvm_gemset_separator}'#'
   fi
+  
+  command="prompt=\"$format\""
+  eval "$command"
+  echo "$prompt" | sed -e 's#^\s*-*##g' -e 's#--*#-#g' -e 's#-*\s*$##' -e 's#-'${rvm_gemset_separator}'#'${rvm_gemset_separator}'#'
+  
 else
-  echo "system"
+  while [[ $# -gt 0 ]] ; do
+    token="$1" ; shift
+    case "$token" in
+      s|system)      echo "system"     ;;
+    esac
+  done
 fi
 
 exit 0

data/config/db

@@ -24,28 +24,29 @@ rubygems_version=1.3.7
 rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
 rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
 rubygems_1.3.7_url=http://rubyforge.org/frs/download.php/70696
-rbx_version=1.0.0
+rbx_version=1.0.1
 rbx_1.0.0_patch_level=20100514
+rbx_1.0.1_patch_level=20100603
 rbx_url=http://asset.rubini.us
+rubinius_repo_url=git://github.com/evanphx/rubinius.git
 ree_version=1.8.7
 ree_configure_flags=--dont-install-useful-gems
 ree_1.8.6_patch_level=20090610
 ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
 ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
-ree_1.8.7_url=http://rubyforge.org/frs/download.php/68719
+ree_1.8.7_url=http://rubyforge.org/frs/download.php/71096
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
-ree_1.8.7_patch_level=2010.01
-jruby_version=1.5.0
+ree_1.8.7_patch_level=2010.02
+jruby_version=1.5.1
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.org.s3.amazonaws.com/downloads
 macruby_version=0.6
 macruby_url=http://www.macruby.org/files
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
-maglev_version=23530
+maglev_version=23577
 maglev_url=http://glass-downloads.gemstone.com/maglev
 maglev_repo_url=git://github.com/MagLev/maglev.git
-rubinius_repo_url=git://github.com/evanphx/rubinius.git
 shyouhei_repo_url=git://github.com/shyouhei/ruby.git
 ironruby_version=1.0
 ironruby_repo_url=git://github.com/ironruby/ironruby.git

data/config/known

@@ -15,21 +15,21 @@ ruby-head
 jruby-1.2.0
 jruby-1.3.1
 jruby-1.4.0
-jruby(-1.5.0) # the default
+jruby(-1.5.1)
 jruby-head
 
 # Rubinius
-rbx(-1.0.0) # default
+rbx(-1.0.1)
 rbx-head
 
 # Ruby Enterprise Edition
 ree-1.8.6
-ree(-1.8.7) # the default
+ree(-1.8.7)
 ree-1.8.6-head
 ree-1.8.7-head
 
 # MagLev
-maglev(-23530)
+maglev(-23577)
 maglev-head
 
 # Shyouhei head, the default mput

data/config/md5

@@ -2,6 +2,7 @@ rubinius-1.0.0-rc1-20091125.tar.gz=c1cf037f05caf1bc962c09e220b435f4
 rubinius-1.0.0-rc4-20100331.tar.gz=c631131cc9542c548b4fc3791d8aa6b2
 rubinius-1.0.0-rc5-20100510.tar.gz=d4fbb5b01aaeee3948cbe1cd38236524
 rubinius-1.0.0-20100514.tar.gz=b05f4e791d3712c5a50b3d210dac6eb0
+rubinius-1.0.1-20100603.tar.gz=eb185703c7ae0c0210e8dcb7f783ee8e
 ruby-1.8.5-p115.tar.gz=20ca6cc87eb077296806412feaac0356
 ruby-1.8.5-p231.tar.gz=e900cf225d55414bffe878f00a85807c
 ruby-1.8.6-p286.tar.gz=797ea136fe43e4286c9362ee4516674e
@@ -34,6 +35,7 @@ jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
 jruby-bin-1.5.0.RC1.tar.gz=47b4ca2a21659d36a2775ade0a2534c4
 jruby-bin-1.5.0.RC3.tar.gz=9c2758600de903b8ca07cb1341f4f1b3
 jruby-bin-1.5.0.tar.gz=ee2b4e326e8b87858e5dd0c8e94102e6
+jruby-bin-1.5.1.tar.gz=0196dcfb17354f12253eaddc1166a0ee
 libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
 ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
 openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
@@ -43,7 +45,7 @@ zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
 curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
 pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
 ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
-GemStone-23530.Darwin-i386.tar.gz=90f395d169693b5c4b5a37785e7a5c99
-GemStone-23530.Linux-x86_64.tar.gz=66366bf82d4a7ba66e430bccc722392c
-MagLev-23530.Darwin-i386.tar.gz=c051f512c62da9f4bd90ef5d4bc83eae
-MagLev-23530.Linux-x86_64.tar.gz=ae6be22534625777965ee3124c38b3aa
+GemStone-23577.Darwin-i386.tar.gz=dd6a758a3f7a3f89bbc2c660d6251d76
+GemStone-23577.Linux-x86_64.tar.gz=d72f05f5b54655262b9268beef3093ae
+MagLev-23577.Darwin-i386.tar.gz=13decfc60cc4489876f246d24a108257
+MagLev-23577.Linux-x86_64.tar.gz=664fb4c82bb878118e0b9b150c49c06a

data/help/alias

@@ -1,6 +1,6 @@
 Alias
 
-  RVM allows you to alias you rubies for your convience and pleasure.
+  RVM allows you to alias your rubies for your convenience and pleasure.
 
 Usage
   rvm [options] alias source destination
@@ -12,9 +12,9 @@ Usage
 
 Creating Aliases
 
-  First select a RVM ruby.
+  First select an RVM ruby.
 
-    ∴ rvm alias create ree-1.8.7-p2010.01 php
+    ∴ rvm alias create php ree-1.8.7-p2010.01
 
 Using Aliases
 

data/help/fetch

@@ -1,5 +1,5 @@
 Fetch
 
-Documentation:
-  TODO: For now see:
-  http://rvm.beginrescueend.com/rubies/installing/
+  Performs an archive / src fetch of the current selected ruby.
+
+Usage: ∴ rvm fetch

data/install

@@ -79,7 +79,13 @@ source_path="${source_path:-$cwd}"
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
-rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+
+if [[ "root" = "$(whoami)" ]] ; then
+  rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
+else
+  rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+fi
+
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 38
+:patch: 39

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.38"
+  s.version = "0.1.39"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-06-03}
+  s.date = %q{2010-06-18}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -95,6 +95,7 @@ Gem::Specification.new do |s|
      "scripts/monitor",
      "scripts/notes",
      "scripts/package",
+     "scripts/rubygems",
      "scripts/rvm",
      "scripts/rvm-install",
      "scripts/selector",

data/scripts/alias

@@ -10,6 +10,23 @@ source $rvm_scripts_path/initialize
 source $rvm_scripts_path/utility
 source $rvm_scripts_path/selector
 
+alias_conflicts_with_ruby() {
+  # Open for suggestions to a better way of doing this...
+  alias_check_result="$(
+    . $rvm_scripts_path/initialize
+    . $rvm_scripts_path/selector
+    export rvm_ruby_string="$1"
+    __rvm_ruby_string > /dev/null 2>&1
+    echo "$?"
+  )"
+  if [[ "0" == "$alias_check_result" ]]; then
+    $rvm_scripts_path/log "error" "You are attempted to create an alias called '$1', which is recognized as a rvm ruby."
+    return 0
+  fi
+  return 1
+  unset alias_check_result
+}
+
 show_alias() {
   if [[ -z "$alias_name" ]]; then
     $rvm_scripts_path/log "error" "usage: 'rvm alias show [alias_name]'"
@@ -36,6 +53,10 @@ delete_alias() {
 }
 
 create_alias() {
+  if alias_conflicts_with_ruby "$alias_name"; then
+    # Force it to an empty alias name to trigger the usage.
+    alias_name=""
+  fi
   if [[ -z "$rvm_environment_identifier" ]] || [[ -z "$alias_name" ]] ; then
     $rvm_scripts_path/log "error" "usage: 'rvm alias [alias_name] [ruby_string]'"
     result=1

data/scripts/cli

@@ -4,7 +4,10 @@ __rvm_usage() { cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less} ; }
 
 __rvm_parse_args() {
 
-  echo "$@" >> $HOME/.rvm_history
+  # TODO:
+  #       Make this more robust '__rvm_history' so that it stores *unique* rvm commands.
+  #       Otherwise this file gets big rather fast.
+  #echo "$@" >> $HOME/.rvm_history
 
   if echo "$@" | grep -q 'trace' ; then echo "$@" ; __rvm_version ; fi
 
@@ -34,12 +37,6 @@ __rvm_parse_args() {
         rvm_action=$rvm_token
       ;;
 
-      inspect)
-        rvm_action=$rvm_token
-        rvm_ruby_args="$@"
-        rvm_parse_break=1
-      ;;
-
       install|uninstall)
         export ${rvm_token}_flag=1
         rvm_action=$rvm_token
@@ -106,7 +103,7 @@ __rvm_parse_args() {
         if [[ "user" = "$1"  ]]   ; then rvm_user_flag=1  ;  shift ; fi
       ;;
 
-      list|info|alias|docs)
+      rubygems|inspect|list|info|alias|docs)
         rvm_action="$rvm_token"
         rvm_ruby_args="$@"
         rvm_parse_break=1
@@ -124,6 +121,12 @@ __rvm_parse_args() {
         rvm_parse_break=1
       ;;
 
+      exec)
+        rvm_action="exec";
+        rvm_ruby_args="$(__rvm_quote_args "$@")"
+        rvm_parse_break=1
+      ;;
+
       do|ruby|rake|gem|rubydo|rakedo|gemdo)
         if [[ "do" = "$rvm_action" ]] ; then rvm_action="ruby" ; fi
         rvm_action=$(echo $rvm_token | sed 's#do##g')
@@ -225,26 +228,6 @@ __rvm_parse_args() {
         fi
         ;;
 
-      -j)
-        if [[ ! -z "$1" ]] ; then
-          rvm_make_flags="$rvm_make_flags -j$1"
-          shift
-        else
-          rvm_action="error"
-          rvm_error_message="-j *must* be followed by an integer (normally the # of CPU's in your machine)."
-        fi
-      ;;
-
-      -C|--configure)
-        if [[ ! -z "$1" ]] ; then
-          rvm_ruby_configure_flags="$(echo $1 | tr ',' ' ')"
-          shift
-        else
-          rvm_action="error"
-          rvm_error_message="--configure *must* be followed by configure flags."
-        fi
-      ;;
-
       -r|--require)
         if [[ -z "$1" ]] ; then
           rvm_action="error"
@@ -255,16 +238,6 @@ __rvm_parse_args() {
         fi
       ;;
 
-      -I|--include)
-        if [[ -z "$1" ]] ; then
-          rvm_action="error"
-          rvm_error_message="-I|--include *must* be followed by a path."
-        else
-          rvm_ruby_load_path="$rvm_ruby_load_path:$1"
-          shift
-        fi
-      ;;
-
       --rdoc|--yard)
         rvm_docs_type="$rvm_token"
         rvm_docs_type
@@ -307,14 +280,16 @@ __rvm_parse_args() {
 
       wrapper)
         rvm_action="$rvm_token"
-        rvm_ruby_string="$1" ; shift
-        rvm_wrapper_name="$1" ; shift
+        rvm_ruby_string="$1" ;
+        [[ -n "$1" ]] && shift
+        rvm_wrapper_name="$1"
+        [[ -n "$1" ]] && shift
         rvm_ruby_args="$@" # list of binaries, or none
         rvm_parse_break=1
       ;;
 
       -h|--help|usage)      rvm_action=help                     ;;
-      -G|--gems)            rvm_gems_path="$1"         ; shift  ;;
+      -G)                   rvm_gems_path="$1"         ; shift  ;;
       --source)             rvm_src_path="$1"          ; shift  ;;
       --archives)           rvm_archives_path="$1"     ; shift  ;;
       --make)               rvm_ruby_make="$1"         ; shift  ;;
@@ -339,10 +314,54 @@ __rvm_parse_args() {
 
       --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--sticky|--create|--rvmrc|--gems|--docs)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
-        if [[ "--debug" = "$rvm_token" ]] ; then rvm_debug_flag ; fi
+      ;;
+
+      -j)
+        if [[ ! -z "$1" ]] ; then
+          rvm_make_flags="$rvm_make_flags -j$1"
+          shift
+        else
+          rvm_action="error"
+          rvm_error_message="-j *must* be followed by an integer (normally the # of CPU's in your machine)."
+        fi
+      ;;
+
+      -C|--configure)
+        if [[ ! -z "$1" ]] ; then
+          rvm_ruby_configure_flags="$(echo $1 | tr ',' ' ')"
+          shift
+        else
+          rvm_action="error"
+          rvm_error_message="--configure *must* be followed by configure flags."
+        fi
+      ;;
+
+      --with-*)
+        rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token"
+      ;;
+      --without-*)
+        rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token"
+      ;;
+      --enable-*)
+        rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token"
+      ;;
+      --disable-*)
+        rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token"
+      ;;
+
+
+      -I|--include)
+        if [[ -z "$1" ]] ; then
+          rvm_action="error"
+          rvm_error_message="-I|--include *must* be followed by a path."
+        else
+          rvm_ruby_load_path="$rvm_ruby_load_path:$1"
+          shift
+        fi
       ;;
 
       --) rvm_ruby_args="$*" ; rvm_parse_break=1                ;;
+
       *)
         if [[ ! -z "$rvm_token" ]] ; then
           if [[ "gemset" = "$rvm_action" ]] ; then
@@ -413,7 +432,7 @@ __rvm_parse_args() {
 rvm() {
   __rvm_setup
 
-  if [[ ! -z "$PS1" ]] ; then export rvm_interactive=1 ; else unset rvm_interactive ; fi
+  if [[ -n "$PS1" ]] ; then export rvm_interactive=1 ; else unset rvm_interactive ; fi
 
   if [[ -z "$ZSH_VERSION" ]] ; then
     trap 'rm -rf "$rvm_tmp_path/$$" >/dev/null 2>&1' 0 1 2 3 15
@@ -460,9 +479,10 @@ rvm() {
       fi
       result=$?
     ;;
-    docs)            $rvm_scripts_path/docs  $rvm_ruby_args ; result=$? ;;
-    alias)           $rvm_scripts_path/alias $rvm_ruby_args ; result=$? ;;
-    help)            $rvm_scripts_path/help  $rvm_ruby_args ; result=$? ;;
+    docs)            $rvm_scripts_path/docs     $rvm_ruby_args ; result=$? ;;
+    alias)           $rvm_scripts_path/alias    $rvm_ruby_args ; result=$? ;;
+    help)            $rvm_scripts_path/help     $rvm_ruby_args ; result=$? ;;
+    rubygems)        $rvm_scripts_path/rubygems $rvm_ruby_args ; result=$? ;;
 
     answer) __rvm_Answer_to_the_Ultimate_Question_of_Life_the_Universe_and_Everything ; result=42 ;;
     question) __rvm_ultimate_question ; result=42 ;;
@@ -483,15 +503,15 @@ rvm() {
       result=$?
     ;;
 
-    ruby|gem|rake)
+    ruby|gem|rake|exec)
       old_rvm_ruby_string=$rvm_ruby_string
       unset rvm_ruby_string
       export rvm_ruby_strings
       $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+      result=$?
       # Restore the state pre-sets.
       [[ -n "$old_rvm_ruby_string" ]] && rvm_ruby_string=$old_rvm_ruby_string
       unset old_rvm_ruby_string
-      result=$?
     ;;
 
     gemset)