cleanup + update to latest ruby

Author: fileformat

.dockerignore

@@ -1,2 +1,9 @@
+.dockerignore
+.editorconfig
 .git/
-README.md
+.github/
+.gitignore
+Dockerfile
+LICENSE.txt
+*.md
+*.sh

.github/workflows/gcr-deploy.yaml

@@ -0,0 +1,59 @@
+name: Build and deploy to Google Cloud Run
+
+on:
+  push:
+    branches:
+    - master
+
+# Environment variables available to all jobs and steps in this workflow
+env:
+  PROJECT_ID: ${{ secrets.RUN_PROJECT }}
+  RUN_REGION: ${{ secrets.RUN_REGION }}
+  SERVICE_NAME: ${{ secrets.RUN_SERVICE }}
+
+jobs:
+  setup-build-deploy:
+    name: Setup, Build, and Deploy
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      # Setup gcloud CLI
+      - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+        with:
+          version: '275.0.0'
+          service_account_email: ${{ secrets. GCP_SA_EMAIL }}
+          service_account_key: ${{ secrets. GCP_SA_KEY }}
+
+      # Configure gcloud CLI
+      - name: gcloud Set up
+        run: |
+          gcloud config set project $PROJECT_ID
+
+      # Build and push image to Google Container Registry
+      - name: Build
+        run: |
+          docker build \
+            --build-arg COMMIT=${GITHUB_SHA:0:7} \
+            --build-arg LASTMOD=$(date -u +%Y-%m-%dT%H:%M:%SZ) \
+            --tag gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA .
+
+      - name: GCloud auth to docker
+        run: |
+          gcloud auth configure-docker
+
+      - name: Push to registry
+        run: |
+          docker push gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA
+
+      # Deploy image to Cloud Run
+      - name: Deploy
+        run: |
+          gcloud run deploy $SERVICE_NAME \
+            --allow-unauthenticated \
+            --image gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA \
+            --platform managed \
+            --project ${PROJECT_ID} \
+            --region $RUN_REGION

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5.7
+FROM ruby:2.7.1
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
@@ -10,6 +10,11 @@ RUN bundle install
 
 COPY . .
 
+ARG COMMIT="(not set)"
+ARG LASTMOD="(not set)"
+ENV COMMIT=$COMMIT
+ENV LASTMOD=$LASTMOD
+
 EXPOSE 4567
 CMD ["./regexplanet.rb"]
 

Gemfile

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
-ruby '2.5.7'
+ruby '2.7.1'
 gem 'sinatra'
 gem 'sinatra-contrib'
 gem 'sinatra-jsonp'
-gem 'thin'

Gemfile.lock

@@ -1,47 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    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.7)
-    i18n (1.1.1)
-      concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
-    mustermann (1.0.3)
-    rack (2.0.8)
-    rack-protection (2.0.4)
+    backports (3.17.2)
+    multi_json (1.14.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    rack (2.2.2)
+    rack-protection (2.0.8.1)
       rack
-    sinatra (2.0.4)
+    ruby2_keywords (0.0.2)
+    sinatra (2.0.8.1)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.4)
+      rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
-    sinatra-contrib (2.0.4)
-      activesupport (>= 4.0.0)
+    sinatra-contrib (2.0.8.1)
       backports (>= 2.8.2)
       multi_json
       mustermann (~> 1.0)
-      rack-protection (= 2.0.4)
-      sinatra (= 2.0.4)
-      tilt (>= 1.3, < 3)
+      rack-protection (= 2.0.8.1)
+      sinatra (= 2.0.8.1)
+      tilt (~> 2.0)
     sinatra-jsonp (0.5.0)
       multi_json (~> 1.8)
       sinatra (>= 1.0)
-    thin (1.7.2)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    thread_safe (0.3.6)
-    tilt (2.0.9)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    tilt (2.0.10)
 
 PLATFORMS
   ruby
@@ -50,10 +33,9 @@ DEPENDENCIES
   sinatra
   sinatra-contrib
   sinatra-jsonp
-  thin
 
 RUBY VERSION
-   ruby 2.5.3p105
+   ruby 2.7.1p83
 
 BUNDLED WITH
-   1.16.2
+   2.1.4

Procfile

@@ -1,18 +1,24 @@
-# regexplanet-ruby
+# RegexPlanet Ruby [<img alt="Ruby Logo" src="https://www.vectorlogo.zone/logos/ruby-lang/ruby-lang-icon.svg" height="90" align="right" />](https://www.ruby-lang.org/)
 
 This is the Ruby backend for RegexPlanet, a tool for online regular expression testing.
 
-See [API docs](http://www.regexplanet.com/support/api.html) for what it is supposed to do.
+Use [Ruby online regex test page](http://www.regexplanet.com/advanced/ruby/index.html) to test your regular expressions.
 
-See [Ruby online regex test page](http://www.regexplanet.com/advanced/ruby/index.html) to use it to test your regular expressions.
+See the [API docs](http://www.regexplanet.com/support/api.html) for what it is supposed to do.
 
 ## Notes
 
  * [Ruby on Docker](https://docs.docker.com/samples/library/ruby/)
+ * [updating Gemfile.lock](https://stackoverflow.com/questions/13101945/how-to-re-sync-gemfile-lock-on-changes-to-gemfile/13102274#13102274)
 
 ## Credits
+[![Docker](https://www.vectorlogo.zone/logos/docker/docker-ar21.svg)](https://www.docker.com/ "Deployment")
+[![Git](https://www.vectorlogo.zone/logos/git-scm/git-scm-ar21.svg)](https://git-scm.com/ "Version control")
+[![Github](https://www.vectorlogo.zone/logos/github/github-ar21.svg)](https://github.com/ "Code hosting")
+[![Google Cloud Run](https://www.vectorlogo.zone/logos/google_cloud_run/google_cloud_run-ar21.svg)](https://cloud.google.com/run/ "Hosting")
+[![Ruby](https://www.vectorlogo.zone/logos/ruby-lang/ruby-lang-ar21.svg)](https://www.ruby-lang.org/ "Code")
 
- * Ruby
- * Docker
- * Zeit
- * Sinatra
+ * [Bundler](https://bundler.io/)
+ * [Rack](https://rack.github.io/)
+ * [RubyGems](https://rubygems.org/)
+ * [Sinatra](http://sinatrarb.com/)

README.md

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+
+docker build -t regexplanet-ruby .
+docker run \
+	--expose 4000 \
+	--env COMMIT=$(git rev-parse --short HEAD)-local \
+	--env LASTMOD=$(date -u +%Y-%m-%dT%H:%M:%SZ) \
+	--env PORT='4000' \
+	--publish 4000:4000 \
+	regexplanet-ruby
+