rvm 0.1.8 → 0.1.9

data/config/db

@@ -23,7 +23,7 @@ jruby_version=1.4.0
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.kenai.com/downloads
 macruby_version=0.5
-macruby_url=http://www.macruby.org/files/
+macruby_url=http://www.macruby.org/files
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.pkg
 maglev_version=22816

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 8
+:patch: 9

data/rvm.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-02-05}
+  s.date = %q{2010-02-06}
   s.default_executable = %q{rvm-install}
-  s.description = %q{Manages Ruby interpreter installations and switching between them.}
+  s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
   s.executables = ["rvm-install"]
   s.extra_rdoc_files = [

data/scripts/manage

@@ -118,10 +118,9 @@ __rvm_install_ruby() {
           result=$? ; if [[ "$result" -gt 0 ]] ; then
             $rvm_scripts_path/log "error" "There has been an error while trying to install from source. Aborting the installation." ; return $result
           fi
-        else # if [[ "nightly" = "$rvm_ruby_version" ]] ; then
+        elif [[ "nightly" = "$rvm_ruby_version" ]] ; then
           macruby_path="/usr/local/bin"
           # TODO: Separated nightly from head.
-          __rvm_db "macruby_nightly_url" "rvm_url"
           $rvm_scripts_path/log "info" "Retrieving the latest nightly macruby build..."
           $rvm_scripts_path/fetch "$rvm_url"
           result=$? ; if [[ "$result" -gt 0 ]] ; then
@@ -130,6 +129,16 @@ __rvm_install_ruby() {
           mv "$rvm_archives_path/macruby_nightly-latest.pkg" "$rvm_archives_path/macruby_nightly.pkg"
           __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_archives_path/macruby_nightly.pkg' -target '/'"
           mkdir -p "$rvm_ruby_home/bin"
+        else # if [[ "nightly" = "$rvm_ruby_version" ]] ; then
+          macruby_path="/usr/local/bin"
+          # TODO: Separated nightly from head.
+          $rvm_scripts_path/log "info" "Retrieving the latest nightly macruby build..."
+          $rvm_scripts_path/fetch "$rvm_url"
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
+          fi
+          __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_archives_path/$rvm_ruby_package_file.pkg' -target '/'"
+          mkdir -p "$rvm_ruby_home/bin"
         fi
 
         binaries="erb gem irb rake rdoc ri ruby testrb" # Trick to work in more shells :)
@@ -562,17 +571,17 @@ RubyWrapper
 
       rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version"
 
+      builtin cd $rvm_src_path
+
       if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
         rm -rf $rvm_ruby_src_path
         __rvm_run "mput.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path" "Cloning $rvm_ruby_repo_url"
-        builtin cd $rvm_ruby_home
+        builtin cd $rvm_ruby_src_path
       else
-        builtin cd $rvm_ruby_home
+        builtin cd $rvm_ruby_src_path
         __rvm_run "mput.repo" "git pull origin trunk" "Pulling from origin trunk"
       fi
 
-      builtin cd $rvm_ruby_src_path
-
       if [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
         if which autoconf &> /dev/null ; then
           __rvm_run "autoconf" "autoconf" "Running autoconf"

data/scripts/selector

@@ -24,15 +24,16 @@ __rvm_select() {
           rvm_url="$rvm_ruby_repo_url"
           rvm_ruby_string="${rvm_ruby_interpreter}-head"
         elif [[ "nightly" = "$rvm_ruby_version" ]] ; then
-          rvm_url="http://macruby.icoretech.org/latest"
+          __rvm_db "macruby_nightly_url" "rvm_url"
           rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
           rvm_ruby_package_name="${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}"
           rvm_ruby_package_file="$rvm_ruby_package_name"
         else
           __rvm_db "macruby_version" "rvm_ruby_version"
+          __rvm_db "macruby_url" "rvm_url"
           rvm_ruby_package_name="MacRuby%200.5.zip"
           rvm_ruby_package_file="$rvm_ruby_package_name"
-          rvm_url="http://www.macruby.org/files/$rvm_ruby_package_name"
+          rvm_url="$rvm_url/$rvm_ruby_package_name"
         fi
 
         unset rvm_ruby_patch_level

data/scripts/utility

@@ -24,7 +24,7 @@ __rvm_db() {
 
 # Ouput rvm environment information.
 __rvm_info() {
-  if [[ ! -z "$(which ruby 2>/dev/null)" ]] ; then full_version=$(ruby -v) ; fi
+  if [[ ! -z "$(/usr/bin/which ruby 2>/dev/null)" ]] ; then full_version=$(ruby -v) ; fi
 
   echo -e "system:\n  uname:        \"$(uname -a)\""
 if [[ ! -z "$ZSH_VERSION" ]] ; then echo -e "  shell:         \"zsh\"\n  version:     \"$ZSH_VERSION\"" ; fi
@@ -768,10 +768,10 @@ __rvm_gems_select() {
 
     # If there is a cache *directory* already,
     # move all the gems to the global cache directory and remove it.
-    if [[ -d "$rvm_ruby_gem_home/cache" ]]  ; then
-      for file in "$rvm_ruby_gem_home"/cache/* ; do
-        mv $file "$rvm_gems_path/cache/" > /dev/null 2>&1
-      done
+    if [[ -d "$rvm_ruby_gem_home/cache" ]] && [[ ! -L "$rvm_ruby_gem_home/cache" ]] ; then
+      if [[ ! -z "$(ls -A "$rvm_ruby_gem_home"/cache/)" ]] ; then
+        mv "$rvm_ruby_gem_home"/cache/* "$rvm_gems_path"/cache/
+      fi
       rm -rf "$rvm_ruby_gem_home/cache"
     fi
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 -05:00
+date: 2010-02-06 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
-description: Manages Ruby interpreter installations and switching between them.
+description: Manages Ruby interpreter environments and switching between them.
 email: wayneeseguin@gmail.com
 executables: 
 - rvm-install