scripts/utility in rvm-0.0.55 vs scripts/utility in rvm-0.0.56

- old
+ new

@@ -1,20 +1,21 @@ #!/bin/bash function __rvm_info { -cat <<Info + full_version=$(ruby -v) + cat <<Info system: uname: "$(uname -a)" ruby: - interpreter: "`ruby -v | awk '{print $1}'`" - version: "`ruby -v | awk '{print $2}'`" - date: "`ruby -v | sed 's/^.*(\([0-9]\{4\}\(-[0-9][0-9]\)\{2\}\).*$/\1/'`" - platform: "`ruby -v | sed 's/^.*\[//' | sed 's/\].*$//'`" - patchlevel: "`ruby -v | sed 's/^.*(//' | sed 's/).*$//'`" - full_version: "`ruby -v`" + interpreter: "`echo $full_version | awk '{print $1}'`" + version: "`echo $full_version | awk '{print $2}'`" + date: "`echo $full_version | sed 's/^.*(\([0-9]\{4\}\(-[0-9][0-9]\)\{2\}\).*$/\1/'`" + platform: "`echo $full_version | sed 's/^.*\[//' | sed 's/\].*$//'`" + patchlevel: "`echo $full_version | sed 's/^.*(//' | sed 's/).*$//'`" + full_version: "$full_version" homes: gem: "${GEM_HOME:-'not set'}" ruby: "${MY_RUBY_HOME:-'not set'}" @@ -27,10 +28,11 @@ environment: GEM_HOME: "$GEM_HOME" MY_RUBY_HOME: "$MY_RUBY_HOME" IRBRC: "$IRBRC" Info + unset full_version } function __rvm_debug { __rvm_log "debug" "\nPATH:\n$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')" @@ -53,87 +55,100 @@ fi } # Logging functions based on level +# TODO: Allow specification of a base file name to output to. function __rvm_log { - case "$1" in + if [ ! -z "$2" ] ; then level=$1 ; shift ; else level="info" ; fi + message=$1 + case "$level" in debug) shift ; if [ ! -z "$rvm_debug_flag" ] ; then - echo -e "\033[0;35m<d>\033[0m $* \033[0;35m</d> \033[0m " + echo -e "\033[0;35m<d>\033[0m $message \033[0;35m</d> \033[0m " fi ;; - info) shift ; echo -e "\033[0;32m<i>\033[0m $* \033[0;32m</i> \033[0m " ;; - warn) shift ; echo -e "\033[0;33m<w>\033[0m $* \033[0;33m</w> \033[0m " ;; - error) shift ; echo -e "\033[0;31m<e>\033[0m $* \033[0;31m</e> \033[0m " ;; - fail) shift ; echo -e "\033[0;31m<f>\033[0m $* \033[0;31m</f> \033[0m " ; __rvm_pushpop ; return 1 ;; - *) echo -e "$*" + info) shift ; echo -e "\033[0;32m<i>\033[0m $message \033[0;32m</i> \033[0m " ;; + warn) shift ; echo -e "\033[0;33m<w>\033[0m $message \033[0;33m</w> \033[0m " ;; + error) shift ; echo -e "\033[0;31m<e>\033[0m $message \033[0;31m</e> \033[0m " ;; + fail) shift ; echo -e "\033[0;31m<f>\033[0m $message \033[0;31m</f> \033[0m " ; __rvm_pushpop ; return 1 ;; + *) echo -e "$message" esac } +if [ ! -z "$ZSH_VERSION" ] ; then __shell_array_start=1 ; else __shell_array_start=0 ; fi +__rvm_push() { + array=$1 ; shift ; item=$2 + # TODO: allow loop over more arguments. + eval "index=\$((\${#${array}[*]} + $__shell_array_start))" + eval "${array}[${index}]=${item}" + unset array item +} + function __rvm_clean-path { - PATH=`echo $PATH | tr -s ':' '\n' | awk '!($0 in a){a[$0];print}' | tr -s '\n' ':' | sed 's/:$//'` + PATH=$(echo $PATH | tr -s ':' '\n' | awk '!($0 in a){a[$0];print}' | tr -s '\n' ':' | sed 's/:$//') export PATH } function __rvm_remove-rvm-from-path { - PATH=`echo $PATH | tr -s ':' '\n' | grep -v "\.rvm" | tr -s '\n' ':' | sed 's/:$//'` + PATH=$(echo $PATH | tr -s ':' '\n' | grep -v "\.rvm" | tr -s '\n' ':' | sed 's/:$//') export PATH } function __rvm_gi { gem install -q --no-rdoc --no-ri $* ; } function __rvm_run { log_file_name="$1" ; command="$2" ; message="$3" - rvm_ruby_log_path=${rvm_ruby_log_path:-$rvm_path/log} - mkdir -p `dirname $rvm_ruby_log_path/$log_file_name.log` + rvm_ruby_log_path="${rvm_ruby_log_path:-$rvm_path/log}" + mkdir -p $(dirname "$rvm_ruby_log_path/$log_file_name.log") if [ ! -z "$message" ] ; then __rvm_log "info" "$message" ; fi __rvm_log "debug" "Executing: $command" - touch $rvm_ruby_log_path/$log_file_name.log $rvm_ruby_log_path/$log_file_name.error.log # for zsh :( - echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee $rvm_ruby_log_path/$log_file_name.log > $rvm_ruby_log_path/$log_file_name.error.log + touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :( + echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee "$rvm_ruby_log_path/$log_file_name.log" > "$rvm_ruby_log_path/$log_file_name.error.log" if [ -z "$rvm_niceness" -o "$rvm_niceness" = "0" ] ; then - eval "$command" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log + eval "$command" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log" else eval "nice -n $rvm_niceness \`$command\`" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log fi if [ $? -gt 0 ] ; then __rvm_log "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name.error.log" ; __rvm_pushpop ; return 1 ; fi unset log_file command } function __rvm_cleanup_variables { - unset rvm_selected rvm_action rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_irbrc_file rvm_ruby_irbrc rvm_source_path rvm_path rvm_prefix_path rvm_ruby_package_name rvm_gem_path rvm_command rvm_error_message rvm_ruby_home rvm_ruby_binary rvm_gem_set_name rvm_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_configure rvm_ruby_make_install rvm_config_path rvm_ruby_string rvm_bin_path 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_ruby_string rvm_ruby_selector rvm_shebang_flag rvm_env_flag rvm_head_flag rvm_tail_flag + __rvm_unset_ruby_variables + unset rvm_selected_flag rvm_action rvm_irbrc_file rvm_src_path rvm_path rvm_prefix_path rvm_gem_path rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_config_path rvm_bin_path 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_head_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_log_path rvm_file_name } function __rvm_unset_ruby_variables { - unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name 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_home rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected rvm_ruby_selector rvm_ruby_string + unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected_flag rvm_ruby_selector rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home } # TODO: root user loadng of /etc/rvmrc function __rvm_load-rvmrc { if [ -s ~/.rvmrc ] ; then source ~/.rvmrc ; fi } function __rvm_bin_scripts { - for rvm_ruby_binary in `/bin/ls $rvm_path/*/bin/ruby 2> /dev/null` ; do + for rvm_ruby_binary in $(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null) ; do if [ -x $rvm_ruby_binary ] ; then - rvm_ruby_string=`dirname $rvm_ruby_binary | xargs dirname | xargs basename` + rvm_ruby_string=$(dirname $rvm_ruby_binary | xargs dirname | xargs basename) __rvm_select __rvm_bin_script fi done } function __rvm_bin_script { - if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi + if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi ruby_wrapper=$(cat <<RubyWrapper #!/bin/bash -GEM_HOME=$rvm_gem_home ; export GEM_HOME -GEM_PATH=$rvm_gem_home ; export GEM_PATH +GEM_HOME=$rvm_ruby_gem_home ; export GEM_HOME +GEM_PATH=$rvm_ruby_gem_home ; export GEM_PATH MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME -PATH=$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH ; export PATH +PATH=$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH ; export PATH exec "$rvm_ruby_binary" "\$@" RubyWrapper ) rm -f $rvm_path/bin/$rvm_ruby_package_name @@ -142,16 +157,16 @@ chmod +x $rvm_path/bin/$rvm_ruby_package_name } function __rvm_fetch { __rvm_pushpop $rvm_archives_path - archive=`basename "$1"` + archive=$(basename "$1") __rvm_log "debug" "Fetching $archive" # Check first if we have the correct archive - if [ -e $archive ] && [ -e $archive.md5 ] ; then + if [ -e "$archive" ] && [ -e "$archive.md5" ] ; then __rvm_log "debug" "Found archive and its md5, testing correctness" - if [ `md5sum --status -c $archive.md5` -gt 0 ] ; then + if [ $(md5sum --status -c "$archive.md5") -gt 0 ] ; then __rvm_log "debug" "Archive is bad, downloading" download=1 else __rvm_log "debug" "Archive is good, not downloading" download=0 @@ -164,23 +179,33 @@ if [ $download -gt 0 ] ; then eval $rvm_fetch "$1" result=$? if [ $result -gt 0 ] ; then + unset retry if [ $result -eq 78 ] ; then __rvm_log "error" "The requested url does not exist: '$1'" + elif [ $result -eq 18 ] ; then + __rvm_log "error" "Partial file. Only a part of the file was transferred. Removing partial and re-trying." + rm -f "$archive" + retry=1 elif [ $result -eq 33 ] ; then __rvm_log "debug" "Server does not support 'range' command, removing '$archive'" - rm -f $archive + rm -f "$archive" + retry=1 + else + __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" + fi + + if [ $retry -eq 1 ] ; then 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 @@ -200,31 +225,25 @@ echo "${variable}='$value' ; export ${variable}" >> $rvm_path/system fi done fi - rvm_system_ps1=`__rvm_db "system_ps1"` - if [ -z "$rvm_system_ps1" ] ; then - rvm_system_ps1=$PS1 - __rvm_db "system_ps1" "$rvm_system_ps1" - fi - - rvm_system_ruby=`__rvm_db "system_ruby"` + rvm_system_ruby=$(__rvm_db "system_ruby") if [ ! -z "$rvm_system_ruby" ] ; then - rvm_system_ruby=`which ruby` + rvm_system_ruby=$(which ruby) if [ $? -ne 0 ] ; then __rvm_log "info" "System ruby not found, no db will be stored." else __rvm_db "system_ruby" "$rvm_system_ruby" # Now store system system & user gem paths - rvm_system_user_gem_path=`__rvm_db "system_user_gem_path"` + rvm_system_user_gem_path=$(__rvm_db "system_user_gem_path") if [ -z "$rvm_system_user_gem_path" ] ; then rvm_system_user_gem_path=$( rvm system ; gem env gemdir user; ) __rvm_db "system_user_gem_path" "$rvm_system_user_gem_path" fi - rvm_system_gem_path=`__rvm_db "system_gem_path"` + rvm_system_gem_path=$(__rvm_db "system_gem_path") if [ -z "$rvm_system_gem_path" ] ; then rvm_system_gem_path=$( rvm system ; gem env gemdir; ) __rvm_db "system_gem_path" "$rvm_system_gem_path" fi fi @@ -241,11 +260,11 @@ if [ -f $rvm_path/$file ] ; then rm -f $rvm_path/$file ; fi done rvm_ruby_interpreter="system" __rvm_select - for system_config in system_ps1 system_ruby system_gem_path system_user_gem_path ; do + for system_config in system_ruby system_gem_path system_user_gem_path ; do __rvm_db "$system_config" "delete" done ; unset system_config variable rm -f $rvm_path/bin/ruby $rvm_path/bin/gem $rvm_path/bin/rake $rvm_path/bin/irb $rvm_path/bin/default* } @@ -273,52 +292,52 @@ fi done } function __rvm_gemdir { - if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi - mkdir -p $rvm_gem_home - echo $rvm_gem_home + if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi + mkdir -p $rvm_ruby_gem_home + echo $rvm_ruby_gem_home } function __rvm_source_dir { - if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi + if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi if [ -z "$rvm_ruby_src_path" ] ; then __rvm_log "fail" "No source directory exists for the default implementation." else echo "$rvm_ruby_src_path" fi } # clones from source implementation/version to default # TODO: Merge this into 'rvm sync' function __rvm_gemdup { - if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi + if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi __rvm_log "debug" "$rvm_ruby_interpreter" if [ "$rvm_ruby_interpreter" = "default" ] ; then # TODO: ~/.rvm/default first, then system user rvm_source_gem_path="$rvm_system_user_gem_path" elif [ "$rvm_ruby_interpreter" = "user" ] ; then rvm_source_gem_path="$rvm_system_user_gem_path" elif [ "$rvm_ruby_interpreter" = "system" ] ; then rvm_source_gem_path="$rvm_system_gem_path" else # TODO: use selector for this? - rvm_source_gem_path=${rvm_gem_home/$rvm_ruby_interpreter/$rvm_ruby_version} + rvm_source_gem_path=${rvm_ruby_gem_home/$rvm_ruby_interpreter/$rvm_ruby_version} fi __rvm_gem_sync } function __rvm_gem_sync { if [ ! -z "$rvm_source_gem_path" ] ; then - for rvm_gem_name_version in `/bin/ls $rvm_source_gem_path/gems 2> /dev/null` ; do - rvm_gem_name=${rvm_gem_name_version%-*} - rvm_gem_version=${rvm_gem_name_version##*-} + for rvm_gem_name_version in $rvm_source_gem_path/gems/* ; do + rvm_gem_name="${rvm_gem_name_version%-*}" + rvm_gem_version="${rvm_gem_name_version##*-}" if [ -d $GEM_HOME/gems/$rvm_gem_name_version ] ; then echo "$rvm_gem_name_version already installed." else - __rvm_gi $rvm_source_gem_path/cache/$rvm_gem_name-$rvm_gem_version.gem + __rvm_gi "$rvm_source_gem_path/cache/$rvm_gem_name-$rvm_gem_version.gem" fi done unset rvm_gem_name_version rvm_gem_name rvm_gem_version else __rvm_log "fail" "Unknown ruby selected :(" @@ -356,121 +375,118 @@ 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, 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` + current_ruby=$(which ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null) echo -e "\nruby:\n" - for version in `/bin/ls -l $rvm_path/ 2> /dev/null | awk '/ ruby-[1-2].*/ { print $NF }'` ; do - string=`$rvm_path/$version/bin/ruby -v` + for version in $(/bin/ls -l $rvm_path/ 2> /dev/null | awk '/ ruby-[1-2].*/ { print $NF }') ; do + string=$($rvm_path/$version/bin/ruby -v) if [ "$current_ruby" = "$version" ] ; then echo -e "=> $version : $string" selected="1" else echo -e " $version : $string" fi done ; unset version echo -e "\njruby:\n" - for version in `/bin/ls -l $rvm_path/ 2> /dev/null | awk '/jruby-.*/ { print $NF }'` ; do - string=`$rvm_path/$version/bin/ruby -v` + for version in $(/bin/ls -l $rvm_path/ 2> /dev/null | awk '/jruby-.*/ { print $NF }') ; do + string=$($rvm_path/$version/bin/ruby -v) if [ "$current_ruby" = "$version" ] ; then echo -e "=> $version : $string" selected="1" else echo -e " $version : $string" fi done ; unset version echo -e "\nree:\n" - for version in `/bin/ls $rvm_path/ 2> /dev/null | awk '/ruby-enterprise-.*/ { print $NF }'` ; do - string=`$rvm_path/$version/bin/ruby -v | tr "\n" ' ' ` + for version in $(/bin/ls $rvm_path/ 2> /dev/null | awk '/ree-.*/ { print $NF }') ; do + string="$($rvm_path/$version/bin/ruby -v | tr "\n" ' ' )" if [ "$current_ruby" = "$version" ] ; then echo -e "=> $version : $string" selected="1" else echo -e " $version : $string" fi done ; unset version if [ -f $rvm_path/default -a -s $rvm_path/default ] ; then - version=`grep '^MY_RUBY_HOME' ~/.rvm/default | awk -F"'" '{print $2}' | xargs basename` + version=$(grep '^MY_RUBY_HOME' ~/.rvm/default | awk -F"'" '{print $2}' | xargs basename) if [ ! -z "$version" ] ; then echo -e "\ndefault:\n" - string=`$rvm_path/$version/bin/ruby -v` + string=$($rvm_path/$version/bin/ruby -v) if [ "$current_ruby" = "$version" ] ; then echo -e "=> $version : $string" selected="1" else echo -e " $version : $string" fi fi ; unset version fi echo -e "\nsystem:\n" - system_version=`rvm system ; ruby -v 2> /dev/null` + system_version=$(rvm system ; ruby -v 2> /dev/null) if [ ! -z "$system_version" ] ; then - if [ "$(`which ruby` -v)" = "$system_version" ] ; then + if [ "$($(which ruby) -v)" = "$system_version" ] ; then echo -e "=> $system_version\n" else echo -e " $system_version\n" fi fi ; unset current_ruby version selected fi } function __rvm_initialize { - rvm_fetch=`which curl` + rvm_fetch=$(which curl) if [ $? -ne 0 ] ; then - rvm_fetch=`which wget` - if [ $? -ne 0 ] ; then - __rvm_log "fail" "rvm expects either curl or wget, neither seem to be in your path :(" - else - rvm_fetch="wget -c " # -q for quiet - fi + __rvm_log "fail" "rvm requires curl, which does not seem to exist in your path :(" else rvm_fetch="$rvm_fetch -O -L --create-dirs -C - " # -s for silent fi # TODO: Sanitize user input, ensure that there is a / a the end... - if [ "`whoami`" = "root" ] ; then + if [ "$(whoami)" = "root" ] ; then __rvm_log "fail" "root user support is not yet implemented." - #rvm_prefix_path=${rvm_prefix_path:-/usr/local/} + rvm_prefix_path="${rvm_prefix_path:-/usr/local/}" else - rvm_prefix_path=${rvm_prefix_path:-"$HOME/."} + rvm_prefix_path="${rvm_prefix_path:-"$HOME/."}" fi if [ "${rvm_prefix_path#${rvm_prefix_path%?}}" = '.' -o "${rvm_prefix_path#${rvm_prefix_path%?}}" = '/' ] ; then rvm_path="${rvm_prefix_path}rvm" else rvm_path="${rvm_prefix_path}/rvm" fi rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}" - rvm_source_path="${rvm_source_path:-"$rvm_path/src"}" - rvm_log_path=${rvm_log_path:-"$rvm_path/log"} - rvm_bin_path=${rvm_bin_path:-"$rvm_path/bin"} - rvm_gem_path=${rvm_gem_path:-"$rvm_path/gems"} - rvm_config_path=${rvm_config_path:-"$rvm_path/config"} - rvm_temp_path=${rvm_temp_path:-"$rvm_path/tmp"} + 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_gem_path="${rvm_gem_path:-"$rvm_path/gems"}" + rvm_config_path="${rvm_config_path:-"$rvm_path/config"}" + rvm_temp_path="${rvm_temp_path:-"$rvm_path/tmp"}" rvm_ruby_repo_url="${rvm_ruby_repo_url:-"http://svn.ruby-lang.org/repos/ruby"}" # Rubinius sha1's will be available after RC1. rvm_rubinius_repo_url="${rvm_rubinius_repo_url:-"git://github.com/evanphx/rubinius.git"}" rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}" rvm_ruby_load_path="." rvm_ruby_require="" + if [ "$(uname)" = "Darwin" ] ; then rvm_archflags="${rvm_archflags:-'-arch i386 -arch x86_64'}" ; fi + __rvm_clean-path rvm_result=$(echo $PATH | grep 'rvm\/bin:') if [ -z $rvm_result ] ; then PATH=$rvm_bin_path:$PATH ; export PATH fi - mkdir -p $rvm_source_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_temp_path + mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_temp_path } function __rvm_update { - if [ "$rvm_ruby_rev" = "head" -o ! -z "$rvm_self_flag" -o ! -z "$rvm_update_flag" ] ; then + if [ "$rvm_ruby_revision" = "head" -o ! -z "$rvm_self_flag" -o ! -z "$rvm_update_flag" ] ; then __rvm_version __rvm_update_rvm __rvm_version fi __rvm_reload @@ -478,16 +494,16 @@ if [ "$rvm_bin_flag" ] ; then __rvm_bin_scripts ; fi if [ "$rvm_rubygems_flag" ] ; then __rvm_rubygems_setup ; fi } function __rvm_update_rvm { - mkdir -p $rvm_source_path - if [ "$rvm_ruby_rev" = "head" ] ; then - if [ -d $rvm_source_path/rvm/.git ] ; then - cd $rvm_source_path/rvm/ && git pull origin master && ./scripts/install + mkdir -p $rvm_src_path + if [ "$rvm_ruby_revision" = "head" ] ; then + if [ -d $rvm_src_path/rvm/.git ] ; then + cd $rvm_src_path/rvm/ && git pull origin master && ./scripts/install else - cd $rvm_source_path && git clone git://github.com/wayneeseguin/rvm.git && cd rvm/ && ./install + cd $rvm_src_path && git clone git://github.com/wayneeseguin/rvm.git && cd rvm/ && ./install fi else # TODO: rvm_install_path: gem install rvm --no-rdoc --no-ri -q && rvm-install && source ~/.rvm/scripts/rvm fi @@ -519,12 +535,11 @@ rvm-install fi source ~/.rvm/scripts/rvm else __rvm_log "info" "Carry on then..." - fi - unset response + fi ; unset response } function __rvm_reload { source $rvm_path/scripts/rvm } @@ -561,11 +576,11 @@ eval "rubies=(${rubies[*]} $rvm_ruby_string)" eval "statuses=(${statuses[*]} $result)" else __rvm_log "warn" "'$rvm_ruby_home/bin/$binary' either does not exist or is not executable? :(" fi - unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name 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_home rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected + __rvm_unset_ruby_variables } function __rvm_do { __rvm_state @@ -617,17 +632,13 @@ } function __rvm_yaml { export successes errors statuses yaml="totals:\n rubies: ${#rubies[*]}\n successes: ${#successes[*]}\n errors: ${#errors[*]}\nsuccesses:" - for var in ${successes[*]} ; do - yaml="$yaml\n - $var" - done + for var in ${successes[*]} ; do yaml="$yaml\n - $var" ; done yaml="$yaml\nerrors:" - for var in ${errors[*]} ; do - yaml="$yaml\n - $var" - done + for var in ${errors[*]} ; do yaml="$yaml\n - $var" ; done yaml="$yaml\nrubies:" 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]}: ${statuses[$index]}" @@ -660,124 +671,21 @@ return ${#errors[*]} } function __rvm_benchmark { - rvm_code="$(cat <<RubyCode -require "benchmark" \n -Benchmark.bmbm do |benchmark| \n - benchmark.report("$rvm_ruby_file") do \n -RubyCode -)" - echo -e "$rvm_code" > $rvm_temp_path/$$.rb - cat $rvm_ruby_file >> $rvm_temp_path/$$.rb - echo -e "\n end \nend\n" >> $rvm_temp_path/$$.rb - unset rvm_code + code="require \"benchmark\" \n Benchmark.bmbm do |benchmark| \n benchmark.report(\"${rvm_ruby_file}\") do \n" + echo -e "$code" > "$rvm_temp_path/$$.rb" + unset code + cat $rvm_ruby_file >> "$rvm_temp_path/$$.rb" + echo -e "\n end \nend\n" >> "$rvm_temp_path/$$.rb" rvm_ruby_args="$rvm_temp_path/$$.rb" rvm_action="ruby" if [ ! -z "$rvm_debug_flag" ] ; then echo -e "$rvm_temp_path/$$.rb:\n$(cat $rvm_temp_path/$$.rb)" ; fi __rvm_do } -__rvm_gemset_delete () { - if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi - - 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 - name=`echo $gem | awk -F';' '{print $1}'` - if [ -z "$rvm_latest_flag" ] ; then - versions=`echo $gem | awk -F';' '{print $2}' | sed 's/,/ /g'` - for version in $versions ; do - echo "$name -v$version" >> $rvm_file_name - done ; unset version versions - else - echo "$name" >> $rvm_file_name - fi ; unset name - done ; unset file_name -} - -function __rvm_gemset_load { - 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. - # TODO: Switch to a different field separator than ; to allow for evals - gem=`echo $line | awk -F';' '{print $1}'` - gem_prefix=`echo $line | awk -F';' '{print $2}'` - gem_name=`echo $gem | awk '{print $1}'` - gem_version=`echo $gem | sed 's/^.*-v[=]*[ ]*//' | awk '{print $1}'` - gem_postfix=`echo $gem | sed "s/$gem_name//" | sed "s/-v[=]*[ ]*$gem_version//"` - - if [ -z "$gem_version" ] ; then # no version - gem_file_name="${gem_name}*.gem" - else # version - 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` - if [ -z "$cache_file" ] ; then - if [ -z "$gem_version" ] ; then - gem="$gem_name" - else - gem="$gem_name -v $gem_version" - fi - else # cached - gem_file_name=`basename $cache_file` - gem_string=`echo "$gem_file_name" | sed 's/\.gem$//'` - if [ ! -z "`echo "$rvm_ruby_gem_list" | awk "/$gem_string/{print}"`" ] ; then - if [ ! -z "$rvm_force_flag" ] ; then - cp $cache_file $rvm_temp_path/$gem_file_name - gem="$rvm_temp_path/$gem_file_name" # install as a named local gem - else - unset gem - __rvm_log "info" "$gem_name $gem_version is already installed, skipping. (use --force to force these to install regardless)" - fi - else - gem="$cache_file" - fi - fi - - if [ ! -z "$gem" ] ; then - # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line. - if [ -z "$vars" ] ; then - GEM_HOME="$rvm_gem_home" GEM_PATH="$rvm_gem_home" $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix - else - eval "GEM_HOME='$rvm_gem_home' GEM_PATH='$rvm_gem_home' $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix" - fi - fi - unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string - done < <(awk '/^[a-zA-Z]/{print}' "$rvm_file_name") -} - function __rvm_irbrc { if [ -d $rvm_ruby_home -a ! -s $rvm_ruby_irbrc ] ; then rvm_ruby_irbrc_file=$(cat <<-Config require "irb/completion" rescue nil @@ -827,11 +735,11 @@ fi } function __rvm_inspect { for binary in $rvm_ruby_args ; do - actual_file=`which $binary` + actual_file=$(which $binary) __rvm_log "info" "$actual_file:" if [ ! -z "$rvm_shebang_flag" ] ; then cat $actual_file | head -n 1 ; fi if [ ! -z "$rvm_env_flag" ] ; then cat $actual_file | awk '/ENV/' ; fi if [ ! -z "$rvm_path_flag" ] ; then cat $actual_file | awk '/PATH/' ; fi if [ ! -z "$rvm_head_flag" ] ; then cat $actual_file | head -n 5 ; fi @@ -842,19 +750,19 @@ # # ruby supporting libraries: # function __rvm_readline_install { - __rvm_pushpop $rvm_source_path + __rvm_pushpop $rvm_src_path package="readline" ; version="5.2" ; archive_format="tar.gz" # TODO: Figure out how to list, grab and apply the patches __rvm_log "info" "Retrieving $package-$version.$archive_format" - __rvm_fetch ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format" - __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_source_path" "Extracting $package-$version.$archive_format" - cd $rvm_source_path/$package-$version - if [ "`uname`" = "Darwin" ] ; then - sdk=`ls -t /Developer/SDKs/ | head -n 1` + __rvm_fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format" + __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format" + cd "$rvm_src_path/$package-$version" + if [ "$(uname)" = "Darwin" ] ; then + sdk=$(ls -t /Developer/SDKs/ | head -n 1) CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64" LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64" export CFLAGS LDFLAGS __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package" else @@ -864,17 +772,34 @@ __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr" __rvm_pushpop } function __rvm_iconv_install { - __rvm_pushpop $rvm_source_path + __rvm_pushpop $rvm_src_path package="libiconv" ; version=1.13.1 ; archive_format="tar.gz" __rvm_log "info" "Retrieving $package-$version.$archive_format" - __rvm_fetch http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format" - __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_source_path" "Extracting $package-$version.$archive_format" - cd $rvm_source_path/$package-$version + __rvm_fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format" + __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format" + cd "$rvm_src_path/$package-$version" __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-static --enable-shared" "Configuring $package." __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package" __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr" __rvm_pushpop +} + +__rvm_monitor() { +if [ -d test/ ] ; then + : +elif [ -d spec/ ] ; then + : +fi +# +# timestamp() { +# if [ "$(uname)" = "Darwin" ] ; then +# $(stat -c "%Y" $1) +# else +# echo $(stat -f "%m" $1) +# fi +# } +# }