Permalink
Browse files

Merge branch 'master' into 1250_create_vm

  • Loading branch information...
2 parents 806cc10 + 050401d commit c1126622c760a505f0d86e7b39812f77e62cda67 Kevin Olbrich committed Mar 11, 2013
View
36 .rvmrc
@@ -4,7 +4,7 @@
# development environment upon cd'ing into the directory
# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="jruby-1.7.1@adaptor-vmware"
+environment_id="jruby-1.7.2@adaptor-vmware"
#
# Uncomment the following lines if you want to verify rvm version per project
@@ -16,38 +16,38 @@ environment_id="jruby-1.7.1@adaptor-vmware"
# }
#
-#
-# Uncomment following line if you want options to be set only for given project.
-#
-#PROJECT_JRUBY_OPTS=( --1.8 )
-#
+PROJECT_JRUBY_OPTS=( -Xcext.enabled=true -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify )
# 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"
+ for __hook in ${rvm_path:-$HOME/.rvm}/hooks/after_use*
+ do
+ if
+ [[ -f "${__hook}" && -x "${__hook}" && -s "${__hook}" &&
+ "${rvm_path:-$HOME/.rvm}/hooks/after_use*" != "${__hook}" ]]
+ then
+ \. "${__hook}" || true
+ fi
+ done
+ unset __hook
+ 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
#
View
@@ -1,3 +1,4 @@
+require 'bundler/setup'
load 'deploy'
# Uncomment if you are using Rails' asset pipeline
# load 'deploy/assets'
View
@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
gem 'padrino', git: 'https://github.com/padrino/padrino-framework.git', branch: 'master'
@@ -9,23 +9,22 @@ gem 'haml'
gem 'rabl'
gem 'yajl-ruby'
gem 'rake'
-gem 'kaminari', require: 'kaminari/sinatra'
gem 'rubyzip', git: 'https://github.com/aussiegeek/rubyzip.git', require: "zip/zip"
gem 'uuid'
gem 'json-jruby', require: 'json'
gem 'jruby-rack'
gem 'rack'
-torquebox_version = "2.2.0"
+torquebox_version = "2.3.0"
gem 'torquebox-cache', torquebox_version
gem 'torquebox-messaging', torquebox_version
gem 'torquebox-rake-support', torquebox_version
gem 'torquebox', torquebox_version
gem 'padrino-rpm', git: 'https://github.com/6fusion/padrino-rpm.git'
-gem 'newrelic_rpm'
-group :development do
+group :development, :test do
gem 'trinidad'
+ gem 'colorize'
gem 'capistrano'
gem 'capistrano-ext'
gem 'capistrano_colors'
Oops, something went wrong.

0 comments on commit c112662

Please sign in to comment.