rvm 0.0.65 → 0.0.66

data/README

@@ -1,4 +1,87 @@
-For detailed information on rvm, please see:
+
+Usage
+
+  rvm Action [Implementation] [Flags] [Options]
+
+Action
+
+  * usage   - show this usage information
+  use       - setup current shell to use a specific ruby version
+  info      - show information for current ruby
+  list      - show currently installed versions
+  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.
+  reset     - remove default and current settings, exit the shell.
+              (If you experience odd behavior try this first)
+  debug     - emit environment & configuration information for *current* ruby
+
+  install   - install one or many ruby versions
+  uninstall - uninstall one or many ruby versions, leaves their sources
+  remove    - uninstall one or many ruby versions and remove their sources
+
+  ruby      - runs a named ruby file against specified and/or all rubies
+  gem       - runs a gem command using selected ruby's 'gem'
+  rake      - runs a rake task against specified and/or all rubies
+  tests     - runs 'rake test' across selected ruby versions
+  specs     - runs 'rake spec' across selected ruby versions
+
+  gemsync   - sync gems from a specified version to current version
+  gemdir    - switch to gem directory for installation (new login shell)
+  srcdir    - switch to src directory for the current ruby installation
+
+Implementation
+
+  * ruby    - MRI/YARV Ruby (The Standard), defaults to 1.8.6
+  jruby     - jRuby
+  rbx       - rubinius
+  ree       - ruby Enterprise Edition
+  mput      - shyouhei(mput)'s github repository
+  system    - use the system ruby (eg. pre-rvm state)
+  default   - use rvm set default ruby and system if it hasn't been set.
+
+Flags
+
+  --self        - with update, updates rvm itself
+  --rubygems    - with update, updates rubygems for selected ruby
+  --default     - with ruby select, sets a default ruby for new shells.
+  --debug       - Toggle debug mode on for very verbose output.
+  --force       - Force install, removes old install & source before install.
+  --all         - Used with 'rvm list' to display 'most' available versions.
+  --dump        - Used with gemset to dump the current ruby's gemset.
+  --load        - Used with gemset to load a specified gemset file
+  --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.
+  --reconfigure - Force ./configure on install even if Makefile already exists.
+
+Options
+
+  -v|--version    - Emit rvm version loaded for current shell
+  -h|--help       - Emit this output and exit
+  -l|--level      - patch level to use with rvm use / install
+     --tag        - subersion tag to use
+     --rev        - repository revision # to use or 'head' for
+
+     --prefix     - path for all rvm files (~/.rvm/), with trailing slash!
+     --bin        - path for binaries to be placed (~/.rvm/bin/)
+     --source     - src directory to use (~/.rvm/src/)
+     --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
+  -C|--configure  - custom configure options, comma separated
+                    default: --enable-shared=true
+  --reconfigure   - Force installer to re-run configure if already run
+  --make          - custom make command
+  --make-install  - custom make install command
+  --nice          - process niceness (for slow computers, default 0)
+  -m|--gem-set    - use a named gem set, instead of the default set.
+  --rm-gem-set    - Remove a named gem set
+  --ree-options   - Options passed directly to ree's './installer' on the command line.
+
+Resources:
 
   http://rvm.beginrescueend.com/
+  https://www.pivotaltracker.com/projects/26822
 

data/install

@@ -32,6 +32,8 @@ for file_name in rvm-prompt gemsync ; do
   chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
+cp -f $source_dir/README $rvm_path/
+
 if [[ -z "$rvm_loaded_flag" ]] ; then
   for rcfile in .bash_profile .bashrc .zshrc ; do
     if [[ ! -e ~/$rcfile ]] ; then touch ~/$rcfile ; fi

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 65
+:patch: 66

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.65"
+  s.version = "0.0.66"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-10-28}
+  s.date = %q{2009-10-29}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -35,6 +35,8 @@ Gem::Specification.new do |s|
      "scripts/gems",
      "scripts/gemsync",
      "scripts/install",
+     "scripts/irbrc",
+     "scripts/irbrc.rb",
      "scripts/ruby-installer",
      "scripts/rvm",
      "scripts/rvm-install",

