Merge branch 'release/1.19.0' into stable

.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 rvm:
   - 1.9.3
-install: gem install tf -v '>=0.4.1'
+install:
+  - gem update --system
+  - gem install bundler --pre
+  - gem install tf -v '>=0.4.1'
 before_script:
+  - gem install bundler --pre
   - rvm alias delete default
   - hash -r
   - ./install
@@ -18,5 +22,4 @@ notifications:
   email:
     recipients:
       - mpapis@gmail.com
-      - me@deryldoucette.com
     on_failure: change

CONTRIBUTING.md

@@ -0,0 +1,31 @@
+Here at RVM we get a high amount of bug reports, and sometimes bugs turn out not to be bugs, but user generated errors and other times it turns out to be our fault.  Don't get us wrong, we love it when you file bugs but we would also love it if you were able to give us more information than most people do right off the bat, so we can maximize our time helping you and minimize our time requesting more information.
+
+## Check Documentation
+
+We know, you hear this over and over and be rest assured we are working hard to improve the usability of https://rvm.io but we must always ask that you first please check the documentation if you are requesting a feature or if you are not sure if you did it right.  If the documentation is not clear, an error message is not clear or you know or have found out that your problem is not resolved by the documentation then please do file a bug.
+
+## Filing
+
+Documentation: https://github.com/rvm/rvm-site/issues/new<br />
+RVM: https://github.com/wayneeseguin/rvm/issues/new
+
+*When in doubt as to whether your issue might relate to another simply file a new bug and we will mark it as duplicate if it needs to be.  It's always better to file a new ticket and let us sort it out than to accidently add noise to another ticket.*
+
+If you wish to file a bug, the only thing we ask is that you provide a [gist](https://gist.github.com) of the command you used and if you are on stable, make sure that the case is the same on head too, this way you and us know whether the issue has been addressed, and always note that if there is a lot of `debug` or `trace` output you can redirect it to a file with the `>` character like so `rvm [command] > output.txt`.  Further information on how to file can be seen below.  Also, please always make sure to split up each command into it's own fenced codeblock, this means that each command and it's output should be in it's own code block.
+
+## Filing for Ruby installation errors
+
+```
+rvm get head
+rvm reload
+rvm --debug install [ruby-version]
+```
+Make sure to include all mentioned log files.
+
+## Filing for other RVM commands
+
+```
+rvm get head
+rvm reload
+rvm --trace [command]
+```

NEXT.md

@@ -1 +0,0 @@
-

README

@@ -1,4 +1,4 @@
-{master:<img src="https://secure.travis-ci.org/wayneeseguin/rvm.png?branch=master" alt="Build Status" /> stable:<img src="https://secure.travis-ci.org/wayneeseguin/rvm.png?branch=stable" alt="Build Status" />}[http://travis-ci.org/#!/wayneeseguin/rvm/branch_summary]
+{Master: <img src="https://secure.travis-ci.org/wayneeseguin/rvm.png?branch=master" alt="Build Status" /> Stable:<img src="https://secure.travis-ci.org/wayneeseguin/rvm.png?branch=stable" alt="Build Status" />}[https://travis-ci.org/wayneeseguin/rvm/branches]
 
 = rvm
 
@@ -106,6 +106,8 @@ install     :: install one or many ruby versions
                See also: https://rvm.io/rubies/installing/
 uninstall   :: uninstall one or many ruby versions, leaves their sources
 remove      :: uninstall one or many ruby versions and remove their sources
+reinstall   :: reinstall ruby and runs gem pristine on all gems,
+               make sure to read output, use 'all' for all rubies.
 
 migrate     :: Lets you migrate all gemsets from one ruby to another.
 upgrade     :: Lets you upgrade from one version of a ruby to another, including

VERSION

@@ -1 +1 @@
-1.18.21
+1.19.0

bin/rvm-installer

@@ -0,0 +1 @@
+../binscripts/rvm-installer

binscripts/rvm-prompt → bin/rvm-prompt

@@ -118,6 +118,7 @@ then
       (ironruby) unicode="♭" ;;
       (system)   unicode="➆" ;;
       (goruby)   unicode="⛳";;
+      (topaz)    unicode="🐍";;
       (ruby)
         case ${version:-""} in
           (1.8.6)  unicode="➇❻" ;;

binscripts/rvmsudo → bin/rvmsudo

@@ -44,7 +44,7 @@ then
       sudo_args+=( "/usr/bin/env" )
       printf "%b" 'Warning: can not check `/etc/sudoers` for `secure_path`, falling back to call via `/usr/bin/env`, this breaks rules from `/etc/sudoers`. export rvmsudo_secure_path=1 to avoid the warning.'
     elif
-      grep -E '^[[:space:]]*Defaults[[:space:]]+secure_path=' "/etc/sudoers" >/dev/null
+      \grep -E '^[[:space:]]*Defaults[[:space:]]+secure_path=' "/etc/sudoers" >/dev/null
     then
       sudo_args+=( "/usr/bin/env" )
       printf "%b" 'Warning: `secure_path` found in `/etc/sudoers`, falling back to call via `/usr/bin/env`, this breaks rules from `/etc/sudoers`. export rvmsudo_secure_path=1 to avoid the warning.'

binscripts/rvm-installer

@@ -18,21 +18,40 @@ PS4="+ \${BASH_SOURCE##\${rvm_path:-}} : \${FUNCNAME[0]:+\${FUNCNAME[0]}()}  \${
 set -o errtrace
 set -o errexit
 
-log()  { printf "%b\n" "$*" ; return $? ;  }
+log()  { printf "%b\n" "$*"; }
 
 fail() { log "\nERROR: $*\n" ; exit 1 ; }
 
-if [[ -z "${rvm_tar_command:-}" ]] && builtin command -v gtar >/dev/null
+if
+  [[ -z "${rvm_tar_command:-}" ]] && builtin command -v gtar >/dev/null
 then
   rvm_tar_command=gtar
+elif
+  ${rvm_tar_command:-tar} --help 2>&1 | GREP_OPTIONS="" \grep -- --strip-components >/dev/null
+then
+  rvm_tar_command="${rvm_tar_command:-tar}"
 else
-  rvm_tar_command=tar
+  case "$(uname)" in
+    (OpenBSD)
+      log "Trying to install GNU version of tar, might require sudo password"
+      if (( UID ))
+      then sudo pkg_add -z gtar-1
+      else pkg_add -z gtar-1
+      fi
+      rvm_tar_command=gtar
+      ;;
+    (Darwin|FreeBSD) # it's not possible to autodetect on OSX, the help/man does not mention all flags
+      rvm_tar_command=tar
+      ;;
+  esac
+  builtin command -v ${rvm_tar_command:-gtar} >/dev/null ||
+  fail "Could not find GNU compatible version of 'tar' command, make sure it's available first before continuing installation."
 fi
-if [[ ! " ${rvm_tar_options:-} " =~ " --no-same-owner "  ]] && \
+if
+  [[ ! " ${rvm_tar_options:-} " =~ " --no-same-owner "  ]] &&
   $rvm_tar_command --help 2>&1 | GREP_OPTIONS="" \grep -- --no-same-owner >/dev/null
 then
-  rvm_tar_options="${rvm_tar_options:-} --no-same-owner"
-  rvm_tar_options="${rvm_tar_options## }"
+  rvm_tar_options="${rvm_tar_options:-}${rvm_tar_options:+ }--no-same-owner"
 fi
 
 usage()
@@ -45,7 +64,7 @@ Usage
 
 Options
 
-  [[--]version] <latest|latest-x|latest-x.y|x.y.z> - Install RVM version
+  [[--]version] <latest|latest-minor|latest-x|latest-x.y|x.y.z> - Install RVM version
   [--]branch    <name> - Install RVM head, from named branch
   --trace              - used to debug the installer script
 
@@ -115,12 +134,12 @@ install_head()
   esac
   log "Downloading RVM from ${_repo} branch ${_branch}"
   get_and_unpack \
-    https://github.com/wayneeseguin/rvm/archive/${_branch}.tar.gz \
+    https://github.com/${_repo}/rvm/archive/${_branch}.tar.gz \
     ${_repo}-rvm-${_branch//\//_}.tgz
 }
 
 # duplication marker dfkjdjngdfjngjcszncv
-# Drop in cd which _desotn't_ respect cdpath
+# Drop in cd which _doesn't_ respect cdpath
 __rvm_cd()
 {
     typeset old_cdpath ret
@@ -141,12 +160,23 @@ get_and_unpack()
   curl -L ${_url} -o ${rvm_archives_path}/${_file} ||
   {
     _return=$?
-    case $ret in
+    case $_return in
+      # duplication marker lfdgzkngdkjvnfjknkjvcnbjkncvjxbn
       (60)
         log "
 Could not download '${_url}'.
   Make sure your certificates are up to date as described above.
   To continue in insecure mode run 'echo insecure >> ~/.curlrc'.
+"
+        ;;
+      # duplication marker lfdgzkngdkjvnfjknkjvcnbjkncvjxbn
+      (77)
+        log "
+It looks like you have old certificates, run:
+
+    curl -O http://curl.haxx.se/ca/cacert.pem && sudo mv cacert.pem /usr/local/etc/openssl/cacert.pem
+
+Replace /usr/local/etc/openssl/cacert.pem with the displayed CAfile.
 "
         ;;
       (*)
@@ -230,6 +260,7 @@ fi
 
 install_rubies=()
 install_gems=()
+flags=()
 # Parse CLI arguments.
 while (( $# > 0 ))
 do
@@ -240,6 +271,12 @@ do
     --trace)
       set -o xtrace
       rvm_trace_flag=1
+      flags+=( "$token" )
+      ;;
+
+    --debug)
+      rvm_debug_flag=1
+      flags+=( "$token" )
       ;;
 
     --path)
@@ -263,24 +300,47 @@ do
       fi
       ;;
 
-    --user-install|--auto-dotfiles|--ignore-dotfiles)
+    --user-install|--ignore-dotfiles)
       token=${token#--}
       token=${token//-/_}
       export "rvm_${token}_flag"=1
       printf "%b" "Turning on ${token/_/ } mode.\n"
       ;;
 
+    --auto-dotfiles)
+      flags+=( "$token" )
+      export "rvm_auto_dotfiles_flag"=1
+      printf "%b" "Turning on auto dotfiles mode.\n"
+      ;;
+
     --auto)
       export "rvm_auto_dotfiles_flag"=1
       printf "%b" "Warning, --auto is deprecated in favor of --auto-dotfiles.\n"
       ;;
 
+    --verify-downloads)
+      if [[ -n "${1:-}" ]]
+      then
+        export rvm_verify_downloads_flag="$1"
+        shift
+      else
+        fail "--verify-downloads must be followed by level(0|1|2)."
+      fi
+      ;;
+
+    --autolibs=*)
+      flags+=( "$token" )
+      export rvm_autolibs_flag="${token#--autolibs=}"
+      ;;
+
     --with-gems=*)
