rvm 1.0.9 → 1.0.10

data/binscripts/rvm

@@ -30,7 +30,7 @@ fi
 # Setup default sandbox value. See scripts/rvm for origin.
 if [[ ${rvm_selfcontained:-0} -eq 0 ]]; then
 
-  if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+  if [[ "root" = "$(whoami)" || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
 
     rvm_selfcontained=0
 
@@ -71,6 +71,6 @@ fi
 
 source "$rvm_path/scripts/rvm"
 
-unset rvm_interactive_flag
+export rvm_interactive_flag=0
 
 rvm "$@"

data/contrib/install-system-wide

@@ -33,6 +33,38 @@ __rvm_system_wide_permissions() {
   return 0
 }
 
+__rvm_create_user_group() {
+  [[ -z "$1" ]] && return 1
+
+  if \grep -q "$1" /etc/group ; then
+    echo "Group '$1' exists, proceeding with installation."
+  else
+    echo "Creating the group '$1'"
+
+    case "$os_type" in
+      "FreeBSD") pw groupadd -q "$rvm_group_name";;
+      "Linux")   groupadd -f "$rvm_group_name";;
+    esac
+  fi
+
+  return 0
+}
+
+__rvm_add_user_to_group() {
+  [[ -z "$1" || -z "$2" ]] && return 1
+
+  echo "Adding '$1' to the group '$2'"
+  
+  case "$os_type" in
+    "FreeBSD") pw usermod "$1" -G "$2";;
+    "Linux")   usermod -a -G "$2" "$1";;
+  esac
+
+  return 0
+}
+
+os_type="$(uname)"
+
 # Require root to install it.
 if [[ "$(whoami)" != "root" ]]; then
   echo "Please rerun this installer as root." >&2
@@ -43,8 +75,8 @@ elif [[ -z "$(command -v git)" ]] ; 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
+elif [[ "$os_type" != "Linux" && "$os_type" != "FreeBSD" ]]; then
+  echo "The rvm system wide installer currently only supports Linux and FreeBSD." >&2
   exit 1
 fi
 
@@ -90,14 +122,9 @@ rvm_path="${rvm_path:-"/usr/local/rvm"}"
 export rvm_selfcontained=0
 
 rvm_group_name="${rvm_group_name:-"rvm"}"
-if \grep -q "${rvm_group_name}$" /etc/group ; then
-  echo "Group '$rvm_group_name' 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)"
+
+__rvm_create_user_group "$rvm_group_name"
+__rvm_add_user_to_group "$(whoami)" "$rvm_group_name"
 
 echo "Creating the destination dir and making sure the permissions are correct"
 mkdir -p "$rvm_path"

data/contrib/r

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+#
+# r - Rails shortcut command.
+#
+r() {
+  local action args
+
+  action="$1" ; shift
+  args="$@"
+
+  case "$action" in
+    c)      action=console   ;;
+    db)     action=dbconsole ;;
+    g)      action=generate  ;;
+    h|help) action="-h"      ;;
+  esac
+
+  if [[ -s config.ru ]] ; then
+    ruby ./script/rails $args
+  else
+    if [[ -s ./script/$action ]] ; then
+      ruby ./script/$action $args
+    else
+      printf "ERROR: Missing script ./script/$action !!!"
+    fi
+  fi
+}

data/install

@@ -40,6 +40,15 @@ check_rubyopt_conditions() {
   fi
 }
 
