rvm 1.0.18 → 1.0.19

data/install

@@ -126,7 +126,7 @@ andand_return_warning()
 thank_you()
 {
   printf "
-${name:-"$USER"},
+${name:-"${USER:-$(whoami)}"},
 
 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: 0
-:patch: 18
+:patch: 19

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.18"
+  s.version = "1.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-10-30}
+  s.date = %q{2010-11-01}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -119,6 +119,7 @@ Gem::Specification.new do |s|
      "scripts/environment-convertor",
      "scripts/fetch",
      "scripts/gemsets",
+     "scripts/get",
      "scripts/hash",
      "scripts/help",
      "scripts/hook",

data/scripts/cli

@@ -154,7 +154,7 @@ __rvm_parse_args()
         fi
       ;;
 
-      inspect|list|info|strings)
+      inspect|list|info|strings|get)
         rvm_action="$rvm_token"
         rvm_ruby_args="$next_token $@"
         rvm_parse_break=1
@@ -739,6 +739,7 @@ rvm()
     ;;
 
     notes)       "$rvm_path/scripts/notes"                  ;;
+    get)         "$rvm_path/scripts/get" $rvm_ruby_args     ;;
     reload)      rvm_reload_flag=1                          ;;
     tests|specs) rvm_action="rake" ; __rvm_do               ;;
     package)     "$rvm_path/scripts/package" $rvm_ruby_args ;;
@@ -775,19 +776,20 @@ rvm()
 
   fi
 
-  __rvm_teardown
-
   if [[ ${rvm_trace_flag:-0} -eq 1 ]] ; then
     rvm_trace_flag=0
     set +o verbose
     set +o noclobber
     set +o nounset
+    set +o xtrace
 
     if [[ -z "${ZSH_VERSION:-""}" ]] ; then
       set +o errtrace
     fi
   fi
 
+  __rvm_teardown
+
   return ${result:-0}
 }
 

data/scripts/get

@@ -0,0 +1,126 @@
+#!/usr/bin/env bash
+
+source "$rvm_path/scripts/base"
+source "$rvm_path/scripts/version"
+
+get_help()
+{
+  printf "
+
+Usage:
+
+  rvm get {latest,head,help}
+
+Options:
+
+  latest - download and install the latest RVM release listed by
+           http://rvm.beginrescueend.com/releases/stable-version.txt
+
+  head   - git clone and install the latest RVM repository HEAD.
+
+  help   - Output this message.
+
+"
+}
+
+get_latest()
+{
+  local version_url stable_version
+
+  version_url="http://rvm.beginrescueend.com/releases/stable-version.txt"
+
+  stable_version=$(curl -s $version_url)
+
+  "$rvm_path/scripts/log" "info" "\nOriginal installed RVM version:"
+  (__rvm_version)
+
+
+  (
+
+  __rvm_run "fetch" \
+    "$rvm_path/scripts/fetch 'http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz'" \
+    "fetching rvm-${stable_version}.tar.gz"
+
+  __rvm_run "extract" \
+    "gunzip < \"${rvm_archives_path:-"$rvm_path/archives"}/rvm-${stable_version}.tar.gz\" | tar xf - -C ${rvm_src_path:-"$rvm_path/src"}" \
+    "Extracting rvm-${stable_version}.tar.gz ..."
+
+  __rvm_run "install" \
+    "builtin cd ${rvm_src_path:-"$rvm_path/src"}/rvm-${stable_version}/; ./install" \
+    "Installing rvm-${stable_version}..."
+
+  )
+
+  "$rvm_path/scripts/log" "info" "\nInstalled RVM version:"
+  ( source $rvm_path/scripts/rvm ; rvm --version )
+
+  rvm_hook="after_update"
+
+  source "$rvm_path/scripts/hook"
+}
+
+get_head()
+{
+
+  "$rvm_path/scripts/log" "info" "\nOriginal installed RVM version:"
+
+  __rvm_version
+
+  (
+    if [[ ! -d "${rvm_src_path:-"$rvm_path/src"}" ]] ; then
+      \mkdir -p "${rvm_src_path:-"$rvm_path/src"}"
+    fi
+
+    builtin cd "${rvm_src_path:-"$rvm_path/src"}"
+
+    if [[ -d "${rvm_src_path:-"$rvm_path/src"}/rvm/.git" ]] ; then
+
+      builtin cd "${rvm_src_path:-"$rvm_path/src"}/rvm/" && \
+        git pull origin master && \
+        ./scripts/install
+
+    else
+
+      builtin cd "${rvm_src_path:-"$rvm_path/src"}" && \
+        ( git clone http://github.com/wayneeseguin/rvm.git || \
+        git clone --depth 1 git://github.com/wayneeseguin/rvm.git ) && \
+        builtin cd rvm/ && ./scripts/install
+    fi
+  )
+
+  "$rvm_path/scripts/log" "info" "\nInstalled RVM HEAD version:"
+  ( source $rvm_path/scripts/rvm ; rvm --version )
+
+  rvm_hook="after_update"
+
+  source "$rvm_path/scripts/hook"
+
+  return 0
+}
+
+args=($*)
+action="${args[$__array_start]}"
+args[$__array_start]=""
+args=(${args[@]})
+
+case "$action" in
+
+  latest)
+    get_latest
+    ;;
+
+  head)
+    get_head
+    ;;
+
+  help)
+    get_help
+    true
+    ;;
+
+  *)
+    false
+    ;;
+esac
+
+exit $?