+      flags+=( "$token" )
       export rvm_with_gems="${token#--with-gems=}"
       printf "%b" "Installing RVM with gems: ${rvm_with_gems}.\n"
       ;;
 
     --without-gems=*)
+      flags+=( "$token" )
       export rvm_without_gems="${token#--without-gems=}"
       printf "%b" "Installing RVM without gems: ${rvm_without_gems}.\n"
       ;;
@@ -323,6 +383,7 @@ do
       ;;
 
     (--add-to-rvm-group)
+      flags+=( "$token" )
       export rvm_add_users_to_rvm_group="$1"
       shift
       ;;
@@ -410,6 +471,12 @@ case "${version}" in
     install_release $(fetch_version "") || exit $?
     ;;
 
+  (latest-minor)
+    echo "${version}" > "$rvm_path/RELEASE"
+    version="$(cat "$rvm_path/VERSION")"
+    install_release $(fetch_version "${version%.*}") || exit $?
+    ;;
+
   (latest-*)
     echo "${version}" > "$rvm_path/RELEASE"
     install_release $(fetch_version "${version#latest-}") || exit $?
@@ -426,31 +493,7 @@ case "${version}" in
 esac
 
 # required flag - path to install
-flags=( --path "$rvm_path" )
-
-if (( rvm_trace_flag == 1 ))
-then flags+=("--trace")
-fi
-
-if (( rvm_debug_flag == 1 ))
-then flags+=("--debug")
-fi
-
-if (( rvm_auto_dotfiles_flag == 1 ))
-then flags+=("--auto-dotfiles")
-fi
-
-if [[ -n "${rvm_with_gems:-}" ]]
-then flags+=("--with-gems=${rvm_with_gems}")
-fi
-
-if [[ -n "${rvm_without_gems:-}" ]]
-then flags+=("--without-gems=${rvm_without_gems}")
-fi
-
-if [[ -n "${rvm_add_users_to_rvm_group:-}" ]]
-then flags+=(--add-to-rvm-group "${rvm_add_users_to_rvm_group}")
-fi
+flags+=( --path "$rvm_path" )
 
 chmod +x ./scripts/install
 ./scripts/install "${flags[@]}"
