rvm 0.0.77 → 0.0.78

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 77
+:patch: 78

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.77"
+  s.version = "0.0.78"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-11-12}
+  s.date = %q{2009-11-14}
   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/ruby-installer

@@ -50,7 +50,7 @@ __rvm_install_source() {
         rvm_rev=""
       elif [[ ! -z "$rvm_ruby_tag" ]] ; then
         # TODO: Check if tag v is valid
-        rvm_url="$rvm_ruby_repo_url/tags/$rvm_ruby_tag"
+        rvm_url="$rvm_ruby_repo_url/tags/$(echo $rvm_ruby_tag | sed 's/^t//')"
         rvm_rev=""
       else
         rvm_url=$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}
@@ -232,48 +232,53 @@ RubyWrapper
 
     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.
+      # prereqs, 1.8.6+ + 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
+      __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_repo_url="$rvm_rubinius_repo_url"
       rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
 
-      # 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_home" ]] || [[ ! -d "$rvm_ruby_home/.git" ]] ; then
-        rm -rf $rvm_ruby_home ; cd $rvm_home
+        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
+        cd "$rvm_ruby_home"
       else
-        cd $rvm_ruby_home
+        cd "$rvm_ruby_home"
         __rvm_run "rbx.repo" "git pull origin master" "Pulling from origin master"
       fi
 
       #if [[ ! -x "$rvm_ruby_distclean" ]] ; then
-      #  __rvm_run "rake.distclean" "\$(rvm 1.8.7%rbx ; rake distclean --trace)" "Running distclean."
+      #  __rvm_run "rake.distclean" "\$(rvm 1.8.7 ; rake distclean --trace)" "Running distclean."
       #fi
 
-      rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
+      # For Installer, can do this once it's ready:
+      # RBX_PREFIX="$rvm_ruby_home" ; export RBX_PREFIX
+      # Also see 'rakelib/configuration.rake'
+
+      cd "$rvm_ruby_home"
+      # TODO: Once installer is done add the prefix:
+      #rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
+      rvm_ruby_configure="./configure" ; message="Configuring rbx"
       if [[ ! -z "$rvm_jit_flag" ]] ; then
         rvm_ruby_configure="$rvm_ruby_configure --enable-llvm" ; message="$message with LLVM enabled"
       fi
       __rvm_run "configure" "$rvm_ruby_configure" "$message"
 
-      rvm_ruby_make="\$(rvm 1.8.7%rbx ; rake --trace)" ; message="Compiling rbx"
+      if [[ "$rvm_trace_flag" -eq 1 ]] ; then
+        rvm_ruby_make="\$(rvm 1.8.7 ; rake --trace)" ; message="Compiling rbx"
+      else
+        rvm_ruby_make="\$(rvm 1.8.7 ; rake)" ; message="Compiling rbx"
+      fi
       __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_ruby_make_install="\$(rvm 1.8.7 ; rake install --trace)" ; message="Installing rbx"
       #__rvm_run "rake.install" "$rvm_ruby_make" "$message"
 
       binaries="ruby irb" # Trick to work in more shells :)

data/scripts/rvm

@@ -46,5 +46,8 @@ alias rvm-restart="source \"${rvm_path}/scripts/rvm\""
 if [[ -f "$rvm_path/default" ]] ; then source "$rvm_path/default" ; fi
 
 # Ok now we determine if we were called or sourced... under assumption of course ;)
-if [[ $# -gt 0 ]] ; then rvm "$*" ; fi
+if [[ $# -gt 0 ]] && [[ -z "$(echo "$*" | awk '/completion-/')" ]] ; then rvm "$*" ; fi
+
+# Source a .rvmrc file in a directory after changing to it, if it exists.
+cd() { builtin cd "$@" ; if [[ -f .rvmrc ]] ; then source .rvmrc ; fi ; }
 

data/scripts/selector

@@ -252,7 +252,7 @@ __rvm_use() {
 
       echo "PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:\$PATH ; export PATH" > $rvm_path/default
 
-      for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC ; do
+      for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name; do
         eval "export $variable"
         eval value=\$${variable}
         if [[ ! -z "$value" ]] ; then
@@ -273,6 +273,10 @@ __rvm_use() {
     unset rvm_default_flag
   fi
 
+  # Export ruby string and gem set name for extrnal scripts to take advantage of them.
+  if [[ ! -z "$rvm_ruby_string" ]] ; then export rvm_ruby_string ; fi
+  if [[ ! -z "$rvm_gem_set_name" ]] ; then export rvm_gem_set_name ; fi
+
   if [[ ! -z "$rvm_load_flag" ]] ; then __rvm_gems_load ; fi
   if [[ ! -z "$rvm_dump_flag" ]] ; then __rvm_gems_dump ; fi
 }
@@ -309,8 +313,6 @@ __rvm_ruby_string() {
       break
     elif match "$string" "^preview" ; then
       rvm_ruby_patch_level="$string"
-    elif match "$string" "^[a-z][a-z]" ; then
-      rvm_ruby_interpreter="$string"
     elif match "$string" "^[0-9]\.[0-9]" ; then
       if [[ "1.8" = "$string" ]] ; then string="1.8.6" ; fi
       if [[ "1.9" = "$string" ]] ; then string="1.9.1" ; fi
@@ -331,9 +333,11 @@ __rvm_ruby_string() {
     elif match "$string" "^s[0-9]" ; then
       unset rvm_ruby_revision
       rvm_ruby_sha="$string"
-    elif match "$string" "^t[0-9]" ; then
+    elif match "$string" "^t[v0-9]" ; then
       unset rvm_ruby_patch_level rvm_ruby_revision
       rvm_ruby_tag="$string"
+    elif match "$string" "^[a-z][a-z]" ; then
+      rvm_ruby_interpreter="$string"
     else
       __rvm_log "error" "Unknown ruby string component: '$string'"
     fi
@@ -356,7 +360,6 @@ __rvm_ruby_string() {
   fi
   rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
 
-  # Unspecified patch level
   if [[ "$rvm_head_flag" -eq 1 ]] ; then
     rvm_ruby_string="${rvm_ruby_string}-head"
   elif [[ ! -z "$rvm_ruby_revision" ]]  ; then

data/scripts/utility

@@ -130,11 +130,11 @@ __rvm_run() {
 
 __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 rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag
+  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_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags
 }
 
 __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_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 rvm_ruby_configure_flags rvm_ruby_configure
+  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 rvm_ruby_configure
 }
 
 __rvm_load_rvmrc() {
@@ -879,19 +879,17 @@ __rvm_make_flags() {
     if [[ $(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=i686-apple-darwin$(uname -r) --host=i686-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)"
+        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=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
       fi
     else
       #   32 bit capable only
       if [[ -z "$rvm_archflags" ]] ; then rvm_archflags="-arch i386" ; fi
-      #rvm_ruby_configure_flags="${rvm_ruby_configure_flags}" #" --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
+      rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
     fi
     ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.77
+  version: 0.0.78
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-12 00:00:00 -05:00
+date: 2009-11-14 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []