rvm 0.1.45 → 0.1.46

data/binscripts/rvm-auto-ruby

@@ -13,6 +13,7 @@ else
   exit 1
 fi
 
+[[ -s "$rvm_environments_path/default" ]] && source "$rvm_environments_path/default"
 rvm load-rvmrc > /dev/null 2>&1
 
 exec ruby "$@"

data/binscripts/rvm-update-head

@@ -7,11 +7,11 @@ fi
 
 rvm_path="${rvm_path:-$HOME/.rvm}"
 
-[ -d "$rvm_path/src" ] || mkdir -p $rvm_path/src/
+[ -d "$rvm_path/src" ] || \mkdir -p $rvm_path/src/
 
 cd "$rvm_path/src"
 
-[ -d ./rvm ] && rm -rf ./rvm/
+[ -d ./rvm ] && \rm -rf ./rvm/
 
 git clone --depth 1 git://github.com/wayneeseguin/rvm.git ||
   git clone http://github.com/wayneeseguin/rvm.git

data/binscripts/rvm-update-latest

@@ -6,7 +6,7 @@ if [[ -z "$rvm_ignore_rvmrc" ]]; then
 fi
 
 rvm_path="${rvm_path:-$HOME/.rvm}"
-mkdir -p $rvm_path/src/
+\mkdir -p $rvm_path/src/
 cd $rvm_path/src
 
 stable_version=$(curl -B http://rvm.beginrescueend.com/releases/stable-version.txt 2>/dev/null)

data/config/db

@@ -18,10 +18,10 @@ ruby_1.8_url=ftp://ftp.ruby-lang.org/pub/ruby/1.8
 ruby_1.9_url=ftp://ftp.ruby-lang.org/pub/ruby/1.9
 ruby_2.0_url=ftp://ftp.ruby-lang.org/pub/ruby/2.0
 ruby_1.9.1_patch_level=378
-ruby_1.9.2_patch_level=rc2
+ruby_1.9.2_patch_level=0
 ruby_1.8.5_patch_level=231
 ruby_1.8.6_patch_level=399
-ruby_1.8.7_patch_level=299
+ruby_1.8.7_patch_level=302
 rubygems_version=1.3.7
 rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
 rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
@@ -46,7 +46,7 @@ macruby_version=0.6
 macruby_url=http://www.macruby.org/files
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
-maglev_version=23913
+maglev_version=24067
 maglev_url=http://glass-downloads.gemstone.com/maglev
 maglev_repo_url=git://github.com/MagLev/maglev.git
 shyouhei_repo_url=git://github.com/shyouhei/ruby.git

data/config/known

@@ -1,7 +1,7 @@
 # MRI Rubies
 (ruby-)1.8.6(-p399)
 (ruby-)1.8.6-head
-(ruby-)1.8.7(-p299)
+(ruby-)1.8.7(-p302)
 (ruby-)1.8.7-head
 (ruby-)1.9.1-p243
 (ruby-)1.9.1-p376
@@ -9,7 +9,7 @@
 (ruby-)1.9.1-head
 (ruby-)1.9.2-preview1
 (ruby-)1.9.2-preview3
-(ruby-)1.9.2(-rc2)
+(ruby-)1.9.2(-p0)
 (ruby-)1.9.2-head
 ruby-head
 
@@ -31,7 +31,7 @@ ree-1.8.6-head
 ree-1.8.7-head
 
 # MagLev
-maglev(-23913)
+maglev(-24067)
 maglev-head
 
 # Shyouhei head, the default mput

data/config/md5

@@ -16,6 +16,7 @@ ruby-1.8.7-p174.tar.gz=18dcdfef761a745ac7da45b61776afa5
 ruby-1.8.7-p248.tar.gz=60a65374689ac8b90be54ca9c61c48e3
 ruby-1.8.7-p249.tar.gz=d7db7763cffad279952eb7e9bbfc221c
 ruby-1.8.7-p299.tar.gz=43533980ee0ea57381040d4135cf9677
+ruby-1.8.7-p302.tar.gz=a6a9e37079ed8cf8726b455dad3de939
 ruby-1.9.1-p129.tar.gz=c71f413514ee6341c627be2957023a5c
 ruby-1.9.1-p243.tar.gz=515bfd965814e718c0943abf3dde5494
 ruby-1.9.1-p376.tar.gz=ebb20550a11e7f1a2fbd6fdec2a3e0a3
@@ -26,6 +27,7 @@ ruby-1.9.2-preview1.tar.gz=e2b8cdbf300f53472be09699a5837fd1
 ruby-1.9.2-preview3.tar.gz=209e59f3495a5503fa948c2732f1d705
 ruby-1.9.2-rc1.tar.gz=fdedd5b42ae89a9a46797823ad2d9acf
 ruby-1.9.2-rc2.tar.gz=d12cd39eee4d99bc54b52aba5a0ba4e1
+ruby-1.9.2-p0.tar.gz=755aba44607c580fddc25e7c89260460
 ruby-enterprise-1.8.6-20090610.tar.gz=0bf66ee626918464a6eccdd83c99d63a
 ruby-enterprise-1.8.7-2009.10.tar.gz=3727eef7b6b1b2f31db7d091328d966e
 ruby-enterprise-1.8.7-20090928.tar.gz=ae00018ce89d95419dfde370fcd485ac
@@ -50,7 +52,7 @@ zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
 curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
 pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
 ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
-GemStone-23913.Darwin-i386.tar.gz=8115f487253aa09d38b303e0e49c62b3
-GemStone-23913.Linux-x86_64.tar.gz=bd7832caef3768eb49d39e433366fc2e
-MagLev-23913.Darwin-i386.tar.gz=35c60bfcea8d84e64af01c024c548019
-MagLev-23913.Linux-x86_64.tar.gz=ea8e1096293a652a8a9b00cbe2eda12d
+GemStone-24067.Darwin-i386.tar.gz=89bdf43e357202266dc8e342f2050855
+GemStone-24067.Linux-x86_64.tar.gz=91a8d99b46e934c5988bc7dd64e7a030
+MagLev-24067.Darwin-i386.tar.gz=76f0c47c0f64ae90f90573aa1280368f
+MagLev-24067.Linux-x86_64.tar.gz=e2a838720a7dc2417ffe98681c3b4a09

data/contrib/install-system-wide

@@ -1,15 +1,23 @@
 #!/usr/bin/env bash
 
+__rvm_system_wide_permissions() {
+  [[ -z "$1" ]] && return 1
+  chown -R root:"$rvm_group_name" "$1"
+  chmod -R g+w "$1"
+  [[ -d "$1" ]] && find "$1" -type d | xargs -n1 chmod g+s
+}
+
 # Require root to install it.
 if [[ "$(whoami)" != "root" ]]; then
   echo "Please rerun this installer as root." >&2
   exit 1
-fi
-
 # Check for the presence of git.
-if ! command -v git >/dev/null 2>&1 ; then
+elif ! command -v git >/dev/null 2>&1 ; then
   echo "Please ensure git is installed and available in PATH to continue." >&2
   exit 1
+elif [[ "$(uname)" != "Linux" ]]; then
+  echo "The rvm system wide installer is currently Linux only." >&2
+  exit 1
 fi
 
 # Load the rvm config.
@@ -21,10 +29,24 @@ fi
 rvm_path="${rvm_path:-"/usr/local/rvm"}"
 export rvm_selfcontained=0
 
-mkdir -p "$rvm_path/src/"
+rvm_group_name="${rvm_group_name:-"rvm"}"
+if cat /etc/group | cut -d: -f1 | grep -q "^${rvm_group_name}$"; then
+  echo "Group exists, proceeding with installation."
+else
+  echo "Creating the group '$rvm_group_name'"
+  groupadd -f "$rvm_group_name"
+fi
+echo "Adding $(whoami) the '$rvm_group_name'"
+usermod -a -G "$rvm_group_name" "$(whoami)"
+
+echo "Creating the destination dir and making sure the permissions are correct"
+\mkdir -p "$rvm_path"
+__rvm_system_wide_permissions "$rvm_path"
+
+\mkdir -p "$rvm_path/src/"
 builtin cd "$rvm_path/src"
 
-rm -rf ./rvm/
+\rm -rf ./rvm/
 
 git clone --depth 1 git://github.com/wayneeseguin/rvm.git || git clone http://github.com/wayneeseguin/rvm.git
 
@@ -33,37 +55,31 @@ builtin cd rvm
 echo "Running the install script."
 bash ./scripts/install "$@"
 
-rvm_group_name="${rvm_group_name:-"rvm"}"
-
-if cat /etc/group | cut -d: -f1 | grep -q "^${rvm_group_name}$"; then
-  echo "Group exists, proceeding with installation."
-else
-  echo "Creating the group '$rvm_group_name'"
-  groupadd -f "$rvm_group_name"
-fi
-echo "Adding root the '$rvm_group_name'"
-usermod -a -G "$rvm_group_name" "$(whoami)"
+__rvm_system_wide_permissions "$rvm_path"
 
 echo "Setting up group permissions"
-for dir in rvm bin share/man; do
-  chown -R root:"$rvm_group_name" /usr/local/$dir
-  chmod -R g+w /usr/local/$dir
+rvm_parent_dir="$(dirname "$rvm_path")"
+for dir in bin share/man; do
+  __rvm_system_wide_permissions "$rvm_parent_dir/$dir"
 done; unset dir
 
 echo "Generating system wide rvmrc"
-rm -f /etc/rvmrc
-touch /etc/rvmrc
+\rm -f /etc/rvmrc
+\touch /etc/rvmrc
 cat > /etc/rvmrc <<END_OF_RVMRC
 # Setup default configuration for rvm.
-umask g+w
-export rvm_selfcontained=0
-export rvm_prefix="/usr/local/"
+# If an rvm install exists in the home directory, don't load this.'
+if [[ ! -s "\$HOME/.rvm/scripts/rvm" ]]; then
+  umask g+w
+  export rvm_selfcontained=0
+  export rvm_prefix="$rvm_parent_dir/"
+fi
 END_OF_RVMRC
 
-echo "Generating /usr/local/lib/rvm to load rvm"
-rm -f /usr/local/lib/rvm
-touch /usr/local/lib/rvm
-cat > /usr/local/lib/rvm <<END_OF_RVM_SH
+echo "Generating $rvm_parent_dir/lib/rvm to load rvm"
+\rm -f "$rvm_parent_dir/lib/rvm"
+\touch "$rvm_parent_dir/lib/rvm"
+cat > "$rvm_parent_dir/lib/rvm" <<END_OF_RVM_SH
 # Automatically source rvm
 if [[ -s "\$HOME/.rvm/scripts/rvm" ]]; then
   source "\$HOME/.rvm/scripts/rvm"
@@ -74,10 +90,10 @@ END_OF_RVM_SH
 
 echo "Correct permissions on rvmrc and the rvm loader"
 # Finally, ensure the rvmrc is owned by the group.
-for file in /etc/rvmrc /usr/local/lib/rvm ; do
-  chown root:"$rvm_group_name" "$file"
-  chmod g+w "$file"
+for file in /etc/rvmrc "$rvm_parent_dir/lib/rvm" ; do
+  __rvm_system_wide_permissions "$file"
 done; unset file
 
-echo "To use, source '/usr/local/lib/rvm' to your shell profile."
+echo "RVM is now installed. To use, source '$rvm_parent_dir/lib/rvm' to your shell profile."
 
+unset rvm_parent_dir

data/install

@@ -96,8 +96,8 @@ rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 
 if [[ "$rvm_selfcontained" = "0" ]] ; then
-  rvm_bin_path="${rvm_bin_path:-"$rvm_prefix/bin"}"
-  rvm_man_path="${rvm_man_path:-"$rvm_prefix/share/man"}"
+  rvm_bin_path="${rvm_bin_path:-"${rvm_prefix}bin"}"
+  rvm_man_path="${rvm_man_path:-"${rvm_prefix}share/man"}"
   rvm_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
 else
   rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"
@@ -126,11 +126,11 @@ fi
 
 spinner
 
-mkdir -p "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path"
+\mkdir -p "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path"
 
 for file in README LICENCE ; do
   spinner
-  cp -f "$source_path/$file" "$rvm_path/"
+  \cp -f "$source_path/$file" "$rvm_path/"
 done
 
 #
@@ -138,22 +138,22 @@ done
 #
 for dir_name in config scripts examples lib hooks help patches; do
   spinner
-  mkdir -p "$rvm_path/$dir_name"
+  \mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
-    cp -Rf "$source_path/$dir_name" "$rvm_path"
+    \cp -Rf "$source_path/$dir_name" "$rvm_path"
   fi
 done ; unset dir_name
 
 spinner
 if [[ ! -s "$rvm_config_path/user" ]] ; then
-  mkdir -p "$rvm_config_path/"
+  \mkdir -p "$rvm_config_path/"
   echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
 scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
 for script_name in "${scripts[@]}" ; do
   spinner
-  chmod +x $rvm_scripts_path/$script_name
+  chmod +x "$rvm_scripts_path/$script_name" 2>/dev/null # Hide errors.
 done
 
 #
@@ -162,8 +162,8 @@ done
 # Cleanse and purge...
 for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
   spinner && perl -e 'sleep 0.2'
-  rm -f "$rvm_bin_path/$file"
-  cp -f "$source_path/binscripts/$file" $rvm_bin_path/
+  \rm -f "$rvm_bin_path/$file"
+  \cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
 spinner
 chmod +x $rvm_bin_path/*
@@ -176,7 +176,7 @@ if [[ -n "$rvm_auto_flag" ]] ; then
   printf "Checking rc files... ($rvm_rc_files)"
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
     for rcfile in $(echo $rvm_rc_files) ; do
-      if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
+      if [[ ! -f $rcfile ]] ; then \touch $rcfile ; fi
       if [[ -s "$HOME/.profile" ]] ; then
         if ! grep -q '.profile' "$rcfile" ; then
           echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
@@ -196,26 +196,26 @@ fi
 #
 spinner
 if [[ -d gemsets/ ]] ; then
-  mkdir -p "$rvm_gemsets_path"
+  \mkdir -p "$rvm_gemsets_path"
   for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/^\.\///') ; do
     destination="$rvm_gemsets_path/$gemset_file"
     destination_path="$(dirname "$destination")"
     if [[ ! -s "$destination" ]] ; then
-      mkdir -p "$destination_path"
-      cp "gemsets/$gemset_file" "$destination"
+      \mkdir -p "$destination_path"
+      \cp "gemsets/$gemset_file" "$destination"
     fi
   done ; unset destination destination_path gemset_file
 fi
 
 spinner
 if [[ -d patchsets/ ]] ; then
-  mkdir -p "$rvm_patchsets_path"
+  \mkdir -p "$rvm_patchsets_path"
   for patchset_file in $(cd patchsets ; find . -iname '*' | sed 's/^\.\///') ; do
     destination="$rvm_patchsets_path/$patchset_file"
     destination_path="$(dirname "$destination")"
     if [[ ! -s "$destination" ]] ; then
-      mkdir -p "$destination_path"
-      cp "patchsets/$patchset_file" "$destination"
+      \mkdir -p "$destination_path"
+      \cp "patchsets/$patchset_file" "$destination"
     fi
   done ; unset destination destination_path patchset_file
 fi
@@ -224,7 +224,7 @@ fi
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
 #
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-mkdir -p "$rvm_rubies_path/"
+\mkdir -p "$rvm_rubies_path/"
 spinner
 for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
   if [[ -d "$ruby" ]] ; then
@@ -280,7 +280,7 @@ if [[ -s "$rvm_config_path/default" ]]; then
     $rvm_scripts_path/alias create default "$original_version" &> /dev/null
   fi
   unset original_version
-  rm -rf "$rvm_config_path/default"
+  \rm -rf "$rvm_config_path/default"
 fi
 
 #
@@ -288,14 +288,14 @@ fi
 #
 
 printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
-mkdir -p $rvm_bin_path
+\mkdir -p $rvm_bin_path
 for file in rvm rvmsudo rvm-shell rvm-auto-ruby; do
   [[ -s "$rvm_bin_path/$file" ]] && chmod +x "$rvm_bin_path/$file"
 done; unset file
 printf "\n    Copying manpages into place."
 for man_file in $(\ls "$install_source_path/man"); do
-  rm -rf "$rvm_man_path/$man_file"
-  cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
+  \rm -rf "$rvm_man_path/$man_file"
+  \cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
 done
 
 [[ "$upgrade_flag" = 0 ]] && ./scripts/notes
@@ -319,7 +319,7 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   check_rubyopt_conditions
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else
-  if [[ -z "$rvm_prefix" ]] && [[ "root" != "$(whoami)" ]] ; then
+  if [[ "$rvm_selfcontained" = "1" ]] ; then
     printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
     printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
     printf "\n     [[ -s \$HOME/.rvm/scripts/rvm ]] && source \$HOME/.rvm/scripts/rvm"

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 45
+:patch: 46

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.45"
+  s.version = "0.1.46"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-08-11}
+  s.date = %q{2010-08-18}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/alias

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-unset rvm_default_flag rvm_wrapper_name 
+unset rvm_default_flag rvm_wrapper_name
 
 source $rvm_scripts_path/base
 
@@ -43,7 +43,7 @@ show_alias() {
 delete_alias() {
   echo "Deleting alias: $alias_name"
   for link in "$rvm_rubies_path/$alias_name" ; do
-    if [[ -L "$link" ]] ; then rm -f $link ; fi
+    if [[ -L "$link" ]] ; then \rm -f $link ; fi
   done
   $rvm_scripts_path/db "$rvm_config_path/alias" "$alias_name" "delete"
 }
@@ -99,7 +99,7 @@ alias_list() {
 action="$1"
 alias_name="$2"
 rvm_environment_identifier="$3"
-if [[ ! -f "$rvm_config_path/alias" ]] ; then touch "$rvm_config_path/alias" ; fi
+if [[ ! -f "$rvm_config_path/alias" ]] ; then \touch "$rvm_config_path/alias" ; fi
 if [[ ! -z "$alias_name" ]] ; then
   rvm_alias="$($rvm_scripts_path/db "$rvm_config_path/alias" "$alias_name")"
 fi

data/scripts/cleanup

@@ -13,7 +13,7 @@ cleanup() {
     eval "current_path=\"\$rvm_${cleanup_type}_path\""
     if [[ -n "$current_path" && -d "$current_path" && "$current_path" != "/" ]]; then
       $rvm_scripts_path/log "info" "Cleaning up rvm directory '$current_path'"
-      rm -rf "$current_path"/* >/dev/null 2>&1
+      \rm -rf "$current_path"/* >/dev/null 2>&1
     fi
   done; unset cleanup_type current_path
 }

data/scripts/cli

@@ -300,9 +300,9 @@ __rvm_parse_args() {
       ;;
 
       -h|--help|usage)      rvm_action=help                     ;;
-      -G)                   path_variable="rvm_gems_path"     ; __rvm_set_path_variable ; shift  ;;
-      --source)             path_variable="rvm_src_path"      ; __rvm_set_path_variable ; shift  ;;
-      --archives)           path_variable="rvm_archives_path" ; __rvm_set_path_variable ; shift  ;;
+      -G)                   path_variable="rvm_gems_path"     ; __rvm_set_path_variable "$1"; shift  ;;
+      --source)             path_variable="rvm_src_path"      ; __rvm_set_path_variable "$1"; shift  ;;
+      --archives)           path_variable="rvm_archives_path" ; __rvm_set_path_variable "$1"; shift  ;;
       --make)               rvm_ruby_make="$1"         ; shift  ;;
       --make-install)       rvm_ruby_make_install="$1" ; shift  ;;
       --nice)               rvm_niceness="$1"          ; shift  ;;
@@ -465,7 +465,7 @@ rvm() {
   if [[ -n "$PS1" ]] ; then export rvm_interactive=1 ; else unset rvm_interactive ; fi
 
   if [[ -z "$ZSH_VERSION" ]] ; then
-    trap 'rm -rf "$rvm_tmp_path/$$" >/dev/null 2>&1' 0 1 2 3 15
+    trap '\rm -rf "$rvm_tmp_path/$$" >/dev/null 2>&1' 0 1 2 3 15
   fi
 
   # Check that this is the current version.
@@ -483,7 +483,7 @@ rvm() {
   export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_patches_path rvm_patches_path rvm_patchsets_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator
 
   result=0
-  
+
   case "$rvm_action" in
     use)             __rvm_use               ; result=$? ;;
     srcdir)          __rvm_source_dir        ; result=$? ;;