@@ -463,20 +506,17 @@ then
     __rvm_version
 
     for _ruby in ${install_rubies[@]}
-    do
-      rvm requirements run force ${_ruby}
-      command rvm install ${_ruby} -j 2
+    do command rvm install ${_ruby} -j 2
     done
+    # set the first one as default, skip rest
     for _ruby in ${install_rubies[@]}
     do
-      # set the first one as default, skip rest
       rvm alias create default ${_ruby}
       break
     done
 
     for _gem in ${install_gems[@]}
-    do
-      rvm all do gem install ${_gem}
+    do rvm all do gem install ${_gem}
     done
 
     printf "%b" "

config/db

@@ -3,7 +3,6 @@ niceness=0
 # Rubies
 interpreter=ruby
 default_ruby=ruby
-ruby_configure_flags=--disable-install-doc
 tcs_repo_url=git://github.com/thecodeshop/ruby.git
 tcs_repo_branch=trunk
 jamesgolick_repo_url=git://github.com/jamesgolick/ruby.git
@@ -46,7 +45,7 @@ rbx_url=http://asset.rubini.us
 rbx_2.0.0_url=https://github.com/rubinius/rubinius/archive
 rubinius_repo_url=git://github.com/rubinius/rubinius.git
 ree_version=1.8.7
