rvm 0.0.64 → 0.0.65

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 64
+:patch: 65

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.64"
+  s.version = "0.0.65"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-10-26}
+  s.date = %q{2009-10-28}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/cli

@@ -82,7 +82,8 @@ Options
      --bin        - path for binaries to be placed (~/.rvm/bin/)
      --source     - src directory to use (~/.rvm/src/)
      --archives   - directory for downladed files (~/.rvm/archives/)
-  -S|--script     - Specify a script file to attempt to load and run (rubydo)
+  -S              - Specify a script file to attempt to load and run (rubydo)
+  -e              - Execute code from the command line.
   -G|--gems       - root gem path to use
   -C|--configure  - custom configure options, comma separated
                     default: --enable-shared=true
@@ -175,17 +176,28 @@ function __rvm_parse_args {
         fi
       ;;
 
+      -S|-e)
+        rvm_action="ruby"
+        rvm_ruby_args="$rvm_token '$@'"
+        rvm_parse_break=1
+      ;;
+
       do|ruby|rake|gem|rubydo|rakedo|gemdo)
         if [[ "do" = "$rvm_action" ]] ; then rvm_action="ruby" ; fi
         rvm_action=$(echo $rvm_token | sed 's#do##g')
-
         if [[ "rake" = "$rvm_action" ]] || [[ "gem" = "$rvm_action" ]] || [[ "ruby" = "$rvm_action" ]] ; then
           if [[ -z "$1" ]] ; then
-            rvm_action="error"
-            rvm_error_message="the 'ruby' and 'gem' actions must be followed by arguments."
-          else
+            if [[ "gem" = "$rvm_action" ]] || [[ "ruby" = "$rvm_action" ]] ; then
+              rvm_action="error"
+              rvm_error_message="the '$rvm_action' actions must be followed by arguments."
+            fi
+          elif [[ "-S" = "$1" ]] || [[ "-e" = "$1" ]] ; then
             rvm_action="ruby"
-            rvm_ruby_args="$rvm_token $@"
+            flag="$1" ; shift
+            rvm_ruby_args="$flag '$@'"
+            rvm_parse_break=1
+          else
+            rvm_ruby_args="$*"
             rvm_parse_break=1
           fi
         else
@@ -292,7 +304,6 @@ function __rvm_parse_args {
         fi
       ;;
 
-
       -C|--configure)
         if [[ ! -z "$1" ]] ; then
           rvm_ruby_configure="$(echo $1 | tr ',' ' ')"
@@ -329,35 +340,29 @@ function __rvm_parse_args {
         shift
       ;;
 
-      -S|--script|-e|--execute)
-        rvm_action="ruby"
-        rvm_ruby_args="$@"
-        rvm_parse_break=1
-      ;;
-
       default|system)
         rvm_action="use"
         rvm_ruby_interpreter="system"
       ;;
 
-      --install)            rvm_install_on_use_flag=1         ;;
-      -h|--help|usage|help) rvm_action=help                   ;;
-      --prefix)             rvm_prefix_path="$1"      ; shift ;;
-      -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 ;;
+      --install)            rvm_install_on_use_flag=1          ;;
+      -h|--help|usage|help) rvm_action=help                    ;;
+      --prefix)             rvm_prefix_path="$1"       ; shift ;;
+      -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 ;;
-      tests|specs)          rvm_action="tests"                ;;
+      -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 ;;
 
-      --trace)
-        eval "rvm_$(echo $rvm_token | sed 's#-##g')_flag=1"
-        set -x
-      ;;
       --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete)
         eval "rvm_$(echo $rvm_token | sed 's#-##g')_flag=1"
       ;;
@@ -374,7 +379,10 @@ function __rvm_parse_args {
       *)
         if [[ ! -z "$rvm_token" ]] ; then
           if [[ "gems" = "$rvm_action" ]] ; then
-            if [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
+            if match "$rvm_token" "^.+%.+$" ; then
+              rvm_gem_set_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
+              rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
+            elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
               rvm_file_name="$(echo "$rvm_token" | sed 's#\.gems##g').gems"
               # elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
             else
@@ -439,49 +447,37 @@ function rvm {
   if [[ -z "$rvm_trace_flag" ]] ; then set +x ; else set -x ; fi
   result=0
   case "$rvm_action" in
-    use)        __rvm_use              ; result=$? ;;
-    gemdir)     __rvm_gemdir           ; result=$? ;;
-    gemdup)     __rvm_gemdup           ; result=$? ;;
-    srcdir)     __rvm_source_dir       ; result=$? ;;
-    list)       __rvm_list             ; result=$? ;;
-    version)    __rvm_version          ; result=$? ;;
-    reset)      __rvm_reset            ; result=$? ;;
-                # TODO: how can we use bin_path here for reload, default file?
-    implode)    __rvm_implode          ; result=$? ;;
-    update)     __rvm_update           ; result=$? ;;
-    readline)   __rvm_readline_install ; result=$? ;;
-    reboot)     __rvm_reboot           ; result=$? ;;
-    usage|help) __rvm_usage            ; result=$? ;;
-    benchmark)  __rvm_benchmark        ; result=$? ;;
-    ruby)       __rvm_do               ; result=$? ;;
-    inspect)    __rvm_inspect          ; result=$? ;;
-    gems)       __rvm_gems             ; result=$? ;;
-    remove)     __rvm_remove_ruby ; result=$?  ;;
-    reload)
-      source "$rvm_path/scripts/rvm"
-    ;;
+    use)           __rvm_use              ; result=$?  ;;
+    gemdir)        __rvm_gemdir           ; result=$?  ;;
+    gemdup)        __rvm_gemdup           ; result=$?  ;;
+    srcdir)        __rvm_source_dir       ; result=$?  ;;
+    list)          __rvm_list             ; result=$?  ;;
+    version)       __rvm_version          ; result=$?  ;;
+    reset)         __rvm_reset            ; result=$?  ;;
+    implode)       __rvm_implode          ; result=$?  ;;
+    update)        __rvm_update           ; result=$?  ;;
+    readline)      __rvm_readline_install ; result=$?  ;;
+    reboot)        __rvm_reboot           ; result=$?  ;;
+    usage|help)    __rvm_usage            ; result=$?  ;;
+    benchmark)     __rvm_benchmark        ; result=$?  ;;
+    inspect)       __rvm_inspect          ; result=$?  ;;
+    gems)          __rvm_gems             ; result=$?  ;;
+    remove)        __rvm_remove_ruby      ; result=$?  ;;
+    ruby|gem|rake) __rvm_do               ; result=$?  ;;
+    reload)        source "$rvm_path/scripts/rvm"      ;;
+    install|uninstall) __rvm_manage_rubies ; result=$? ;;
+    tests|specs)   rvm_action="rake" ; __rvm_do ; result=$? ;;
 
     iconv|openssl|ncurses|zlib|readline)
       __rvm_${rvm_action}_install
       result=$?
     ;;
 
-    install|uninstall)
-      __rvm_manage_rubies
-      result=$?
-    ;;
-
     gemsync)
       rvm_source_gem_path=$(__rvm_select ; echo $rvm_ruby_gem_home)
       __rvm_gem_sync
     ;;
 
-    tests|specs)
-      rvm_summary_flag=1
-      rvm_action="rake"
-      __rvm_do
-    ;;
-
     info|debug)
       __rvm_version
       __rvm_info

data/scripts/ruby-installer

@@ -180,44 +180,50 @@ function __rvm_install_ruby {
     ;;
 
     rbx|rubinius)
+      __rvm_log "info" "Installing pre-requisites"
+      # prereqs, 1.8.7 w/ParseTree & rake. Yes this could all be one line... not pushing our luck.
+      echo "$(export rvm_install_on_use_flag=1 ; rvm 1.8.7)" # This should install if missing.
+      # TODO: use 'rvm gems load' here:
+      echo "$(rvm 1.8.7%rbx ; gem install --no-rdoc --no-ri rake ParseTree)" # This should install if missing.
+      __rvm_unset_ruby_variables
+      rvm_ruby_string="rbx-head" ; __rvm_select
+
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
       rvm_ruby_repo_url=$rvm_rubinius_repo_url
-      rvm_ruby_configure=" "
-      rvm_ruby_src_path=$rvm_ruby_home
-      rvm_ruby_make="rake"
-      rvm_ruby_make_install="rake install"
       rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
-      #rvm_ruby_revision="head"
 
       # For Installer, can do this once it's ready:
       RBX_PREFIX=$rvm_ruby_home ; export RBX_PREFIX
       # Also see 'rakelib/configuration.rake'
 
-      if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
-        rm -rf $rvm_ruby_src_path
-        __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path" "Cloning $rvm_ruby_repo_url"
+      if [[ ! -d "$rvm_ruby_home" ]] || [[ ! -d "$rvm_ruby_home/.git" ]] ; then
+        rm -rf $rvm_ruby_home ; cd $rvm_home
+        __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_home" "Cloning $rvm_ruby_repo_url"
         cd $rvm_ruby_home
       else
         cd $rvm_ruby_home
         __rvm_run "rbx.repo" "git pull origin master" "Pulling from origin master"
       fi
 
-      # prereqs, 1.8.6 w/ParseTree & rake. Yes this could all be one line... not pushing our luck.
-      echo "$(export rvm_install_on_use_flag=1 ; rvm 1.8.6)" # This should install if missing.
-      echo "$(rvm 1.8.6 -m rbx ; gem install --no-rdoc --no-ri rake ParseTree)" # This should install if missing.
-      rvm_ruby_interpreter="rbx"
-      __rvm_select
+      #if [[ ! -x "$rvm_ruby_distclean" ]] ; then
+      #  __rvm_run "rake.distclean" "\$(rvm 1.8.7%rbx ; rake distclean --trace)" "Running distclean."
+      #fi
 
+      rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
       if [[ ! -z "$rvm_jit_flag" ]] ; then
-        __rvm_run "configure" "./configure --prefix=$rvm_ruby_home --enable-llvm" "Configuring rbx with LLVM enabled"
-      else
-        __rvm_run "configure" "./configure --prefix=$rvm_ruby_home" "Configuring rbx"
+        rvm_ruby_configure="$rvm_ruby_configure --enable-llvm" ; message="$message with LLVM enabled"
       fi
+      __rvm_run "configure" "$rvm_ruby_configure" "$message"
 
-      __rvm_run "build" "\$(rvm 1.8.6 -m rbx ; rake build)" "Building rbx"
+      rvm_ruby_make="\$(rvm 1.8.7%rbx ; rake --trace)" ; message="Compiling rbx"
+      __rvm_run "rake" "$rvm_ruby_make" "$message"
+
+      # TODO: Uncomment the following once --prefix is working properly again
+      #rvm_ruby_make_install="\$(rvm 1.8.7%rbx ; rake install --trace)" ; message="Installing rbx"
+      #__rvm_run "rake.install" "$rvm_ruby_make" "$message"
 
       binaries="ruby irb" # Trick to work in more shells :)
       for binary_name in $(echo $binaries) ; do
@@ -225,6 +231,7 @@ function __rvm_install_ruby {
       done ; unset binary_name binaries
 
       __rvm_run "rake.install" "$rvm_ruby_home/bin/rbx gem install rake --no-rdoc --no-ri" "Installing Rake"
+
       binary=rake
       if [[ -f $rvm_ruby_gem_home/bin/$binary ]] ; then
         if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] ; then

data/scripts/selector

