Permalink
Browse files

Upgrade to ruby 2.0.0 for default development

  • Loading branch information...
1 parent 06fb8e0 commit fb93bb2130921afb9fe1681860761c9422943fb5 @paulelliott committed Mar 6, 2013
Showing with 31 additions and 48 deletions.
  1. +28 −46 .rvmrc
  2. +1 −0 .travis.yml
  3. +1 −1 Gemfile
  4. +1 −1 Gemfile.lock
View
74 .rvmrc
@@ -3,69 +3,51 @@
# 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="ruby-1.9.3-p194@fabrication"
+# 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@fabrication"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.18.15 (master)" # 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"
- fi
+ for __hook in "${rvm_path:-$HOME/.rvm}/hooks/after_use"*
+ do
+ if [[ -f "${__hook}" && -x "${__hook}" && -s "${__hook}" ]]
+ then \. "${__hook}" || true
+ fi
+ done
+ unset __hook
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 "$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
+# if [[ -s Gemfile ]] && {
+# ! builtin command -v bundle >/dev/null ||
+# builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
+# }
# then
-# printf "The rubygem 'bundler' is not installed. Installing it now.\n"
+# printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
# gem install bundler
# fi
-# if [[ -s Gemfile ]] && command -v bundle
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
# then
-# bundle install
+# bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
# fi
-
-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 interactive shells
-fi
-
View
1 .travis.yml
@@ -1,5 +1,6 @@
rvm:
- 1.9.3
+ - 2.0.0
- rbx-19mode
services:
View
2 Gemfile
@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
gemspec
View
2 Gemfile.lock
@@ -4,7 +4,7 @@ PATH
fabrication (2.6.1)
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
activemodel (3.2.9)
activesupport (= 3.2.9)

0 comments on commit fb93bb2

Please sign in to comment.