Merge branch 'master' into hotfix/1.25.16

README

@@ -123,41 +123,48 @@ cleanup     :: Lets you remove stale source folders / archives and other
                miscellaneous data associated with rvm.
 repair      :: Lets you repair parts of your environment e.g. wrappers, env
                files and and similar files (e.g. general maintenance).
+fix-permissions :: Repairs broken permissions (e.g. by sudo or chef)
+osx-ssl-certs :: Helps update certificates for OpenSSL installed by rvm on OSX.
 snapshot    :: Lets you backup / restore an rvm installation in a lightweight
                manner.
 
+alias       :: Lets you set shortcut strings for convenience with 'rvm use'.
 disk-usage  :: Tells you how much disk space rvm install is using.
 tools       :: Provides general information about the ruby environment,
                primarily useful when scripting rvm.
 docs        :: Tools to make installing ri and rdoc documentation easier.
 rvmrc       :: Tools related to managing rvmrc trust and loading.
+patchset    :: Tools related to managing ruby patchsets.
 
 do          :: runs an arbitrary command against specified and/or all rubies
-tests       :: runs 'rake test' across selected ruby versions
-specs       :: runs 'rake spec' across selected ruby versions
-monitor     :: Monitor cwd for testing, run `rake {spec,test}` on changes.
+cron        :: Manages setup for using ruby in cron tasks.
 
 gemset      :: gemsets: https://rvm.io/gemsets/
 
 rubygems    :: Switches the installed version of rubygems for the current ruby.
 
+config-get  :: display values for RbConfig::CONFIG variables.
 gemdir      :: display the path to the current gem directory (GEM_HOME).
-srcdir      :: display the path to rvm source directory (may be yanked)
+
 
 fetch       :: Performs an archive / src fetch only of the selected ruby.
 list        :: show currently installed rubies, interactive output.
 
                https://rvm.io/rubies/list/
+autolibs    :: Controls settings for automatically installing dependencies.
 pkg         :: Install a dependency package {readline,iconv,zlib,openssl}
 
                https://rvm.io/packages/
 notes       :: Display notes, with operating system specifics.
 
 export      :: Temporarily set an environment variable in the current shell.
 unexport    :: Undo changes made to the environment by 'rvm export'.
-requirements  :: Shows additional OS specific dependencies/requirements for
-                 building various rubies.
-mount       :: Install rubies from external locations 'rvm help mount'.
+requirements  :: Installs additional OS specific dependencies/requirements for
+                 building various rubies. Usually run by install.
+mount       :: Install rubies from external locations.
+
+user        :: Tools for managing RVM mixed mode in multiuser installations.
+group       :: Tools for managing groups in multiuser installations.
 
 == Implementation
 

bin/rvm-auto-ruby

@@ -51,6 +51,13 @@ fi
 
 [[ -s "$rvm_environments_path/default" ]] && source "$rvm_environments_path/default"
 
-rvm_promptless=1 rvm rvmrc load > /dev/null 2>&1
+case $0 in
+  (*rvm-shebang-ruby)
+    rvm_promptless=1 rvm rvmrc load "$(dirname "$(which "$1")")" > /dev/null 2>&1
+    ;;
+  (*)
+    rvm_promptless=1 rvm rvmrc load > /dev/null 2>&1
+    ;;
+esac
 
 exec ruby "$@"

bin/rvm-shebang-ruby

@@ -0,0 +1 @@
+rvm-auto-ruby

config/db

@@ -11,7 +11,8 @@ ruby_repo_url=git://github.com/ruby/ruby.git
 ruby_url=http://cache.ruby-lang.org/pub/ruby
 ruby_url_fallback_1=http://ftp.ruby-lang.org/pub/ruby
 ruby_url_fallback_2=http://www.mirrorservice.org/sites/ftp.ruby-lang.org/pub/ruby
-oldest_maintained_ruby=2.0.0
+unmaintained_ruby=1.9.3
+unmaintained_date=2014-02-23
 ruby_version=2.1.0
 ruby_2.1.0_patch_level=
 ruby_2.0.0_patch_level=p353