+# Regenerates a users wrappers as part of the update.
+regenerate_wrappers() {
+  printf "\n"
+  if command -v __rvm_regenerate_wrappers >/dev/null; then
+    __rvm_regenerate_wrappers
+  fi
+  printf "\n"
+}
+
 andand_return_instructions() {
   printf "
   This means that if you see something like:
@@ -493,6 +502,15 @@ for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
 
 done
 
+# Cleanup any .swp files that might have appeared.
+files=($( find "$rvm_path/" -mindepth 1 -maxdepth 2 -iname '*.swp' -type f ))
+
+for file in "${files[@]}" ; do
+
+  [[ -f "$file" ]] && rm -f "$file"
+
+done
+
 printf "\n    Copying manpages into place."
 
 files=($(builtin cd "$install_source_path/man" ; find . -maxdepth 1 -mindepth 1 -type f -print))
@@ -514,6 +532,8 @@ if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
   upgrade_notes
 
   check_rubyopt_conditions
+  
+  regenerate_wrappers
 
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 9
+:patch: 10

data/lib/rvm/environment.rb

@@ -12,7 +12,8 @@ module RVM
 
     # The default config has rvm_silence_logging so that log doesn't print anything to stdout.
     merge_config! :rvm_silence_logging => 1,
-                  :rvm_promptless      => 1
+                  :rvm_promptless      => 1,
+                  :rvm_ruby_api        => 1
 
     attr_reader :environment_name, :shell_wrapper
 
@@ -45,7 +46,7 @@ module RVM
 
     # Automatically load rvm config from the multiple sources.
     def source_rvm_environment
-      rvm_path = config_value_for(:rvm_path, File.expand_path("~/.rvm"), false)
+      rvm_path = config_value_for(:rvm_path, self.class.default_rvm_path, false)
       actual_config = defined_config.merge('rvm_path' => rvm_path)
       config = []
       actual_config.each_pair do |k, v|

data/lib/rvm/environment/env.rb

@@ -3,12 +3,12 @@ module RVM
 
     # Returns the contents of the env file.
     def env_contents
-      rvm(:env).stdout
+      rvm(:env, environment_name).stdout
     end
 
     # Returns the path to the env file
     def env_path
-      rvm(:env, :path => true).stdout.strip
+      rvm(:env, environment_name, :path => true).stdout.strip
     end
 
     # Returns a ruby-like wrapper for the env functions

data/lib/rvm/environment/utility.rb

@@ -3,6 +3,11 @@ module RVM
 
     PREFIX_OPTIONS = [:trace, :json, :yaml]
 
+    def self.default_rvm_path
+      value = `bash '#{File.expand_path('../shell/calculate_rvm_path.sh', File.dirname(__FILE__))}'`.strip
+      $?.success? && !value.empty? ? File.expand_path(value) : nil
+    end
+
     # Returns the environment identifier for the current environment,
     # as determined from the GEM_HOME.
     def self.current_environment_id
@@ -19,7 +24,7 @@ module RVM
 
     # Returns the ruby string that represents the current environment.
     def self.current_ruby_string
-      identifier_to_ruby_string current_environment_id
+      identifier_to_ruby_string(current_environment_id)
     end
 
     # Converts a ruby identifier (string + gemset) to just the ruby string.
@@ -55,10 +60,11 @@ module RVM
       rearrange_options!(args, options)
       args += hash_to_options(options)
       args.map! { |a| a.to_s }
+
       if silent
-        run_silently 'rvm', *args
+        run_silently('rvm', *args)
       else
-        run 'rvm', *args
+        run('rvm', *args)
       end
     end
 
@@ -89,7 +95,7 @@ module RVM
       if result && result[:rvm_ruby_string]
         result[:rvm_ruby_string]
       else
-        self.class.identifier_to_ruby_string expanded_name
+        self.class.identifier_to_ruby_string(expanded_name)
       end
     end
 
@@ -116,7 +122,7 @@ module RVM
 
     # Normalizes an array, removing blank lines.
     def normalize_array(value)
-      value.split("\n").map { |l| l.strip }.reject { |l| l.empty? }
+      value.split("\n").map { |line| line.strip }.reject { |line| line.empty? }
     end
 
     # Extract options from a hash.
@@ -146,7 +152,7 @@ module RVM
     def normalize_option_value(value)
       case value
       when Array
-        value.map { |v| normalize_option_value(v) }.join(",")
+        value.map { |option| normalize_option_value(option) }.join(",")
       else
         value.to_s
       end

data/lib/rvm/shell/calculate_rvm_path.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Calculates a default rvm path
+
+# Check first.
+if [[ -n "$rvm_path" ]]; then
+  echo "$rvm_path"
+  exit
+fi
+
+# Load extra files.
+
+[[ -s ~/.rvmrc ]] && source ~/.rvmrc >/dev/null 2>&1
+[[ -s /etc/.rvmrc ]] && source /etc/rvmrc >/dev/null 2>&1
+
+if [[ -n "$rvm_path" ]]; then
+  echo "$rvm_path"
+elif [[ -d ~/.rvm ]]; then
+  echo "~/.rvm"
+elif [[ -d /usr/local/rvm ]]; then
+  echo "/usr/local/rvm"
+else
+  exit 1
+fi
+
+exit 0

data/lib/rvm/shell/shell_wrapper.sh

@@ -5,6 +5,6 @@ __rvm_show_command_epilog() {
   echo "---"
   echo " exit_status: \"$last_command_result\""
   echo " environment:"
-  env | sed "s#'#\\'#" | sed -e 's#"#\\"#' -e "s#\\([^=]*\\)=\\(.*\\)#   '\1': \"\2\"#"
+  env | sed "s#'#\\'#g" | sed -e 's#"#\\"#g' -e "s#\\([^=]*\\)=\\(.*\\)#   '\1': \"\2\"#"
   echo "----------------RVM-RESULTS-END----------------"
 }

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.9"
+  s.version = "1.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-09-15}
+  s.date = %q{2010-09-18}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "config/md5",
      "contrib/gemset_snapshot",
      "contrib/install-system-wide",
+     "contrib/r",
      "examples/rvmrc",
      "gemsets/default.gems",
      "gemsets/global.gems",
@@ -92,6 +93,7 @@ Gem::Specification.new do |s|
      "lib/rvm/install_command_dumper.rb",
      "lib/rvm/shell.rb",
      "lib/rvm/shell/abstract_wrapper.rb",
+     "lib/rvm/shell/calculate_rvm_path.sh",
      "lib/rvm/shell/result.rb",
      "lib/rvm/shell/shell_wrapper.sh",
      "lib/rvm/shell/single_shot_wrapper.rb",

data/scripts/cd

@@ -13,6 +13,9 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
         builtin cd "$@"
         local result=$?
         __rvm_project_rvmrc
+
+        rvm_hook="after_cd" ; source "$rvm_path/scripts/hook"
+
         return $result
       }
     fi
@@ -21,6 +24,9 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
       builtin cd "$@"
       local result=$?
       __rvm_project_rvmrc
+
+      rvm_hook="after_cd" ; source "$rvm_path/scripts/hook"
+
       return $result
     }
   fi

data/scripts/cli

@@ -396,12 +396,14 @@ __rvm_parse_args() {
         if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
       ;;
 
+      --debug)
+        export rvm_debug_flag=1
+        set -o verbose
+      ;;
+
       --trace|--debug)
         local option
 
-        export rvm_debug_flag=1
-
-        set -o verbose
         set -o noclobber
         set -o nounset
 
@@ -414,10 +416,10 @@ __rvm_parse_args() {
 
           export rvm_trace_flag=1
 
-          #set -o xtrace
+          set -o xtrace
 
           if [[ -z "${ZSH_VERSION:-""}" ]] ; then
-            export PS4='-[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() > }'
+            export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
           fi
         fi
       ;;
@@ -667,7 +669,7 @@ rvm() {
     ;;
 
     ruby|gem|rake|exec)
-      old_rvm_ruby_string=$rvm_ruby_string
+      old_rvm_ruby_string=${rvm_ruby_string:-""}
       unset rvm_ruby_string
       export rvm_ruby_strings
 
@@ -757,8 +759,14 @@ rvm() {
   __rvm_teardown
 
   if [[ ${rvm_trace_flag:-0} -eq 1 ]] ; then
-    set +x
     rvm_trace_flag=0
+    set +o verbose
+    set +o noclobber
+    set +o nounset
+
+    if [[ -z "${ZSH_VERSION:-""}" ]] ; then
+      set +o errtrace
+    fi
   fi
 
   return ${result:-0}

data/scripts/gemsets

@@ -215,8 +215,14 @@ gemset_list() {
 
 gemset_delete() {
 
+  gemsets=(${args[@]})
+
   if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select ; fi
 
+  if [[ -n "${gemsets[__array_start]}" ]] ; then
+    rvm_gemset_name="${gemsets[__array_start]}"
+  fi
+
   if [[ -n "$rvm_gemset_name" ]] ; then
 
     gemdir="${rvm_gems_path:-"$rvm_path/gems"}/$rvm_ruby_string${rvm_gemset_separator:-"@"}$rvm_gemset_name"
@@ -810,8 +816,9 @@ if ! command -v gem > /dev/null ; then
 fi
 
 args=($*)
-action="${args[0]}"
-args=($(echo ${args[@]:1}))
+action="${args[$__array_start]}"
+args[$__array_start]=""
+args=(${args[@]})
 gems_args="$(echo ${args[@]}) " # Strip trailing / leading / extra spacing.
 
 export rvm_gemset_name="${args[1]:-""}" # For wherever used.

data/scripts/help

@@ -1,22 +1,37 @@
 #!/usr/bin/env bash
+
 rvm_base_except="selector"
+
 source "$rvm_path/scripts/base"
 
 rvm_help_path="${rvm_help_path:-"$rvm_path/help"}"
 
 args=($*)
-command="${args[0]}"
-action="${args[1]}"
-args="$(echo ${args[@]:2}) " # Strip trailing / leading / extra spacing.
 
-if [[ ! -z "$command" ]] && [[ -s "${rvm_help_path}/${command}" ]] ; then
-  if [[ ! -z "$action" ]] && [[ -s "${rvm_help_path}/${command}/${action}" ]] ; then
+command="${args[$__array_start]}"
+args[$__array_start]=""
+args=(${args[@]})
+
+action="${args[$array_start]}"
+args[$__array_start]=""
+args=(${args[@]})
+
+if [[ -n "$command" && -s "${rvm_help_path}/${command}" ]] ; then
+
+  if [[ -n "$action" && -s "${rvm_help_path}/${command}/${action}" ]] ; then
+
     less "${rvm_help_path}/${command}/${action}"
+
   else
+
     less "${rvm_help_path}/${command}"
+
   fi
+
 else
+
   less "${rvm_path:-$HOME/.rvm}/README"
+
   "$rvm_path/scripts/log" "info" \
     "Commands available with 'rvm help':\n\n    $(builtin cd "${rvm_help_path}" ; find . -maxdepth 1 -mindepth 1 -type f -print | \tr "\n" ' ' | sed -e 's#./##g')"
 fi