.rvmrc in flash_rails_messages-0.0.5 vs .rvmrc in flash_rails_messages-0.0.6

- old
+ new

@@ -3,16 +3,16 @@ # This is an RVM Project .rvmrc file, used to automatically load the ruby # development environment upon cd'ing into the directory # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional, # Only full ruby name is supported here, for short names use: -# echo "rvm use 2.0.0" > .rvmrc -environment_id="ruby-2.0.0-p0@flash_rails_messages" +# echo "rvm use 1.9.3" > .rvmrc +environment_id="ruby-1.9.3-p484@flash_rails_messages" # Uncomment the following lines if you want to verify rvm version per project -# rvmrc_rvm_version="1.19.1 (stable)" # 1.10.1 seams as a safe start -# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || { +# rvmrc_rvm_version="1.25.14 (stable)" # 1.10.1 seems like a safe start +# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | __rvm_awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || { # echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading." # return 1 # } # First we attempt to load the desired environment directly from the environment @@ -28,10 +28,19 @@ if [[ -f "${__hook}" && -x "${__hook}" && -s "${__hook}" ]] then \. "${__hook}" || true fi done unset __hook + if (( ${rvm_use_flag:=1} >= 2 )) # display only when forced + then + if [[ $- == *i* ]] # check for interactive shells + then printf "%b" "Using: $(tput setaf 2 2>/dev/null)$GEM_HOME$(tput sgr0 2>/dev/null) +" # show the user the ruby and gemset they are using in green + else printf "%b" "Using: $GEM_HOME +" # don't use colors in non-interactive shells + fi + fi else # If the environment file has not yet been created, use the RVM CLI to select. rvm --create "$environment_id" || { echo "Failed to create RVM environment '${environment_id}'." return 1 @@ -39,15 +48,15 @@ fi # If you use bundler, this might be useful to you: # if [[ -s Gemfile ]] && { # ! builtin command -v bundle >/dev/null || -# builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null +# builtin command -v bundle | GREP_OPTIONS="" \grep $rvm_path/bin/bundle >/dev/null # } # then # printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n" # gem install bundler # fi # if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null # then -# bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete' +# bundle install | GREP_OPTIONS="" \grep -vE '^Using|Your bundle is complete' # fi