rvm 0.1.41 → 0.1.42

data/binscripts/rvm

@@ -18,7 +18,7 @@ if [[ -z "$rvm_prefix" ]] ; then
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_prefix="/usr/local"
   else
-    rvm_prefix="$HOME"
+    rvm_prefix="$HOME/."
   fi
 fi
 

data/binscripts/rvm-shell

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+__rvm_shell_lookup_script() {
+  local relative_scripts_dir="$(dirname -- "$(dirname -- "$0")")/scripts"
+  for directory in "$rvm_scripts_path" "$HOME/.rvm/scripts" "/usr/local/rvm/scripts" "$relative_scripts_dir"; do
+    if [[ -d "$directory" && -s "$directory/rvm" ]]; then
+      echo "$directory/rvm"
+      return
+    fi
+  done
+}
+
+# If the first argument isn't -c, remove it and set
+# it to the ruby string value.
+if [[ -n "$1" && -n "$(echo "$1" | grep -v '^-')" ]]; then
+  rvm_shell_ruby_string="$1"
+  shift
+fi
+
+if [[ -n "$rvm_shell_ruby_string" ]]; then
+  rvm_shell_rvm_path="$(__rvm_shell_lookup_script)"
+  if [[ -n "$rvm_shell_rvm_path" ]]; then
+    source "$rvm_shell_rvm_path"
+    rvm "$rvm_shell_ruby_string"
+    if [[ "$?" -gt 0 ]]; then
+      echo "Error: RVM was unable to use '#$rvm_shell_ruby_string'" 1>&2
+      exit 1
+    fi
+  fi
+fi
+
+exec bash "$@"

data/binscripts/rvmsudo

@@ -1,8 +1,3 @@
 #!/usr/bin/env bash
 
-prefix="PATH='$PATH'"
-if [[ ! -z "$BUNDLE_PATH" ]] ; then prefix="BUNDLE_PATH='$BUNDLE_PATH' $prefix" ; fi
-if [[ ! -z "$GEM_HOME" ]] ; then prefix="GEM_HOME='$GEM_HOME' $prefix" ; fi
-if [[ ! -z "$GEM_PATH" ]] ; then prefix="GEM_PATH='$GEM_PATH' $prefix" ; fi
-
-eval "sudo" "/usr/bin/env $prefix $@"
+exec sudo -E "$@"

data/config/db

@@ -18,7 +18,7 @@ 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=rc1
+ruby_1.9.2_patch_level=rc2
 ruby_1.8.5_patch_level=231
 ruby_1.8.6_patch_level=399
 ruby_1.8.7_patch_level=299
@@ -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=23767
+maglev_version=23832
 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

@@ -9,7 +9,7 @@
 (ruby-)1.9.1-head
 (ruby-)1.9.2-preview1
 (ruby-)1.9.2-preview3
-(ruby-)1.9.2(-rc1)
+(ruby-)1.9.2(-rc2)
 (ruby-)1.9.2-head
 ruby-head
 
@@ -31,7 +31,7 @@ ree-1.8.6-head
 ree-1.8.7-head
 
 # MagLev
-maglev(-23767)
+maglev(-23832)
 maglev-head
 
 # Shyouhei head, the default mput

data/config/md5

@@ -25,9 +25,11 @@ ruby-1.9.1-p429.tar.gz=0f6d7630f26042e00bc59875755cf879
 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-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
+ruby-enterprise-1.8.7-2010.02.tar.gz=4df7b09c01adfd711b0ab76837611542
 rubygems-1.3.5.tgz=6e317335898e73beab15623cdd5f8cff
 rubygems-1.3.6.tgz=789ca8e9ad1d4d3fe5f0534fcc038a0d
 rubygems-1.3.7.tgz=e85cfadd025ff6ab689375adbf344bbe