@@ -101,7 +102,8 @@ pkg-config_url=http://pkgconfig.freedesktop.org/releases
 gettext_url=http://ftp.gnu.org/pub/gnu/gettext
 libxml2_url=ftp://xmlsoft.org/libxml2
 libxslt_url=ftp://xmlsoft.org/libxslt
-yaml_url=http://pyyaml.org/download/libyaml
+yaml_url=https://bitbucket.org/mpapis/libyaml/get
+yaml_rename_dir=mpapis-libyaml-fdb5d3574a4c
 glib_url=http://ftp.gnome.org/pub/gnome/sources/glib/2.23
 mono_url=http://ftp.novell.com/pub/mono/sources/mono
 llvm_url=https://llvm.org/svn/llvm-project/llvm/trunk

config/known

@@ -7,7 +7,7 @@
 [ruby-]2.0.0-p195
 [ruby-]2.0.0[-p353]
 [ruby-]2.1.0
-[ruby-]2.1.0-head
+[ruby-]2.1-head
 ruby-head
 
 # GoRuby

config/md5

@@ -33,6 +33,7 @@ http://releases.rubini.us/rubinius-2.0.0.tar.bz2=62e379e044c822b81e7b20a27daf133
 http://releases.rubini.us/rubinius-2.1.0.tar.bz2=908053f38fd840c75a93aab7487c20a5
 http://releases.rubini.us/rubinius-2.1.1.tar.bz2=6b4df0caec5ea88373e113f97a3b4c72
 http://releases.rubini.us/rubinius-2.2.0.tar.bz2=f1fbc6f3baf1da5ad86b3858f30f3349
+https://bitbucket.org/mpapis/libyaml/get/0.1.4.3.tar.gz=022516bf5d40b8a1ebd8b12035cfc994
 https://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm=3b3280f24c2afacf75e70f2284569161
 https://dl.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm=2cd0ae668a585a14e07c2ea4f264d79b
 https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-5=0466c259781def56dafe0a2cdc9de0c5

help/notes.md

@@ -0,0 +1,5 @@
+Display all release notes.
+
+This is list of all notes that were displayed during RVM updates.
+
+It also displays warnings for problems RVM can not or should not handle automatically.

help/osx-ssl-certs.md

@@ -2,8 +2,8 @@
 
 ## Synopsis
 
-    rvm osx-ssl-certs status [<ruby>|all]
-    rvm [--silent] osx-ssl-certs update [<ruby>|all]
+    rvm osx-ssl-certs status [<ruby>|<certs-path>|<openssl-binary>|all]
+    rvm [--silent] osx-ssl-certs update [<ruby>|<certs-path>|<openssl-binary>|all]
     rvm osx-ssl-certs cron [status|install|uninstall]
 
 ## Description
@@ -19,9 +19,13 @@ You can check status, update certificates manually or schedule an automated upda
 
 * `status`      => Show certificates status for current Ruby,
   * `<ruby>`    => Status of a specific Ruby certificates,
+  * `<certs-path>`     => Status for a specific path certificates,
+  * `<openssl-binary>` => Status for a specific openssl installation,
   * `all`       => Status of all installed Rubies certificate paths.
 * `update`      => Update SSL certificates for current Ruby,
   * `<ruby>`    => Update a specific Ruby certificates,
+  * `<certs-path>`     => Update certificates in a specific path,
+  * `<openssl-binary>` => Update certificates for a specific openssl installation,
   * `all`       => Update all installed Rubies certificate paths.
 * `cron`        => Manage cron job for daily updates,
   * `status`    => Show if the cron job is installed,
@@ -38,6 +42,10 @@ Update OpenSSL certificates for current ruby:
 
     rvm osx-ssl-certs update
 
+Update OpenSSL certificates for specific path:
+
+    rvm osx-ssl-certs update /etc/openssl
+
 Schedule daily update of certificates:
 
     rvm osx-ssl-certs cron install

help/requirements.md

@@ -0,0 +1,9 @@
+Automated installation of software ruby depends on.
+
+Usually there is no need to run requirements manually as it is part of ruby installation process.
+
+## Usage
+
+    rvm requirements ruby-2.1.0
+
+See `rvm help autolibs` for details on how to control requirements behavior.

patchsets/ruby/1.9.3/head/railsexpress

@@ -15,3 +15,4 @@ https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/head/railse
 https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/head/railsexpress/15-configurable-fiber-stack-sizes.patch
 https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/head/railsexpress/16-backport-psych-20.patch
 https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/head/railsexpress/17-fix-missing-c-return-event.patch
+https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/head/railsexpress/18-fix-process-daemon-call.patch

patchsets/ruby/1.9.3/p484/railsexpress

@@ -15,3 +15,4 @@ https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p484/railse
 https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p484/railsexpress/15-configurable-fiber-stack-sizes.patch
 https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p484/railsexpress/16-backport-psych-20.patch
 https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p484/railsexpress/17-fix-missing-c-return-event.patch
+https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p484/railsexpress/18-fix-process-daemon-call.patch

patchsets/ruby/2.1.0/railsexpress

@@ -4,3 +4,5 @@ https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/2.1.0/railsexpres
 https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/2.1.0/railsexpress/04-show-full-backtrace-on-stack-overflow.patch
 https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/2.1.0/railsexpress/05-fix-missing-c-return-event.patch
 https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/2.1.0/railsexpress/06-backport-ca050a8d57a771d24de2cdf3e3d56e5ff6bc278c.patch
+https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/2.1.0/railsexpress/07-fix-broken-imap-cert.patch
+https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/2.1.0/railsexpress/08-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch

patchsets/ruby/2.1/head/railsexpress

@@ -0,0 +1,6 @@
+https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/2.1/head/railsexpress/01-zero-broken-tests.patch
+https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/2.1/head/railsexpress/02-improve-gc-stats.patch
+https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/2.1/head/railsexpress/03-display-more-detailed-stack-trace.patch
+https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/2.1/head/railsexpress/04-show-full-backtrace-on-stack-overflow.patch
+https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/2.1/head/railsexpress/05-fix-missing-c-return-event.patch
+https://raw.github.com/skaes/rvm-patchsets/master/patches/ruby/2.1/head/railsexpress/06-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch

scripts/alias

@@ -22,15 +22,17 @@ usage() {
 "
 }
 
-alias_after_create_default()
+alias_create_exceute()
 {
-  rvm_log "Creating default links/files"
-
-  environment_id="${final_environment_identifier}"
-
-  RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | __rvm_sed 's#^\(.*\) (.*$#\1#')"
+  for _path in "$rvm_rubies_path" "$rvm_environments_path" "$rvm_wrappers_path"
+  do
+    if [[ -L "$_path/$alias_name" ]]
+    then \rm -fv "$_path/$alias_name" || return $?
+    fi
+    \ln -fsv "$_path/$rvm_ruby_string" "$_path/$alias_name" || return $?
+  done
 
-  export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
+  __rvm_db_ "$rvm_path/config/alias" "$alias_name" "$rvm_ruby_string"
 }
 
 alias_create()
@@ -52,19 +54,9 @@ alias_create()
     rvm_error "$alias_name is a full ruby name and can not be used as alias name."
     return 2
   else
-    final_environment_identifier="${rvm_ruby_string:-$(__rvm_env_string)}"
-
-    rvm_log "Creating alias $alias_name for $final_environment_identifier."
-    for _path in "$rvm_rubies_path" "$rvm_environments_path" "$rvm_wrappers_path"
-    do
-      [[ -L "$_path/$alias_name" ]] && \rm -f "$_path/$alias_name"
-      \ln -fs "$_path/$rvm_ruby_string" "$_path/$alias_name"
-    done
-
-    rvm_log "Recording alias $alias_name for $final_environment_identifier."
-    "$rvm_scripts_path"/db "$rvm_path/config/alias" "$alias_name" "$final_environment_identifier"
-
-    [[ "default" != "$alias_name" ]] || alias_after_create_default
+    __rvm_log_command "alias_create" \
+      "Creating alias $alias_name for $rvm_ruby_string" \
+      alias_create_exceute
   fi
 }