rvm 1.1.3 → 1.1.4

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 [[ $(id -u) -eq 0 || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
 
     rvm_selfcontained=0
 

data/contrib/install-system-wide

@@ -85,7 +85,7 @@ __rvm_add_user_to_group() {
 os_type="$(uname)"
 
 # Require root to install it.
-if [[ "$(whoami)" != "root" ]]; then
+if [[ $(id -u) -ne 0 ]]; then
   echo "Please rerun this installer as root." >&2
   exit 1
 
@@ -154,7 +154,7 @@ export rvm_selfcontained=0
 rvm_group_name="${rvm_group_name:-"rvm"}"
 
 __rvm_create_user_group "$rvm_group_name"
-__rvm_add_user_to_group "$(whoami)" "$rvm_group_name"
+__rvm_add_user_to_group "$USER" "$rvm_group_name"
 
 echo "Creating the destination dir and making sure the permissions are correct"
 mkdir -p "$rvm_path"

data/help/gemset

@@ -0,0 +1,14 @@
+
+  Usage:
+
+    rvm gemset [action]
+
+  Action:
+
+    {import,export,create,copy,rename,empty,delete,name,dir,list,list_all,gemdir,install,pristine,clear,use,update,unpack,globalcache}
+
+  Description:
+
+    Commands for working with and manipulating gemsets within RVM.
+
+

data/install

@@ -5,8 +5,7 @@ set -o errtrace
 export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
 
 if [[ -z "$rvm_selfcontained" ]]; then
-  if [[ "root" = "$(whoami)" \
-    || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+  if [[ $(id -u) -eq 0 || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
     export rvm_selfcontained=0
   else
     export rvm_selfcontained=1
@@ -126,7 +125,7 @@ andand_return_warning()
 thank_you()
 {
   printf "
-${name:-"${USER:-$(whoami)}"},
+${name:-"${USER:-$(id | sed -e 's/^[^(]*(//' -e 's/).*$//')}"},
 
 Thank you very much for using RVM! I sincerely hope that RVM helps to
 make your work both easier and more enjoyable.

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 1
-:patch: 3
+:patch: 4

data/lib/rvm/capistrano.rb

@@ -16,13 +16,26 @@ Capistrano::Configuration.instance(true).load do
   set :default_shell do
     shell = File.join(rvm_bin_path, "rvm-shell")
     ruby = rvm_ruby_string.to_s.strip
-    shell = "#{shell} '#{ruby}'" unless ruby.empty?
+    shell = "rvm_path=#{rvm_path} #{shell} '#{ruby}'" unless ruby.empty?
     shell
   end
 
   # Let users set the type of their rvm install.
   _cset(:rvm_type, :system)
 
+  # Define rvm_path
+  # This is used in the default_shell command to pass the required variable to rvm-shell, allowing
+  # rvm to boostrap using the proper path.  This is being lost in Capistrano due to the lack of a
+  # full environment.
+  _cset(:rvm_path) do
+    case rvm_type
+    when :system_wide, :root, :system
+      "/usr/local/rvm"
+    when :local, :user, :default
+      "$HOME/.rvm/"
+    end
+  end
+
   # Let users override the rvm_bin_path
   _cset(:rvm_bin_path) do
     case rvm_type

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.1.3"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-12-05}
+  s.date = %q{2010-12-09}
   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

@@ -170,7 +170,7 @@ __rvm_parse_args()
 
       -e)
         rvm_action="ruby"
-        rvm_ruby_args="$rvm_token $next_token $(__rvm_quote_args "$@")"
+        IFS="\n" ; rvm_ruby_args="$rvm_token '$next_token $@'" ; IFS=" "
         rvm_parse_break=1
       ;;
 
@@ -221,7 +221,7 @@ __rvm_parse_args()
 
           elif [[ "-e" = "$next_token" ]] ; then
             rvm_action="ruby"
-            rvm_ruby_args="$flag $next_token $(__rvm_quote_args "$@")"
+            IFS="\n" ; rvm_ruby_args="$flag $next_token '$@'" ; IFS=" "
             rvm_parse_break=1
 
           else
@@ -453,7 +453,6 @@ __rvm_parse_args()
       --install)                    rvm_install_on_use_flag=1 ;;
       --pretty)                     rvm_pretty_print_flag=1   ;;
 
-
       reboot|damnit|wtf|argh|BOOM|boom|wth) $rvm_action="reboot" ;;
 
       --self|--gem|--rubygems|--reconfigure|--default|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--sticky|--create|--gems|--docs)

data/scripts/fetch

@@ -16,15 +16,17 @@ cleanup_download()
 
 record_md5()
 {
-  if [[ "Darwin" = "$(uname)" ]] || [[ "FreeBSD" = "$(uname)" ]]; then
-
-    archive_md5="$(/sbin/md5 -q "${archive}")"
-
-  else
-
-    archive_md5="$(md5sum "${archive}" | awk '{print $1}')"
-
-  fi
+  case "$(uname)" in
+    Darwin|FreeBSD)
+      archive_md5="$(/sbin/md5 -q "${archive}")"
+      ;;
+    OpenBSD)
+      archive_md5="$(/bin/md5 -q "${archive}")"
+      ;;
+    Linux|*)
+      archive_md5="$(md5sum "${archive}" | awk '{print $1}')"
+      ;;
+  esac
 
   "$rvm_path/scripts/db" "$rvm_path/config/md5" "$archive" "$archive_md5"
 

data/scripts/gemsets

@@ -15,7 +15,7 @@ usage()
 
   Action:
 
-    {import,export,create,copy,rename,empty,delete,name,dir,list,gemdir,install,pristine,clear,use,update,unpack,globalcache}
+    {import,export,create,copy,rename,empty,delete,name,dir,list,list_all,gemdir,install,pristine,clear,use,update,unpack,globalcache}
 
   Description:
 
@@ -24,6 +24,14 @@ usage()
 "
 }
 
+gemset_list_all()
+{
+  for rvm_ruby_string in $(rvm list strings) ; do
+    (__rvm_use $ruby ; gemset_list)
+  done
+  unset rvm_ruby_string
+}
+
 gemset_update()
 {
 
@@ -993,6 +1001,9 @@ case "$action" in
   list)
     gemset_list
     ;;
+  list_all)
+    gemset_list_all
+    ;;
   gemdir|gempath|gemhome|home|path|version)
     gemset_info
     ;;

data/scripts/install

@@ -5,8 +5,7 @@ set -o errtrace
 export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
 
 if [[ -z "$rvm_selfcontained" ]]; then
-  if [[ "root" = "$(whoami)" \
-    || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+  if [[ $(id -u) -eq 0 || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
     export rvm_selfcontained=0
   else
     export rvm_selfcontained=1
@@ -126,7 +125,7 @@ andand_return_warning()
 thank_you()
 {
   printf "
-${name:-"${USER:-$(whoami)}"},
+${name:-"${USER:-$(id | sed -e 's/^[^(]*(//' -e 's/).*$//')}"},
 
 Thank you very much for using RVM! I sincerely hope that RVM helps to
 make your work both easier and more enjoyable.

data/scripts/manage

@@ -307,7 +307,7 @@ __rvm_install_ruby()
           # TODO: configure & make variables should be set here.
           rvm_ruby_configure=" true "
           rvm_ruby_make="rake"
-          rvm_ruby_make_install="sudo rake install"
+          rvm_ruby_make_install="$rvm_path/bin/rvmsudo rake install"
 
           __rvm_db "${rvm_ruby_interpreter}_repo_url" "rvm_ruby_url"
 
@@ -777,6 +777,8 @@ RubyWrapper
 
         cp -R "$rvm_ruby_home/lib/ruby/gems/1.8/" "$rvm_ruby_gem_home/"
       fi
+
+      "$rvm_ruby_home/bin/gem" install jruby-launcher
     ;;
 
     maglev)

data/scripts/notes

@@ -41,7 +41,7 @@ dependencies:
   jruby: aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk
 
 # For Ruby (MRI & ree)  you should install the following OS dependencies:
-  ruby: aptitude install build-essential bison openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev autoconf
+  ruby: aptitude install build-essential bison openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf
 
 # In addition to ruby: dependencies,
   ruby-head: subversion
@@ -74,7 +74,7 @@ dependencies:
   rvm: bash curl git
 
   # For Ruby (MRI & Ree) you should install the following OS dependencies:
-  ruby: pacman -Sy --noconfirm patch curl bison zlib readline libxml2 git autoconf diffutils patch bison make
+  ruby: pacman -Sy --noconfirm patch curl bison zlib readline libxml2 libxslt git autoconf diffutils patch bison make
   ruby-head: pacman -Sy --noconfirm subversion
 
   # For JRuby (if you wish to use it) you will need:

data/scripts/rvm

@@ -34,7 +34,7 @@ if ! declare -f rvm > /dev/null || [[ ${rvm_reload_flag:-0} -eq 1 ]] ; then
   # Set the default sandboxed value.
   if [[ -z "$rvm_selfcontained" ]]; then
 
-    if [[ "root" = "$(whoami)" || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+    if [[ $(id -u) -eq 0 || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
 
       rvm_selfcontained=0
 

data/scripts/rvm-install

@@ -5,8 +5,7 @@ set -o errtrace
 export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
 
 if [[ -z "$rvm_selfcontained" ]]; then
-  if [[ "root" = "$(whoami)" \
-    || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+  if [[ $(id -u) -eq 0 || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
     export rvm_selfcontained=0
   else
     export rvm_selfcontained=1
@@ -126,7 +125,7 @@ andand_return_warning()
 thank_you()
 {
   printf "
-${name:-"${USER:-$(whoami)}"},
+${name:-"${USER:-$(id | sed -e 's/^[^(]*(//' -e 's/).*$//')}"},
 
 Thank you very much for using RVM! I sincerely hope that RVM helps to
 make your work both easier and more enjoyable.

data/scripts/selector

@@ -274,6 +274,18 @@ __rvm_use_system() {
     fi
   fi
 
+  if [[ ${rvm_default_flag:-0} -eq 1 ]] ; then
+
+    "$rvm_path/scripts/alias" delete default &> /dev/null
+
+    \find "${rvm_bin_path:-"$rvm_path/bin"}" -name 'default_*' -maxdepth 0 -delete
+    \rm -f "$rvm_path/config/default"
+    \rm -f "$rvm_path/environments/default"
+    \rm -rf "$rvm_path/wrappers/default"
+
+  fi
+
+
   # Check binaries, remove under the condition they're symlinks.
   if [[ ${rvm_selfcontained:-1} -eq 0 ]] ; then
 
@@ -377,22 +389,22 @@ __rvm_use()
         "$rvm_path/scripts/wrapper" "$rvm_ruby_string" "default"
       fi
 
+      if [[ "system" != "$rvm_ruby_interpreter" ]] ; then
 
-      if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
-        "$rvm_path/scripts/alias" delete default &> /dev/null
-        \find "${rvm_bin_path:-"$rvm_path/bin"}" -name 'default_*' -maxdepth 0 -delete
-        \rm -f "$rvm_path/config/default"
-        \rm -f "$rvm_path/environments/default"
-        \rm -rf "$rvm_path/wrappers/default"
-
-      else
         RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | sed 's#^\(.*\) (.*$#\1#')"
+
         export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
+
         "$rvm_path/scripts/alias" delete default &> /dev/null
+
         "$rvm_path/scripts/alias" create default "$environment_id" >& /dev/null
+
         \ln -nfs "$rvm_path/environments/$environment_id" "$rvm_path/environments/default"
+
         \ln -nfs "$rvm_path/wrappers/$environment_id" "$rvm_path/wrappers/default"
+
       fi
+
     fi
 
     rvm_default_flag=0

data/scripts/set

@@ -35,7 +35,6 @@ __rvm_ruby_do()
 
       binary="$rvm_ruby_home/bin/$binary"
 
-
     elif [[ -x "$rvm_ruby_global_gems_path/bin/$binary" ]] ; then
 
       binary="$rvm_ruby_global_gems_path/bin/$binary"

data/scripts/update

@@ -5,8 +5,7 @@ set -o errtrace
 export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
 
 if [[ -z "$rvm_selfcontained" ]]; then
-  if [[ "root" = "$(whoami)" \
-    || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+  if [[ $(id -u) -eq 0 || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
     export rvm_selfcontained=0
   else
     export rvm_selfcontained=1
@@ -126,7 +125,7 @@ andand_return_warning()
 thank_you()
 {
   printf "
-${name:-"${USER:-$(whoami)}"},
+${name:-"${USER:-$(id | sed -e 's/^[^(]*(//' -e 's/).*$//')}"},
 
 Thank you very much for using RVM! I sincerely hope that RVM helps to
 make your work both easier and more enjoyable.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-05 00:00:00 -05:00
+date: 2010-12-09 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []