Skip to content

Commit

Permalink
Merge pull request #13 from sul-dlss/add-ci
Browse files Browse the repository at this point in the history
Add ci
  • Loading branch information
Jessie Keck committed Dec 16, 2015
2 parents 2c5dabf + e053c31 commit f4ba203
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 12 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@
config/settings.local.yml
config/settings/*.local.yml
config/environments/*.local.yml

# Ignore coverage directory
coverage
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
language: ruby
rvm:
- '2.2.3'
sudo: false
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ group :development, :test do
gem 'rspec-rails', '< 2.99'
gem 'capybara'
gem 'poltergeist'
gem 'coveralls', require: false
end

group :development do
Expand Down
27 changes: 26 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ GEM
config (1.0.0)
activesupport (>= 3.0)
deep_merge (~> 1.0.0)
coveralls (0.8.9)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
simplecov (~> 0.10.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (~> 1.6.0)
debug_inspector (0.0.2)
deep_merge (1.0.1)
deprecation (0.2.2)
Expand All @@ -117,13 +124,18 @@ GEM
devise-guests (0.3.3)
devise
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.25)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
execjs (2.6.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
globalid (0.3.6)
activesupport (>= 4.1.0)
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.7.0)
iso-639 (0.2.5)
jbuilder (2.3.2)
Expand Down Expand Up @@ -172,6 +184,7 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.0.1)
netrc (0.11.0)
nokogiri (1.6.6.3)
mini_portile (~> 0.6.0)
nom-xml (0.5.4)
Expand Down Expand Up @@ -216,6 +229,10 @@ GEM
ref (2.0.0)
responders (2.1.0)
railties (>= 4.2.0, < 5)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rsolr (1.0.13)
builder (>= 2.1.2)
rspec-core (2.14.8)
Expand All @@ -242,6 +259,11 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
simplecov (0.10.0)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
spring (1.4.3)
sprockets (3.4.0)
rack (> 1, < 3)
Expand All @@ -256,12 +278,15 @@ GEM
net-ssh (>= 2.8.0)
stanford-mods (1.1.5)
mods (~> 2.0.2)
term-ansicolor (1.3.2)
tins (~> 1.0)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.1)
tins (1.6.0)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
Expand Down Expand Up @@ -300,6 +325,7 @@ DEPENDENCIES
coderay
coffee-rails (~> 4.1.0)
config (~> 1.0.0.beta3)
coveralls
devise
devise-guests (~> 0.3)
jbuilder (~> 2.0)
Expand All @@ -323,4 +349,3 @@ DEPENDENCIES

BUNDLED WITH
1.10.6

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Colligo #
[![Build Status](https://travis-ci.org/sul-dlss/colligo.svg?branch=master)](https://travis-ci.org/sul-dlss/colligo) | [![Coverage Status](https://coveralls.io/repos/sul-dlss/colligo/badge.svg?branch=master&service=github)](https://coveralls.io/github/sul-dlss/colligo?branch=master)


This is the codebase for the Colligo application, showcasing digital manuscripts.
16 changes: 15 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

task default: [:ci]
require File.expand_path('../config/application', __FILE__)

Rails.application.load_tasks

ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.3.zip"
require 'jettywrapper'

desc 'Execute the test build that runs on travis'
task ci: [:environment] do
if Rails.env.test?
Rake::Task['db:migrate'].invoke
Rake::Task['jetty:download'].invoke
Rake::Task['jetty:unzip'].invoke
Jettywrapper.wrap(Jettywrapper.load_config) do
Rake::Task['spec'].invoke
end
else
system('RAILS_ENV=test rake ci')
end
end
12 changes: 2 additions & 10 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,8 @@

Capybara.default_max_wait_time = 10

if ENV["COVERAGE"] or ENV["CI"]
require 'simplecov'
require 'coveralls' if ENV["CI"]

SimpleCov.formatter = Coveralls::SimpleCov::Formatter if ENV["CI"]
SimpleCov.start do
add_filter "/spec/"
end
end

require 'coveralls'
Coveralls.wear!('rails')

# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
Expand Down

0 comments on commit f4ba203

Please sign in to comment.