rvm 0.1.43 → 0.1.44

data/binscripts/rvm

@@ -1,21 +1,32 @@
 #!/usr/bin/env bash
 
-for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
-  if [[ -f "$rvmrc" ]] ; then
-    if grep -q '^\s*rvm .*$' $rvmrc ; then
-      printf "\nError: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
-      exit 1
-    else
-      source "$rvmrc"
+if [[ -z "$rvm_ignore_rvmrc" ]]; then
+  for rvmrc in /etc/rvmrc "$HOME/.rvmrc" ; do
+    if [[ -f "$rvmrc" ]] ; then
+      if grep -q '^\s*rvm .*$' "$rvmrc" ; then
+        printf "\nError: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
+        exit 1
+      else
+        source "$rvmrc"
+      fi
     fi
-  fi
-done
+  done
+fi
+
+[[ -z "$rvm_prefix" ]] && unset rvm_prefix
+[[ -z "$rvm_path" ]]   && unset rvm_path
 
-if [[ -z "$rvm_prefix" ]] ; then unset rvm_prefix ; fi
-if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
+# Setup default sandbox value. See scripts/rvm for origin.
+if [[ -z "$rvm_sandboxed" ]]; then
+  if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+    rvm_sandboxed=0
+  else
+    rvm_sandboxed=1
+  fi
+fi
 
 if [[ -z "$rvm_prefix" ]] ; then
-  if [[ "root" = "$(whoami)" ]] ; then
+  if [[ "$rvm_sandboxed" = "0" ]] ; then
     rvm_prefix="/usr/local"
   else
     rvm_prefix="$HOME/."
@@ -24,7 +35,7 @@ fi
 
 if [[ -z "$rvm_path" ]] ; then
   unset rvm_path
-  if [[ "root" = "$(whoami)" ]] ; then
+  if  [[ "$rvm_sandboxed" = "0" ]] ; then
     rvm_path="$rvm_prefix/rvm"
   else
     if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
@@ -38,7 +49,7 @@ if [[ -z "$rvm_path" ]] ; then
 fi
 
 rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
-source $rvm_scripts_path/rvm
+source "$rvm_scripts_path/rvm"
 
 unset rvm_interactive
 

data/binscripts/rvm-auto-ruby

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+if [[ -n "$rvm_path" && -s "$rvm_path/scripts/rvm" ]]; then
+  source "$rvm_path/scripts/rvm"
+elif [[ -s "/usr/local/lib/rvm" ]]; then
+  source "/usr/local/lib/rvm"
+elif [[ -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"
+else
+  echo "Unable to detect rvm, please manually set the rvm_path env variable." >&2
+  exit 1
+fi
+
+rvm load-rvmrc > /dev/null 2>&1
+
+exec ruby "$@"

data/binscripts/rvm-prompt

@@ -25,6 +25,7 @@ if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; the
       g|gemset)       add "gemset"       ;;
       u|unicode)      add "unicode"      ;;
       s|system)       add "system"       ;;
+      -d|--no-default) no_default=1      ;;
       *) echo "Unrecognized command line option '$token' for $0" ; exit 1 ;;
     esac
   done
@@ -38,6 +39,11 @@ if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; the
 
   ruby_string=$(dirname "$ruby" | xargs dirname | xargs basename)
 
+  # Dont' display anything if no default flag was provided and we're using the default ruby
+  if [[ -n "$no_default" && "$(rvm tools identifier)" = "$(rvm alias show default)" ]]; then
+	exit 0
+  fi
+
   if [[ ! -z "$interpreter_flag" ]] || [[ ! -z "$unicode_flag" ]] ; then
     interpreter="$(echo $ruby_string | awk -F'-' '{print $1}')"
   fi

data/binscripts/rvm-shell

@@ -10,22 +10,24 @@ __rvm_shell_lookup_script() {
   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
+# If the first argument isn't -c, remove it and set it to the ruby string value.
+if [[ -n "$1" && ! -f "$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
+rvm_shell_rvm_path="$(__rvm_shell_lookup_script)"
+if [[ -n "$rvm_shell_rvm_path" ]]; then
+  source "$rvm_shell_rvm_path"
+  # Setup as expected.
+  if [[ -n "$rvm_shell_ruby_string" ]]; then
+      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
+  else
+    rvm load-rvmrc >/dev/null 2>&1
   fi
 fi
 

data/binscripts/rvm-update-head

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
-if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+
+if [[ -z "$rvm_ignore_rvmrc" ]]; then
+  [[ -s /etc/rvmrc ]] && source /etc/rvmrc
+  [[ -s "$HOME/.rvmrc" ]] && source "$HOME/.rvmrc"
+fi
+
 rvm_path="${rvm_path:-$HOME/.rvm}"
 mkdir -p $rvm_path/src/
 cd $rvm_path/src

data/binscripts/rvm-update-latest

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
-if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+if [[ -z "$rvm_ignore_rvmrc" ]]; then
+  [[ -s /etc/rvmrc ]] && source /etc/rvmrc
+  [[ -s "$HOME/.rvmrc" ]] && source "$HOME/.rvmrc"
+fi
+
 rvm_path="${rvm_path:-$HOME/.rvm}"
 mkdir -p $rvm_path/src/
 cd $rvm_path/src

data/binscripts/rvmsudo

@@ -1,3 +1,10 @@
 #!/usr/bin/env bash
 
-exec sudo -E "$@"
+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 $@"
+# rvm_env_prefix="PATH='$PATH'"
+# exec sudo -E /usr/bin/env "$rvm_env_prefix" "$@"

data/config/db

@@ -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=23832
+maglev_version=23913
 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

@@ -31,7 +31,7 @@ ree-1.8.6-head
 ree-1.8.7-head
 
 # MagLev
-maglev(-23832)
+maglev(-23913)
 maglev-head
 
 # Shyouhei head, the default mput

data/config/md5

@@ -50,7 +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-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
+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

data/contrib/gemset_snapshot

@@ -3,7 +3,7 @@
 echo "Snapshotting the current environment gem list into snapshot.gems"
 file_name="snapshot.gems"
 echo '# system snapshot gemset file' > snapshot.gems
-for gem in $(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | tr ' ' ';') ; do
+for gem in $(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | \tr ' ' ';') ; do
   name="$(echo $gem | awk -F';' '{print $1}')"
   versions="$(echo $gem | awk -F';' '{print $2}' | sed 's#,# #g')"
   for version in $versions ; do

data/contrib/install-system-wide

@@ -13,10 +13,13 @@ if ! command -v git >/dev/null 2>&1 ; then
 fi
 
 # Load the rvm config.
-[[ -s /etc/rvmrc ]] && source /etc/rvmrc
-[[ -s "$HOME/.rvmrc" ]] && source "$HOME/.rvmrc"
+if [[ -z "$rvm_ignore_rvmrc" ]]; then
+  [[ -s /etc/rvmrc ]] && source /etc/rvmrc
+  [[ -s "$HOME/.rvmrc" ]] && source "$HOME/.rvmrc"
+fi
 
 rvm_path="${rvm_path:-"/usr/local/rvm"}"
+export rvm_sandboxed=0
 
 mkdir -p "$rvm_path/src/"
 builtin cd "$rvm_path/src"
@@ -27,8 +30,8 @@ git clone --depth 1 git://github.com/wayneeseguin/rvm.git
 
 builtin cd rvm
 
-"Running the install script."
-bash ./scripts/install
+echo "Running the install script."
+bash ./scripts/install "$@"
 
 rvm_group_name="${rvm_group_name:-"rvm"}"
 
@@ -52,13 +55,12 @@ rm -f /etc/rvmrc
 touch /etc/rvmrc
 cat > /etc/rvmrc <<END_OF_RVMRC
 # Setup default configuration for rvm.
-export rvm_path="/usr/local/rvm"
+umask g+w
+export rvm_sandboxed=0
 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"
+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
@@ -70,10 +72,10 @@ elif [[ -s "/usr/local/rvm/scripts/rvm" ]]; then
 fi
 END_OF_RVM_SH
 
-echo "Correct permissions on rvmrc and load_rvm"
+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_groop_name" "$file"
+  chown root:"$rvm_group_name" "$file"
   chmod g+w "$file"
 done; unset file
 

data/gemsets/default.gems

@@ -1,2 +1 @@
 rake
-rdoc

data/gemsets/global.gems

@@ -1,2 +1 @@
 rake
-rdoc

data/install

@@ -1,10 +1,18 @@
 #!/usr/bin/env bash
 
+if [[ -z "$rvm_sandboxed" ]]; then
+  if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+    export rvm_sandboxed=0
+  else
+    export rvm_sandboxed=1
+  fi
+fi
+
 unset rvm_auto_flag
 
-install_source_path=$(dirname $0)
+install_source_path="$(dirname "$0" | sed 's#\/scripts$##')"
 if [[ -d "$install_source_path/scripts" ]] && [[ -s "$install_source_path/scripts/utility" ]] ; then
-  builtin cd $install_source_path
+  builtin cd "$install_source_path"
 fi
 
 source scripts/version
@@ -53,7 +61,7 @@ done
 
 if [[ -z "$rvm_prefix" ]] ; then
   __rvm_load_rvmrc
-  if [[ "root" = "$(whoami)" ]] ; then
+  if [[ "$rvm_sandboxed" = "0" ]] ; then
     rvm_prefix="${rvm_prefix:-"/usr/local/"}"
   else
     rvm_prefix="${rvm_prefix:-"$HOME/."}"
@@ -64,7 +72,7 @@ if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
 
-if grep -q 'scripts/rvm' $HOME/.bash* || grep -q 'scripts/rvm' $HOME/.zsh*; then
+if grep -q 'scripts/rvm' $HOME/.bash* 2>/dev/null || grep -q 'scripts/rvm' $HOME/.zsh* 2>/dev/null; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
   else
@@ -114,7 +122,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_tmp_path"
 
 for file in README LICENCE ; do
   spinner
@@ -148,7 +156,7 @@ done
 # Bin Scripts
 #
 # Cleanse and purge...
-for file in rvm-prompt rvm rvmsudo rvm-shell ; do
+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/
@@ -183,29 +191,30 @@ fi
 # Initial Interpreter Gemsets.
 #
 spinner
-mkdir -p "$rvm_gemsets_path"
-for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/^\.\///') ; do
-  source_path="$(pwd)/gemsets"
-  destination="$rvm_gemsets_path/$gemset_file"
-  destination_path="$(dirname "$destination")"
-  if [[ ! -s "$destination" ]] ; then
-    mkdir -p "$destination_path"
-    cp "$source_path/$gemset_file" "$destination"
-  fi
-done ; unset destination destination_path source_path gemset_file
+if [[ -d gemsets/ ]] ; then
+  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"
+    fi
+  done ; unset destination destination_path gemset_file
+fi
 
 spinner
-mkdir -p "$rvm_patchsets_path"
-for patchsets_file in $(cd gemsets ; find . -iname '*' | sed 's/^\.\///') ; do
-  source_path="$(pwd)/gemsets"
-  destination="$rvm_patchsets_path/$patchset_file"
-  destination_path="$(dirname "$destination")"
-  if [[ ! -s "$destination" ]] ; then
-    mkdir -p "$destination_path"
-    cp "$source_path/$patchset_file" "$destination"
-  fi
-done ; unset destination destination_path source_path patchset_file
-
+if [[ -d patchsets/ ]] ; then
+  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"
+    fi
+  done ; unset destination destination_path patchset_file
+fi
 
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
@@ -276,7 +285,7 @@ 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
+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."
@@ -285,9 +294,7 @@ for man_file in $(\ls "$install_source_path/man"); do
   cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
 done
 
-if [[ "$upgrade_flag" -eq 0 ]] ; then
-  ./scripts/notes
-fi
+[[ "$upgrade_flag" = 0 ]] && ./scripts/notes
 
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
 printf "\n\n${name:-"$(whoami)"},\n"

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 43
+:patch: 44

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.43"
+  s.version = "0.1.44"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-07-21}
+  s.date = %q{2010-08-06}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     "LICENCE",
      "README",
      "binscripts/rvm",
+     "binscripts/rvm-auto-ruby",
      "binscripts/rvm-prompt",
      "binscripts/rvm-shell",
      "binscripts/rvm-update-head",
@@ -100,6 +101,7 @@ Gem::Specification.new do |s|
      "scripts/disk-usage",
      "scripts/docs",
      "scripts/env",
+     "scripts/environment-convertor",
      "scripts/fetch",
      "scripts/gemsets",
      "scripts/hash",
@@ -123,6 +125,7 @@ Gem::Specification.new do |s|
      "scripts/package",
      "scripts/patches",
      "scripts/patchsets",
+     "scripts/repair",
      "scripts/rubygems",
      "scripts/rvm",
      "scripts/rvm-install",