Skip to content
Permalink
Browse files

Merge branch 'development'

  • Loading branch information...
mjy committed Aug 22, 2019
2 parents 0ee428e + 59db10e commit 4fdb5179355abea512a23a38f7047d7826bc18ef
Showing 681 changed files with 5,707 additions and 2,719 deletions.
@@ -18,6 +18,7 @@ engines:
enabled: true
rubocop:
enabled: true
channel: rubocop-0-70
ratings:
paths:
- Gemfile.lock
@@ -45,5 +45,5 @@ public/index.html
public/packs-test

spec
travis
.travis
k8s
@@ -53,16 +53,12 @@ config/initializers/vendor/better_errors.rb
/spec/test_files/

REVISION
/public/packs
/public/packs-test
/node_modules
yarn-debug.log*
.yarn-integrity
npm-debug.log

yarn.lock
/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
@@ -6,7 +6,7 @@ cache:
- $TRAVIS_BUILD_DIR/spec/fixtures/vcr_cassettes
- $TRAVIS_BUILD_DIR/public/packs-test
- $TRAVIS_BUILD_DIR/public/assets
- $TRAVIS_BUILD_DIR/tmp/cache
- $TRAVIS_BUILD_DIR/tmp/cache/webpacker
- /home/travis/.rvm/
dist: xenial
# sudo: required
@@ -18,6 +18,8 @@ branches:
- master
- development
- dates
- docker-travis
- build-with-assets
addons:
postgresql: "10"
firefox: "latest"
@@ -48,8 +50,10 @@ before_install:
- nvm install 10.15.3
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.7.0
- export PATH=$HOME/.yarn/bin:$PATH
- export BUNDLER_VERSION=$(tail -n1 Gemfile.lock | tr -d '[:space:]')
install:
- npm install
- gem install bundler --no-ri --no-rdoc -v $BUNDLER_VERSION
- bundle install --without development production
before_script:
- echo ===[TEST_WORKER=$TEST_WORKER before_script $(date -u +%Y%m%d-%H%M%S)]===
@@ -28,15 +28,16 @@ done
[ "$BEGIN_INDEX" -gt "$SPEC_COUNT" ] || \
SPECS_TO_RUN[(($TEST_WORKERS-1))]+=" $(echo $SPEC_FILES | cut -d " " -f $BEGIN_INDEX-$SPEC_COUNT)"

report() {
report_cleanup() {
END_TIME=$(date +%s)

echo "[TEST_WORKER=$TEST_WORKER Runtime] $[$END_TIME - $START_TIME]"
echo "[TEST_WORKER=$TEST_WORKER Proportion] $[$(echo ${SPECS_TO_RUN[$TEST_WORKER]} | wc -w)]/$SPEC_COUNT"
[ ! -f public/assets/.sprockets-manifest-*.json ] || rm public/assets/.sprockets-manifest-*.json
}

START_TIME=$(date +%s)
trap 'report' ERR
trap 'report_cleanup' ERR

# Refresh VCRs on CRON event
[ "$TRAVIS_EVENT_TYPE" != "cron" ] || (rm -rf spec/fixtures/vcr_cassettes/* && echo "VCRs cleared")
@@ -46,9 +47,9 @@ trap 'report' ERR

# Precompile assets only if feature tests will be executed
echo ${SPECS_TO_RUN[$TEST_WORKER]} | grep -qv "spec/features/" || \
bundle exec rake assets:precompile
NODE_OPTIONS="--max-old-space-size=4096" bundle exec rake assets:precompile

echo "[TEST_WORKER=$TEST_WORKER specs set] ${SPECS_TO_RUN[$TEST_WORKER]}"
bundle exec rspec ${SPECS_TO_RUN[$TEST_WORKER]}

report
report_cleanup
@@ -70,7 +70,7 @@ gem 'jquery-turbolinks', '~> 2.1'

# BibTeX handling
gem 'csl', '~> 1.5.0'
gem 'bibtex-ruby', '~> 4.4.7'
gem 'bibtex-ruby', '~> 5.0.0'
gem 'citeproc-ruby', '~> 1.1.10'
gem 'csl-styles', '~> 1.0.1.8'
gem 'ref2bibtex', '~> 0.3.0'
@@ -58,7 +58,7 @@ GEM
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
afm (0.2.2)
airbrussh (1.3.1)
airbrussh (1.3.2)
sshkit (>= 1.6.1, != 1.7.0)
archive-zip (0.12.0)
io-like (~> 0.3.0)
@@ -77,9 +77,9 @@ GEM
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bibtex-ruby (4.4.7)
bibtex-ruby (5.0.0)
latex-decode (~> 0.0)
bindex (0.7.0)
bindex (0.8.1)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
biodiversity (3.5.1)
@@ -97,15 +97,15 @@ GEM
sshkit (>= 1.9.0)
capistrano-npm (1.0.3)
capistrano (>= 3.0.0)
capybara (3.22.0)
capybara (3.28.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
chartkick (3.2.0)
chartkick (3.2.1)
childprocess (1.0.1)
rake (< 13.0)
chronic (0.10.2)
@@ -137,13 +137,13 @@ GEM
daemons (1.3.1)
database_cleaner (1.7.0)
debug_inspector (0.0.3)
delayed_job (4.1.5)
delayed_job (4.1.7)
activesupport (>= 3.0, < 5.3)
delayed_job_active_record (4.1.3)
activerecord (>= 3.0, < 5.3)
delayed_job (>= 3.0, < 5)
diff-lcs (1.3)
docile (1.3.1)
docile (1.3.2)
dropzonejs-rails (0.8.4)
rails (> 3.1)
dwc-archive (1.0.1)
@@ -159,7 +159,7 @@ GEM
factory_bot_rails (5.0.2)
factory_bot (~> 5.0.2)
railties (>= 4.2.0)
faker (1.9.3)
faker (1.9.6)
i18n (>= 0.7)
ffi (1.11.1)
ffi-geos (2.0.0)
@@ -189,18 +189,18 @@ GEM
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
hashdiff (0.4.0)
hashdiff (1.0.0)
hashery (2.1.2)
hiredis (0.6.3)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
indefinite_article (0.2.4)
activesupport
io-like (0.3.0)
jaro_winkler (1.5.2)
jaro_winkler (1.5.3)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
jquery-rails (4.3.3)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@@ -244,7 +244,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
modularity (2.0.1)
@@ -254,10 +254,10 @@ GEM
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-ssh (5.2.0)
nio4r (2.3.1)
nokogiri (1.10.3)
nio4r (2.4.0)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
notiffany (0.1.1)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
paper_trail (10.2.1)
@@ -272,7 +272,7 @@ GEM
paperclip-meta (3.1.0)
paperclip (>= 5.0)
parallel (1.17.0)
parallel_tests (2.29.0)
parallel_tests (2.29.2)
parallel
parser (2.6.3.0)
ast (~> 2.4.0)
@@ -282,7 +282,7 @@ GEM
rack
rake (>= 0.8.1)
pdf-core (0.7.0)
pdf-reader (2.2.0)
pdf-reader (2.2.1)
Ascii85 (~> 1.0.0)
afm (~> 0.2.1)
hashery (~> 2.0)
@@ -299,7 +299,7 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.9.0)
psych (3.1.0)
public_suffix (3.1.0)
public_suffix (3.1.1)
rack (2.0.7)
rack-cors (1.0.3)
rack-proxy (0.6.5)
@@ -326,7 +326,7 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rails-jquery-autocomplete (1.0.5)
rails (>= 3.2)
@@ -337,31 +337,31 @@ GEM
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
rake (12.3.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rdoc (6.1.1)
redcarpet (3.4.0)
redcarpet (3.5.0)
redis (4.1.2)
ref2bibtex (0.3.0)
addressable (~> 2.6)
regexp_parser (1.5.1)
regexp_parser (1.6.0)
request_store (1.4.1)
rack (>= 1.4)
require_all (1.3.3)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rgeo (2.0.1)
rgeo-activerecord (6.2.0)
rgeo-activerecord (6.2.1)
activerecord (>= 5.0)
rgeo (>= 1.0.0)
rgeo-geojson (2.1.1)
rgeo (>= 1.0.0)
rgeo-proj4 (2.0.0)
rgeo (~> 2.0)
rmagick (3.1.0)
rmagick (3.2.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
@@ -370,12 +370,12 @@ GEM
activemodel (>= 3.0)
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.0)
rspec-core (3.8.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.3)
rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
rspec-mocks (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.2)
@@ -386,20 +386,20 @@ GEM
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rspec-support (3.8.2)
rtesseract (3.0.3)
nokogiri
rubocop (0.71.0)
rubocop (0.74.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-rails (2.0.0)
rack (>= 2.0)
rubocop (>= 0.70.0)
rubocop-rspec (1.33.0)
rubocop-rails (2.3.0)
rack (>= 1.1)
rubocop (>= 0.72.0)
rubocop-rspec (1.35.0)
rubocop (>= 0.60.0)
ruby-prof (0.17.0)
ruby-progressbar (1.10.1)
@@ -411,7 +411,7 @@ GEM
sassc (2.0.1)
ffi (~> 1.9)
rake
sassc-rails (2.1.1)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
@@ -430,8 +430,7 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
spring (2.0.2)
activesupport (>= 4.2)
spring (2.1.0)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.7.2)
@@ -449,7 +448,7 @@ GEM
rake (~> 12.3)
rmagick (~> 3.0)
rtesseract (~> 3.0.3)
sshkit (1.18.2)
sshkit (1.20.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
taxonifi (0.4.0)
@@ -463,7 +462,7 @@ GEM
tilt (2.0.9)
timecop (0.9.1)
timeliness (0.3.10)
tins (1.20.3)
tins (1.21.1)
treetop (1.6.10)
polyglot (~> 0.3)
ttfunk (1.5.1)
@@ -498,9 +497,9 @@ GEM
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
websocket-driver (0.7.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
websocket-extensions (0.1.4)
with_advisory_lock (4.0.0)
activerecord (>= 4.2)
xpath (3.2.0)
@@ -516,7 +515,7 @@ DEPENDENCIES
bcrypt (~> 3.1.11)
best_in_place (~> 3.1.1)
better_errors (~> 2.4)
bibtex-ruby (~> 4.4.7)
bibtex-ruby (~> 5.0.0)
binding_of_caller
biodiversity (~> 3.5.0)
brakeman (~> 4.4.0)

0 comments on commit 4fdb517

Please sign in to comment.
You can’t perform that action at this time.