rvm 0.0.53 → 0.0.54

data/lib/VERSION.yml

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

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.53"
+  s.version = "0.0.54"
 
   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-01}
+  s.date = %q{2009-10-03}
   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

@@ -107,10 +107,15 @@ 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|use|gemsync|gemset)
+      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|update|readline|iconv|gemsync)
         rvm_action=$rvm_token
       ;;
 
+      use)
+        rvm_action=$rvm_token
+        if [ "$1" = "ruby" ] ; then shift ; fi
+      ;;
+
       inspect)
         rvm_action=$rvm_token
         rvm_ruby_args=$*
@@ -131,29 +136,40 @@ function __rvm_parse-args {
         rvm_action="${rvm_action:-use}"
       ;;
 
-      gemdir)
+      gemset)
+          set +x
         rvm_action=$rvm_token
+        if [ "$1" = "delete" ] ; then
+          rvm_delete_flag=1
+          shift
+          if [ -z "$1" -a -z "$rvm_gem_set_name" ] ; then
+            rvm_action="error"
+            rvm_error_message="A gem set name must be specified with 'gemset delete'"
+          else
+            rvm_gem_set_name="$1"
+            shift
+          fi
+        fi
+        set -x
+      ;;
 
+      gemdir)
+        rvm_action=$rvm_token
         if [ "$1" = "system" ] ; then rvm_ruby_interpreter="system" ; shift ; fi
         if [ "$1" = "user" ]   ; then rvm_ruby_interpreter="user"   ; shift ; fi
-
         rvm_ruby_interpreter="${rvm_ruby_interpreter:-current}"
       ;;
 
       --load|load|dump)
+        rvm_action=gemset
         eval "rvm_${rvm_token}_flag=1"
         if [ ! -z "$1" ] ; then
-          if [ ! -z "$(echo $1 | awk '/\.gemset$/')" ] ; then
-            rvm_gem_set_name=$(echo $1 | sed 's/\.gemset//')
-          else
-            rvm_gem_set_name=$1
-          fi
+          rvm_gem_set_name=$(echo $1 | sed 's/\.gemset//' | xargs basename)
+          rvm_file_name="$(echo $1 | sed 's/\.gemset//').gemset"
           shift
         else
-          rvm_gem_set_name="default"
+          rvm_file_name="$rvm_gem_set_name.gemset"
         fi
-        rvm_file_name="$rvm_gem_set_name.gemset"
-        rvm_action=$rvm_token
       ;;
 
       gemdup)
@@ -213,9 +229,15 @@ function __rvm_parse-args {
         rvm_action=${rvm_action:-use}
       ;;
 
-      1.2.0|1.3.1)
+      1.2.0|1.3|1.3.0|1.3.1|1.4|1.4.0)
+        if [ "$rvm_token" = "1.3" ] ; then
+          rvm_ruby_version="1.3.1"
+        elif [ "$rvm_token" = "1.4" ] ; then
+          rvm_ruby_version="1.4.0"
+        else
+          rvm_ruby_version="$rvm_token"
+        fi
         rvm_ruby_interpreter=${rvm_ruby_interpreter:-jruby}
-        rvm_ruby_version="$rvm_token"
         rvm_action=${rvm_action:-use}
       ;;
 
@@ -228,6 +250,10 @@ function __rvm_parse-args {
         fi
       ;;
 
+      --repository|--repo|--url)
+        rvm_ruby_repo_url=$rvm_token
+      ;;
+
       -t|--tag)
         rvm_ruby_tag="$1";
         rvm_action="${rvm_action:-use}"
@@ -332,7 +358,7 @@ 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)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--trace|--delete)
         eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1"
       ;;
 
