rvm 0.0.54 → 0.0.55

data/config/db

@@ -19,6 +19,6 @@ ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
 ree_1.8.7_patch_level=20090928
 ruby_1.9.1_patch_level=243
 ruby_1.9.2_patch_level=preview1
-ruby_1.8.5_patch_level=115
+ruby_1.8.5_patch_level=231
 ruby_1.8.6_patch_level=383
 ruby_1.8.7_patch_level=174

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 54
+:patch: 55

data/lib/rvm.rb

@@ -1,3 +1 @@
-module RVM
-  VERSION = YAML.load_file("#{File.dirname(File.dirname(__FILE__))}/VERSION.yml")
-end
+Dir.glob("#{File.expand_path(File.dirname(__FILE__))}/rvm/*.rb").each { |file| require file }

data/lib/rvm/version.rb

@@ -0,0 +1,4 @@
+module RVM
+  require "yaml"
+  VERSION = YAML.load_file("#{File.expand_path(File.dirname(__FILE__))}/../VERSION.yml")
+end

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.54"
+  s.version = "0.0.55"
 
   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-03}
+  s.date = %q{2009-10-05}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "install",
      "lib/VERSION.yml",
      "lib/rvm.rb",
+     "lib/rvm/version.rb",
      "rvm.gemspec",
      "scripts/aliases",
      "scripts/cli",
@@ -43,9 +44,11 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/wayneeseguin/rvm}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{dynamicreports}
+  s.rubyforge_project = %q{rvm}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ruby Version Manager (rvm)}
+  s.test_files = [
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

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.01"
+  rvm_meta_updated="2009.10.05"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -131,13 +131,16 @@ function __rvm_parse-args {
         rvm_ruby_interpreter="$rvm_token"
       ;;
 
+      # TODO: if $1 is a $version string nab it and shift
       jruby|ree|macruby|rbx|rubinius|default|all)
         rvm_ruby_interpreter="$rvm_token"
         rvm_action="${rvm_action:-use}"
+        if [ ! -z "$(echo $1 | awk '/^[0-9]/')" ] ; then
+          rvm_ruby_version=$1 ; shift
+        fi
       ;;
 
       gemset)
-          set +x
         rvm_action=$rvm_token
         if [ "$1" = "delete" ] ; then
           rvm_delete_flag=1
@@ -150,7 +153,6 @@ function __rvm_parse-args {
             shift
           fi
         fi
-        set -x
       ;;
 
       gemdir)
@@ -358,7 +360,11 @@ function __rvm_parse-args {
          --rm-gem-set)      rvm_gem_set_name_rm="$1"  ; shift ;;
       tests|specs)          rvm_action="tests"                ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--trace|--delete)
+      --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"
       ;;
 

data/scripts/selector

@@ -119,7 +119,7 @@ function __rvm_select {
 
   if [ -z "$rvm_gem_set_name" ] ; then
     gemset=$(gem env gemdir | xargs basename | sed "s/${rvm_ruby_version}-//")
-    if [ "$gemset" != "$rvm_ruby_version" ] ; then
+    if [ "$gemset" != "$rvm_ruby_version" -a -z "$(echo $gemset | awk '/^[0-9]/')" ] ; then
       rvm_gem_set_name="$gemset"
     else
       unset rvm_gem_set_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.54
+  version: 0.0.55
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-03 00:00:00 -04:00
+date: 2009-10-05 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -29,6 +29,7 @@ files:
 - install
 - lib/VERSION.yml
 - lib/rvm.rb
+- lib/rvm/version.rb
 - rvm.gemspec
 - scripts/aliases
 - scripts/cli
@@ -67,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: dynamicreports
+rubyforge_project: rvm
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3