Skip to content

Commit

Permalink
Merge pull request #58 from publiclab/kramdown_from_alax
Browse files Browse the repository at this point in the history 
Enabling multijobs travis builds
  • Loading branch information
@alaxalves
alaxalves committed Jun 25, 2020
2 parents 4184498 + 4abecad commit 5adcdc8
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 53 deletions.
23 changes: 20 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
language: ruby

sudo: required

dist: buster

rvm:
- 2.4.6

services:
- docker

cache:
directories:
- vendor/.bundle

install:
docker build . -t mapknitter-exporter:latest
- sudo ./scripts/install-deps.sh
- bundle install --path vendor/.bundle

script:
docker run mapknitter-exporter bundle exec rspec
jobs:
include:
- name: "Exporter Tests"
script: bundle exec rspec
- name: "Docker Build"
script: docker build . -t lib-mapknitter-exporter:latest
12 changes: 11 additions & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,17 @@ FROM debian:buster
MAINTAINER Sebastian Silva <sebastian@fuentelibre.org>

# Install the application.
RUN apt-get update -qq && apt-get install -y gdal-bin ruby imagemagick ruby-sinatra ruby-kramdown ruby-nokogiri bundler git python-gdal
RUN apt-get update -qq && \
apt-get install -y \
gdal-bin \
ruby \
zlib1g-dev \
imagemagick \
ruby-sinatra \
ruby-kramdown \
ruby-nokogiri \
bundler \
python-gdal

# Configure ImageMagick
COPY ./nolimit.xml /etc/ImageMagick-6/policy.xml
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.


gem "sinatra"
gem "sinatra-cors"
gem "nokogiri"
gem "kramdown"

gem "fog-google"
gem "fog-local"
gem "mapknitter-exporter", "~> 1.0.9"

group :test do
gem 'rubocop', '~> 0.70.0'
gem 'rubocop-performance'
gem "rubocop", "~> 0.70.0"
gem "rubocop-performance"
gem "rspec"
gem "rack-test"
end
99 changes: 53 additions & 46 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
ast (2.4.0)
builder (3.2.3)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.1)
builder (3.2.4)
declarative (0.0.10)
declarative-option (0.1.0)
diff-lcs (1.3)
excon (0.64.0)
faraday (0.15.4)
excon (0.75.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
fog-core (2.1.0)
builder
excon (~> 0.58)
formatador (~> 0.2)
mime-types
fog-google (1.9.1)
fog-google (1.10.0)
fog-core (<= 2.1.0)
fog-json (~> 1.2)
fog-xml (~> 0.1.0)
google-api-client (~> 0.23.0)
google-api-client (>= 0.32, < 0.34)
fog-json (1.2.0)
fog-core
multi_json (~> 1.10)
Expand All @@ -30,42 +30,46 @@ GEM
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
formatador (0.2.5)
google-api-client (0.23.9)
google-api-client (0.33.2)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.5, < 0.7.0)
googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
mime-types (~> 3.0)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.9)
googleauth (0.6.7)
faraday (~> 0.12)
signet (~> 0.12)
googleauth (0.13.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
signet (~> 0.14)
httpclient (2.8.3)
jaro_winkler (1.5.4)
jwt (2.1.0)
jwt (2.2.1)
kramdown (2.2.1)
rexml
mapknitter-exporter (1.0.9)
memoist (0.16.0)
mime-types (3.2.2)
memoist (0.16.2)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mime-types-data (3.2020.0512)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
multi_json (1.13.1)
multipart-post (2.0.0)
mustermann (1.0.3)
nokogiri (1.10.0)
multi_json (1.14.1)
multipart-post (2.1.1)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
os (1.0.1)
parallel (1.19.1)
parser (2.7.1.3)
ast (~> 2.4.0)
public_suffix (3.0.3)
rack (2.0.7)
rack-protection (2.0.5)
os (1.1.0)
parallel (1.19.2)
parser (2.7.1.4)
ast (~> 2.4.1)
public_suffix (4.0.5)
rack (2.2.3)
rack-protection (2.0.8.1)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
Expand All @@ -75,19 +79,20 @@ GEM
declarative-option (< 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.2)
rexml (3.2.4)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.2)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.3)
rubocop (0.70.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
Expand All @@ -98,18 +103,19 @@ GEM
rubocop-performance (1.3.0)
rubocop (>= 0.68.0)
ruby-progressbar (1.10.1)
signet (0.11.0)
ruby2_keywords (0.0.2)
signet (0.14.0)
addressable (~> 2.3)
faraday (~> 0.9)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
sinatra (2.0.5)
sinatra (2.0.8.1)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.5)
rack-protection (= 2.0.8.1)
tilt (~> 2.0)
sinatra-cors (1.1.0)
tilt (2.0.9)
tilt (2.0.10)
uber (0.1.0)
unicode-display_width (1.6.1)

Expand All @@ -119,6 +125,7 @@ PLATFORMS
DEPENDENCIES
fog-google
fog-local
kramdown
mapknitter-exporter (~> 1.0.9)
nokogiri
rack-test
Expand Down
0 views/landing.md → app/controllers/views/landing.md
View file
File renamed without changes.
9 changes: 9 additions & 0 deletions scripts/install-deps.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

apt-get update -qq && \
apt-get install -y \
gdal-bin \
python-gdal \
ruby-kramdown \
ruby-nokogiri \
imagemagick

0 comments on commit 5adcdc8

Please sign in to comment.