data/scripts/cli

@@ -9,99 +9,7 @@ function __rvm_meta {
 
 function __rvm_version { __rvm_meta ; echo "rvm ${rvm_meta_version} by ${rvm_meta_author} (${rvm_meta_author_email}) [${rvm_meta_website}]" ; }
 
-function __rvm_usage {
-
-  echo -e "
-  $(__rvm_version)
-
-Usage
-
-  rvm Action [Implementation] [Flags] [Options]
-
-Action
-
-  * usage   - show this usage information
-  use       - setup current shell to use a specific ruby version
-  info      - show information for current ruby
-  list      - show currently installed versions
-  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.
-  reset     - remove default and current settings, exit the shell.
-              (If you experience odd behavior try this first)
-  debug     - emit environment & configuration information for *current* ruby
-
-  install   - install one or many ruby versions
-  uninstall - uninstall one or many ruby versions, leaves their sources
-  remove    - uninstall one or many ruby versions and remove their sources
-
-  ruby      - runs a named ruby file against specified and/or all rubies
-  gem       - runs a gem command using selected ruby's 'gem'
-  rake      - runs a rake task against specified and/or all rubies
-  tests     - runs 'rake test' across selected ruby versions
-  specs     - runs 'rake spec' across selected ruby versions
-
-  gemsync   - sync gems from a specified version to current version
-  gemdir    - switch to gem directory for installation (new login shell)
-  srcdir    - switch to src directory for the current ruby installation
-
-Implementation
-
-  * ruby    - MRI/YARV Ruby (The Standard), defaults to 1.8.6
-  jruby     - jRuby
-  rbx       - rubinius
-  ree       - ruby Enterprise Edition
-  mput      - shyouhei(mput)'s github repository
-  system    - use the system ruby (eg. pre-rvm state)
-  default   - use rvm set default ruby and system if it hasn't been set.
-
-Flags
-
-  --self        - with update, updates rvm itself
-  --rubygems    - with update, updates rubygems for selected ruby
-  --default     - with ruby select, sets a default ruby for new shells.
-  --debug       - Toggle debug mode on for very verbose output.
-  --force       - Force install, removes old install & source before install.
-  --all         - Used with 'rvm list' to display 'most' available versions.
-  --dump        - Used with gemset to dump the current ruby's gemset.
-  --load        - Used with gemset to load a specified gemset file
-  --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.
-  --reconfigure - Force ./configure on install even if Makefile already exists.
-
-Options
-
-  -v|--version    - Emit rvm version loaded for current shell
-  -h|--help       - Emit this output and exit
-  -l|--level      - patch level to use with rvm use / install
-     --tag        - subersion tag to use
-     --rev        - repository revision # to use or 'head' for
-
-     --prefix     - path for all rvm files (~/.rvm/), with trailing slash!
-     --bin        - path for binaries to be placed (~/.rvm/bin/)
-     --source     - src directory to use (~/.rvm/src/)
-     --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
-  -C|--configure  - custom configure options, comma separated
-                    default: --enable-shared=true
-  --reconfigure   - Force installer to re-run configure if already run
-  --make          - custom make command
-  --make-install  - custom make install command
-  --nice          - process niceness (for slow computers, default 0)
-  -m|--gem-set    - use a named gem set, instead of the default set.
-  --rm-gem-set    - Remove a named gem set
-  --ree-options   - Options passed directly to ree's './installer' on the command line.
-
-Resources:
-
-  http://rvm.beginrescueend.com/
-  https://www.pivotaltracker.com/projects/26822
-
-" | ${PAGER:-less}
-}
+function __rvm_usage { cat "$rvm_path/README" | ${PAGER:-less} ; }
 
 function __rvm_parse_args {
   while [[ $# -gt 0 ]] ; do

data/scripts/gems

@@ -148,11 +148,14 @@ __rvm_gems_load() {
     fi
   fi
 
+  mkdir -p "$rvm_gem_path/cache"
+
   if [[ -f "$rvm_file_name" ]] ; then
     echo "Loading $rvm_file_name file..."
     rvm_ruby_gem_list=$(/bin/ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's#.gems.*$##' 2> /dev/null)
+
     while read line
-    do # Keep this on 2nd line :( bash fail.
+    do # Keep this on 2nd line :(
       # TODO: Switch to a different field separator than ; to allow for evals
       gem="$(echo $line | awk -F';' '{print $1}')"
       gem_prefix="$(echo $line | awk -F';' '{print $2}')"
@@ -177,11 +180,21 @@ __rvm_gems_load() {
         gem_file_name="${gem_name/ /}-${gem_version/ /}.gem"
       fi
 
-      if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/${gem_name/ /}-${gem_version/ /}.gemspec" ]] ; then
+      if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/${gem_file_name}" ]] ; then
         unset gem
         __rvm_log "warn" "$(__color "yellow")$gem_name $gem_version$(__color "none") exists, skipping (--force to re-install)"
       else
-        cache_file="${cache_file:-$(/bin/ls -t "${rvm_gem_path}/*/*/cache/${gem_file_name}*" 2> /dev/null | head -n1)}"
+        set -x
+        if [[ -f "$rvm_gem_path/cache/${gem_file_name}" ]] ; then
+          cache_file="$rvm_gem_path/cache/${gem_file_name}"
+        else
+          cache_file="${cache_file:-$(/bin/ls -t "${rvm_gem_path}/*/*/cache/${gem_file_name}*" 2> /dev/null | head -n1)}"
+          if [[ -f "$cache_file" ]] ; then
+            cp "$cache_file" "$rvm_gem_path/cache/$(basename "$cache_file")"
+          fi
+        fi
+        set +x
+
         if [[ -z "$cache_file" ]] ; then
           if [[ -f "$gem_file_name" ]] ; then
             gem="$gem_file_name"
@@ -193,10 +206,10 @@ __rvm_gems_load() {
         else # cached
           gem_file_name="$(basename "$cache_file")"
           gem_string="$(echo "$gem_file_name" | sed 's#\.gem$##')"
+
           # TODO: Switch this to use match
           if [[ ! -z "$(echo "$rvm_ruby_gem_list" | awk "/${gem_name/ /} \(.*$gem_version/{print}")" ]] ; then
             if [[ ! -z "$rvm_force_flag" ]] ; then
-              cp $cache_file $rvm_temp_path/$gem_file_name
               gem="$rvm_temp_path/$gem_file_name" # install as a named local gem
             fi
           else

data/scripts/install

@@ -32,6 +32,8 @@ for file_name in rvm-prompt gemsync ; do
   chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
+cp -f $source_dir/README $rvm_path/
+
 if [[ -z "$rvm_loaded_flag" ]] ; then
   for rcfile in .bash_profile .bashrc .zshrc ; do
     if [[ ! -e ~/$rcfile ]] ; then touch ~/$rcfile ; fi

data/scripts/irbrc

@@ -0,0 +1,9 @@
+
+# This loads some niceties for irb, courtesy of rvm.
+# It also loads your custom ~/.irbrc if it exists.
+# If you want to customize the irbrc for ONLY this version of
+# ruby then edit this file. It will only be deleted if you do
+# an "rvm install" over this ruby version.
+
+require File.join(ENV["HOME"], ".rvm", "scripts", "irbrc")
+

data/scripts/irbrc.rb

@@ -0,0 +1,31 @@
+# This is the common irbrc file used by all rvm ruby installations.
+# This file will be overriden every time you update rvm.
+
+# Turn on completion.
+require "irb/completion" rescue nil
+
+# Turn on history saving.
+require "irb/ext/save-history"
+IRB.conf[:HISTORY_FILE] = File.join(ENV["HOME"], ".irb-history")
+
+# Calculate the ruby string.
+rvm_ruby_string = ENV["rvm_ruby_string"] || "#{RUBY_ENGINE}-#{RUBY_VERSION}-#{(RUBY_PATCHLEVEL) ? "p#{RUBY_PATCHLEVEL}" : "r#{RUBY_REVISION}"}"
+
+# Set up the prompt to be RVM specific.
+@prompt = {
+  :PROMPT_I => "#{rvm_ruby_string} > ",  # default prompt
+  :PROMPT_S => "#{rvm_ruby_string}%l> ", # known continuation
+  :PROMPT_C => "#{rvm_ruby_string} > ",
+  :PROMPT_N => "#{rvm_ruby_string} ?> ", # unknown continuation
+  :RETURN => " => %s \n",
+  :AUTO_INDENT => true
+}
+IRB.conf[:PROMPT][:RVM] = @prompt
+IRB.conf[:PROMPT_MODE] = :RVM
+
+# Load the user's irbrc file, if possible.
+if File.exists?("#{ENV["HOME"]}/.irbrc_disabled")
+  load File.join(ENV["HOME"], ".irbrc") rescue nil
+end
+
+# EOF

data/scripts/rvm-install

@@ -32,6 +32,8 @@ for file_name in rvm-prompt gemsync ; do
   chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
+cp -f $source_dir/README $rvm_path/
+
 if [[ -z "$rvm_loaded_flag" ]] ; then
   for rcfile in .bash_profile .bashrc .zshrc ; do
     if [[ ! -e ~/$rcfile ]] ; then touch ~/$rcfile ; fi

data/scripts/selector

@@ -240,7 +240,7 @@ function __rvm_use {
   if [[ ! -z "$rvm_dump_flag" ]] ; then __rvm_gems_dump ; fi
 }
 
-function __rvm_ruby_string {
+__rvm_ruby_string() {
   if [[ ! -z "$rvm_ruby_string" ]] ; then
     if [[ "system" = "$rvm_ruby_string" ]] ; then
       __rvm_unset_ruby_variables
@@ -260,7 +260,7 @@ function __rvm_ruby_string {
 
       if [[ "$rvm_ruby_version" != "head" ]] ; then
         patch_level=$(echo $ruby_string |  awk -F'-' '{print $3}')
-        if [[ ! -z "$patch_level" ]] ; then rvm_ruby_patch_level="$patch_level" ; fi
+        if [[ ! -z "$patch_level" ]] ; then rvm_ruby_patch_level="p$patch_level" ; fi
       else
         unset rvm_ruby_version
         rvm_head_flag=1
@@ -299,9 +299,12 @@ function __rvm_ruby_string {
         if [[ "rbx" = "$rvm_ruby_interpreter" ]] ; then unset rvm_ruby_patch_level ; fi
         if [[ "mput" = "$rvm_ruby_interpreter" ]] ; then unset rvm_ruby_patch_level ; fi
       else
-        revision=$(echo $ruby_string | awk -F'-' '{print $3}')
+        revision=$(echo $ruby_string | awk -F'-' '{print $NF}')
+        if [[ ! -z "$revision" ]] ; then rvm_ruby_patch_level="${rvm_ruby_patch_level:-p${patch_level}}" ; fi
         if [[ ! -z "$revision" ]] ; then
-          if match "$revision" "^p" ; then
+          if match "$revision" "^[0-9]\.[0-9]" ; then
+            unset rvm_ruby_revision rvm_ruby_tag
+          elif match "$revision" "^p" ; then
             rvm_ruby_patch_level="$revision"
             # if [[ "preview" == "$revision" ]] ; then
           elif match "$revision" "^[0-9]" ; then
@@ -312,8 +315,10 @@ function __rvm_ruby_string {
               rvm_ruby_revision="r$revision"
             fi
           elif match "$revision" "^r" ; then
+            unset rvm_ruby_patch_level
             rvm_ruby_revision="$revision"
           elif match "$revision" "^t" ; then
+            unset rvm_ruby_patch_level rvm_ruby_revision
             rvm_ruby_tag="$revision"
           else
             unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag

data/scripts/update

@@ -32,6 +32,8 @@ for file_name in rvm-prompt gemsync ; do
   chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
+cp -f $source_dir/README $rvm_path/
+
 if [[ -z "$rvm_loaded_flag" ]] ; then
   for rcfile in .bash_profile .bashrc .zshrc ; do
     if [[ ! -e ~/$rcfile ]] ; then touch ~/$rcfile ; fi

data/scripts/utility

@@ -122,12 +122,12 @@ function __rvm_run {
   unset log_file command
 }
 
-function __rvm_cleanup_variables {
+__rvm_cleanup_variables() {
   __rvm_unset_ruby_variables
-  unset rvm_ruby_selected_flag rvm_action rvm_irbrc_file rvm_src_path rvm_path rvm_prefix_path rvm_gem_path rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_config_path rvm_bin_path 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_log_path rvm_file_name rvm_ruby_configure
+  unset rvm_ruby_selected_flag rvm_action rvm_irbrc_file rvm_src_path rvm_path rvm_prefix_path rvm_gem_path rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_config_path rvm_bin_path 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_log_path rvm_file_name rvm_ruby_configure rvm_benchmark_flag
 }
 
-function __rvm_unset_ruby_variables {
+__rvm_unset_ruby_variables() {
   unset rvm_ruby_interpreter rvm_ruby_version 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
 }
 
@@ -562,11 +562,12 @@ __rvm_ruby_do() {
   binary="$(echo $rvm_action | sed 's#do$##')"
   if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
     load_path="$rvm_ruby_home/bin:$rvm_ruby_load_path"
-    if [[ "ruby" = "$binary" ]] ; then
+    # TODO: the else case below should be run if $rvm_ruby_args =~ /\.rb$/
+    if [[ "ruby" = "$binary" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
       if match "$rvm_ruby_args" "\.rb$" ; then
         if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
         if ! match "$rvm_ruby_args" "$prefix" ; then
-          rvm_ruby_args="$prefix $rvm_ruby_args"
+          rvm_ruby_args="$prefix '$rvm_ruby_args'"
         fi
       fi
       rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_require -I$load_path $rvm_ruby_args"
@@ -693,38 +694,16 @@ function __rvm_benchmark {
   cat $rvm_ruby_file >> "$rvm_temp_path/$$.rb"
   echo -e "\n end \nend\n" >> "$rvm_temp_path/$$.rb"
   rvm_ruby_args="$rvm_temp_path/$$.rb"
+  rvm_benchmark_flag=1
   rvm_action="ruby"
   if [[ ! -z "$rvm_debug_flag" ]] ; then echo -e "$rvm_temp_path/$$.rb:\n$(cat $rvm_temp_path/$$.rb)" ; fi
   __rvm_do
 }
 
 function __rvm_irbrc {
+  # Create the irbrc for the currently selected ruby installation.
   if [[ -d "$rvm_ruby_home" ]] && [[ ! -s "$rvm_ruby_irbrc" ]] ; then
-    rvm_ruby_irbrc_file=$(cat <<-Config
-
-require "irb/completion" rescue nil
-
-require "irb/ext/save-history"
-IRB.conf[:HISTORY_FILE] = "#{ENV['HOME']}/.irb-history"
-
-@prompt = {
-  :PROMPT_I => "${rvm_ruby_package_name} > ",  # default prompt
-  :PROMPT_S => "${rvm_ruby_package_name}%l> ", # known continuation
-  :PROMPT_C => "${rvm_ruby_package_name} > ",
-  :PROMPT_N => "${rvm_ruby_package_name} ?> ", # unknown continuation
-  :RETURN => " => %s \n",
-  :AUTO_INDENT => true
-}
-IRB.conf[:PROMPT][:RVM] = @prompt
-IRB.conf[:PROMPT_MODE] = :RVM
-
-load '$HOME/.irbrc' if File.exists?('$HOME/.irbrc') rescue nil
-
-Config
-)
-    touch $rvm_ruby_irbrc
-    echo -e "\n$rvm_ruby_irbrc_file" > $rvm_ruby_home/.irbrc
-    unset rvm_ruby_irbrc_file
+    cp $rvm_path/scripts/irbrc $rvm_ruby_irbrc
   fi
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.65
+  version: 0.0.66
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -04:00
+date: 2009-10-29 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -39,6 +39,8 @@ files:
 - scripts/gems
 - scripts/gemsync
 - scripts/install
+- scripts/irbrc
+- scripts/irbrc.rb
 - scripts/ruby-installer
 - scripts/rvm
 - scripts/rvm-install