wayneeseguin-rvm 0.0.40 → 0.0.42

data/config/db

@@ -13,8 +13,8 @@ ree_interpreter=ruby-enterprise
 ree_version=1.8.6
 ree_patch_level=20090610
 macruby_version=2009-09-04
-ruby_1.9.1_patch_level=p243
+ruby_1.9.1_patch_level=243
 ruby_1.9.2_patch_level=preview1
-ruby_1.8.5_patch_level=p115
-ruby_1.8.6_patch_level=p383
-ruby_1.8.7_patch_level=p174
+ruby_1.8.5_patch_level=115
+ruby_1.8.6_patch_level=383
+ruby_1.8.7_patch_level=174

data/examples/rvmrc

@@ -30,3 +30,6 @@
 
 # Default gems directory
 # rvm_gem_path="$HOME/.gem"
+
+# Install rubies on use when they are not installed
+#ruby_install_on_use=1

data/lib/VERSION.yml

@@ -0,0 +1,4 @@
+---
+:major: 0
+:minor: 0
+:patch: 42

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.40"
+  s.version = "0.0.42"
 
   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-15}
+  s.date = %q{2009-09-17}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "README",
      "config/db",
      "examples/rvmrc",
+     "lib/VERSION.yml",
      "lib/rvm.rb",
      "rvm.gemspec",
      "scripts/rvm",

data/scripts/rvm-cli

@@ -4,8 +4,8 @@ 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"
+  rvm_meta_version="`cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
+  rvm_meta_updated="2009.09.17"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -20,7 +20,7 @@ function __rvm_usage {
 
   Usage:
 
-    rvm Action [Implementation] [Options]
+    rvm Action [Implementation] [Options] [Flags]
 
   Action:
 
@@ -43,6 +43,8 @@ function __rvm_usage {
     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.
+    tests     - run 'rake test' across selected ruby versions
+    specs     - run 'rake spec' across selected ruby versions
 
   Implementation:
 
@@ -55,41 +57,41 @@ function __rvm_usage {
 
   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
+    -v|--version    - Emit rvm version loaded for current shell
     -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.
+    -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|--script     - Specify a script file to attempt to load and run (rubydo)
-    --all           - Used with 'rvm list' to list "most" installable versions.
+    -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
-    --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.
+
+  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.
 
   Resources:
 
@@ -104,7 +106,7 @@ function __rvm_parse-args {
   while [ $# -gt 0 ] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      install|uninstall|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode|update|readline|iconv)
+      install|uninstall|remove|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode|update|readline|iconv)
         rvm_action=$rvm_token
       ;;
 
@@ -166,45 +168,49 @@ function __rvm_parse-args {
       ;;
 
       1.8|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.9.1|1.9.2)
-                         rvm_ruby_interpreter="ruby"
-                         rvm_ruby_version="$rvm_token"
-                         rvm_action="${rvm_action:-use}"
+        rvm_ruby_interpreter="ruby"
+        rvm_ruby_version="$rvm_token"
+        rvm_action="${rvm_action:-use}"
       ;;
 
       1.2.0|1.3.1)
-                         rvm_ruby_interpreter="jruby"
-                         rvm_ruby_version="$rvm_token"
-                         rvm_action="${rvm_action:-use}"
+        rvm_ruby_interpreter="jruby"
+        rvm_ruby_version="$rvm_token"
+        rvm_action="${rvm_action:-use}"
       ;;
 
       -v|--version)
-                         if [ -z "$1" ] ; then
-                           rvm_action="version"
-                         else
-                           rvm_ruby_version="$1"
-                           shift
-                         fi
+        if [ -z "$1" ] ; then
+          rvm_action="version"
+        else
+          rvm_ruby_version="$1"
+          shift
+        fi
+      ;;
+
+      -t|--tag)
+        rvm_ruby_tag="$1";
+        rvm_action="${rvm_action:-use}"
+        shift
       ;;
 
-      -t|--tag)          rvm_ruby_tag="$1";
-                         rvm_action="${rvm_action:-use}"
-                         shift                             ;;
       --head)
-                         rvm_ruby_rev="head"
-                         rvm_action="${rvm_action:-use}"
+        rvm_ruby_rev="head"
+        rvm_action="${rvm_action:-use}"
       ;;
-      --rev|--revision)  rvm_ruby_rev="$1";
-                         rvm_action="${rvm_action:-use}"
-                         shift                             ;;
-      -b|--branch)       rvm_ruby_branch="$1";
-                         rvm_action="${rvm_action:-use}"
-                         shift                             ;;
 
+      --rev|--revision)
+        rvm_ruby_rev="$1";
+        rvm_action="${rvm_action:-use}"
+        shift
+      ;;
 
