rvm 0.0.87 → 0.0.88

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 87
+:patch: 88

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.87"
+  s.version = "0.0.88"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-12-02}
+  s.date = %q{2009-12-04}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -50,10 +50,10 @@ Gem::Specification.new do |s|
      "scripts/irbrc.rb",
      "scripts/libraries",
      "scripts/log",
+     "scripts/manage",
      "scripts/match",
      "scripts/monitor",
      "scripts/notes",
-     "scripts/ruby-installer",
      "scripts/rvm",
      "scripts/rvm-install",
      "scripts/selector",

data/scripts/cli

@@ -243,22 +243,22 @@ __rvm_parse_args() {
         rvm_ruby_string="$rvm_token"
       ;;
 
-      --install)            rvm_install_on_use_flag=1          ;;
-      -h|--help|usage|help) rvm_action=help                    ;;
-      -G|--gems)            rvm_gem_path="$1"          ; shift ;;
-      --source)             rvm_src_path="$1"          ; shift ;;
-      --archives)           rvm_archives_path="$1"     ; shift ;;
-      --make)               rvm_ruby_make="$1"         ; shift ;;
-      --make-install)       rvm_ruby_make_install="$1" ; shift ;;
-      --nice)               rvm_niceness="$1"          ; shift ;;
-      -l|--level)           rvm_ruby_patch_level="p$1" ; shift ;;
+      --install)            rvm_install_on_use_flag=1           ;;
+      -h|--help|usage|help) rvm_action=help                     ;;
+      -G|--gems)            rvm_gem_path="$1"          ; shift  ;;
+      --source)             rvm_src_path="$1"          ; shift  ;;
+      --archives)           rvm_archives_path="$1"     ; shift  ;;
+      --make)               rvm_ruby_make="$1"         ; shift  ;;
+      --make-install)       rvm_ruby_make_install="$1" ; shift  ;;
+      --nice)               rvm_niceness="$1"          ; shift  ;;
+      -l|--level)           rvm_ruby_patch_level="p$1" ; shift  ;;
       # TODO: handle this below better (if $1 is null)
-      -m|--gem-set)         rvm_gem_set_name="$1"      ; shift ;;
-      --sdk)                rvm_sdk="$1"               ; shift ;;
-      --archflags)          rvm_archflags="$1"         ; shift ;;
+      -m|--gem-set)         rvm_gem_set_name="$1"      ; shift  ;;
+      --sdk)                rvm_sdk="$1"               ; shift  ;;
+      --archflags)          rvm_archflags="$1"         ; shift  ;;
 
-      tests|specs)          rvm_action="tests"                 ;;
-      --trace)              eval "rvm_$(echo $rvm_token | sed 's#-##g')_flag=1" ; set -x ;;
+      tests|specs)          rvm_action="tests"                  ;;
+      --trace)              export rvm_trace_flag=1    ; set -x ;;
 
       --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose)
         eval "rvm_$(echo $rvm_token | sed 's#-##g')_flag=1"
@@ -335,7 +335,9 @@ __rvm_parse_args() {
 }
 
 rvm() {
-  trap '__rvm_cleanup_variables ; rm -rf "/tmp/rvm/$$" >/dev/null 2>&1' 0 1 2 3 15
+  if [[ -z "$ZSH_VERSION" ]] ; then
+    trap 'rm -rf "/tmp/rvm/$$" >/dev/null 2>&1' 0 1 2 3 15
+  fi
 
   # Check that this is the current version.
   disk_version=$(cat "${rvm_path:-$HOME/.rvm}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')
@@ -350,7 +352,6 @@ rvm() {
   __rvm_load_defaults
   __rvm_parse_args $@
 
-  if [[ -z "$rvm_trace_flag" ]] ; then set +x ; else set -x ; fi
   result=0
   case "$rvm_action" in
     use)           __rvm_use                 ; result=$?  ;;
@@ -366,7 +367,6 @@ rvm() {
     benchmark)     __rvm_benchmark           ; result=$?  ;;
     inspect)       __rvm_inspect             ; result=$?  ;;
     gems)          __rvm_gems                ; result=$?  ;;
-    remove)        __rvm_remove_ruby         ; result=$?  ;;
     ruby|gem|rake) __rvm_do                  ; result=$?  ;;
     monitor)
       export rvm_ruby_version rvm_ruby_string
@@ -374,7 +374,16 @@ rvm() {
     ;;
     notes)         $rvm_scripts_path/notes   ; result=$?  ;;
     reload) rvm_reload_flag=1                             ;;
-    fetch|install|uninstall) __rvm_manage_rubies   ; result=$? ;;
+    fetch|install|uninstall|remove)
+      if [[ ! -z "$rvm_ruby_string" ]] ; then
+        $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_string"
+      elif $rvm_scripts_path/match "$rvm_ruby_version" "," ; then
+        $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_version"
+      else
+        $rvm_scripts_path/manage "$rvm_action"
+      fi
+      result=$?
+    ;;
     tests|specs)   rvm_action="rake" ; __rvm_do ; result=$? ;;
 
     iconv|openssl|ncurses|zlib|readline|curl)
@@ -405,7 +414,7 @@ rvm() {
 
   if [[ "$rvm_reload_flag" -eq 1 ]] ; then source "$rvm_path/scripts/rvm" ; fi
 
-  if [[ "1" = "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi
+  if [[ "$rvm_trace_flag" -eq 1 ]] ; then set +x ; unset rvm_trace_flag ; fi
 
   return $result
 }

data/scripts/libraries

@@ -107,3 +107,15 @@ __rvm_ncurses_install() {
   __rvm_pushpop
 }
 
+__rvm_install_llvm() {
+  builtin cd "$rvm_src_path"
+  if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
+    rm -rf "$rvm_src_path/llvm"
+    svn co -r 82747 https://llvm.org/svn/llvm-project/llvm/trunk llvm
+    builtin cd "$rvm_src_path/llvm"
+    ./configure --enable-bindings=none
+    UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make -j2
+    sudo env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make install
+  fi
+}
+

data/scripts/{ruby-installer → manage}

@@ -1,5 +1,14 @@
 #!/usr/bin/env bash
 
+if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
+
+original_ruby_version=$rvm_ruby_version
+original_ruby_string=$rvm_ruby_string
+
+source $rvm_scripts_path/rvm
+
+trap "rm -f $rvm_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+
 __rvm_install_source() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
   $rvm_scripts_path/log "info" "Installing Ruby from source to: $rvm_ruby_home"
@@ -11,9 +20,6 @@ __rvm_install_source() {
   __rvm_fetch_ruby
   if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
-  __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
-  if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
-
   builtin cd $rvm_ruby_src_path
   if [[ $? -gt 0 ]] ; then result=$? ; $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; __rvm_pushpop ; return $result ; fi
 
@@ -288,6 +294,10 @@ RubyWrapper
     ;;
 
     jruby)
+      if [[ -z "$(which java 2>/dev/null)" ]] ; then
+        echo -e "java must be installed and in your path in order to install JRuby." ; return 1
+      fi
+
       mkdir -p "$rvm_ruby_log_path"  "$rvm_ruby_src_path"
       __rvm_pushpop $rvm_src_path
 
@@ -301,7 +311,7 @@ RubyWrapper
       if [[ "$rvm_head_flag" -eq 1 ]] || [[ ! -z "$rvm_ruby_revision" ]] ; then ant dist ; fi
 
       mkdir -p "$rvm_ruby_home/bin/"
-      builtin cd "$rvm_ruby_src_path/tool/nailgun" && /usr/bin/make $rvm_make_flags
+      __rvm_run "nailgun" "builtin cd "$rvm_ruby_src_path/tool/nailgun" && ./configure --prefix=$rvm_ruby_home && make $rvm_make_flags"
 
       __rvm_pushpop
 
@@ -315,16 +325,10 @@ RubyWrapper
       done ; unset binary
       __rvm_pushpop
 
-      for binary in rake rdoc ri spec autospec testrb ast generate_yaml_index.rb ; do
-        __rvm_inject_ruby_shebang $rvm_ruby_home/bin/$binary
+      for binary in jrubyc jirb_swing jirb jgem rdoc ri spec autospec testrb ast generate_yaml_index.rb ; do
         __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
-        chmod +x $rvm_ruby_home/bin/$binary
       done ; unset binary
 
-      for binary in jrubyc jirb_swing jirb jgem ; do
-        __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
-      done
-
       __rvm_rubygems_setup
       __rvm_irbrc
       __rvm_bin_script
@@ -412,45 +416,6 @@ RubyWrapper
   if [[ ! -z "$ruby_options" ]] ; then RUBYOPT=$ruby_options ; export RUBYOPT ; fi
 }
 
-__rvm_manage_rubies() {
-  __rvm_state
-  rubies=() ; successes=() ; errors=() ; statuses=()
-  unset rvm_gem_set_name
-  rvm_ruby_gem_home=$(echo $rvm_ruby_gem_home | awk -F'%' '{print $1}')
-  rvm_ruby_string=$(echo $rvm_ruby_string | awk -F'%' '{print $1}')
-  # TODO: Extract the common functionality out of the if below
-  if [[ ! -z "$rvm_ruby_string" ]] ; then
-    unset rvm_ruby_interpreter rvm_ruby_version
-    __rvm_${rvm_action}_ruby
-  elif [[ ! -z "$rvm_ruby_version" ]] ;then
-    for rvm_ruby_string in $(echo $rvm_ruby_version | tr ',' ' ') ; do
-      eval "__rvm_${rvm_action}_ruby"
-      __rvm_unset_ruby_variables
-    done
-  elif [[ ! -z "$rvm_ruby_interpreter" ]] ; then
-    unset rvm_ruby_string rvm_ruby_version
-    eval "__rvm_${rvm_action}_ruby"
-  else # all
-    if [[ "$rvm_action" != "install" ]] ; then
-      while read -r bin_line
-      do # Keep this on second line damnit!
-        if [[ -x "$bin_line" ]] ; then
-          rvm_ruby_string="$(dirname "$bin_line" | xargs dirname | xargs basename)"
-          eval "__rvm_${rvm_action}_ruby"
-          __rvm_unset_ruby_variables
-        fi
-      done < <(\ls $rvm_path/*/bin/ruby 2> /dev/null)
-    else
-      $rvm_scripts_path/log "warn" 'Really? Install all? See "rvm list --all" and limit the selection to something more sane please :)'
-    fi
-  fi
-  __rvm_state
-
-  if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
-  if [[ ! -z "$rvm_yaml_flag" ]]   ; then __rvm_yaml    ; fi
-  if [[ ! -z "$rvm_json_flag" ]]   ; then __rvm_json    ; fi
-}
-
 __rvm_fetch_ruby() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
 
@@ -470,6 +435,8 @@ __rvm_fetch_ruby() {
       $rvm_scripts_path/log "info" "Downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
       $rvm_scripts_path/fetch "$rvm_url"
       result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+      __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
+      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
     fi
   else
     if [[ ! -z "$(echo $rvm_url | awk '/^git/')" ]] ; then
@@ -668,15 +635,49 @@ __rvm_actual_file() {
   fi
 }
 
-__rvm_install_llvm() {
-  builtin cd "$rvm_src_path"
-  if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
-    rm -rf "$rvm_src_path/llvm"
-    svn co -r 82747 https://llvm.org/svn/llvm-project/llvm/trunk llvm
-    builtin cd "$rvm_src_path/llvm"
-    ./configure --enable-bindings=none
-    UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make -j2
-    sudo env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make install
+__rvm_manage_rubies() {
+  #__rvm_state
+  rubies=() ; successes=() ; errors=() ; statuses=()
+  unset rvm_gem_set_name rvm_ruby_selected_flag
+  rvm_ruby_gem_home=$(echo $rvm_ruby_gem_home | awk -F'%' '{print $1}')
+  rvm_ruby_string=$(echo $rvm_ruby_string | awk -F'%' '{print $1}')
+
+  # TODO: Extract the common functionality out of the if below
+  #if [[ ! -z "$rvm_ruby_string" ]] ; then
+  #  unset rvm_ruby_interpreter rvm_ruby_version
+  #  eval "__rvm_${rvm_action}_ruby"
+  #  __rvm_unset_ruby_variables
+  #elif [[ ! -z "$rvm_ruby_version" ]] ;then
+  if [[ ! -z "$rubies_string" ]] ;then
+    for rvm_ruby_string in $(echo $rubies_string | tr ',' ' ') ; do
+      eval "__rvm_${rvm_action}_ruby"
+      __rvm_unset_ruby_variables
+    done
+  #elif [[ ! -z "$rvm_ruby_interpreter" ]] ; then
+  #  unset rvm_ruby_string rvm_ruby_version
+  #  eval "__rvm_${rvm_action}_ruby"
+  #  __rvm_unset_ruby_variables
+  else # all
+    if [[ "$rvm_action" != "install" ]] ; then
+      while read -r bin_line
+      do # Keep this on second line damnit!
+        if [[ -x "$bin_line" ]] ; then
+          rvm_ruby_string="$(dirname "$bin_line" | xargs dirname | xargs basename)"
+          eval "__rvm_${rvm_action}_ruby"
+          __rvm_unset_ruby_variables
+        fi
+      done < <(\ls $rvm_path/*/bin/ruby 2> /dev/null)
+    else
+      $rvm_scripts_path/log "warn" 'Really? Install all? See "rvm list --all" and limit the selection to something more sane please :)'
+    fi
   fi
+  #__rvm_state
+
+  if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
+  if [[ ! -z "$rvm_yaml_flag" ]]   ; then __rvm_yaml    ; fi
+  if [[ ! -z "$rvm_json_flag" ]]   ; then __rvm_json    ; fi
 }
 
+rvm_action="$1" ; rubies_string="$2"
+__rvm_manage_rubies
+exit $?

data/scripts/rvm

@@ -25,7 +25,6 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   source $rvm_path/scripts/initialize
   source $rvm_path/scripts/utility
   source $rvm_path/scripts/selector
-  source $rvm_path/scripts/ruby-installer # TODO: Script not function.
   source $rvm_path/scripts/cli
   source $rvm_path/scripts/gems
   source $rvm_path/scripts/libraries

data/scripts/utility

@@ -656,7 +656,7 @@ __rvm_make_flags() {
   PATH=${rvm_path}/usr/bin:$PATH ; export PATH
   # This is only an issue with Darwin :/
   if [[ "Darwin" = "$(uname)" ]] ; then
-    # ls /usr/lib/gcc/i686-apple-darwin10
+    # ls /usr/lib/gcc/x86_64-apple-darwin10
 
     # Set the build & host type
     if [[ "Power Macintosh" = "$(sysctl hw.machine | awk -F: '{print $2}' | sed 's/^ //')" ]] ; then
@@ -664,12 +664,12 @@ __rvm_make_flags() {
     elif [[ $(sysctl hw.cpu64bit_capable | awk '{print $2}') = 1 ]] ; then # we could also use: sysctl hw.optional.x86_64
       #   64 bit capable
       if [[ "-arch x86_64" = "$rvm_archflags" ]] ; then
-        rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
+        rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=x86_64-apple-darwin$(uname -r) --host=x86_64-apple-darwin$(uname -r)"
       elif [[ "-arch i386" = "$rvm_archflags" ]] ; then
         rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
       else
         rvm_archflags="-arch x86_64"
-        rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
+        rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=x86_64-apple-darwin$(uname -r) --host=x86_64-apple-darwin$(uname -r)"
       fi
     else
       #   32 bit capable only

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.87
+  version: 0.0.88
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -05:00
+date: 2009-12-04 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -54,10 +54,10 @@ files:
 - scripts/irbrc.rb
 - scripts/libraries
 - scripts/log
+- scripts/manage
 - scripts/match
 - scripts/monitor
 - scripts/notes
-- scripts/ruby-installer
 - scripts/rvm
 - scripts/rvm-install
 - scripts/selector