rvm 0.1.46 → 0.1.47

data/config/known

@@ -9,6 +9,8 @@
 (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(-p0)
 (ruby-)1.9.2-head
 ruby-head

data/lib/VERSION.yml

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

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.46"
+  s.version = "0.1.47"
 
   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-18}
+  s.date = %q{2010-08-21}
   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/cli

@@ -587,10 +587,8 @@ rvm() {
     reload)        unset rvm_loaded_flag ; rvm_reload_flag=1 ;;
 
     fetch|install|uninstall|remove)
-      if [[ -n "$rvm_ruby_strings" ]] && $rvm_scripts_path/match "$rvm_ruby_strings" "," ; then
+      if [[ -n "$rvm_ruby_strings" ]]; then
         $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_strings"
-      elif [[ -n "$rvm_ruby_string" ]]; then
-        $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_string"
       else
         $rvm_scripts_path/manage "$rvm_action"
       fi

data/scripts/gemsets

@@ -79,6 +79,10 @@ gemset_dir() {
 gemset_create() {
   rvm_ruby_gem_prefix=$(echo $rvm_ruby_gem_home | sed 's/'${rvm_gemset_separator}'.*$//')
   for gemset in $(echo $gems_args) ; do
+    if [[ "$gemset" == *"${rvm_gemset_separator}"* ]]; then
+      $rvm_scripts_path/log "error" "Can't do that, it contains a \"${rvm_gemset_separator}\"."
+      continue
+    fi
     gem_home="${rvm_ruby_gem_prefix}${rvm_gemset_separator}${gemset}"
     \mkdir -p "$gem_home"
     # When the globalcache is enabled, we need to ensure we setup the cache directory correctly.

data/scripts/list

@@ -35,7 +35,7 @@ list_gemsets() {
   done ; unset version
 
   if [[ -f "$rvm_config_path/default" ]] && [[ -s $rvm_config_path/default ]] ; then
-    version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n1 | awk -F"'" '{print $2}' | xargs basename)
+    version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n1 | awk -F"'" '{print $2}' | xargs basename --)
     if [[ ! -z "$version" ]] ; then
       printf "\n\nDefault Ruby (for new shells)\n"
       string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
@@ -50,10 +50,10 @@ list_gemsets() {
 
 list_default() {
   if [[ "$1" = "string" ]] ; then
-    $rvm_scripts_path/alias show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename
+    $rvm_scripts_path/alias show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename --
   else
     if [[ -L "$rvm_rubies_path/default" ]]; then
-      version=$($rvm_scripts_path/alias show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename)
+      version=$($rvm_scripts_path/alias show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename --)
       if [[ ! -z "$version" ]] ; then
         printf "\n\nDefault Ruby (for new shells)\n"
         string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
@@ -81,7 +81,7 @@ list_strings() {
 # This is meant to be used with scripting.
 list_gemset_strings() {
   local all_rubies="$(list_strings)"
-  for gemset in $(\ls $rvm_gems_path/ 2>/dev/null | xargs -n1 basename | grep -v '^\(@\|doc$\|cache$\|system$\)' | sort); do
+  for gemset in $(\ls $rvm_gems_path/ 2>/dev/null | xargs -n1 basename -- | grep -v '^\(@\|doc$\|cache$\|system$\)' | sort); do
     local ruby_name="$(echo "$gemset" | awk -F$rvm_gemset_separator '{print $1}')"
     [[ "$all_rubies" != *"$ruby_name"* ]] && continue
     echo "$gemset"
@@ -94,6 +94,10 @@ list_known_strings() {
 }
 
 list_known() {
+  if [[ "$1" = "strings" ]]; then
+    list_known_strings
+    return 0
+  fi
   if [[ -z "$rvm_interactive" ]] || [[ -z "$TERM" ]] || [[ "unknown" = "$TERM" ]] ; then
     cat "$rvm_config_path/known"
   else
@@ -102,7 +106,17 @@ list_known() {
 }
 
 
+list_rubies_strings() {
+  find "$rvm_rubies_path/" -type d -maxdepth 1 | tail -n+2 | xargs -n1 basename -- |  __rvm_strip
+}
+
 list_rubies() {
+  
+  if [[ "$1" = "strings" ]]; then
+    list_rubies_strings
+    return 0
+  fi
+  
   echo
 
   current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
@@ -126,7 +140,7 @@ list_rubies() {
   done ; unset version
 
   if [[ -f "$rvm_config_path/default" ]] && [[ -s $rvm_config_path/default ]] ; then
-    version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n 1 | awk -F"'" '{print $2}' | xargs basename)
+    version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n 1 | awk -F"'" '{print $2}' | xargs basename --)
     if [[ ! -z "$version" ]] ; then
       printf "\n\nDefault Ruby (for new shells)\n"
       string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"

data/scripts/manage

@@ -1190,7 +1190,7 @@ __rvm_manage_rubies() {
       __rvm_unset_ruby_variables
     done
   else # all
-    if [[ "$rvm_action" != "install" ]] ; then
+    if [[ "$rvm_action" != "install" && "$rvm_action" != "remove" && "$rvm_action" != "uninstall" ]] ; then
       while read -r bin_line
       do # Keep this on second line damnit!
         if [[ -x "$bin_line" ]] ; then
@@ -1208,7 +1208,7 @@ __rvm_manage_rubies() {
         fi
       done < <(\ls $rvm_rubies_path/*/bin/ruby 2> /dev/null)
     else
-      $rvm_scripts_path/log "warn" 'Really? Install all? See "rvm list known" and limit the selection to something more sane please :)'
+      $rvm_scripts_path/log "warn" 'Really? '"$rvm_action"' all? See "rvm list known" and limit the selection to something more sane please :)'
     fi
   fi
 
@@ -1217,6 +1217,7 @@ __rvm_manage_rubies() {
 
 }
 
-rvm_action="$1" ; rubies_string="$2"
+rvm_action="$1"
+rubies_string="$2"
 __rvm_manage_rubies
 exit $?

data/scripts/notes

@@ -24,7 +24,7 @@ if [[ "Linux" = "$system" ]] ; then
     printf "\n       $ aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk"
 
     printf "\n    $item For MRI & ree (if you wish to use it) you will need (depending on what you are installing):"
-    printf "\n       $ aptitude install build-essential bison openssl libreadline5 libreadline-dev curl git-core zlib1g zlib1g-dev libssl-dev vim libsqlite3-0 libsqlite3-dev sqlite3 libreadline5-dev libreadline6-dev libxml2-dev git-core subversion autoconf"
+    printf "\n       $ aptitude install build-essential bison openssl libreadline5 libreadline-dev curl git-core zlib1g zlib1g-dev libssl-dev vim libsqlite3-0 libsqlite3-dev sqlite3 libreadline-dev libxml2-dev git-core subversion autoconf"
 
     printf "\n    $item For IronRuby (if you wish to use it) you will need:"
     printf "\n       $ aptitude install curl mono-2.0-devel"

data/scripts/selector

@@ -292,17 +292,19 @@ __rvm_use() {
 
   environment_id="$(__rvm_environment_identifier)"
 
-  if [[ ! -z "$rvm_default_flag" ]] && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
+  if [[ -n "$rvm_default_flag" && "default" != "$rvm_ruby_interpreter" ]] ; then
     if [[ "$rvm_selfcontained" = "0" ]] ; then
       # Sets up the default wrappers.
-      $rvm_scripts_path/wrapper "$rvm_ruby_string"
+      $rvm_scripts_path/wrapper "$rvm_ruby_string" --no-prefix
+    else
+      $rvm_scripts_path/wrapper "$rvm_scripts_path" "default"
     fi
     if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
       $rvm_scripts_path/alias delete default &> /dev/null
-      \rm -f $rvm_bin_path/default*
-      [[ -f $rvm_config_path/default ]] && \rm -f $rvm_config_path/default
-      [[ -f $rvm_environments_path/default ]] && \rm -f $rvm_environments_path/default
-      [[ -f $rvm_wrappers_path/default ]] && \rm -f $rvm_wrappers_path/default
+      \find "$rvm_bin_path" -name 'default_*' -maxdepth 1 -delete
+      \rm -f $rvm_config_path/default
+      \rm -f $rvm_environments_path/default
+      \rm -rf $rvm_wrappers_path/default
     else
       RUBY_VERSION="$($rvm_ruby_home/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
       export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION

data/scripts/set

@@ -7,9 +7,6 @@ if [[ -z "$1" ]] ; then
   exit 1
 fi
 
-action="$1" ; shift
-args="$*"
-
 __rvm_attempt_single_exec() {
   # Return if we have multiple rubies. or we're not running exec.
   local ruby_string_lines="$(printf "$rvm_ruby_strings" | wc -l | __rvm_strip)"
@@ -160,6 +157,16 @@ __rvm_json() {
 
 rubies=() ; successes=() ; errors=() ; statuses=()
 
+
+action="$1";
+[[ "$#" -gt 0 ]] && shift
+args="$*"
+
+if [[ "$action" == "ruby" ]] && echo "$args" | grep -q  "^'--[^[:space:]]*'$" ; then
+  $rvm_scripts_path/log "warn" "You called rvm ruby with the arguments $args which look like use options."
+  $rvm_scripts_path/log "warn" "Please note that 'rvm ruby' invokes set operations instead."
+fi
+
 rvm_ruby_strings="$(__rvm_expand_ruby_string "$rvm_ruby_strings")"
 
 # Check for a single ruby && exec if present.

data/scripts/utility

@@ -591,14 +591,6 @@ __rvm_ensure_has_environment_files() {
   local environment_identifier="$(__rvm_environment_identifier)"
   file_name="${rvm_environments_path}/$environment_identifier"
 
-  # Ensure system is a blank file.
-  if [[ "$environment_identifier" == "system" ]]; then
-    \rm -f "$file_name" 2>&1 | grep -v 'rm: cannot remove .* Permission denied'
-    \mkdir -p "$(dirname "$file_name")"
-    \touch "$file_name" 2>&1 | grep -v 'touch: cannot touch .* Permission denied'
-    return
-  fi
-
   if [[ ! -s "$file_name" ]] ; then
     \mkdir -p "${rvm_environments_path}"
     echo "export PATH=\"${rvm_ruby_gem_home}/bin:${rvm_ruby_global_gems_path}/bin:${rvm_ruby_home}/bin:${rvm_bin_path}:\$PATH\"" > $file_name
@@ -656,6 +648,16 @@ __rvm_ultimate_question() {
   printf "\nUltimate Question."
 }
 
+__rvm_load_env_file() {
+  if [[ -f "$rvm_environments_path/$1" ]]; then
+    # Restore the path to it's state minus rvm
+    PATH="$(echo $PATH | \tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
+    . "$rvm_environments_path/$1"
+  else
+    rvm use "$1" >/dev/null 2>&1
+  fi
+}
+
 # Checks the rvmrc for the given directory. Note that if
 # argument is passed, it will be used instead of pwd.
 __rvm_project_rvmrc() {
@@ -663,23 +665,19 @@ __rvm_project_rvmrc() {
   # Get the first argument or the pwd.
   cwd="${1:-"$(pwd)"}"
   while : ; do
-    if [[ -z "$cwd" ]] || [[ "$HOME" = "$cwd" ]] || [[ "/" = "$cwd" ]] ; then
+    if [[ -z "$cwd" || "$HOME" = "$cwd" || "/" = "$cwd" ]] ; then
       if [[ -n "$rvm_rvmrc_cwd" ]] ; then
-        if [[ -f "$rvm_environments_path/$rvm_previous_environment" ]] ; then
-          . "$rvm_environments_path/$rvm_previous_environment"
-        else
-          if [[ -f "$rvm_environments_path/default" ]] ; then
-            . "$rvm_environments_path/default"
-          fi
+        if [[ "$rvm_project_rvmrc_default" = "1" ]]; then
+          __rvm_load_env_file "default"
+        elif [[ -n "$rvm_previous_environment" ]] ; then
+          __rvm_load_env_file "$rvm_previous_environment"
         fi ; unset rvm_rvmrc_cwd rvm_previous_environment
       fi
       break
     else
       if [[ -f "$cwd/.rvmrc" ]] ; then
         if [[ "$rvm_rvmrc_cwd" != "$cwd" ]] ; then
-          if [[ -z "$rvm_previous_environment" ]] ; then
-            rvm_previous_environment="$(__rvm_environment_identifier)"
-          fi
+          rvm_previous_environment="$(__rvm_environment_identifier)"
           rvm_rvmrc_cwd="$cwd"
           source "$cwd/.rvmrc"
         fi
@@ -736,12 +734,14 @@ __rvm_environment_identifier() {
 }
 
 __rvm_expand_ruby_string() {
-  if [[ -z "$1" || "$1" = "all" || "$1" == "all-gemsets" ]]; then
+  if [[ -z "$1" || "$1" = "all" ]]; then
+    $rvm_scripts_path/list strings | tr ' ' "\n" | __rvm_strip
+  elif [[ "$1" = "all" || "$1" == "all-gemsets" ]]; then
     $rvm_scripts_path/list gemsets strings | __rvm_strip
   elif [[ "$1" == "default-with-rvmrc" || "$1" == "rvmrc" ]]; then
     $rvm_scripts_path/tools path-identifier "$(pwd)"
   elif [[ "$1" == "all-rubies" || "$1" == "rubies" ]]; then
-    $rvm_scripts_path/list strings | tr ' ' "\n" | __rvm_strip
+    $rvm_scripts_path/list rubies strings | __rvm_strip
   elif [[ "$1" == "current" || "$1" == "gemsets" ]]; then
     local current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
     rvm_silence_logging=1 $rvm_scripts_path/gemsets list | sed "s/^/$current_ruby$rvm_gemset_separator/"  | __rvm_strip

data/scripts/wrapper

@@ -67,11 +67,6 @@ prefix="$1"
 
 binaries="$(echo "$@" | __rvm_strip)"
 
-if [[ 'system' == '$ruby_string' ]]; then
-  $rvm_scripts_path/log "error" "Wrapper can't be called with system rubies - sorry!"
-  exit 1
-fi
-
 # Default the list of binaries to those we use regularily.
 if [[ -z "$binaries" ]] ; then
   binaries="ruby gem irb ri rdoc rake erb testrb"
@@ -101,6 +96,14 @@ for binary_name in $binaries; do
       \rm -rf "$destination"
       ln -nsf "$file_name" "$destination"
     fi; unset destination
+  elif [[ "$prefix" == "--no-prefix" ]]; then
+    override_check=1
+    wrap_binary
+    if [[ -f  "$file_name" ]]; then
+      destination="$rvm_bin_path/$binary_name"
+      \rm -rf "$destination"
+      ln -nsf "$file_name" "$destination"
+    fi; unset destination
   else
     symlink_binary
   fi ; unset file_name

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: false
   segments: 
   - 0
   - 1
-  - 46
-  version: 0.1.46
+  - 47
+  version: 0.1.47
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 -04:00
+date: 2010-08-21 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []