-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Style guide conformance #14
Merged
jkeck
merged 16 commits into
sul-dlss-deprecated:master
from
anusharanganathan:style_guide_conformance
Jan 4, 2016
Merged
Changes from 5 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
31b0b0b
Merge pull request #3 from anusharanganathan/master
mejackreed fd6177c
Merge pull request #5 from anusharanganathan/feature_capistrano
mejackreed 4d49633
Merge pull request #6 from anusharanganathan/feature_mods
mejackreed f557286
Merge pull request #7 from anusharanganathan/feature_annotation_data
mejackreed 2c5dabf
Merge pull request #8 from anusharanganathan/feature_iiif_manifest_data
mejackreed cfd6577
adds travis support
mejackreed e053c31
add coveralls support
mejackreed f4ba203
Merge pull request #13 from sul-dlss/add-ci
1046a39
Changes to conform to ruby style guide
9b19972
More changes to conform to ruby style guide
dbd4b30
adds travis support
mejackreed 282aaab
add coveralls support
mejackreed 24721f9
Ignore IDE specific files
6592a11
Merge pull request #9 from anusharanganathan/feature_solr_config
10314ff
Adding rubocop.yml
e1c9ed0
Fixed .gitignore conflict
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
language: ruby | ||
rvm: | ||
- '2.2.3' | ||
sudo: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it would be okay to check-in the
rubocop.yml
for this project. It allows others that come into the project in the future (even if that never ends up happening) to know what the guidelines you were using when developing this app, and that they should follow the same.It's your call though, I'm not sold in one direction or the other.