Permalink
Browse files

Update to a newer .rvmrc

  • Loading branch information...
1 parent 56e5406 commit 2330cbafb8f7abcfcc7ebbf568979d5f5f4c075d Grant Hutchins & Jason Berlinsky committed Jun 26, 2012
Showing with 23 additions and 52 deletions.
  1. +23 −52 .rvmrc
View
@@ -3,79 +3,50 @@
# 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.
-environment_id="ree-1.8.7-2011.12@pg_search"
+# 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 1.9.3" > .rvmrc
+environment_id="ruby-1.9.3-p194@pg_search"
-#
# Uncomment the following lines if you want to verify rvm version per project
-#
-# rvmrc_rvm_version="1.10.2" # 1.10.1 seams as a safe start
+# rvmrc_rvm_version="1.12.4 ()" # 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" ]]"}' )" || {
# echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
# return 1
# }
-#
-#
-# Uncomment following line if you want options to be set only for given project.
-#
-# PROJECT_JRUBY_OPTS=( --1.9 )
-#
-# The variable PROJECT_JRUBY_OPTS requires the following to be run in shell:
-#
-# chmod +x ${rvm_path}/hooks/after_use_jruby_opts
-#
-
-#
# First we attempt to load the desired environment directly from the environment
# file. This is very fast and efficient compared to running through the entire
# CLI and selector. If you want feedback on which environment was used then
# insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
&& -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
then
\. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
- if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
- then
- . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
+ [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+ \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+ if [[ $- == *i* ]] # check for interactive shells
+ then echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
+ else echo "Using: $GEM_HOME" # don't use colors in non-interactive shells
fi
else
# If the environment file has not yet been created, use the RVM CLI to select.
- if ! rvm --create use "$environment_id"
- then
+ rvm --create use "$environment_id" || {
echo "Failed to create RVM environment '${environment_id}'."
return 1
- fi
+ }
fi
-#
-# If you use an RVM gemset file to install a list of gems (*.gems), you can have
-# it be automatically loaded. Uncomment the following and adjust the filename if
-# necessary.
-#
-# filename=".gems"
-# if [[ -s "$filename" ]]
-# then
-# rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
-# fi
-
# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && ! command -v bundle >/dev/null
-# then
-# printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
-# gem install bundler
-# fi
-# if [[ -s Gemfile ]] && command -v bundle
-# then
-# bundle install
-# fi
-
-if [[ $- == *i* ]] # check for interactive shells
+if [[ -s Gemfile ]] && {
+ ! builtin command -v bundle >/dev/null ||
+ builtin command -v bundle | grep $rvm_path/bin/bundle >/dev/null
+}
then
- echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
-else
- echo "Using: $GEM_HOME" # don't use colors in interactive shells
+ 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 -vE '^Using|Your bundle is complete'
fi
-

0 comments on commit 2330cba

Please sign in to comment.