data/scripts/install

@@ -126,7 +126,7 @@ andand_return_warning()
 thank_you()
 {
   printf "
-${name:-"$USER"},
+${name:-"${USER:-$(whoami)}"},
 
 Thank you very much for using RVM! I sincerely hope that RVM helps to
 make your work both easier and more enjoyable.

data/scripts/rvm-install

@@ -126,7 +126,7 @@ andand_return_warning()
 thank_you()
 {
   printf "
-${name:-"$USER"},
+${name:-"${USER:-$(whoami)}"},
 
 Thank you very much for using RVM! I sincerely hope that RVM helps to
 make your work both easier and more enjoyable.

data/scripts/update

@@ -126,7 +126,7 @@ andand_return_warning()
 thank_you()
 {
   printf "
-${name:-"$USER"},
+${name:-"${USER:-$(whoami)}"},
 
 Thank you very much for using RVM! I sincerely hope that RVM helps to
 make your work both easier and more enjoyable.

data/scripts/utility

@@ -772,10 +772,12 @@ __rvm_update()
   (
     builtin cd "$rvm_path"
 
+    # TODO:
     if [[ ${rvm_head_flag:-0} -eq 1 || ${rvm_self_flag:-0} -eq 1 \
       || "update" = "${rvm_action:-""}" || ${rvm_update_flag:-0} -eq 1 ]] ; then
-      __rvm_version
-      __rvm_update_rvm
+    "$rvm_path/scripts/log" "warn" \
+        "'rvm update --head' is depreciated, use 'rvm get head' instead"
+      "$rvm_path/scripts/get" head
     fi
 
     if [[ ${rvm_bin_flag:-0} -eq 1 ]] ; then
@@ -793,56 +795,6 @@ __rvm_update()
   return 0
 }
 
-# Update rvm using rubygems
-# If --head was specified, update from git repository master branch.
-__rvm_update_rvm()
-{
-  (
-    if [[ ! -d "${rvm_src_path:-"$rvm_path/src"}" ]] ; then
-      \mkdir -p "${rvm_src_path:-"$rvm_path/src"}"
-    fi
-
-    builtin cd "${rvm_src_path:-"$rvm_path/src"}"
-
-    if [[ ${rvm_head_flag:-0} -eq 1 ]] ; then
-
-      if [[ -d "${rvm_src_path:-"$rvm_path/src"}/rvm/.git" ]] ; then
-
-        builtin cd "${rvm_src_path:-"$rvm_path/src"}/rvm/" && \
-          git pull origin master && \
-          ./scripts/install
-
-      else
-
-        builtin cd "${rvm_src_path:-"$rvm_path/src"}" && \
-          ( git clone http://github.com/wayneeseguin/rvm.git || \
-          git clone --depth 1 git://github.com/wayneeseguin/rvm.git ) && \
-          builtin cd rvm/ && ./scripts/install
-      fi
-    else
-      version_url="http://rvm.beginrescueend.com/releases/stable-version.txt"
-
-      stable_version="$(curl -s $version_url)"
-
-      __rvm_run "fetch" \
-        "$rvm_path/scripts/fetch 'http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz'" \
-        "fetching rvm-${stable_version}.tar.gz"
-
-      __rvm_run "extract" \
-        "gunzip < \"${rvm_archives_path:-"$rvm_path/archives"}/rvm-${stable_version}.tar.gz\" | tar xf - -C ${rvm_src_path:-"$rvm_path/src"}" \
-        "Extracting rvm-${stable_version}.tar.gz ..."
-
-      __rvm_run "install" \
-        "builtin cd ${rvm_src_path:-"$rvm_path/src"}/rvm-${stable_version}/; ./install" \
-        "Installing rvm-${stable_version}..."
-    fi
-  )
-
-  rvm_hook="after_update" ; source "$rvm_path/scripts/hook"
-
-  return 0
-}
-
 __rvm_reboot()
 {
   "$rvm_path/scripts/log" "warn" \
@@ -868,7 +820,7 @@ __rvm_reboot()
 
     gem install rvm $rvm_gem_options
 
-    __rvm_update_rvm
+    "$rvm_path/scripts/get" latest
 
     source "$rvm_path/scripts/rvm"
   else
@@ -972,12 +924,12 @@ __rvm_make_flags()
     # \ls /usr/lib/gcc/x86_64-apple-darwin10
 
     # Set the build & host type
-    if [[ "Power Macintosh" = "$(sysctl -n hw.machine)" ]] ; then
+    if [[ "Power Macintosh" = "$(/usr/sbin/sysctl -n hw.machine)" ]] ; then
 
       : # Do nothing ?
 
-    elif [[ "$(sysctl -n hw.cpu64bit_capable)" = 1 \
-      || "$(sysctl -n hw.optional.x86_64)" = 1 ]] ; then
+    elif [[ "$(/usr/sbin/sysctl -n hw.cpu64bit_capable)" = 1 \
+      || "$(/usr/sbin/sysctl -n hw.optional.x86_64)" = 1 ]] ; then
 
       #   64 bit capable
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 1
   - 0
-  - 18
-  version: 1.0.18
+  - 19
+  version: 1.0.19
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 -04:00
+date: 2010-11-01 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -129,6 +129,7 @@ files:
 - scripts/environment-convertor
 - scripts/fetch
 - scripts/gemsets
+- scripts/get
 - scripts/hash
 - scripts/help
 - scripts/hook