-      -P|--prefix)       rvm_prefix_path="$1"      ; shift ;;
+      -b|--branch)
+        rvm_ruby_branch="$1";
+        rvm_action="${rvm_action:-use}"
+        shift
+      ;;
 
-      --rubygems)        rvm_rubygems_flag=1               ;;
-      --rvm|--gem)       rvm_update_flag=1                 ;;
       --bin)
         if [ "$rvm_action" = "update" ] ; then
           rvm_bin_flag=1
@@ -213,34 +219,27 @@ function __rvm_parse-args {
         fi
         ;;
 
-       --source)         rvm_source_path="$1"      ; shift ;;
-       --archive)        rvm_archives_path="$1"    ; shift ;;
-      -G|--gems)         rvm_gem_path="$1"         ; shift ;;
-      -C|--configure)
+      -j)
         if [ ! -z "$1" ] ; then
-          rvm_ruby_configure="$(echo $1 | tr ',' ' ')"
+          rvm_make_flags="$rvm_make_flags -j$1"
           shift
         else
           rvm_action="error"
-          rvm_error_message="--configure *must* be followed by configure flags."
+          rvm_error_message="-j *must* be followed by an integer (normally the # of CPU's in your machine)."
         fi
       ;;
 
-      --re-configure)    rvm_re_configure=1                ;;
-      --make)            rvm_ruby_make="$1"        ; shift ;;
-      --make-install)    rvm_ruby_make_install="$1"; shift ;;
-      -j)
+
+      -C|--configure)
         if [ ! -z "$1" ] ; then
-          rvm_make_flags="$rvm_make_flags -j$1"
+          rvm_ruby_configure="$(echo $1 | tr ',' ' ')"
           shift
         else
           rvm_action="error"
-          rvm_error_message="-j *must* be followed by an integer (normally the # of CPU's in your machine)."
+          rvm_error_message="--configure *must* be followed by configure flags."
         fi
       ;;
-      --nice)            rvm_niceness="$1"         ; shift ;;
-      -l|--level)        rvm_ruby_patch_level="$1" ; shift ;;
-         --summary)      rvm_summary=1                     ;;
+
       -r|--require)
         if [ -z "$1" ] ; then
           rvm_action="error"
@@ -250,6 +249,7 @@ function __rvm_parse-args {
           shift
         fi
       ;;
+
       -I|--include)
         if [ -z "$1" ] ; then
           rvm_action="error"
@@ -259,47 +259,64 @@ function __rvm_parse-args {
           shift
         fi
       ;;
+
       -f|--file)
-                         rvm_action="rubydo"
-                         rvm_ruby_args="$1"
-                         shift
+        rvm_action="rubydo"
+        rvm_ruby_args="$1"
+        shift
       ;;
-      -S|--script|-e|--execute)
-                         rvm_action="rubydo"
-                         rvm_ruby_args="$@"
-                         rvm_parse_break=1
+
+      specs|tests)
+        rvm_action="rubydo"
+        rvm_ruby_args="rake $rvm_token"
       ;;
 
-      -h|--help)         rvm_action=help           ; shift ;;
-      -d|--default)      rvm_set_default=1                 ;;
-      --trace|--debug)   rvm_debug=1                       ;;
-      --force)           rvm_force=1                       ;;
-         --all)          rvm_all=1                         ;;
-      -m|--gem-set)      rvm_gem_set_name="$1"     ; shift ;;
-         --rm-gem-set)   rvm_gem_set_name_rm="$1"  ; shift ;;
-         --dump)         rvm_dump=1                        ;;
-         --load)
-                         rvm_load=1
-                         if [ ! -z "$1" ] ; then
-                           rvm_load_file="$1"
-                           shift
-                         else
-                            rvm_action="error"
-                            rvm_error_message="--load must be followed by the .gemset file to load."
-                            break;
-                         fi
-                         shift
+      rake|gem)
+        rvm_action="rubydo"
+        rvm_ruby_args="$rvm_token $@"
+        rvm_parse_break=1
       ;;
 
-      --jit)            rvm_rubinius_jit="RBX_LLVM=1"     ;;
-      --latest)         rvm_latest=1                      ;;
-      --tests|--specs)  rvm_action="tests"                ;;
+      -S|--script|-e|--execute)
+        rvm_action="rubydo"
+        rvm_ruby_args="$@"
+        rvm_parse_break=1
+      ;;
+
+      --load)
+        rvm_load_flag=1
+        if [ ! -z "$1" ] ; then
+          rvm_load_file="$1"
+          shift
+        else
+           rvm_action="error"
+           rvm_error_message="--load must be followed by the .gemset file to load."
+           break;
+        fi
+      ;;
 
       default|system)
         rvm_action="use"
         rvm_ruby_interpreter="system"
       ;;
 
+      --prefix)          rvm_prefix_path="$1"      ; shift ;;
+      -G|--gems)         rvm_gem_path="$1"         ; shift ;;
+      --source)          rvm_source_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 ;;
+      -m|--gem-set)      rvm_gem_set_name="$1"     ; shift ;;
+         --rm-gem-set)   rvm_gem_set_name_rm="$1"  ; shift ;;
+      tests|specs)       rvm_action="tests"                ;;
+
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|debug|--force|--all|--dump|--summary|--jit|--latest)
+        eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1"
+      ;;
+
       reboot|flush|asdf|damnit|wtf|argh|work|workdamnit|BOOM|boom|wth)
         $rvm_action="reboot"
       ;;
@@ -337,8 +354,6 @@ function __rvm_parse-args {
   done
 
   if [ ! -z "$rvm_error_message" ] ; then popd 2> /dev/null ; return 1 ; fi
-  if [ -z "$rvm_debug" ] ; then set +x ; else set -x ; fi
-
 }
 
 function rvm {
@@ -349,38 +364,43 @@ function rvm {
   __rvm_load-defaults
   __rvm_parse-args $@
 
-  status=0
+  if [ -z "$rvm_debug_flag" ] ; then set +x ; else set -x ; fi
+  result=0
   case "$rvm_action" in
-    install)   __rvm_install-ruby ;status=$? ;;
-    uninstall) __rvm_uninstall    ;status=$? ;;
-    use)       __rvm_use          ;status=$? ;;
-    gemdir)    __rvm_gem-dir      ;status=$? ;;
-    srcdir)    __rvm_src-dir      ;status=$? ;;
-    gemdup)    __rvm_gem-dup      ;status=$? ;;
-    list)      __rvm_list         ;status=$? ;;
-    symlinks)  __rvm_symlinks     ;status=$? ;;
-    version)   __rvm_version      ;status=$? ;;
+    install)    __rvm_install-ruby     ; result=$? ;;
+    uninstall)  __rvm_uninstall        ; result=$? ;;
+    remove)     __rvm_remove           ; result=$? ;;
+    use)        __rvm_use              ; result=$? ;;
+    gemdir)     __rvm_gem-dir          ; result=$? ;;
+    srcdir)     __rvm_src-dir          ; result=$? ;;
+    gemdup)     __rvm_gem-dup          ; result=$? ;;
+    list)       __rvm_list             ; result=$? ;;
+    symlinks)   __rvm_symlinks         ; result=$? ;;
+    version)    __rvm_version          ; result=$? ;;
+    reset)      __rvm_reset            ; result=$? ;;
+                # TODO: how can we use bin_path here for reload, default file?
+    reload)     __rvm_reload           ; result=$? ;;
+    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=$? ;;
+    rubydo|rakedo|gemdo) __rvm_do      ; result=$? ;;
+
     tests|specs)
-      rvm_do_summary=1
+      rvm_summary_flag=1
       rvm_action="rake"
       __rvm_do
     ;;
-    rubydo|rakedo|gemdo) __rvm_do ; status=$? ;;
-    reset)      __rvm_reset            ;;
-                # TODO: how can we use bin_path here for reload, default file?
-    reload)     __rvm_reload           ;;
-    implode)    __rvm_implode          ;;
-    update)     __rvm_update           ;;
-    readline)   __rvm_readline_install ;;
-    iconv)      __rvm_iconv_install    ;;
-    reboot)     __rvm_reboot           ;;
-    usage|help) __rvm_usage            ;;
+
     info|debug)
-                __rvm_version
-                __rvm_info
-                if [ "$rvm_action" = "debug" ] ; then __rvm_debug ; fi
-                return 0
+      __rvm_version
+      __rvm_info
+      if [ "$rvm_action" = "debug" ] ; then __rvm_debug ; fi
+      result=0
     ;;
+
     error)      __rvm_log "fail" "$rvm_error_message ( see: 'rvm usage' )" ; popd 2> /dev/null ; return 1; ;;
     *)
       if [ ! -z "$rvm_action" ] ; then
@@ -388,11 +408,10 @@ function rvm {
       else
         __rvm_usage
       fi
-      return 1
+      result=1
   esac
-
-  if [ "$rvm_debug" = "1" ] ; then set +x ; unset rvm_debug ; fi
-  return $status
+  if [ "$rvm_debug_flag" = "1" ] ; then set +x ; unset rvm_debug_flag ; fi
+  return $result
 }