Updating Sinatra to support pandoc

publiclab · Apr 14, 2020 · 7b8174f · 7b8174f
1 parent 1ed55b4
commit 7b8174f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,16 +12,12 @@ services:
 
 cache:
   directories:
-   - /usr/share
-   - /usr/bin
    - vendor/.bundle
 
 install:
     - sudo ./scripts/install-deps.sh
     - bundle install --path vendor/.bundle
 
-script:
-    docker run mapknitter-exporter bundle exec rspec
 jobs:
   include:
     - name: "Exporter Tests"

diff --git a/Gemfile b/Gemfile
@@ -16,6 +16,7 @@
 gem "sinatra"
 gem "sinatra-cors"
 gem "nokogiri"
+gem "pandoc-ruby"
 
 gem "fog-google"
 gem "fog-local"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -93,7 +93,7 @@ GEM
       rack-protection (= 2.0.5)
       tilt (~> 2.0)
     sinatra-cors (1.1.0)
-    tilt (2.0.9)
+    tilt (2.0.10)
     uber (0.1.0)
 
 PLATFORMS

diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh
@@ -1,9 +1,16 @@
 #!/bin/bash
 
 apt-get update -qq && \
-apt-get install -y --no-install-recommends \
+apt-get install -y \
         gdal-bin \
         python-gdal \
         build-essential \
         git \
         imagemagick
+
+cp ./nolimit.xml /etc/ImageMagick-6/policy.xml
+wget https://github.com/jgm/pandoc/releases/download/2.9.2.1/pandoc-2.9.2.1-1-amd64.deb
+
+dpkg -i pandoc-2.9.2.1-1-amd64.deb
+
+rm pandoc-2.9.2.1-1-amd64.deb