rvm 0.1.15 → 0.1.16

data/install

@@ -2,6 +2,11 @@
 
 unset rvm_auto_flag
 
+install_source_path=$(dirname $0)
+if [[ -d "$install_source_path/scripts" ]] && [[ -s "$install_source_path/scripts/utility" ]] ; then
+  builtin cd $install_source_path
+fi
+
 source scripts/version
 source scripts/utility
 
@@ -30,6 +35,7 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
+__rvm_load_rvmrc
 
 if [[ -z "$rvm_path" ]] ; then
   unset rvm_path
@@ -55,8 +61,6 @@ __rvm_initialize
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
-source_path="${source_path:-"$(dirname $0 | xargs dirname)"}"
-if [[ ! -d "$source_path" ]] ; then unset source_path ; fi
 source_path="${source_path:-$cwd}"
 
 # State what is required to use rvm

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 15
+:patch: 16

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.15"
+  s.version = "0.1.16"
 
   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-16}
+  s.date = %q{2010-02-18}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/cli

@@ -50,7 +50,7 @@ __rvm_parse_args() {
 
       gems|gemset)
         rvm_action="gems"
-        if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "dump" = "$1" ]] || [[ "load" = "$1" ]] || [[ "nuke" = "$1" ]] ; then
+        if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "dump" = "$1" ]] || [[ "load" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "copy" = "$1" ]] || [[ "import" = "$1" ]] || [[ "export" = "$1" ]] ; then
           export rvm_ruby_args="$*" ; export rvm_${1}_flag=1 ; shift
         elif [[ "clear" = "$1" ]] ; then
           unset rvm_gem_set_name ; shift
@@ -281,7 +281,7 @@ __rvm_parse_args() {
       --disable-llvm|--disable-jit) export rvm_llvm_flag=0      ;;
       --enable-llvm|--enable-jit)   export rvm_llvm_flag=1      ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--load|--rvmrc|--passenger|--editor|--sticky_gems)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--passenger|--editor|--sticky_gems)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
         if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
       ;;

data/scripts/fetch

@@ -5,7 +5,7 @@ if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
 
 record_md5() {
-  if [[ "Darwin" = "$(uname)" ]] ; then
+  if [[ "Darwin" = "$(uname)" ]] || [[ "FreeBSD" = "$(uname)" ]]; then
     archive_md5="$(md5 $archive | awk '{print $NF}')"
   else
     archive_md5="$(md5sum $archive | awk '{print $1}')"

data/scripts/gems

@@ -63,7 +63,7 @@ __rvm_gems_delete() {
   fi
 }
 
-__rvm_gems_nuke() {
+__rvm_gems_empty() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
   if [[ ! -z "$rvm_gem_set_name" ]] ; then
     gemdir="$rvm_gems_path/$rvm_ruby_string%$rvm_gem_set_name"
@@ -86,7 +86,34 @@ __rvm_gems_nuke() {
   fi
 }
 
-__rvm_gems_dump() {
+# Migrate gemsets from ruby X to ruby Y
+__rvm_gems_copy() {
+  source_ruby="$(echo $gem_args | awk '{print $1}')"
+  destination_ruby="$(echo $gem_args | awk '{print $2}')"
+  if [[ -z "$source_ruby" ]] ; then
+    $rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gems copy X Y'"
+  fi
+  if [[ -z "$destination_ruby" ]] ; then
+    $rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gems copy X Y'"
+  fi
+  source_path="$($rvm_bin_path/rvm $source_ruby gem env gemdir | tail -n 1)"
+  destination_path="$($rvm_bin_path/rvm $destination_ruby gem env gemdir | tail -n 1)"
+
+  if [[ -d "$source_path" ]] ; then
+    if [[ ! -d "$destination_path" ]] ; then mkdir -p $destination_path ; fi
+    $rvm_scripts_path/log "info" "Copying gemset from $source_ruby to $destination_ruby" ;
+    for dir in bin doc gems specifications ; do
+      cp -Rf $source_path/$dir $destination_path/
+    done
+  else
+    $rvm_scripts_path/log "error" "Gems directory does not exist for $source_path ($source_path)"
+    return 1
+  fi
+
+  unset source_ruby destination_ruby source_path destination_path
+}
+
+__rvm_gems_export() {
   rvm_file_name="${rvm_file_name:-$gems_args}"
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
@@ -103,10 +130,10 @@ __rvm_gems_dump() {
     fi
   fi
 
-  $rvm_scripts_path/log "info" "Dumping current environments gems to $rvm_file_name"
+  $rvm_scripts_path/log "info" "Exporting current environments gems to $rvm_file_name"
 
   touch $rvm_file_name
-  echo "# $rvm_file_name generated gem dump file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_file_name
+  echo "# $rvm_file_name generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_file_name
   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
@@ -120,7 +147,7 @@ __rvm_gems_dump() {
   done ; unset file_name
 }
 
-__rvm_gems_load() {
+__rvm_gems_import() {
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
@@ -150,7 +177,7 @@ __rvm_gems_load() {
   mkdir -p "$rvm_gems_path/cache" # Ensure the base cache dir is initialized.
 
   if [[ -s "$rvm_file_name" ]] ; then
-    echo "Loading $rvm_file_name file..."
+    echo "Importing  $rvm_file_name file..."
     rvm_ruby_gem_list=$(\ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's#.gems.*$##' 2> /dev/null)
 
     while read -r line
@@ -160,7 +187,7 @@ __rvm_gems_load() {
       fi
     done < <(awk '/^[^#]+/{print}' "${rvm_file_name}")
   else
-    $rvm_scripts_path/log "error" "${rvm_file_name} does not exist to load from."
+    $rvm_scripts_path/log "error" "${rvm_file_name} does not exist to import from."
   fi
 }
 
@@ -188,7 +215,7 @@ __rvm_parse_gem_args() {
     gem_file_name="$gem"
   elif $rvm_scripts_path/match "$gem" ".gem$" ; then
     gem_file_name="$gem"
-  elif [[ -z "${gem_version/ /}" ]] ; then # no v/Users/wayne/projects/db0/rvm/scripts/gems
+  elif [[ -z "${gem_version/ /}" ]] ; then
     gem_file_name="${gem_name/ /}*.gem"
   else # version
     gem_file_name="${gem_name/ /}-${gem_version/ /}.gem"
@@ -285,14 +312,16 @@ if [[ -z "$(which gem 2>/dev/null)" ]] ; then
 fi
 
 action="$(echo $* | awk '{print $1}')"
-gems_args="$(echo $* | awk '{$1="" ; print}' | sed 's/^\s*//')"
-
-if [[ "load" = "$action" ]] ; then
-  __rvm_gems_load
-elif [[ "dump" = "$action" ]] ; then
-  __rvm_gems_dump
-elif [[ "nuke" = "$action" ]] ; then
-  __rvm_gems_nuke
+gem_args=$(echo "$*" | awk '{$1="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+
+if [[ "import" = "$action" ]] || [[ "load" = "$action" ]] ; then
+  __rvm_gems_import
+elif [[ "export" = "$action" ]] || [[ "dump" = "$action" ]] ; then
+  __rvm_gems_export
+elif [[ "copy" = "$action" ]] ; then
+  __rvm_gems_copy
+elif [[ "empty" = "$action" ]] ; then
+  __rvm_gems_empty
 elif [[ "delete" = "$action" ]] ; then
   __rvm_gems_delete
 elif [[ "name" = "$action" ]] ; then
@@ -309,7 +338,7 @@ elif [[ "clear" = "$action" ]] ; then
   $rvm_scripts_path/log "info" "gems(et) cleared."
   exit 0
 else
-  $rvm_scripts_path/log "error" "gems must be passed an action as the first parameter {load,dump,delete,name,list,gemdir,install}"
+  $rvm_scripts_path/log "error" "Unrecognized gems action '$action'.\ngems must be passed an action as the first parameter {import,export,copy,delete,empty,name,list,gemdir,install}"
 fi
 
 exit $?

data/scripts/initialize

@@ -15,7 +15,13 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
-rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
+
+if [[ "root" = "$(whoami)" ]] ; then
+  rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
+else
+  rvm_gems_path="${rvm_gems_path:-"$HOME/.rvm/gems"}"
+fi
+
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"

data/scripts/install

@@ -2,6 +2,11 @@
 
 unset rvm_auto_flag
 
+install_source_path=$(dirname $0)
+if [[ -d "$install_source_path/scripts" ]] && [[ -s "$install_source_path/scripts/utility" ]] ; then
+  builtin cd $install_source_path
+fi
+
 source scripts/version
 source scripts/utility
 
@@ -30,6 +35,7 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
+__rvm_load_rvmrc
 
 if [[ -z "$rvm_path" ]] ; then
   unset rvm_path
@@ -55,8 +61,6 @@ __rvm_initialize
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
-source_path="${source_path:-"$(dirname $0 | xargs dirname)"}"
-if [[ ! -d "$source_path" ]] ; then unset source_path ; fi
 source_path="${source_path:-$cwd}"
 
 # State what is required to use rvm

data/scripts/rvm-install

@@ -2,6 +2,11 @@
 
 unset rvm_auto_flag
 
+install_source_path=$(dirname $0)
+if [[ -d "$install_source_path/scripts" ]] && [[ -s "$install_source_path/scripts/utility" ]] ; then
+  builtin cd $install_source_path
+fi
+
 source scripts/version
 source scripts/utility
 
@@ -30,6 +35,7 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
+__rvm_load_rvmrc
 
 if [[ -z "$rvm_path" ]] ; then
   unset rvm_path
@@ -55,8 +61,6 @@ __rvm_initialize
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
-source_path="${source_path:-"$(dirname $0 | xargs dirname)"}"
-if [[ ! -d "$source_path" ]] ; then unset source_path ; fi
 source_path="${source_path:-$cwd}"
 
 # State what is required to use rvm

data/scripts/update

@@ -2,6 +2,11 @@
 
 unset rvm_auto_flag
 
+install_source_path=$(dirname $0)
+if [[ -d "$install_source_path/scripts" ]] && [[ -s "$install_source_path/scripts/utility" ]] ; then
+  builtin cd $install_source_path
+fi
+
 source scripts/version
 source scripts/utility
 
@@ -30,6 +35,7 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
+__rvm_load_rvmrc
 
 if [[ -z "$rvm_path" ]] ; then
   unset rvm_path
@@ -55,8 +61,6 @@ __rvm_initialize
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
-source_path="${source_path:-"$(dirname $0 | xargs dirname)"}"
-if [[ ! -d "$source_path" ]] ; then unset source_path ; fi
 source_path="${source_path:-$cwd}"
 
 # State what is required to use rvm

data/scripts/utility

@@ -152,7 +152,7 @@ __rvm_cleanup_variables() {
 
   if [[ "$rvm_sticky_gems" = "1" ]] ; then export rvm_gem_set_name ; else unset rvm_gem_set_name  ; fi
 
-  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_ruby_patch rvm_sticky_gems
+  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_ruby_patch rvm_sticky_gems
 }
 
 # Unset ruby-specific variables
@@ -469,9 +469,14 @@ __rvm_reboot() {
 __rvm_ruby_do() {
   __rvm_select
   __rvm_use
+
   binary="$(echo $rvm_action | sed 's#do$##')"
   if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
+    rm -f "$rvm_path/gems/cache"
+    ln -nfs "$HOME/.gem/cache" "$rvm_path/gems/cache"
     binary="$rvm_ruby_home/bin/$binary"
+  elif [[ -x "$rvm_ruby_global_gems_path/bin/$binary" ]] ; then
+    binary="$rvm_ruby_global_gems_path/bin/$binary"
   elif [[ -x "$rvm_ruby_gem_home/bin/$binary" ]] ; then
     binary="$rvm_ruby_gem_home/bin/$binary"
   elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(which $binary)" ]] ; then
@@ -771,8 +776,13 @@ __rvm_gems_select() {
     fi
     rmdir $rvm_path/gems/cache
   fi
-  rm -f "$rvm_path/gems/cache"
-  ln -nfs "$HOME/.gem/cache" "$rvm_path/gems/cache"
+
+  # Some sanity checking.
+  if [[ ! -e "$HOME/.gem/cache" ]] ; then mkdir -p $HOME/.gem/cache ; fi
+  chmod u+w "$HOME/.gem"
+  rm -f "$rvm_gems_path/cache"
+  ln -nfs "$HOME/.gem/cache" "$rvm_gems_path/cache"
+  chmod u+w "$HOME/.gem/cache"
   # /TODO
 
   # Careful not to nuke system gems cache.

metadata

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