updated dependencies, deploy to zeit

Author: fileformat

Gemfile.lock

@@ -1,25 +1,35 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.11.3)
+    activesupport (5.2.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    backports (3.11.4)
+    concurrent-ruby (1.1.3)
     daemons (1.2.6)
-    eventmachine (1.2.5)
+    eventmachine (1.2.7)
+    i18n (1.1.1)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
     multi_json (1.13.1)
-    mustermann (1.0.2)
-    rack (2.0.4)
-    rack-protection (2.0.1)
+    mustermann (1.0.3)
+    rack (2.0.6)
+    rack-protection (2.0.4)
       rack
-    sinatra (2.0.1)
+    sinatra (2.0.4)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.1)
+      rack-protection (= 2.0.4)
       tilt (~> 2.0)
-    sinatra-contrib (2.0.1)
-      backports (>= 2.0)
+    sinatra-contrib (2.0.4)
+      activesupport (>= 4.0.0)
+      backports (>= 2.8.2)
       multi_json
       mustermann (~> 1.0)
-      rack-protection (= 2.0.1)
-      sinatra (= 2.0.1)
+      rack-protection (= 2.0.4)
+      sinatra (= 2.0.4)
       tilt (>= 1.3, < 3)
     sinatra-jsonp (0.5.0)
       multi_json (~> 1.8)
@@ -28,7 +38,10 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    tilt (2.0.8)
+    thread_safe (0.3.6)
+    tilt (2.0.9)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -40,7 +53,7 @@ DEPENDENCIES
   thin
 
 RUBY VERSION
-   ruby 2.3.1p112
+   ruby 2.3.7p456
 
 BUNDLED WITH
-   1.16.1
+   1.17.1

deploy.sh

@@ -1,19 +1,27 @@
 #!/bin/bash
 #
-# deploy the xregexp backend to zeit
+# deploy the ruby backend to zeit
 #
 
-heroku container:push --app regexplanet-postgresql web
+#set -o errexit
+set -o pipefail
+set -o nounset
 
+LASTMOD=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+grep -q "^LASTMOD=" .env
+if [ $? -ne 0 ]; then
+    echo "LASTMOD=$LASTMOD" >> .env
+else
+    sed -i -e "s/^LASTMOD=.*$/LASTMOD=$LASTMOD/g" .env
+fi
 
-#echo "INFO: listing existing versions"
-#now ls regexplanet-postgresql
+COMMIT=$(git rev-parse --short HEAD)
+grep -q "^COMMIT=" .env
+if [ $? -ne 0 ]; then
+    echo "COMMIT=$COMMIT" >> .env
+else
+    sed -i -e "s/^COMMIT=.*$/COMMIT=$COMMIT/g" .env
+fi
 
-#echo "INFO: deploying"
-#now && now alias
 
-#
-# need to kill the old version!
-#
-#echo "INFO: removing the old version "
-#echo "WARNING: must be done manually with 'now rm'"
+now --public --dotenv && now alias && now rm $(cat ./now.json | jq '.name' --raw-output) --safe --yes

now.json

@@ -1,4 +1,8 @@
 {
-  "name": "regexplanet-ruby",
-  "alias": "regexplanet-ruby.now.sh"
+    "name": "regexplanet-ruby",
+    "alias": "regexplanet-ruby.now.sh",
+    "features": {
+        "cloud": "v2"
+    },
+    "type": "docker"
 }

regexplanet.rb

@@ -31,6 +31,8 @@ def get_or_post(path, opts={}, &block)
 	jsonp( {
 		:success => true,
 		:message => "OK",
+		:commit => ENV['COMMIT'],
+		:lastmod => ENV['LASTMOD'],
 		:version => RUBY_VERSION,
 		"request.host" => request.host,
 		"request.port" => request.port,

run.sh

@@ -2,4 +2,8 @@
 
 
 docker build -t regexplanet-ruby .
-docker run -p 4000:4000 --expose 4000 -e PORT='4000' regexplanet-ruby
+docker run \
+	-p 4000:4000 --expose 4000 -e PORT='4000' \
+	-e COMMIT=$(git rev-parse --short HEAD) \
+	-e LASTMOD=$(date -u +%Y-%m-%dT%H:%M:%SZ) \
+	regexplanet-ruby