@@ -410,8 +436,17 @@ function rvm {
       result=$?
     ;;
 
-    load|dump)
-      __rvm_gemset_${rvm_action}
+    gemset)
+      if [ ! -z "$rvm_load_flag" ] ; then
+        __rvm_gemset_load
+      elif [ ! -z "$rvm_dump_flag" ] ; then
+        __rvm_gemset_load
+      elif [ ! -z "$rvm_delete_flag" ] ; then
+        __rvm_gemset_delete
+      else
+        rvm_action="error"
+        rvm_error_message="At least one of load, dump, or delete must be specified with 'gemset'."
+      fi
     ;;
 
     gemsync)

data/scripts/ruby-installer

@@ -267,10 +267,6 @@ RubyWrapper
     ;;
 
     jruby)
-      rvm_package_file="$rvm_ruby_interpreter-bin-$rvm_ruby_version"
-      rvm_url="http://dist.codehaus.org/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.zip"
-      rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}"
-
       mkdir -p $rvm_ruby_log_path
       __rvm_pushpop $rvm_source_path
 
@@ -289,11 +285,9 @@ RubyWrapper
             __rvm_log "info" "Downloading $rvm_package_file, this may take a while depending on your connection..."
             __rvm_fetch $rvm_url
           fi
-          rvm_unzip=`which unzip`
-          if [ $? -ne 0 ] ; then
-            __rvm_log "error" "'unzip' was not found in your PATH. jRuby official release comes as a .zip file, hence 'unzip' is required to extract it. Please install 'unzip' and try again."
-          else
-            __rvm_run "extract" "unzip -q $rvm_archives_path/$rvm_package_file.zip -d $rvm_source_path" "Extracting $rvm_package_file..."
+          __rvm_run "extract" "tar zxf $rvm_archives_path/$rvm_package_file.tar.gz -C $rvm_source_path" "Extracting $rvm_package_file..."
+          if [ "$rvm_package_file" != "$rvm_ruby_string" ] ; then
+            mv $rvm_source_path/$rvm_package_file $rvm_source_path/$rvm_ruby_string
           fi
           cd $rvm_ruby_src_path
         fi

data/scripts/selector

@@ -43,7 +43,7 @@ function __rvm_select {
       rvm_ruby_version="head"
       unset rvm_ruby_patch_level
       rvm_ruby_interpreter="rubinius"
-      rvm_ruby_repo_url=`__rvm_db "rubinius_repo_url"`
+      rvm_ruby_repo_url=${rvm_rbx_repo_url:-`__rvm_db "rubinius_repo_url"`}
       rvm_url=$rvm_ruby_repo_url
       rvm_ruby_configure=""
       rvm_ruby_make="build"
@@ -53,8 +53,16 @@ function __rvm_select {
 
     jruby)
       rvm_ruby_version="${rvm_ruby_version:-`__rvm_db "jruby_version"`}"
+      rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}"
+      if [ ! -z "$(echo $rvm_ruby_version | awk '/^1.4/')" ] ; then
+        rvm_ruby_version="1.4.0RC1"
+        rvm_package_file="$rvm_ruby_interpreter-bin-${rvm_ruby_version}"
+      else
+        rvm_package_file="$rvm_ruby_interpreter-bin-$rvm_ruby_version"
+      fi
+      rvm_url="http://dist.codehaus.org/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz"
       unset rvm_ruby_patch_level
-      if [ -z "$(echo $rvm_ruby_version | awk '/^1\.2\.0/')" -a -z "$(echo $rvm_ruby_version | awk '/^1\.3\.[0-3]/')" ] ; then
+      if [ -z "$(echo $rvm_ruby_version | awk '/^1\.[2-4]/')" ] ; then
         __rvm_log "fail" "Unknown jRuby version: $rvm_ruby_version"
       fi
       alias jruby_ng="jruby --ng"
@@ -109,6 +117,15 @@ function __rvm_select {
     fi
   fi
 
+  if [ -z "$rvm_gem_set_name" ] ; then
+    gemset=$(gem env gemdir | xargs basename | sed "s/${rvm_ruby_version}-//")
+    if [ "$gemset" != "$rvm_ruby_version" ] ; then
+      rvm_gem_set_name="$gemset"
+    else
+      unset rvm_gem_set_name
+    fi ; unset gemset
+  fi
+
   if [ ! -z "$rvm_ruby_interpreter" -a ! -z "$rvm_ruby_version" -a "$rvm_ruby_interpreter" != "system" ] ; then
     rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }')
     rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }')
@@ -139,11 +156,11 @@ function __rvm_select {
       rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
     fi
+    rvm_ruby_string="$rvm_ruby_package_name"
     rvm_ruby_log_path="$rvm_log_path/$rvm_ruby_package_name"
-    rvm_ruby_src_path="$rvm_source_path/$rvm_ruby_package_name"
+    rvm_ruby_src_path="$rvm_source_path/$rvm_ruby_string"
     rvm_ruby_binary="$rvm_ruby_home/bin/ruby"
     rvm_ruby_irbrc="$rvm_ruby_home/.irbrc"
-    rvm_ruby_string="$rvm_ruby_package_name"
     rvm_selected=1
 
     export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_gem_home rvm_path rvm_source_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_source_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected rvm_ruby_string
@@ -173,10 +190,8 @@ function __rvm_use {
   elif [ "$rvm_ruby_interpreter" = "system" ] ; then
 
     unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
-
     PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
     PATH=$rvm_bin_path:$PATH ; export PATH
-
     if [ -s $rvm_path/system ] ; then
       grep "^MY_RUBY_HOME='$rvm_path" "$rvm_path/system" > /dev/null
       if [ $? -eq 0 ] ; then

data/scripts/utility

@@ -46,9 +46,12 @@ function __rvm_debug {
     fi
   done
 
+  __rvm_log "debug" "gem sources:\n$(gem sources | awk '/gems/')"
+
   if [ -f $rvm_path/bin/rvm ] ; then
     __rvm_log "error" "rvm script in bin! \n$(ls -laht $rvm_path/bin/rvm)"
   fi
+
 }
 
 # Logging functions based on level
@@ -158,6 +161,7 @@ function __rvm_fetch {
     __rvm_log "debug" "No archive or no MD5, downloading"
     download=1
   fi
+
   if [ $download -gt 0 ] ; then
     eval $rvm_fetch "$1"
     result=$?
@@ -167,13 +171,18 @@ function __rvm_fetch {
       elif [ $result -eq 33 ] ; then
         __rvm_log "debug" "Server does not support 'range' command, removing '$archive'"
         rm -f $archive
-        __rvm_fetch "$1"
+        eval $rvm_fetch "$1"
+        result=$?
+        if [ $result -gt 0 ] ; then
+          __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
+        fi
       else
         __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
       fi
     fi
     __rvm_pushpop
   fi
+
   unset archive
   unset download
   return $result
@@ -345,9 +354,9 @@ function __rvm_db {
 function __rvm_list {
   if [ "$rvm_all_flag" ] ; then
     svn list http://svn.ruby-lang.org/repos/ruby/tags/ | grep 'v1_[8|9]' | sed 's/^v1_//' | sed 's/\/$//' | awk -F'_' '{print "1."$1"."$2 " -l "$3}' | sed 's/p$//'
-    echo -e "jruby 1.2.0\njruby 1.3.0\njruby 1.3.1\njruby --head"
-    echo -e "rbx head (rubinius head)\nrbx head --jit"
-    echo -e "ree 20090610\nree --head\nree 1.8.7 --head"
+    echo -e "jruby 1.2.0\njruby 1.3.0\njruby (1.3.1, the default)\njruby 1.4.1\njruby --head"
+    echo -e "rbx head (rubinius head, the default)\nrbx head --jit"
+    echo -e "ree 1.8.6 --head\nree (1.8.7, the default)"
   else
     current_ruby=`which ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null`
     echo -e "\nruby:\n"
@@ -594,16 +603,15 @@ function __rvm_do {
 
 function __rvm_summary {
   export successes errors statuses
-  summary="\nSummary:\n"
-  summary="$summary \033[0;32m${#successes[*]} successful: $(echo "${successes[*]}" | sed 's/ /, /g')\033[0m\n"
-  summary="$summary \033[0;31m${#errors[*]} errors: $(echo "${errors[*]}" | sed 's/ /, /g')\033[0m\n"
+  summary="\nSummary:\n\n"
+  if [ ${#successes[*]} -gt 0 ] ; then
+    summary="$summary \033[0;32m${#successes[*]} successful: $(echo "${successes[*]}" | sed 's/ /, /g')\033[0m\n"
+  fi
+  if [ ${#errors[*]} -gt 0 ] ; then
+    summary="$summary \033[0;31m${#errors[*]} errors: $(echo "${errors[*]}" | sed 's/ /, /g')\033[0m\n"
+  fi
   total=${#rubies[*]}
   if [ ! -z "$ZSH_VERSION" ] ; then array_start=1 ; else array_start=0 ; fi
-  for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-    __rvm_log "debug" "${rubies[$index]} returned ${statuses[$index]}"
-    summary="$summary ${rubies[$index]} returned ${statuses[$index]}"
-    if (( $index + 1 < $total + $array_start )) ; then summary="$summary\n" ; fi
-  done ; unset index array_start
   echo -e "$summary" | tee -a log/summary.log
   return ${#errors[*]}
 }
@@ -670,13 +678,36 @@ RubyCode
   __rvm_do
 }
 
-function __rvm_gemset_dump {
+__rvm_gemset_delete () {
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
-  rvm_file_name=${rvm_file_name:-'default'}
+
+  if [ ! -z $rvm_gem_set_name ] ; then
+    gemdir="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
+    if [ -d $gemdir ] ; then
+      __rvm_log "warn" "Are you SURE you wish to remove the installed gemset '$rvm_gem_set_name ' ($gemdir)?"
+      echo -n "(anything other than 'yes' will cancel) > "
+      read response
+      if [ "$response" = "yes" ] ; then
+        rm -rf  $gemdir
+      else
+        __rvm_log "info" "Not doing anything, phew... close call that one eh?"
+      fi
+    else
+      __rvm_log "info" "$gemdir does not exist, dirtywork alredy done."
+    fi
+    unset gemdir
+  else
+    __rvm_log "error" "A gemset name must be specified in order to delete a gemset."
+  fi
+}
+
+function __rvm_gemset_dump {
+  rvm_gem_set_name=${rvm_gem_set_name:-"default"}
+  rvm_file_name=${rvm_file_name:-$rvm_gem_set_name}
 
   echo "# $rvm_gem_set_name.gemset generated gem dump file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_gem_set_name.gemset
 
-  for gem in `gem list | sed 's/[\(|\)]//g' | sed 's/, /,/g' | tr ' ' ';'` ; do
+  for gem in $(gem list | sed 's/[\(|\)]//g' | sed 's/, /,/g' | tr ' ' ';') ; do
     name=`echo $gem | awk -F';' '{print $1}'`
     if [ -z "$rvm_latest_flag" ] ; then
       versions=`echo $gem | awk -F';' '{print $2}' | sed 's/,/ /g'`
@@ -690,8 +721,10 @@ function __rvm_gemset_dump {
 }
 
 function __rvm_gemset_load {
-  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
-  echo "Loading $rvm_file file..."
+  rvm_gem_set_name=${rvm_gem_set_name:-"default"}
+  rvm_file_name=${rvm_file_name:-$rvm_gem_set_name}
+
+  echo "Loading $rvm_file_name file..."
   rvm_ruby_gem_list=`/bin/ls $rvm_gem_home/specifications/ 2> /dev/null | sed 's/\.gemspec$//' 2> /dev/null`
   while read line
   do # Keep this on 2nd line :( bash fail.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.53
+  version: 0.0.54
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 -04:00
+date: 2009-10-03 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []