rvm 1.1.4 → 1.1.5

data/lib/VERSION.yml

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

data/lib/rvm/environment.rb

@@ -57,7 +57,7 @@ module RVM
       actual_config.each_pair do |k, v|
         config << "#{k}=#{escape_argument(v.to_s)}"
       end
-      run_silently :export, config.join(" ")
+      run_silently "export #{config.join(" ")}"
       run_silently :source, File.join(rvm_path, "scripts", "rvm")
     end
 

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#'#\\'#g" | sed -e 's#"#\\"#g' -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.1.4"
+  s.version = "1.1.5"
 
   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-09}
+  s.date = %q{2010-12-14}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -20,59 +20,6 @@ Gem::Specification.new do |s|
   s.files = [
     "LICENCE",
     "README",
-    "binscripts/rvm",
-    "binscripts/rvm-auto-ruby",
-    "binscripts/rvm-prompt",
-    "binscripts/rvm-shell",
-    "binscripts/rvm-update-head",
-    "binscripts/rvm-update-latest",
-    "binscripts/rvmsudo",
-    "config/db",
-    "config/known",
-    "config/md5",
-    "contrib/gemset_snapshot",
-    "contrib/install-system-wide",
-    "contrib/r",
-    "examples/rvmrc",
-    "gemsets/default.gems",
-    "gemsets/global.gems",
-    "help/alias",
-    "help/benchmark",
-    "help/cleanup",
-    "help/debug",
-    "help/disk-usage",
-    "help/docs",
-    "help/exec",
-    "help/fetch",
-    "help/gem",
-    "help/gemdir",
-    "help/gemset",
-    "help/implode",
-    "help/info",
-    "help/install",
-    "help/list",
-    "help/migrate",
-    "help/monitor",
-    "help/notes",
-    "help/package",
-    "help/rake",
-    "help/remove",
-    "help/repair",
-    "help/reset",
-    "help/ruby",
-    "help/rubygems",
-    "help/rvmrc",
-    "help/snapshot",
-    "help/specs",
-    "help/srcdir",
-    "help/tests",
-    "help/tools",
-    "help/uninstall",
-    "help/update",
-    "help/upgrade",
-    "help/use",
-    "help/wrapper",
-    "install",
     "lib/VERSION.yml",
     "lib/rvm.rb",
     "lib/rvm/capistrano.rb",
@@ -99,61 +46,7 @@ Gem::Specification.new do |s|
     "lib/rvm/shell/single_shot_wrapper.rb",
     "lib/rvm/shell/utility.rb",
     "lib/rvm/version.rb",
-    "man/man1/rvm.1",
-    "man/man1/rvm.1.gz",
-    "rvm.gemspec",
-    "scripts/alias",
-    "scripts/aliases",
-    "scripts/array",
-    "scripts/base",
-    "scripts/cd",
-    "scripts/cleanup",
-    "scripts/cli",
-    "scripts/color",
-    "scripts/completion",
-    "scripts/db",
-    "scripts/default",
-    "scripts/disk-usage",
-    "scripts/docs",
-    "scripts/env",
-    "scripts/environment-convertor",
-    "scripts/fetch",
-    "scripts/gemsets",
-    "scripts/get",
-    "scripts/hash",
-    "scripts/help",
-    "scripts/hook",
-    "scripts/info",
-    "scripts/initialize",
-    "scripts/install",
-    "scripts/irbrc",
-    "scripts/irbrc.rb",
-    "scripts/list",
-    "scripts/log",
-    "scripts/maglev",
-    "scripts/manage",
-    "scripts/match",
-    "scripts/md5",
-    "scripts/migrate",
-    "scripts/monitor",
-    "scripts/notes",
-    "scripts/override_gem",
-    "scripts/package",
-    "scripts/patches",
-    "scripts/patchsets",
-    "scripts/repair",
-    "scripts/rubygems",
-    "scripts/rvm",
-    "scripts/rvm-install",
-    "scripts/selector",
-    "scripts/set",
-    "scripts/snapshot",
-    "scripts/tools",
-    "scripts/update",
-    "scripts/upgrade",
-    "scripts/utility",
-    "scripts/version",
-    "scripts/wrapper"
+    "rvm.gemspec"
   ]
   s.homepage = %q{http://github.com/wayneeseguin/rvm}
   s.post_install_message = %q{********************************************************************************

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 -05:00
+date: 2010-12-14 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -30,59 +30,6 @@ extra_rdoc_files:
 files: 
 - LICENCE
 - README
-- binscripts/rvm
-- binscripts/rvm-auto-ruby
-- binscripts/rvm-prompt
-- binscripts/rvm-shell
-- binscripts/rvm-update-head
-- binscripts/rvm-update-latest
-- binscripts/rvmsudo
-- config/db
-- config/known
-- config/md5
-- contrib/gemset_snapshot
-- contrib/install-system-wide
-- contrib/r
-- examples/rvmrc
-- gemsets/default.gems
-- gemsets/global.gems
-- help/alias
-- help/benchmark
-- help/cleanup
-- help/debug
-- help/disk-usage
-- help/docs
-- help/exec
-- help/fetch
-- help/gem
-- help/gemdir
-- help/gemset
-- help/implode
-- help/info
-- help/install
-- help/list
-- help/migrate
-- help/monitor
-- help/notes
-- help/package
-- help/rake
-- help/remove
-- help/repair
-- help/reset
-- help/ruby
-- help/rubygems
-- help/rvmrc
-- help/snapshot
-- help/specs
-- help/srcdir
-- help/tests
-- help/tools
-- help/uninstall
-- help/update
-- help/upgrade
-- help/use
-- help/wrapper
-- install
 - lib/VERSION.yml
 - lib/rvm.rb
 - lib/rvm/capistrano.rb
@@ -109,61 +56,7 @@ files:
 - lib/rvm/shell/single_shot_wrapper.rb
 - lib/rvm/shell/utility.rb
 - lib/rvm/version.rb
-- man/man1/rvm.1
-- man/man1/rvm.1.gz
 - rvm.gemspec
-- scripts/alias
-- scripts/aliases
-- scripts/array
-- scripts/base
-- scripts/cd
-- scripts/cleanup
-- scripts/cli
-- scripts/color
-- scripts/completion
-- scripts/db
-- scripts/default
-- scripts/disk-usage
-- scripts/docs
-- scripts/env
-- scripts/environment-convertor
-- scripts/fetch
-- scripts/gemsets
-- scripts/get
-- scripts/hash
-- scripts/help
-- scripts/hook
-- scripts/info
-- scripts/initialize
-- scripts/install
-- scripts/irbrc
-- scripts/irbrc.rb
-- scripts/list
-- scripts/log
-- scripts/maglev
-- scripts/manage
-- scripts/match
-- scripts/md5
-- scripts/migrate
-- scripts/monitor
-- scripts/notes
-- scripts/override_gem
-- scripts/package
-- scripts/patches
-- scripts/patchsets
-- scripts/repair
-- scripts/rubygems
-- scripts/rvm
-- scripts/rvm-install
-- scripts/selector
-- scripts/set
-- scripts/snapshot
-- scripts/tools
-- scripts/update
-- scripts/upgrade
-- scripts/utility
-- scripts/version
-- scripts/wrapper
 - bin/rvm-install
 has_rdoc: true
 homepage: http://github.com/wayneeseguin/rvm

data/binscripts/rvm

@@ -1,76 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ ${rvm_ignore_rvmrc:-0} -eq 0 ]]; then
-
-  for rvmrc in /etc/rvmrc "$HOME/.rvmrc" ; do
-
-    if [[ -f "$rvmrc" ]] ; then
-
-      if grep -q '^\s*rvm .*$' "$rvmrc" ; then
-
-        printf "\n  Error:
-    $rvmrc is for rvm settings only.
-    rvm CLI may NOT be called from within $rvmrc.
-    Skipping the loading of $rvmrc
-"
-        exit 1
-
-      else
-
-        source "$rvmrc"
-
-      fi
-
-    fi
-
-  done
-
-fi
-
-# Setup default sandbox value. See scripts/rvm for origin.
-if [[ ${rvm_selfcontained:-0} -eq 0 ]]; then
-
-  if [[ $(id -u) -eq 0 || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
-
-    rvm_selfcontained=0
-
-  else
-
-    rvm_selfcontained=1
-
-  fi
-
-fi
-
-if [[ -z "${rvm_prefix:-""}" ]] ; then
-
-  if [[ ${rvm_selfcontained:-0} -eq 0 ]] ; then
-
-    rvm_prefix="/usr/local/"
-
-  else
-
-    rvm_prefix="$HOME/."
-
-  fi
-
-fi
-
-# Fix rvm_prefix changes.
-echo "$rvm_prefix" | grep -vq '\(\/\|\.\)$' && [[ -d "$rvm_prefix/rvm/scripts" ]]
-
-rvm_prefix_needs_trailing_slash="$?"
-
-if [[ "$rvm_prefix" = "/usr/local" || "$rvm_prefix_needs_trailing_slash" = "0" ]]; then
-  rvm_prefix="$rvm_prefix/"
-fi
-
-if [[ -z "${rvm_path:-""}" ]] ; then
-  rvm_path="${rvm_prefix}rvm"
-fi
-
-source "$rvm_path/scripts/rvm"
-
-export rvm_interactive_flag=0
-
-rvm "$@"

data/binscripts/rvm-auto-ruby

@@ -1,24 +0,0 @@
-#!/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
-
-[[ -s "$rvm_path/environments/default" ]] && source "$rvm_path/environments/default"
-
-rvm rvmrc load > /dev/null 2>&1
-
-exec ruby "$@"

data/binscripts/rvm-prompt

@@ -1,208 +0,0 @@
-#!/usr/bin/env bash
-
-add(){
-
-  token=${1:-""}
-
-  eval "${token}_flag=1" ; shift
-
-  if [[ -n "$format" ]] ; then
-
-    format="${format}-\$${token}"
-
-  else
-
-    format="\$${token}"
-
-  fi
-
-  return 0
-}
-
-rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
-
-ruby=$(command -v ruby)
-
-if [[ -n "$ruby" && -n "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
-
-  unset format
-
-  while [[ $# -gt 0 ]] ; do
-
-    token="$1" ; shift
-
-    case "$token" in
-
-      i|interpreter)  add "interpreter"  ;;
-
-      v|version)      add "version"      ;;
-
-      p|patchlevel)   add "patchlevel"   ;;
-
-      r|revision)     add "revision"     ;;
-
-      a|architecture) add "architecture" ;;
-
-      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
-
-
-  if [[ -z "$format" ]] ; then
-
-    add "interpreter"
-
-    add "version"
-
-    add "patchlevel"
-
-    add "gemset"
-
-  fi
-
-  ruby_string=$(dirname "$ruby" | xargs dirname | xargs basename)
-
-  if [[ -n "$no_default" ]]; then
-
-    # Do not display anything if no default flag was provided
-    #   and we are using the default ruby
-
-    # Only people who explicitely ask for this will have the
-    #   slight performance penalty associated.
-
-    if [[ "$(rvm tools identifier)" = "$(rvm alias show default)"  ]] ; then
-
-      exit 0
-
-    fi
-
-  fi
-
-  strings=(${ruby_string//-/ })
-
-  if [[ ${interpreter_flag:-0} -gt 0 || -n "$unicode_flag" ]] ; then
-
-    interpreter=${strings[0]}
-
-  fi
-
-  if [[ ${version_flag:-0} -gt 0 || -n "$unicode_flag" ]] ; then
-
-    version=${strings[1]}
-
-  fi
-
-  if [[ ${#strings[@]} -gt 2 ]] ; then
-
-    if [[ ${patchlevel_flag:-0} -gt 0 ]] ; then
-
-      patchlevel=${strings[2]}
-
-    fi
-
-  fi
-
-  if [[ ${architecture_flag:-0} -gt 0 ]] ; then
-
-    architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
-
-  fi
-
-  if [[ ${gemset_flag:-0} -gt 0 ]] ; then
-
-    case "${GEM_HOME:-""}" in
-
-      *${rvm_gemset_separator:-"@"}*)
-
-        gemset="${rvm_gemset_separator:-"@"}${GEM_HOME/*${rvm_gemset_separator:-"@"}/}"
-
-        ;;
-
-    esac
-
-  fi
-
-  if [[ ${unicode_flag:-0} -gt 0 ]] ; then
-
-    case "$interpreter" in
-
-      jruby)    unicode="☯" ;;
-
-      rbx)      unicode="☃" ;;
-
-      ree)      unicode="✈" ;;
-
-      macruby)  unicode="⌘" ;;
-
-      maglev)   unicode="㎖" ;;
-
-      ironruby) unicode="♭" ;;
-
-      system)   unicode="➆" ;;
-
-      goruby)   unicode="⛳";;
-
-      ruby)
-
-        case ${version:-""} in
-
-          1.8.6)  unicode="❻"  ;;
-
-          1.8.7)  unicode="❼"  ;;
-
-          1.9.1)  unicode="❶"  ;;
-
-          1.9.2)  unicode="❷"  ;;
-
-          *)      unicode="♢"  ;;
-
-        esac ;;
-
-      *) unicode="♢" ;;
-
-    esac
-
-    if echo "$ruby_string" | \grep -q '-head' ; then
-
-      unicode="${unicode}〠"
-
-    fi
-
-  fi
-
-  eval "prompt=\"$format\""
-
-  echo "$prompt" \
-    | sed -e 's#^[[:space:]]*-*##g' \
-          -e 's#--*#-#g' \
-          -e 's#-*[[:space:]]*$##' \
-          -e 's#-'${rvm_gemset_separator:-"@"}'#'${rvm_gemset_separator:-"@"}'#'
-
-
-else
-
-  while [[ $# -gt 0 ]] ; do
-
-    token="$1" ; shift
-
-    case "$token" in
-
-      s|system) echo "system" ;;
-
-    esac
-
-  done
-
-fi
-
-exit 0