Updating Sinatra to support pandoc

publiclab · Apr 14, 2020 · 4ec051c · 4ec051c
1 parent 1ed55b4
commit 4ec051c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 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
@@ -13,9 +13,10 @@
 # limitations under the License.
 
 
-gem "sinatra"
+gem "sinatra", "2.0.8.1"
 gem "sinatra-cors"
 gem "nokogiri"
+gem "pandoc-ruby"
 
 gem "fog-google"
 gem "fog-local"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -54,13 +54,15 @@ GEM
     mini_portile2 (2.4.0)
     multi_json (1.13.1)
     multipart-post (2.0.0)
-    mustermann (1.0.3)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
     nokogiri (1.10.0)
       mini_portile2 (~> 2.4.0)
     os (1.0.1)
+    pandoc-ruby (2.1.4)
     public_suffix (3.0.3)
     rack (2.0.7)
-    rack-protection (2.0.5)
+    rack-protection (2.0.8.1)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -82,18 +84,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    ruby2_keywords (0.0.2)
     signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       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)
 
 PLATFORMS
@@ -104,9 +107,10 @@ DEPENDENCIES
   fog-local
   mapknitter-exporter (~> 1.0.9)
   nokogiri
+  pandoc-ruby
   rack-test
   rspec
-  sinatra
+  sinatra (= 2.0.8.1)
   sinatra-cors
 
 BUNDLED WITH

diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh
@@ -1,9 +1,10 @@
 #!/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
+        pandoc \
+        imagemagick