rvm 0.1.38 → 0.1.39

data/scripts/rvm-install

@@ -79,7 +79,13 @@ source_path="${source_path:-$cwd}"
 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"}"
-rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+
+if [[ "root" = "$(whoami)" ]] ; then
+  rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
+else
+  rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+fi
+
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"

data/scripts/set

@@ -8,50 +8,63 @@ if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 
 trap "if [[ -d $rvm_tmp_path/ ]] && [[ -s $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
 
-action="$1" ; shift
-args="$*"
-if [[ -z "$action" ]] ; then
+if [[ -z "$1" ]] ; then
   $rvm_scripts_path/log "error" "Action must be specified."
   exit 1
 fi
 
+action="$1" ; shift
+args="$*"
+
+__rvm_attempt_single_exec() {
+  # Return if we have multiple rubies. or we're not running exec.
+  if [[ "$action" != "exec" ]] || $rvm_scripts_path/match "$rvm_ruby_strings" ' '; then
+    return 1
+  fi
+  eval "exec $args"
+}
+
 # Perform an action using one of a selected ruby's specified binaries.
 __rvm_ruby_do() {
   # Return on invalid rubies.
   __rvm_become || return 1
-
-  binary="$(echo $action | sed 's#do$##')"
-  if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
-    binary="$rvm_ruby_home/bin/$binary"
-  elif [[ -x "$rvm_ruby_global_gems_path/bin/$binary" ]] ; then
-    binary="$rvm_ruby_global_gems_path/bin/$binary"
-  elif [[ -x "$rvm_ruby_gem_home/bin/$binary" ]] ; then
-    binary="$rvm_ruby_gem_home/bin/$binary"
-  elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(command -v $binary)" ]] ; then
-    binary="$(basename $(command -v $binary) 2>/dev/null)"
+  if [[ "$action" = "exec" ]]; then
+    # Exec is a special case.
+    rvm_command="$args"
   else
-    $rvm_scripts_path/log "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
-    __rvm_unset_ruby_variables
-    return 1
-  fi
+    binary="$(echo $action | sed 's#do$##')"
+    if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
+      binary="$rvm_ruby_home/bin/$binary"
+    elif [[ -x "$rvm_ruby_global_gems_path/bin/$binary" ]] ; then
+      binary="$rvm_ruby_global_gems_path/bin/$binary"
+    elif [[ -x "$rvm_ruby_gem_home/bin/$binary" ]] ; then
+      binary="$rvm_ruby_gem_home/bin/$binary"
+    elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(command -v $binary)" ]] ; then
+      binary="$(basename $(command -v $binary) 2>/dev/null)"
+    else
+      $rvm_scripts_path/log "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
+      __rvm_unset_ruby_variables
+      return 1
+    fi
 
-  if [[ ! -z "$rvm_ruby_mode" ]] ; then
-    rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_mode}"
-    rvm_ruby_mode="--$(echo "$rvm_ruby_mode" | sed 's/^m//')"
-  fi
+    if [[ ! -z "$rvm_ruby_mode" ]] ; then
+      rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_mode}"
+      rvm_ruby_mode="--$(echo "$rvm_ruby_mode" | sed 's/^m//')"
+    fi
 
-  load_path="$(dirname $(command -v $binary) 2>/dev/null):$rvm_ruby_load_path"
-  # TODO: the else case below should be run if $args =~ /\.rb$/
-  if [[ "ruby" = "$(basename $binary)" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
-    if $rvm_scripts_path/match "$args" "\.rb$" ; then
-      if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
-      if ! $rvm_scripts_path/match "$args" "$prefix" ; then
-        args="$prefix $args"
+    load_path="$(dirname $(command -v $binary) 2>/dev/null):$rvm_ruby_load_path"
+    # TODO: the else case below should be run if $args =~ /\.rb$/
+    if [[ "ruby" = "$(basename $binary)" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
+      if $rvm_scripts_path/match "$args" "\.rb$" ; then
+        if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
+        if ! $rvm_scripts_path/match "$args" "$prefix" ; then
+          args="$prefix $args"
+        fi
       fi
+      rvm_command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $args"
+    else
+      rvm_command="$binary $rvm_ruby_mode $args"
     fi
-    rvm_command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $args"
-  else
-    rvm_command="$binary $rvm_ruby_mode $args"
   fi
 
   if [[ ! -z "$rvm_json_flag" ]] || [[ ! -z "$rvm_yaml_flag" ]] || [[ ! -z "$rvm_summary_flag" ]] ; then
@@ -147,7 +160,12 @@ __rvm_json() {
 rubies=() ; successes=() ; errors=() ; statuses=()
 
 rvm_ruby_strings="${rvm_ruby_strings:-"$($rvm_scripts_path/list strings)"}"
-for rvm_ruby_string in $(echo "$rvm_ruby_strings" | tr ',' ' ') ; do
+rvm_ruby_strings="$(echo "$rvm_ruby_strings" | tr ',' ' ')"
+
+# Check for a single ruby && exec if present.
+__rvm_attempt_single_exec
+
+for rvm_ruby_string in ${rvm_ruby_strings} ; do
   __rvm_ruby_do
 done
 

data/scripts/update

@@ -79,7 +79,13 @@ source_path="${source_path:-$cwd}"
 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"}"
-rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+
+if [[ "root" = "$(whoami)" ]] ; then
+  rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
+else
+  rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+fi
+
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"

data/scripts/utility

@@ -51,6 +51,18 @@ __rvm_db() {
 
 is_a_function() { type $1 | head -n 1 | grep -q "function" ; }
 
+__rvm_quote_args() {
+  local quoted_string=""
+  for quoted_argument in "$@"; do
+    if echo "$quoted_argument" | grep -q " "; then
+      quoted_string="$quoted_string '$(echo "$quoted_argument" | sed "s/'/\\\'/g")'"
+    else
+      quoted_string="$quoted_string $quoted_argument"
+    fi
+  done
+  echo "$quoted_string" | sed -e 's/^ *//g' -e 's/ *$//g'
+}
+
 __rvm_strings() {
   unset results
   for rvm_ruby_string in $(echo $rvm_ruby_args) ; do
@@ -108,6 +120,28 @@ __rvm_run() {
   unset log_file command
 }
 
+# Runs a command in a given env.
+__rvm_run_with_env() {
+  log_file_name="$1" ; env_name="$2" ; command="$3" ; message="$4"
+  if [[ -z "$env_name" ]]; then env_name="$(__rvm_environment_identifier)"; fi
+  if [[ -z "$rvm_ruby_log_path" ]] ; then rvm_ruby_log_path="$rvm_log_path" ; fi
+  if [[ ! -z "$message" ]] ; then $rvm_scripts_path/log "info" "$message" ; fi
+  if [[ ! -z "$rvm_debug_flag" ]] ; then
+    $rvm_scripts_path/log "debug" "Executing: $command in environment "$env_name""
+  fi
+
+  mkdir -p "$(dirname "$rvm_ruby_log_path/$log_file_name.log")"
+  touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
+  echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command # under $env_name" | tee "$rvm_ruby_log_path/$log_file_name.log" >> "$rvm_ruby_log_path/$log_file_name.error.log"
+  if [[ -z "$rvm_niceness" ]] || [[ "0" = "$rvm_niceness" ]] ; then
+    eval "__rvm_with_env '$env_name' '$command'" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log"
+  else
+    eval "nice -n $rvm_niceness __rvm_with_env '$env_name' '$command'" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
+  fi
+  if [[ $? -gt 0 ]] ; then $rvm_scripts_path/log "error" "Error running '$command' under $env_name, please check $rvm_ruby_log_path/$log_file_name*.log" ; __rvm_pushpop ; return 1 ; fi
+  unset log_file command env_name
+}
+
 # Unset both rvm variables as well as ruby-specific variables
 # Preserve gemset if 'rvm_sticky' is set (persist gemset unless clear is explicitely called).
 __rvm_cleanup_variables() {
@@ -123,6 +157,18 @@ __rvm_unset_ruby_variables() {
   unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_release_version rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path rvm_ruby_name rvm_ruby_alias rvm_ruby_strings rvm_ruby_repo_path
 }
 
+# Usage: __rvm_with_env 'env-name' 'command'
+__rvm_with_env() {
+  [[ -n "$rvm_trace_flag" ]] && rvm_env_args="--trace"
+  rvm_env_command="$(echo "$2" | sed "s/rvm /rvm $rvm_env_args /")"
+  # Subshells!
+  (
+    source $rvm_scripts_path/rvm
+    rvm $rvm_env_args use $1 && eval "$rvm_env_command"
+  )
+  unset rvm_env_args rvm_env_command
+}
+
 __rvm_set_rvmrc() {
   if [[ "$HOME" != "$(pwd)" ]] ; then
     if [[ "$rvm_verbose_flag" -eq 1 ]] ; then flags="use " ; fi
@@ -166,7 +212,15 @@ __rvm_benchmark() {
   rvm_benchmark_flag=1
   rvm_action="ruby"
   if [[ ! -z "$rvm_debug_flag" ]] ; then printf "\n$rvm_tmp_path/$$.rb:\n$(cat $rvm_tmp_path/$$.rb)" ; fi
+  # Override ruby string stuff, pass through.
+  old_rvm_ruby_string=$rvm_ruby_string
+  unset rvm_ruby_string
+  export rvm_ruby_strings
   $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+  result=$?
+  # Restore the state pre-sets.
+  [[ -n "$old_rvm_ruby_string" ]] && rvm_ruby_string=$old_rvm_ruby_string
+  unset old_rvm_ruby_string
 }
 
 # Loop over the currently installed rubies and refresh their binscripts.

data/scripts/wrapper

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+default_flag="$rvm_default_flag"
 # Prevent it from recursing.
 unset rvm_default_flag rvm_wrapper_name
 
@@ -18,17 +19,24 @@ full_binary_name() {
 wrap() {
   mkdir -p "$(dirname "$file_name")"
   rm -f "$file_name"
-  printf "#!/usr/bin/env sh\n" > "$file_name"
-  printf "source \"${rvm_environments_path}/${environment_identifier}\"\n" >> "$file_name"
-  printf "exec $binary_name \"\$@\"\n" >> "$file_name"
+
+  echo "#!/usr/bin/env sh" > "$file_name"
+  echo "if [ -s \"${rvm_environments_path}/${environment_identifier}\" ] ; then" >> "$file_name"
+  echo "  . \"${rvm_environments_path}/${environment_identifier}\"" >> "$file_name"
+  echo "  exec $binary_name \"\$@\"" >> "$file_name"
+  echo "else" >> $file_name
+  echo "  echo \"ERROR: Missing RVM environment file: '${rvm_environments_path}/${environment_identifier}'\"" >> $file_name
+  echo "  exit 1" >> $file_name
+  echo "fi" >> $file_name
 
   if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
 }
 
 symlink_binary() {
   # Generate the default wrapper with the given binary name.
-  [[ ! -f "$file_name" ]] && wrap_binary
+  wrap_binary # Note, now forcing this every time to force clean.
   # Then symlink it into place.
+  rm -f "${rvm_bin_path}/${prefix}_${binary_name}"
   ln -fs "$file_name" "${rvm_bin_path}/${prefix}_${binary_name}"
 }
 
@@ -48,6 +56,7 @@ usage() {
 }
 
 # Empty ruby string: show usage and exit.
+
 if [[ -z "$1" ]]; then
   usage
   exit 1
@@ -84,15 +93,20 @@ for binary_name in $binaries; do
   if [[ -z "$prefix" ]] ; then
     wrap_binary
     # Symlink it into place.
-    if [[ "$binary_name" == "ruby" ]]; then
-      ln -sf "$file_name" "$rvm_bin_path/$environment_identifier"
+    if [[ "$binary_name" == "ruby" ]] ; then
+      rm -f "${rvm_bin_path}/${environment_identifier}"
+      ln -nsf "${file_name}" "${rvm_bin_path}/${environment_identifier}"
     else
-      ln -sf "$file_name" "$rvm_bin_path/$binary_name-$environment_identifier"
+      rm -f "${rvm_bin_path}/${binary_name}-${environment_identifier}"
+      ln -nsf "${file_name}" "${rvm_bin_path}/${binary_name}-${environment_identifier}"
+    fi
+    if [[ "root" = "$(whoami)" ]] && [[ "${default_flag}" = 1 ]] ; then
+      rm -f "${rvm_bin_path}/${binary_name}"
+      ln -nsf "${file_name}" "${rvm_bin_path}/${binary_name}"
     fi
   else
     symlink_binary
-  fi
-  unset file_name
+  fi ; unset file_name
 done
 
 exit $?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 85
   prerelease: false
   segments: 
   - 0
   - 1
-  - 38
-  version: 0.1.38
+  - 39
+  version: 0.1.39
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -04:00
+date: 2010-06-18 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -105,6 +105,7 @@ files:
 - scripts/monitor
 - scripts/notes
 - scripts/package
+- scripts/rubygems
 - scripts/rvm
 - scripts/rvm-install
 - scripts/selector