Permalink
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
2 parents fcf0040 + 0cd99b8 commit f9f2368b36745c378c590ea593b9046a100b91a3 @joshuacronemeyer joshuacronemeyer committed Jul 21, 2011
View
@@ -14,3 +14,12 @@ pkg/
.rvmrc
.DS_Store
.idea
+aclocal.m4
+autom4te.cache/
+config.status
+configure
+install-sh
+Makefile
+depcomp
+missing
+.deps/
View
No changes.
View
@@ -1 +1 @@
-1.6.24
+1.6.25
View
@@ -54,7 +54,7 @@ macruby_nightly_version=0.11
macruby_url=http://www.macruby.org/files
macruby_repo_url=git://github.com/MacRuby/MacRuby.git
macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
-maglev_version=26063
+maglev_version=26197
maglev_url=http://glass-downloads.gemstone.com/maglev
maglev_repo_url=git://github.com/MagLev/maglev.git
ironruby_version=1.0
View
@@ -41,7 +41,7 @@ ree-1.8.7-head
kiji
# MagLev
-maglev[-26063]
+maglev[-26197]
maglev-head
# Mac OS X Snow Leopard Only
View
@@ -158,9 +158,9 @@ rubygems-1.6.1.tgz=a77c64896aaa10d64aaf34f5c1488173
rubygems-1.6.2.tgz=0c95a9869914ba1a45bf71d3b8048420
zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
zlib-1.2.5.tar.gz=c735eab2d659a96e5a594c9e8541ad63
-GemStone-26063.Darwin-i386.tar.gz=652246ddf376ab9a9d862e7906db7e7c
-GemStone-26063.Linux-x86_64.tar.gz=5e924283dd242571b3a3b654585d8ef5
-GemStone-26063.SunOS-i86pc.tar.gz=d28c508fe5f170a9b4cc0e588e1a0603
-MagLev-26063.Darwin-i386.tar.gz=5c54f50d56b075eeb4d930eb68ea2ccd
-MagLev-26063.Linux-x86_64.tar.gz=eed972c51e7d17f142a8c74ab34e8aa2
-MagLev-26063.SunOS-i86pc.tar.gz=70d5e3c79e1d40625b24e9c578e3adea
+GemStone-26197.Darwin-i386.tar.gz=af38715e9b6a7a325eb5b094340d4637
+GemStone-26197.Linux-x86_64.tar.gz=80788b6b4c7e99e6903a0ac5ba2c3c34
+GemStone-26197.SunOS-i86pc.tar.gz=080648734bc87f85fcfa2344e804f34a
+MagLev-26197.Darwin-i386.tar.gz=15b330a9206f38f50451bdbc18f12509
+MagLev-26197.Linux-x86_64.tar.gz=4410849b6bfb0da488a62a4428c5ddcc
+MagLev-26197.SunOS-i86pc.tar.gz=ac6bb478f4b795472422b4250a996362
View
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+after_use_hooks=($(
+ find "${rvm_path:-"$HOME/.rvm"}/hooks" -iname 'after_use_*' -type f
+))
+
+for after_use_hook in "${after_use_hooks[@]}"
+do
+ if [[ -x "${after_use_hook}" ]]
+ then
+ . "${after_use_hook}"
+ fi
+done
+
View
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+if [[ "${rvm_ruby_string}" =~ "jruby" ]]
+then
+ . "${rvm_path}/scripts/functions/hooks/jruby"
+
+ if ! jruby_ngserver_is_running
+ then
+ (JRUBY_OPTS='' jruby --ng-server 2>&1 1>/dev/null)&
+ fi
+else
+ for function in jruby_ngserver_is_running jruby ruby
+ do
+ if declare -f ${function} | \grep -q "${function} ()"
+ then
+ unset -f $function
+ fi
+ done
+fi
View
@@ -54,7 +54,7 @@
# RVM::Environment.new, versus RVM.environment
#
module RVM
- VERSION = "1.6.24"
+ VERSION = "1.6.25"
require "rvm/errors"
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils
+
+# This should be the first 7 characters of the tagged version's commit.
+VERSION_SHORT_SHA1="b83b808"
+
+SRC_URI="http://github.com/wayneeseguin/rvm/tarball/${PV} -> ${P}.tar.gz"
+S="${WORKDIR}/wayneeseguin-rvm-${VERSION_SHORT_SHA1}"
+
+DESCRIPTION="RVM facilitates easy installation and management of multiple Ruby environments and sets of gems"
+HOMEPAGE="http://rvm.beginrescueend.com/"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="mono java"
+
+RDEPEND="net-misc/curl
+ sys-devel/patch
+ java? (
+ dev-java/sun-jdk
+ dev-java/sun-jre-bin
+ )
+ mono? ( dev-lang/mono )"
+
+RVM_DIR="/opt/rvm"
+
+src_install() {
+ for v in `env | egrep '^rvm_' | cut -d '=' -f 1`; do
+ unset $v
+ done
+
+ # Set variables for installation (only!)
+ export rvm_prefix="${D}"
+ export rvm_path="${D}${RVM_DIR}"
+ export rvm_user_install=1
+
+ ./install || die "Installation failed."
+
+ # Set variables for actual operation in a default rvmrc
+ echo "rvm_user_install=1" > "${T}"/rvmrc
+ echo "rvm_prefix=\"$(dirname $RVM_DIR)/\"" >> "${T}"/rvmrc
+ echo "rvm_path=\"${RVM_DIR}\"" >> "${T}"/rvmrc
+
+ insinto /etc
+ doins "${T}"/rvmrc || die "Failed to install /etc/rvmrc."
+ elog "A default /etc/rvmrc has been installed. Feel free to modify it."
+ elog
+
+ elog "Before any user (including root) can use rvm, the following line must be appended"
+ elog "to the end of the user's shell's loading files (.bashrc and then .bash_profile"
+ elog "for bash; or .zshrc for zsh), after all path/variable settings:"
+ elog
+ elog " [[ -s $RVM_DIR/scripts/rvm ]] && source $RVM_DIR/scripts/rvm"
+}
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
@@ -138,10 +138,12 @@ __rvm_parse_args()
fi
;;
- package)
+ pkg)
rvm_action="$rvm_token"
- if [[ "$next_token" = "--only-path" ]]; then
- shift; rvm_only_path_flag=1
+ if [[ "$next_token" = "--only-path" ]]
+ then
+ shift
+ rvm_only_path_flag=1
fi
rvm_ruby_args="$next_token $*"
rvm_parse_break=1
@@ -818,6 +820,7 @@ rvm()
source "$rvm_scripts_path/functions/implode"
__rvm_implode
;;
+
get)
if (( $# > 0 ))
then
@@ -837,7 +840,7 @@ rvm()
\rm -f $tmpdir/$$
;;
- help|rtfm|env|current|info|list|gemdir|gemhome|gempath|monitor|notes|package)
+ help|rtfm|env|current|info|list|gemdir|gemhome|gempath|monitor|notes|package|extract|pkg)
if (( $# > 0 ))
then
@@ -847,10 +850,11 @@ rvm()
next_token=""
fi
- if [[ "$next_token" = "${rvm_action}" ]]
+ if [[ "$next_token" == "${rvm_action}" ]]
then
shift
fi
+
"$rvm_scripts_path/${rvm_action}" ${rvm_ruby_args:-}
;;
View
@@ -6,7 +6,7 @@ source "$rvm_scripts_path/base"
usage()
{
- printf "Usage: 'rvm disk-usage {all,archives,repos,sources,logs,packages,rubies,gemsets}'\n"
+ printf "Usage: 'rvm disk-usage {all,archives,repos,sources,logs,pkg,rubies,gemsets}'\n"
printf " Lists the space rvm uses for a given item.\n"
exit 1
}
@@ -31,7 +31,7 @@ all_disk_usage()
repos_disk_usage
sources_disk_usage
logs_disk_usage
- packages_disk_usage
+ pkg_disk_usage
rubies_disk_usage
gemsets_disk_usage
total_disk_usage
@@ -46,7 +46,7 @@ archives_disk_usage() { disk_usage "Downloaded Archives" "archives"; }
repos_disk_usage() { disk_usage "Repositories" "repos"; }
sources_disk_usage() { disk_usage "Extracted Source Code" "src"; }
logs_disk_usage() { disk_usage "Log Files" "log"; }
-packages_disk_usage() { disk_usage "Packages" "usr"; }
+pkg_disk_usage() { disk_usage "Packages" "usr"; }
rubies_disk_usage() { disk_usage "Rubies" "rubies"; }
gemsets_disk_usage() { disk_usage "Gemsets" "gems"; }
@@ -55,6 +55,6 @@ gemsets_disk_usage() { disk_usage "Gemsets" "gems"; }
[[ -z "$1" ]] && usage
case "$1" in
- all|archives|repos|sources|logs|total|packages|rubies|gemsets) eval "$1_disk_usage" ;;
+ all|archives|repos|sources|logs|total|pkg|rubies|gemsets) eval "$1_disk_usage" ;;
*) usage ;;
esac
View
@@ -0,0 +1 @@
+#/usr/bin/env bash
View
@@ -69,6 +69,11 @@ __rvm_load_environment()
# source the environment file
\. "$rvm_environments_path/$string"
+
+ if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
+ then
+ \. "${rvm_path:-$HOME/.rvm}/hooks/after_use"
+ fi
# clear the PATH cache
builtin hash -r
@@ -262,7 +262,10 @@ __rvm_setup()
}
__rvm_teardown()
{
- [[ ! -d "${rvm_tmp_path}/$$" ]] || __rvm_rm_rf "${rvm_tmp_path}/$$"
+ if [[ -d "${rvm_tmp_path}/$$" ]]
+ then
+ __rvm_rm_rf "${rvm_tmp_path}/$$"
+ fi
if [[ -n "${ZSH_VERSION:-""}" ]]
then
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+jruby_ngserver_is_running()
+{
+ ps auxww | grep -q '[s]un.java.command=com.martiansoftware.nailgun.NGServer'
+}
+
+jruby()
+{
+ if jruby_ngserver_is_running
+ then
+ command jruby --ng "$@"
+ else
+ command jruby "$@"
+ fi
+}
+
+ruby()
+{
+ jruby "$@"
+}
+
Oops, something went wrong.

0 comments on commit f9f2368

Please sign in to comment.