Merge branch 'WIP-db-fields-for-schema-attributes'

.gitignore

@@ -35,8 +35,8 @@ capybara-*.html
 /tmp/*
 /data/*
 /db/*.sqlite3
-/public/system/*
-public/assets
+/public/*
+!/public/.keep
 /coverage/
 /spec/tmp/
 /config/data_bags/*

.travis.yml

@@ -52,11 +52,6 @@ after_success:
       docker push $REPO:$TRAVIS_TAG;
       echo "Pushed to" $REPO:$TRAVIS_TAG;
       AUTO_DEPLOY=true;
-    elif [ "$TRAVIS_PULL_REQUEST" == "true" ]; then
-      docker build -f Dockerfile -t $REPO:$TRAVIS_PULL_REQUEST_BRANCH .;
-      docker push $REPO:$TRAVIS_PULL_REQUEST_BRANCH;
-      echo "Pushed to" $REPO:$TRAVIS_PULL_REQUEST_BRANCH;
-      AUTO_DEPLOY=true;
     elif [ "$TRAVIS_BRANCH" == "master" ]; then
       docker build -f Dockerfile -t $REPO .;
       docker push $REPO;
@@ -66,6 +61,7 @@ after_success:
       docker build -f Dockerfile -t $REPO:$TRAVIS_BRANCH .;
       docker push $REPO:$TRAVIS_BRANCH;
       echo "Pushed to" $REPO:$TRAVIS_BRANCH;
+      AUTO_DEPLOY=true;
     fi
 
   - if [ "$AUTO_DEPLOY" == "true" ]; then
@@ -90,10 +86,6 @@ after_success:
         git add prod-eu-west/services/client-api/_lupo.auto.tfvars;
         git commit -m "Adding lupo git variables for commit tagged ${TRAVIS_TAG?}";
         git push "https://${TRAVIS_SECURE_TOKEN}@github.com/datacite/mastino.git" master;
-      elif [ "$TRAVIS_PULL_REQUEST" == "true" ]; then
-        git add stage/services/client-api/_lupo.auto.tfvars;
-        git commit -m "Adding lupo git variables for pull request ${TRAVIS_PULL_REQUEST}";
-        git push "https://${TRAVIS_SECURE_TOKEN}@github.com/datacite/mastino.git" ${TRAVIS_PULL_REQUEST_BRANCH};
       else
         git add stage/services/client-api/_lupo.auto.tfvars;
         git commit -m "Adding lupo git variables for latest commit";

Dockerfile

@@ -16,7 +16,7 @@ RUN bash -lc 'rvm --default use ruby-2.4.4'
 
 # Update installed APT packages
 RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
-    apt-get install ntp wget tzdata -y && \
+    apt-get install ntp wget tzdata pandoc -y && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # install dockerize
@@ -53,12 +53,18 @@ RUN mkdir -p tmp/pids && \
     chown -R app:app /home/app/webapp && \
     chmod -R 755 /home/app/webapp
 
+# Install Ruby gems for middleman
+WORKDIR /home/app/webapp/vendor/middleman
+RUN /sbin/setuser app bundle install 
+
 # Add Runit script for shoryuken workers
+WORKDIR /home/app/webapp
 RUN mkdir /etc/service/shoryuken
 ADD vendor/docker/shoryuken.sh /etc/service/shoryuken/run
 
 # Run additional scripts during container startup (i.e. not at build time)
 RUN mkdir -p /etc/my_init.d
+COPY vendor/docker/70_index_page.sh /etc/my_init.d/70_index_page.sh
 COPY vendor/docker/80_flush_cache.sh /etc/my_init.d/80_flush_cache.sh
 COPY vendor/docker/90_migrate.sh /etc/my_init.d/90_migrate.sh
 

Gemfile

@@ -4,17 +4,19 @@ gem 'rails', '~> 5.2.0'
 gem 'bootsnap', '~> 1.2', '>= 1.2.1'
 gem 'mysql2', '~> 0.4.4'
 gem 'dotenv'
+gem 'rake', '~> 12.0'
 gem 'multi_json'
 gem 'json', '~> 1.8', '>= 1.8.5'
 gem 'oj', '>= 2.8.3'
 gem 'jsonlint', '~> 0.2.0'
 gem 'equivalent-xml', '~> 0.6.0'
 gem 'nokogiri', '~> 1.8.1'
+gem 'diffy', '~> 3.2', '>= 3.2.1'
 gem 'commonmarker', '~> 0.17.9'
 gem 'iso8601', '~> 0.9.0'
 gem 'patron', '~> 0.13.1', require: false
 gem 'maremma', '>= 4.1'
-gem 'bolognese', '~> 0.9', '>= 0.10'
+gem 'bolognese', '~> 1.0'
 gem 'dalli', '~> 2.7', '>= 2.7.6'
 gem 'lograge', '~> 0.10.0'
 gem 'logstash-event', '~> 1.2', '>= 1.2.02'
@@ -32,9 +34,9 @@ gem 'api-pagination'
 gem 'cancancan', '~> 2.0'
 gem 'country_select', '~> 3.1'
 gem 'countries', '~> 2.1', '>= 2.1.2'
-gem 'aasm', '~> 4.12', '>= 4.12.3'
+gem 'aasm', '~> 5.0', '>= 5.0.1'
 gem "facets", require: false
-gem 'shoryuken', '~> 3.2', '>= 3.2.2'
+gem 'shoryuken', '~> 4.0'
 gem "aws-sdk-s3", require: false
 gem 'aws-sdk-sqs', '~> 1.3'
 gem 'bergamasco', '~> 0.3.10'
@@ -52,6 +54,7 @@ gem 'elasticsearch-rails', '~> 5.0', '>= 5.0.2'
 gem 'faraday_middleware-aws-sigv4', '~> 0.2.4'
 gem 'rack-utf8_sanitizer', '~> 1.6'
 gem 'oj_mimic_json', '~> 1.0', '>= 1.0.1'
+gem 'turnout', '~> 2.5'
 
 group :development, :test do
   gem 'rspec-rails', '~> 3.5', '>= 3.5.2'
@@ -64,6 +67,7 @@ group :development do
   gem 'listen', '>= 3.0.5', '< 3.2'
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'spring-commands-rspec'
   # gem 'httplog', '~> 1.0'
 end