rvm 0.0.56 → 0.0.57

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 56
+:patch: 57

data/rvm.gemspec

@@ -0,0 +1,61 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rvm}
+  s.version = "0.0.57"
+
+  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-10}
+  s.default_executable = %q{rvm-install}
+  s.description = %q{Manages Ruby interpreter installations and switching between them.}
+  s.email = %q{wayneeseguin@gmail.com}
+  s.executables = ["rvm-install"]
+  s.extra_rdoc_files = [
+    "README"
+  ]
+  s.files = [
+    "LICENCE",
+     "README",
+     "config/db",
+     "examples/rvmrc",
+     "install",
+     "lib/VERSION.yml",
+     "lib/rvm.rb",
+     "lib/rvm/version.rb",
+     "rvm.gemspec",
+     "scripts/aliases",
+     "scripts/cli",
+     "scripts/completion",
+     "scripts/functions",
+     "scripts/gems",
+     "scripts/gemsync",
+     "scripts/install",
+     "scripts/ruby-installer",
+     "scripts/rvm",
+     "scripts/rvm-install",
+     "scripts/rvm-prompt",
+     "scripts/selector",
+     "scripts/update",
+     "scripts/utility"
+  ]
+  s.homepage = %q{http://github.com/wayneeseguin/rvm}
+  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rvm}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Ruby Version Manager (rvm)}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/scripts/cli

@@ -5,7 +5,7 @@ function __rvm_meta {
   rvm_meta_author_email="wayneeseguin@gmail.com"
   rvm_meta_website="http://rvm.beginrescueend.com/"
   rvm_meta_version="`cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
-  rvm_meta_updated="2009.10.09"
+  rvm_meta_updated="2009.10.10"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -107,7 +107,7 @@ function __rvm_parse_args {
   while [ $# -gt 0 ] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|update|readline|iconv|gemsync)
+      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|iconv|gemsync|update)
         rvm_action=$rvm_token
       ;;
 
@@ -190,9 +190,15 @@ function __rvm_parse_args {
         rvm_action=$(echo $rvm_token | sed 's/do//g')
 
         if [ "$rvm_action" = "rake" -o "$rvm_action" = "gem" -o "$rvm_action" = "ruby" ] ; then
-          rvm_action="ruby"
-          rvm_ruby_args="$rvm_token $@"
-          rvm_parse_break=1
+          if [ -z "$1" ] ; then
+            rvm_action="error"
+            rvm_error_message="the 'ruby' and 'gem' actions must be followed by arguments."
+            rvm_parse_break=1
+          else
+            rvm_action="ruby"
+            rvm_ruby_args="$rvm_token $@"
+            rvm_parse_break=1
+          fi
         else
           if [ ! -z "$(echo $1 | awk '/^-/')" ] ; then
             unset rvm_ruby_version

data/scripts/gems

@@ -23,26 +23,24 @@ __rvm_gems() {
 
 __rvm_gems_select() {
   if [ -z "$rvm_gem_set_name" ] ; then
-    if [ -z "$GEM_HOME" ] ; then
-      rvm_ruby_gem_home=$(gem env gemdir)
-    elif [ ! -z "$GEM_HOME" ] ; then
-      rvm_ruby_gem_home="$GEM_HOME"
-    elif [ ! -z "$rvm_ruby_interpreter" -a ! -z "$rvm_ruby_version" -a "$rvm_ruby_interpreter" != "system" ] ; then
-      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
-    else
-      __rvm_log "error" "Cannot select gem home, something definitely wrong :/"
-    fi
-
     if [ -z "$rvm_gem_set_name" -a ! -z "$rvm_ruby_gem_home" -a ! -z "$rvm_ruby_version" ] ; then
       rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | sed "s/${rvm_ruby_version}-//")
     fi
 
     if [ -z "$rvm_gem_set_name" ] ; then unset rvm_gem_set_name ; fi
 
-    if [ ! -z "$rvm_gem_set_name" -a ! -z "$(echo $rvm_gem_set_name | awk '/^'$rvm_ruby_version'/')" ] ; then
+    if [ ! -z "$rvm_gem_set_name" -a ! -z "$(echo $rvm_gem_set_name | awk '/^\d\.\d/')" ] ; then
       rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
     else
-      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
+      if [ ! -z "$rvm_ruby_interpreter" -a ! -z "$rvm_ruby_version" -a "$rvm_ruby_interpreter" != "system" ] ; then
+        rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
+      elif [ -z "$GEM_HOME" ] ; then
+        rvm_ruby_gem_home=$(gem env gemdir)
+      elif [ ! -z "$GEM_HOME" ] ; then
+        rvm_ruby_gem_home="$GEM_HOME"
+      else
+        __rvm_log "error" "Cannot select gem home, something definitely wrong :/"
+      fi
     fi
   else
     rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
@@ -118,7 +116,7 @@ __rvm_gems_load() {
       gem_file_name="$gem_name-$gem_version.gem"
     fi
 
-    cache_file=$(/bin/ls -t $rvm_gem_path/*/*/cache/${gem_file_name}* 2> /dev/null | head -n1)
+    cache_file=$(/bin/ls -t "$rvm_gem_path/*/*/cache/${gem_file_name}*" 2> /dev/null | head -n1)
     if [ -z "$cache_file" ] ; then
       if [ -z "$gem_version" ] ; then
         gem="$gem_name"

data/scripts/ruby-installer

@@ -425,7 +425,6 @@ function __rvm_remove_ruby {
         rm -f $rvm_bin_path/$rvm_ruby_package_name
       fi
     done ; unset dir
-    rm -rf $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version*/
   else
     __rvm_log "fail" "Cannot uninstall unknown package '$rvm_ruby_package_name'"
   fi

data/scripts/utility

@@ -484,7 +484,7 @@ function __rvm_initialize {
 }
 
 function __rvm_update {
-  if [ "$rvm_ruby_revision" = "head" -o ! -z "$rvm_self_flag" -o ! -z "$rvm_update_flag" ] ; then
+  if [ "$rvm_ruby_revision" = "head" -o ! -z "$rvm_self_flag" -o "$rvm_action" = "update" -o ! -z "$rvm_update_flag" ] ; then
     __rvm_version
     __rvm_update_rvm
     __rvm_version
@@ -505,7 +505,8 @@ function __rvm_update_rvm {
     fi
   else
     # TODO: rvm_install_path:
-    gem install rvm --no-rdoc --no-ri -q && rvm-install && source ~/.rvm/scripts/rvm
+    GEM_HOME="${GEM_HOME:-$(gem env gemdir user)}"
+    gem install rvm --no-rdoc --no-ri -q && $GEM_HOME/bin/rvm-install && source ~/.rvm/scripts/rvm
   fi
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.56
+  version: 0.0.57
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-09 00:00:00 -04:00
+date: 2009-10-10 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - lib/VERSION.yml
 - lib/rvm.rb
 - lib/rvm/version.rb
+- rvm.gemspec
 - scripts/aliases
 - scripts/cli
 - scripts/completion