@@ -48,8 +50,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-23767.Darwin-i386.tar.gz=639ca12a261e8626ff8cf63bd408b253
-GemStone-23767.Linux-x86_64.tar.gz=79ee9214a2df3427584a2b9b13437ddd
-MagLev-23767.Darwin-i386.tar.gz=e4eae8ef9f1c9264d00b90899e3896ca
-MagLev-23767.Linux-x86_64.tar.gz=d42bc9fdfb704e5723310352959e17cc
-
+GemStone-23832.Darwin-i386.tar.gz=2e5d34c21a064b04103def63d0221149
+GemStone-23832.Linux-x86_64.tar.gz=429f81c5c0ec4c8d7188f176b1dc3374
+MagLev-23832.Darwin-i386.tar.gz=d9925605f27a2b454aede7b410d99b8b
+MagLev-23832.Linux-x86_64.tar.gz=f3f7048a353e1b1724adcecb56d50766

data/contrib/install-system-wide

@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+
+# 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
+  echo "Please ensure git is installed and available in PATH to continue." >&2
+  exit 1
+fi
+
+# Load the rvm config.
+[[ -s /etc/rvmrc ]] && source /etc/rvmrc
+[[ -s "$HOME/.rvmrc" ]] && source "$HOME/.rvmrc"
+
+rvm_path="${rvm_path:-"/usr/local/rvm"}"
+
+mkdir -p "$rvm_path/src/"
+builtin cd "$rvm_path/src"
+
+rm -rf ./rvm/
+
+git clone --depth 1 git://github.com/wayneeseguin/rvm.git
+
+builtin cd rvm
+
+"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)"
+
+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
+done; unset dir
+
+echo "Generating system wide rvmrc"
+rm -f /etc/rvmrc
+touch /etc/rvmrc
+cat > /etc/rvmrc <<END_OF_RVMRC
+# Setup default configuration for rvm.
+export rvm_path="/usr/local/rvm"
+export rvm_prefix="/usr/local"
+export rvm_bin_path="\$rvm_prefix/bin"
+export rvm_man_path="\$rvm_prefix/share/man"
+END_OF_RVMRC
+
+echo "Generating /etc/load_rvm to load rvm"
+rm -f /usr/local/lib/rvm
+touch /usr/local/lib/rvm
+cat > /usr/local/lib/rvm <<END_OF_RVM_SH
+# Automatically source rvm
+if [[ -s "\$HOME/.rvm/scripts/rvm" ]]; then
+  source "\$HOME/.rvm/scripts/rvm"
+elif [[ -s "/usr/local/rvm/scripts/rvm" ]]; then
+  source "/usr/local/rvm/scripts/rvm"
+fi
+END_OF_RVM_SH
+
+echo "Correct permissions on rvmrc and load_rvm"
+# Finally, ensure the rvmrc is owned by the group.
+for file in /etc/rvmrc /usr/local/lib/rvm ; do
+  chown root:"$rvm_groop_name" "$file"
+  chmod g+w "$file"
+done; unset file
+
+echo "To use, source '/usr/local/lib/rvm' to your shell profile."
+

data/install

@@ -44,19 +44,19 @@ if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ;
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
   case "$token" in
-    --auto)    rvm_auto_flag=1          ;;
+    --auto)    rvm_auto_flag=1 ;;
     --prefix)  rvm_prefix="$1" ; shift ;;
     --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
-    --help|*)  usage                    ;;
+    --help|*)  usage ;;
   esac
 done
 
 if [[ -z "$rvm_prefix" ]] ; then
   __rvm_load_rvmrc
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_prefix="/usr/local/"
+    rvm_prefix="${rvm_prefix:-"/usr/local/"}"
   else
-    rvm_prefix="$HOME/."
+    rvm_prefix="${rvm_prefix:-"$HOME/."}"
   fi
 fi
 
@@ -87,7 +87,7 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 
-if [[ "root" = "$(whoami)" ]] ; then
+if [[ -z "$rvm_prefix" ]] && [[ "root" = "$(whoami)" ]] ; then
   rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
 else
   rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
@@ -114,7 +114,7 @@ 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_patches_path $rvm_tmp_path
 
 for file in README LICENCE ; do
   spinner
@@ -139,7 +139,7 @@ if [[ ! -s "$rvm_config_path/user" ]] ; then
 fi
 
 scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
-for script_name in $scripts ; do
+for script_name in "${scripts[@]}" ; do
   spinner
   chmod +x $rvm_scripts_path/$script_name
 done
@@ -148,7 +148,7 @@ done
 # Bin Scripts
 #
 # Cleanse and purge...
-for file in rvm-prompt rvm rvmsudo ; do
+for file in rvm-prompt rvm rvmsudo rvm-shell ; do
   spinner && perl -e 'sleep 0.2'
   rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
@@ -160,7 +160,7 @@ chmod +x $rvm_bin_path/*
 # RC Files
 #
 spinner
-if [[ ! -z "$rvm_auto_flag" ]] ; then
+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
@@ -274,16 +274,16 @@ fi
 # End of gemset migration.
 #
 
-if [[ "root" = "$(whoami)" ]] ; then
-  printf "\n    Symlinking rvm to $rvm_bin_path/rvm ..."
-  mkdir -p $rvm_bin_path
-  chmod +x $rvm_bin_path/rvm
-  chmod +x $rvm_bin_path/rvmsudo
-  printf "\n    Copying manpages into place."
-  for man_file in $(\ls "$install_source_path/man"); do
-    cp -f "$install_source_path/man/$man_file" "$rvm_man_path/$man_file"
-  done
-fi
+printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
+mkdir -p $rvm_bin_path
+for file in rvm rvmsudo rvm-shell ; 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/"
+done
 
 if [[ "$upgrade_flag" -eq 0 ]] ; then
   ./scripts/notes
@@ -303,20 +303,19 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n$(tput setaf 6)Upgrade Notes\n"
   printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
   printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
-  printf "\n  * 1.8.7 default patchlevel is p174, override ~/.rvm/config/db in ~/.rvm/config/user"
   printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
   printf "\n$(tput sgr0)\n"
   check_rubyopt_conditions
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else
-  if [[ "root" != "$(whoami)" ]] ; then
+  if [[ -z "$rvm_prefix" ]] && [[ "root" != "$(whoami)" ]] ; 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"
     printf "\n   Please note that this must only occur once - so, you only need to add it the first time you install rvm."
     printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    printf "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
-    printf "\n   if [[ ! -z "$PS1" ]] ; then"
+    printf "\n   This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
+    printf "\n   if [[ -n "\$PS1" ]] ; then"
     printf "\n     ... original content that was below the && return line ..."
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"
@@ -325,7 +324,7 @@ else
     printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
-  if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
+  if [[ -s $HOME/.bashrc ]] && grep -q '&& return' $HOME/.bashrc ; then
     printf "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
     printf "\n   This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
     printf "\n   if [[ -n "\$PS1" ]] ; then"

data/lib/VERSION.yml

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

data/lib/rvm.rb

@@ -1 +1,156 @@
-Dir.glob("#{File.expand_path(File.dirname(__FILE__))}/rvm/*.rb").each { |file| require file }
+# == Ruby Version Manager - Ruby API
+#
+# Provides a wrapper around the command line api implemented as part of the api.
+# If you're not familiar with rvm, please read http://rvm.beginrescueend.com/
+# first.
+#
+# == Usage
+#
+# When using the rvm ruby api, you gain access to most of the commands, including the set
+# functionality. As a side node, the RVM module provides access to most of the api
+# both via direct api wrappers (of the form <tt><tool>_<action></tt> - e.g. +alias_create+,
+# +gemset_use+ and +wrapper+).
+#
+# == The Environment Model
+#
+# The RVM ruby api is implemented using an environment model. Each environment maps directly
+# to some ruby string interpretable by rvm (e.g. +ree+, +ruby-1.8.7-p174+, +system+, +rbx@rails+
+# and so on) and is considered a sandboxed environment (for commands like use etc) in which you
+# can deal with rvm. it's worth noting that a single environment can have multiple environment
+# instances and for the most part creating of these instances is best handled by the RVM.environment
+# and RVM.environments methods.
+#
+# Each Environment (and instance of RVM::Environment) provides access to the rvm ruby api (in some
+# cases, the api may not directly be related to the current ruby - but for simplicity / consistency
+# purposes, they are still implemented as methods of RVM::Environment).
+#
+# When you perform an action with side effects (e.g. RVM::Environment#gemset_use or RVM::Environment#use)
+# this will mutate the ruby string of the given environment (hence, an environment is considered mutable).
+#
+# Lastly, for the actual command line work, RVM::Environment works with an instance of RVM::Shell::AbstractWrapper.
+# This performs logic (such as correctly escaping strings, calling the environment and such) in a way that
+# is both reusable and simplified.
+#
+# By default, method_missing is used on the RVM module to proxy method calls to RVM.current (itself
+# calling RVM::Environment.current), meaning things like RVM.gemset_name, RVM.alias_create and the like
+# work. This is considered the 'global' instance and should be avoided unless needed directly.
+#
+# RVM::Environment.current will first attempt to use the current ruby string (determined by
+# +ENV['GEM_HOME']+ but will fall back to using the rubies load path if that isn't available).
+#
+# In many cases, (e.g. +alias+, +list+ and the like) there is a more ruby-like wrapper class,
+# typically available via <tt>RVM::Environment#<action></tt>.
+#
+# == Side Notes
+#
+# In the cases this api differs, see the RVM::Environment class for more information.
+#
+# You can check the name of a given environment in two ways - RVM::Environment#environment_name
+# for the short version / the version set by RVM::Environment#use, RVM::Environment#gemset_use
+# or RVM.environment. If you wish to get the full, expanded string (which has things such as
+# the actual version of the selected ruby), you instead with to use RVM::Environment#expanded_name.
+#
+# Lastly, If you do need to pass environment variables to a specific environment, please use
+# RVM::Environment.new, versus RVM.environment
+#
+module RVM
+  require 'rvm/errors'
+
+  autoload :Shell,       'rvm/shell'
+  autoload :Environment, 'rvm/environment'
+  autoload :Version,     'rvm/version'
+
+  class << self
+
+    # Returns the current global environment.
+    def current
+      Environment.current
+    end
+
+    # Reset the current global environment to the default / what it was
+    # when the process first started.
+    def reset_current!
+      Environment.reset_current!
+    end
+
+    # Returns an array of multiple environments. If given
+    # a block, will yield each time with the given environment.
+    #
+    #   RVM.environments("ree@rails3,rbx@rails3") do |env|
+    #     puts "Full environment: #{env.expanded_name}"
+    #   end
+    #
+    # Alternatively, you can use the more ruby-like fashion:
+    #
+    #   RVM.environments("ree@rails3", "rbx@rails3") do |env|
+    #     puts "Full environment: #{env.expanded_name}"
+    #   end
+    #
+    def environments(*names, &blk)
+      # Normalize the names before using them on for the environment.
+      names.flatten.join(",").split(",").uniq.map do |n|
+        environment(n, &blk)
+      end
+    end
+
+    # Returns the environment with the given name.
+    # If passed a block, will yield with that as the single argument.
+    #
+    #   RVM.environment("ree@rails3") do |env|
+    #     puts "Gemset is #{env.gemset.name}"
+    #   end
+    #
+    def environment(name)
+      # TODO: Maintain an Environment cache.
+      # The cache needs to track changes via use etc though.
+      env = Environment.new(name)
+      yield env if block_given?
+      env
+    end
+
+    # Merges items into the default config, essentially
+    # setting environment variables passed to child processes:
+    #
+    #   RVM.merge_config!({
+    #     :some_shell_variable => "me",
+    #   })
+    #
+    def merge_config!(config = {})
+      Environment.merge_config!(config)
+    end
+
+    # Returns the current 'best guess' value for rvm_path.
+    def path
+      Environment.rvm_path
+    end
+
+    #  Shortcut to set rvm_path. Will set it on all new instances
+    #  but wont affect currently running environments.
+    def path=(value)
+      Environment.rvm_path = value
+    end
+
+    private
+
+    def cache_method_call(name)
+      class_eval <<-END, __FILE__, __LINE__
+        def #{name}(*args, &blk)
+          current.__send__(:#{name}, *args, &blk)
+        end
+      END
+    end
+
+    # Proxies methods to the current environment, creating a
+    # method before dispatching to speed up future calls.
+    def method_missing(name, *args, &blk)
+      if current.respond_to?(name)
+        cache_method_call name
+        current.__send__ name, *args, &blk
+      else
+        super
+      end
+    end
+
+  end
+
+end