-ree_configure_flags=--dont-install-useful-gems --no-dev-docs
+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
@@ -73,6 +72,9 @@ maglev_repo_url=git://github.com/MagLev/maglev.git
 ironruby_version=1.1.3
 ironruby_repo_url=git://github.com/ironruby/ironruby.git
 ironruby_1.1.3_url=http://download-codeplex.sec.s-msft.com/Download/Release?ProjectName=ironruby&DownloadId=217153&FileTime=129445296766130000&Build=19727
+topaz_version=head
+topaz_repo_url=git://github.com/topazproject/topaz.git
+topaz_url=http://builds.topazruby.com
 rvm_remote_server_url=https://rvm.io/binaries
 rvm_remote_server_type=rubies
 rvm_remote_server_url1=http://jruby.org.s3.amazonaws.com

config/known

@@ -20,6 +20,9 @@ ruby-head
 # GoRuby
 goruby
 
+# Topaz
+topaz
+
 # TheCodeShop - MRI experimental patches
 tcs
 

docs/rvm.txt

@@ -191,7 +191,7 @@ ACTIONS
     Performs an archive / src fetch only of the selected ruby.
 
 *list*::
-    Show currently installed rubies, interactive output.
+    Show currently installed or available rubies, interactive output.
     https://rvm.io/rubies/list/
 
 *pkg*::
@@ -236,6 +236,9 @@ IMPLEMENTATION
 *ironruby*::
     IronRuby, NOT supported yet. Looking for volunteers to help.
 
+*topaz*::
+    Topaz, written in RPython, the system that powers PyPy
+
 *system*::
     Use the system ruby (eg. pre-rvm state).