Skip to content

Commit

Permalink
Merge pull request #12 from RepoCamp/enhancement/#11-configure-travis
Browse files Browse the repository at this point in the history
Configure rubocop for travis
  • Loading branch information
adam malantonio authored May 8, 2018
2 parents ba91898 + aa3c23c commit d0b35ec
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 73 deletions.
13 changes: 9 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
language: ruby
sudo: required
cache: bundler
sudo: false
cache:
bundler: true
dist: trusty

jdk:
- oraclejdk8
rvm:
- 2.3.4
- 2.4.1
before_install:
- gem update --system
- gem install bundler
before_script:
- bundle exec rake db:create
- bundle exec rubocop
script:
- xvfb-run -a bundle exec rake travis
- bundle exec rake ci
addons:
apt:
packages:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'

gem 'bixby', '~> 1.0.0'
gem 'devise'
gem 'devise-guests', '~> 0.6'
gem 'dotenv-rails'
Expand All @@ -51,7 +52,6 @@ end

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'bixby'
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13'
Expand Down
52 changes: 21 additions & 31 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ GEM
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activerecord-import (0.22.0)
activerecord-import (0.23.0)
activerecord (>= 3.2)
activesupport (5.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -70,15 +70,15 @@ GEM
execjs
awesome_nested_set (3.1.4)
activerecord (>= 4.0.0, < 5.3)
aws-partitions (1.82.0)
aws-partitions (1.84.0)
aws-sdk-core (3.20.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-kms (1.5.0)
aws-sdk-core (~> 3)
aws-sigv4 (~> 1.0)
aws-sdk-s3 (1.9.1)
aws-sdk-s3 (1.10.0)
aws-sdk-core (~> 3)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
Expand Down Expand Up @@ -108,7 +108,7 @@ GEM
blacklight (~> 6.0)
cancancan (~> 1.8)
deprecation (~> 1.0)
blacklight-gallery (0.9.0)
blacklight-gallery (0.10.0)
blacklight (~> 6.3)
bootstrap-sass (~> 3.0)
openseadragon (>= 0.2.0)
Expand Down Expand Up @@ -174,12 +174,12 @@ GEM
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
connection_pool (2.2.1)
coveralls (0.7.1)
coveralls (0.7.2)
multi_json (~> 1.3)
rest-client
rest-client (= 1.6.7)
simplecov (>= 0.7)
term-ansicolor
thor
term-ansicolor (= 1.2.2)
thor (= 0.18.1)
crass (1.0.4)
daemons (1.2.6)
database_cleaner (1.7.0)
Expand All @@ -197,8 +197,6 @@ GEM
devise
diff-lcs (1.3)
docile (1.3.0)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.4.0)
dotenv-rails (2.4.0)
dotenv (= 2.4.0)
Expand Down Expand Up @@ -260,15 +258,15 @@ GEM
railties (>= 3.2, < 6.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
google-api-client (0.19.8)
google-api-client (0.20.1)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.5, < 0.7.0)
httpclient (>= 2.8.1, < 3.0)
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
google_drive (2.1.10)
google-api-client (>= 0.11.0, < 0.20.0)
google_drive (2.1.3)
google-api-client (>= 0.11.0, < 1.0.0)
googleauth (>= 0.5.0, < 1.0.0)
nokogiri (>= 1.5.3, < 2.0.0)
googleauth (0.6.2)
Expand All @@ -286,8 +284,6 @@ GEM
concurrent-ruby (~> 1.0)
hiredis (0.6.1)
htmlentities (4.3.4)
http-cookie (1.0.3)
domain_name (~> 0.5)
http_logger (0.5.1)
httparty (0.16.2)
multi_xml (>= 0.5.2)
Expand Down Expand Up @@ -502,8 +498,7 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (4.2.0)
netrc (0.11.0)
nio4r (2.3.0)
nio4r (2.3.1)
noid (0.9.0)
noid-rails (3.0.0)
actionpack (>= 5.0.0, < 6)
Expand Down Expand Up @@ -644,10 +639,8 @@ GEM
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rest-client (1.6.7)
mime-types (>= 1.16)
retriable (3.1.1)
riiif (1.7.0)
deprecation (>= 1.0.0)
Expand Down Expand Up @@ -704,7 +697,7 @@ GEM
tilt (>= 1.1, < 3)
select2-rails (3.5.10)
thor (~> 0.14)
selenium-webdriver (3.11.0)
selenium-webdriver (3.12.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
shex (0.5.2)
Expand Down Expand Up @@ -775,13 +768,13 @@ GEM
sxp (1.0.1)
rdf (>= 2.2, < 4.0)
temple (0.8.0)
term-ansicolor (1.6.0)
tins (~> 1.0)
thor (0.20.0)
term-ansicolor (1.2.2)
tins (~> 0.8)
thor (0.18.1)
thread_safe (0.3.6)
tilt (2.0.8)
tins (1.16.3)
tinymce-rails (4.7.11)
tins (0.13.2)
tinymce-rails (4.7.12)
railties (>= 3.1.1)
turbolinks (5.1.1)
turbolinks-source (~> 5.1)
Expand All @@ -795,9 +788,6 @@ GEM
uber (0.1.0)
uglifier (4.1.10)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.3.2)
warden (1.2.7)
rack (>= 1.0)
Expand All @@ -817,7 +807,7 @@ PLATFORMS
ruby

DEPENDENCIES
bixby
bixby (~> 1.0.0)
byebug
capistrano
capistrano-bundler (~> 1.3)
Expand Down
36 changes: 0 additions & 36 deletions lib/tasks/travis.rake

This file was deleted.

2 changes: 1 addition & 1 deletion spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
if ENV['COVERAGE'] || ENV['TRAVIS']
require 'simplecov'
require 'coveralls'

SimpleCov.formatter = Coveralls::SimpleCov::Formatter if ENV['TRAVIS']
SimpleCov.start 'rails'
end
Expand Down

0 comments on commit d0b35ec

Please sign in to comment.