@@ -191,7 +191,7 @@ function __rvm_use {
     if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
 
     if [[ ! -d $MY_RUBY_HOME ]] ; then
-      __rvm_log "warn" "$rvm_ruby_interpreter $rvm_ruby_version is not installed."
+      __rvm_log "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed.\nTo install do: 'rvm install $rvm_ruby_string'"
       if [[ ! -z "$rvm_install_on_use_flag" ]] ; then
         __rvm_install_ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level
       fi

data/scripts/utility

@@ -34,11 +34,22 @@ Info
 }
 
 function __rvm_debug {
-  __rvm_log "debug" "\nPATH:\n$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')"
+  __rvm_log "debug" "PATH:\n$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')"
+  __rvm_log "debug" "uname -a: $(uname -a)"
+
+  if [[ "Darwin" = "$(uname)" ]] ; then
+    __rvm_log "debug" "uname -r: $(uname -r)"
+    __rvm_log "debug" "uname -m: $(uname -m)"
+    __rvm_log "debug" "sw_vers: $(sw_vers | tr "\n" ',')"
+    __rvm_log "debug" "ARCHFLAGS: $ARCHFLAGS"
+    __rvm_log "debug" "LDFLAGS: $LDFLAGS"
+    __rvm_log "debug" "CFLAGS: $CFLAGS"
+    __rvm_log "debug" "/Developer/SDKs/*:$(ls /Developer/SDKs/ | tr "\n" ',')"
+  fi
 
   for file_name in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
     if [[ -s "$file_name" ]] ; then
-      __rvm_log "debug" "\n$file_name:\n$(grep 'rvm' $file_name)"
+      __rvm_log "debug" "$file_name:\n$(grep 'rvm' $file_name)"
     fi
   done
 
@@ -113,11 +124,11 @@ function __rvm_run {
 
 function __rvm_cleanup_variables {
   __rvm_unset_ruby_variables
-  unset rvm_ruby_selected_flag rvm_action rvm_irbrc_file rvm_src_path rvm_path rvm_prefix_path rvm_gem_path rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_config_path rvm_bin_path rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_log_path rvm_file_name
+  unset rvm_ruby_selected_flag rvm_action rvm_irbrc_file rvm_src_path rvm_path rvm_prefix_path rvm_gem_path rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_config_path rvm_bin_path rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_log_path rvm_file_name rvm_ruby_configure
 }
 
 function __rvm_unset_ruby_variables {
-  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag
 }
 
 # TODO: root user loadng of /etc/rvmrc
@@ -693,6 +704,9 @@ function __rvm_irbrc {
 
 require "irb/completion" rescue nil
 
+require "irb/ext/save-history"
+IRB.conf[:HISTORY_FILE] = "#{ENV['HOME']}/.irb-history"
+
 @prompt = {
   :PROMPT_I => "${rvm_ruby_package_name} > ",  # default prompt
   :PROMPT_S => "${rvm_ruby_package_name}%l> ", # known continuation
@@ -701,9 +715,8 @@ require "irb/completion" rescue nil
   :RETURN => " => %s \n",
   :AUTO_INDENT => true
 }
-@prompt_mode = :DEFAULT
-IRB.conf[:PROMPT][@prompt_mode] = @prompt
-IRB.conf[:PROMPT_MODE] = @prompt_mode
+IRB.conf[:PROMPT][:RVM] = @prompt
+IRB.conf[:PROMPT_MODE] = :RVM
 
 load '$HOME/.irbrc' if File.exists?('$HOME/.irbrc') rescue nil
 
@@ -836,18 +849,27 @@ function __rvm_ncurses_install {
 __rvm_make_flags() {
   PATH=${rvm_path}/usr/bin:$PATH ; export PATH
   if [[ "Darwin" = "$(uname)" ]] ; then
-    sdk="$(/bin/ls -t /Developer/SDKs/ | head -n 1)"
-    if [[ "Darwin" = "$(uname)" ]] ; then
-      rvm_archflags="-arch $(uname -m)"
-      if [[ "-arch x86_64" = "$rvm_archflags" ]] ; then
-        openssl_os="os/compiler darwin64-x86_64-cc"
+    if [[ -z "$rvm_archflags" ]] ; then
+      if [[ $(echo "scale=4; $(uname -r | awk -F'.' '{print $1"."$2}') >= 10.0" | bc) -eq 1 ]] ; then
+        rvm_archflags="-arch x86_64"
       else
-        openssl_os="os/compiler darwin-i386-cc"
+        rvm_archflags="-arch i386"
       fi
     fi
-    CFLAGS="-isysroot /Developer/SDKs/$sdk $rvm_archflags" ; export CFLAGS
-    LDFLAGS="-Wl,-syslibroot /Developer/SDKs/$sdk $rvm_archflags" ; export LDFLAGS
-    # CXXFLAGS="-mmacosx-version-min="$(sw_vers -productVersion | awk -F'.' '{print $1"."$2}')" -isysroot /Developer/SDKs/$sdk " ; export CXXFLAGS
+
+    if [[ -z "$rvm_sdk" ]] ; then
+      rvm_sdk="$(ls /Developer/SDKs/ | sort | tail -n 1)"
+    fi
+
+    if [[ "-arch x86_64" = "$rvm_archflags" ]] ; then
+      openssl_os="os/compiler darwin64-x86_64-cc"
+    else
+      openssl_os="os/compiler darwin-i386-cc"
+    fi
+
+    CFLAGS="-isysroot /Developer/SDKs/$rvm_sdk $rvm_archflags" ; export CFLAGS
+    LDFLAGS="-Wl,-syslibroot /Developer/SDKs/$rvm_sdk $rvm_archflags" ; export LDFLAGS
+    # CXXFLAGS="-mmacosx-version-min="$(sw_vers -productVersion | awk -F'.' '{print $1"."$2}')" -isysroot /Developer/SDKs/$rvm_sdk " ; export CXXFLAGS
     ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS
   fi
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.64
+  version: 0.0.65
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 -04:00
+date: 2009-10-28 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []