rvm 0.1.7 → 0.1.8

data/README

@@ -6,15 +6,16 @@ Usage
 Action
 
   * usage   - show this usage information
+  version   - show the rvm version installed in rvm_path
   use       - setup current shell to use a specific ruby version
-  info      - show information for current ruby
-  list      - show currently installed versions
   reload    - reload rvm source itself (useful after changing rvm source)
-  implode   - removes all ruby installations it manages, everything in ~/.rvm
+  implode   - removes rvm completely, i.e. everything in ~/.rvm
   update    - upgrades rvm to the latest version.
-  reset     - remove default and current settings, exit the shell.
-              (If you experience odd behavior try this first)
-  debug     - emit environment & configuration information for *current* ruby
+              (If you experience bugs try this first with --head)
+  reset     - remove current and stored default & system settings.
+              (If you experience odd behavior try this second)
+  info      - show information for current ruby
+  debug     - show environment & configuration information for *current* ruby
 
   install   - install one or many ruby versions
   uninstall - uninstall one or many ruby versions, leaves their sources
@@ -31,6 +32,18 @@ Action
   gemdir    - switch to gem directory for installation (new login shell)
   srcdir    - switch to src directory for the current ruby installation
 
+  fetch     - Performs an archive / src fetch only of the selected ruby.
+  srcdir    - display the path to rvm source directory (may be yanked)
+  list      - show currently installed rubies, interactive output.
+  rubies    - show list of rubies installed for use with scripting.
+  iconv     - Install iconv
+  openssl   - Install openssl
+  ncurses   - Install ncurses
+  zlib      - Install zlib
+  readline  - with install, install readline versions 5.2 & 6.0
+  monitor   - Monitor cwd for testing, run `rake {spec,test}` on changes.
+  notes     - Display notes, with operating system specifics.
+
 Implementation
 
   * ruby    - MRI/YARV Ruby (The Standard), defaults to 1.8.6
@@ -59,6 +72,7 @@ Flags
   --latest      - with gemset --dump skips version strings for latest gem.
   --reconfigure - Force ./configure on install even if Makefile already exists.
 
+
 Options
 
   -v|--version    - Emit rvm version loaded for current shell

data/config/db

@@ -17,7 +17,7 @@ ree_1.8.7_patch_level=2010.01
 ruby_1.9.1_patch_level=378
 ruby_1.9.2_patch_level=preview1
 ruby_1.8.5_patch_level=231
-ruby_1.8.6_patch_level=398
+ruby_1.8.6_patch_level=399
 ruby_1.8.7_patch_level=249
 jruby_version=1.4.0
 jruby_repo_url=git://github.com/jruby/jruby.git

data/config/md5

@@ -6,6 +6,7 @@ ruby-1.8.6-p287.tar.gz=6ff3420094711266c3201a0c7c2faa38
 ruby-1.8.6-p369.tar.gz=8c140ae28b4c3947b92dfad69109d90b
 ruby-1.8.6-p383.tar.gz=4f49544d4a4d0d34e9d86c41e853db2e
 ruby-1.8.6-p398.tar.gz=736db5f56c2d9b0136e563d049249fa8
+ruby-1.8.6-p399.tar.gz=c3d16cdd3c1ee8f3b7d1c399d4884e33
 ruby-1.8.7-p160.tar.gz=945398f97e2de6dd8ab6df68d10bb1a1
 ruby-1.8.7-p174.tar.gz=18dcdfef761a745ac7da45b61776afa5
 ruby-1.8.7-p248.tar.gz=60a65374689ac8b90be54ca9c61c48e3

data/lib/VERSION.yml

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

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   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-04}
+  s.date = %q{2010-02-05}
   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

@@ -8,7 +8,7 @@ __rvm_parse_args() {
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      fetch|path|info|setup|version|srcdir|list|rubies|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes)
+      fetch|info|version|srcdir|list|rubies|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|monitor|notes)
         rvm_action=$rvm_token
       ;;
 

data/scripts/completion

@@ -56,7 +56,7 @@ _rvm ()
       gemdir)
       ;;
 
-      1.8|1.8.0|1.8.1|1.8.2|1.8.3|1.8.4|1.8.5|1.8.6|1.8.7|1.9|1.9.1|1.9.2)
+      1.8.0|1.8.1|1.8.2|1.8.3|1.8.4|1.8.5|1.8.6|1.8.7|1.9.1|1.9.2)
       ;;
 
       1.2.0|1.3.1)

data/scripts/gems

@@ -67,8 +67,8 @@ __rvm_gems_dump() {
   rvm_file_name="${rvm_file_name:-$gems_args}"
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
-    GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME ;
-    GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH ;
+    export GEM_HOME="$rvm_ruby_gem_home"
+    export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_gems_path/$rvm_ruby_string%global/bin"
   fi
 
   if [[ -z "$rvm_file_name" ]] ; then
@@ -100,7 +100,7 @@ __rvm_gems_load() {
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
-    export GEM_PATH="$rvm_ruby_gem_path"
+    export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_gems_path/$rvm_ruby_string%global/bin"
   fi
 
   if [[ ! -z "$(echo "$gems_args" | awk '/\.gem.*$/')" ]] ; then
@@ -175,8 +175,7 @@ __rvm_parse_gem_line() {
 __rvm_gem_install() {
   __rvm_parse_gem_line $*
 
-  installed_gems="$(ls ${rvm_ruby_gem_home}/specifications/ 2>/dev/null)"
-  if [[ -z "$rvm_force_flag" ]] && [[ ! -z "$(echo $installed_gems | awk '/'$(basename $gem_file_name)'spec/')" ]] ; then
+  if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
     unset gem
     $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"
   else
@@ -185,16 +184,10 @@ __rvm_gem_install() {
     elif [[ -f "$rvm_gems_path/cache/${gem_file_name}" ]] ; then
       cache_file="$rvm_gems_path/cache/${gem_file_name}"
     else
-      cache_file="${cache_file:-$(\ls ${rvm_gems_path}/*/*/cache/${gem_file_name}* 2> /dev/null | sort | head -n1)}"
-      if [[ ! -z "$cache_file" ]] && [[ -f "$cache_file" ]] ; then
-        if [[ "$(dirname $cache_file)" != "$rvm_gems_path/cache/" ]] ; then
-          cp "$cache_file" "$rvm_gems_path/cache/"
-          cache_file="$rvm_gems_path/cache/$(basename $cache_file)"
-        fi
-      fi
+      cache_file="${cache_file:-$(\ls ${rvm_gems_path}/cache/${gem_file_name} 2> /dev/null | sort | head -n1)}"
     fi
 
-    if [[ -z "$cache_file" ]] ; then
+    if [[ ! -f "$cache_file" ]] ; then
       if [[ -f "$gem_file_name" ]] ; then
         gem="$gem_file_name"
       elif [[ -z "${gem_version/ /}" ]] ; then
@@ -206,13 +199,16 @@ __rvm_gem_install() {
       gem_file_name="$(basename "$cache_file")"
       gem_string="$(echo "$gem_file_name" | sed 's#\.gem$##')"
 
-      # TODO: Switch this to use match
-      if [[ ! -z "$(echo "$rvm_ruby_gem_list" | awk "/${gem_name/ /} \(.*$gem_version/{print}")" ]] ; then
-        if [[ ! -z "$rvm_force_flag" ]] ; then
-          gem="$rvm_gems_path/cache/$gem_file_name" # install as a named local gem
-        fi
+      if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
+        unset gem # already installed, not forcing reinstall.
       else
-        gem="$cache_file"
+        if [[ -s "$rvm_gems_path/cache/$(basename $gem_file_name)" ]] ; then
+          mkdir -p "$rvm_tmp_path/$$/"
+          mv "$rvm_gems_path/cache/$gem_file_name" "$rvm_tmp_path/$$/$gem_file_name"
+          gem="$rvm_tmp_path/$$/$gem_file_name -f -l"
+        else
+          gem="$cache_file"
+        fi
       fi
     fi
   fi
@@ -222,7 +218,7 @@ __rvm_gem_install() {
     if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
 
     if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ "$rvm_ruby_gem_home" != "$rvm_gems_path" ]] ; then
-      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_path' $gem_prefix gem install $rvm_gem_options $gem $gem_postfix $vars"
+      command="export GEM_HOME='$GEM_HOME' ; export GEM_PATH='$GEM_PATH' ; $gem_prefix gem install $rvm_gem_options $gem $gem_postfix $vars"
     else
       command="$gem_prefix gem install $rvm_gem_options -q $gem $gem_postfix $vars"
     fi
@@ -234,6 +230,7 @@ __rvm_gem_install() {
       $rvm_scripts_path/log "error" "$color_red$gem_name $gem_version$color_none failed to install, output has been logged to:\n$rvm_path/log/$rvm_ruby_string/gem.install.error.log"
     fi
   fi ; unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
+
   return $result
 }
 

data/scripts/manage

@@ -830,7 +830,7 @@ __rvm_post_install() {
 
 __rvm_rubygems_setup() {
   if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
-    # 1.9 has it's own built-in gem command
+    # 1.9.X has it's own built-in gem command
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
     cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem

data/scripts/utility

@@ -26,10 +26,11 @@ __rvm_db() {
 __rvm_info() {
   if [[ ! -z "$(which ruby 2>/dev/null)" ]] ; then full_version=$(ruby -v) ; fi
 
-  cat <<Info
+  echo -e "system:\n  uname:        \"$(uname -a)\""
+if [[ ! -z "$ZSH_VERSION" ]] ; then echo -e "  shell:         \"zsh\"\n  version:     \"$ZSH_VERSION\"" ; fi
+if [[ ! -z "$BASH_VERSION" ]] ; then echo -e "  shell:        \"bash\"\n  version:      \"$BASH_VERSION\"" ; fi
 
-system:
-  uname: "$(uname -a)"
+  cat <<Info
 
 ruby:
   interpreter:  "$(echo $full_version | awk '{print $1}')"
@@ -55,7 +56,7 @@ environment:
   MY_RUBY_HOME: "$MY_RUBY_HOME"
   IRBRC:        "$IRBRC"
 Info
-if [[ ! -z "$MAGLEV_HOME" ]] ; then echo "  MAGLEV_HOME: $MAGLEV_HOME" ; fi
+if [[ ! -z "$MAGLEV_HOME" ]] ; then echo -e "  MAGLEV_HOME: \"$MAGLEV_HOME\"" ; fi
 
   unset full_version
 }
@@ -752,6 +753,9 @@ __rvm_gems_select() {
   else
     rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gem_set_name"
   fi
+
+  if [[ ! -d "$rvm_ruby_gem_home" ]] ; then mkdir -p $rvm_ruby_gem_home ; fi
+
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
   # TODO: Remove next line after a few releases.
@@ -759,15 +763,24 @@ __rvm_gems_select() {
   # Careful not to nuke system gems cache.
   if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ ! -z "$(echo $rvm_ruby_gem_home | awk '/rvm/')" ]] ; then
     # Global gems cache
+    # Ensure that the ruby gem home exists.
     mkdir -p "$rvm_ruby_gem_home"
-    if [[ ! -L "$rvm_ruby_gem_home/cache" ]] ; then
+
+    # 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
       rm -rf "$rvm_ruby_gem_home/cache"
+    fi
+
+    # If the ruby's gems cache directory is not a symlink to the global cache,
+    # symlink it
+    if [[ ! -L "$rvm_ruby_gem_home/cache" ]] ; then
       ln -nfs "$rvm_gems_path/cache" "$rvm_ruby_gem_home/cache"
     fi
-  fi
+  fi ; export rvm_ruby_gem_path rvm_ruby_gem_home
 }
 
 # Use a gems(et) specified by 'rvm_ruby_gem_home'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -05:00
+date: 2010-02-05 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []