Skip to content

Commit

Permalink
adds travis config for ruby 2.2.2 and adjusts gems
Browse files Browse the repository at this point in the history
  • Loading branch information
rmalecky authored and jwieringa committed Aug 7, 2016
1 parent 1a91331 commit 974562c
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 16 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Expand Up @@ -2,6 +2,10 @@ language: ruby
args: --without development debug
rvm:
- 1.9.3
matrix:
include:
- rvm: 2.2.2
gemfile: gemfiles/2.2.2-Gemfile
before_script:
- cp config/database.travis.yml config/database.yml
- psql -c 'create database allincome_test;' -U postgres
Expand Down
31 changes: 15 additions & 16 deletions Gemfile.lock
Expand Up @@ -49,12 +49,12 @@ GEM
rack-test (>= 0.5.4)
xpath (~> 2.0)
chronic (0.10.2)
coderay (1.0.9)
coderay (1.1.0)
crack (0.4.2)
safe_yaml (~> 1.0.0)
docile (1.1.5)
erubis (2.7.0)
execjs (2.2.1)
execjs (2.5.2)
figaro (1.1.1)
thor (~> 0.14)
geokit (1.6.7)
Expand All @@ -79,7 +79,7 @@ GEM
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.1)
method_source (0.8.2)
mime-types (2.6.1)
mini_portile (0.6.2)
minitest (5.7.0)
Expand All @@ -90,8 +90,8 @@ GEM
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
pg (0.18.2)
pry (0.9.12.2)
coderay (~> 1.0.5)
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
rack (1.6.4)
Expand Down Expand Up @@ -122,25 +122,24 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rdoc (4.1.1)
json (~> 1.4)
safe_yaml (1.0.3)
rdoc (4.2.0)
safe_yaml (1.0.4)
sass (3.2.19)
sass-rails (4.0.3)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
sdoc (0.4.0)
json (~> 1.8)
rdoc (~> 4.0, < 5.0)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
simplecov (0.8.2)
docile (~> 1.1.0)
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (3.4.6)
sprockets (2.11.0)
slop (3.6.0)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand Down
53 changes: 53 additions & 0 deletions gemfiles/2.2.2-Gemfile
@@ -0,0 +1,53 @@
source 'http://rubygems.org'

gem 'rails', '~> 4.2.3'


# DB's
gem 'pg', '~> 0.18.2'

# Assets
gem 'sass-rails', '~> 4.0.1'
gem 'jquery-rails', '~> 3.0.4'
gem 'jquery_mobile_rails', '~> 1.4.5'

# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '~> 2.3.1'

# Keep around until RetailersController#get_geo_from_google is removed
#gem 'crack', '~> 0.4.1'

# Automated cron jobs
gem 'whenever', '~> 0.8.4', :require => false

# Geolocation tools
gem 'geokit', '~> 1.6.7'
gem 'geokit-rails', '~> 2.0.0'

# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem "jbuilder", "~> 1.5.2"

# Temporary measure for handling ENV due to not having control over deploy process.
gem 'figaro'

group :test do
gem "capybara", "~> 2.1.0"
gem "simplecov", "~> 0.8.1", :require => false
gem 'minitest-spec-rails', '~> 5.2.2'
gem 'rake'
gem 'vcr'
gem 'webmock'
end

# This group is loaded in test and dev enviroments
# It exists so that Travis-ci doesn't install uncessary gems
group :debug do
gem "awesome_print", "~> 1.2.0"
gem "pry", "~> 0.9.12"
gem "annotate", "~> 2.5.0"
end

group :doc do
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', require: false
end

0 comments on commit 974562c

Please sign in to comment.