From a8bb43e6d837587748adb8ca754c3cc64fc3b05c Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 11 Aug 2020 16:44:05 -0500
Subject: [PATCH] Use bundler to get stuff installed

---
 .github/workflows/publish.yml |  3 +-
 .gitignore                    |  2 +
 Gemfile                       | 10 +++++
 Gemfile.lock                  | 83 +++++++++++++++++++++++++++++++++++
 README.md                     |  6 ++-
 5 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 Gemfile
 create mode 100644 Gemfile.lock

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 2c4de66..a91a14d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -18,6 +18,7 @@ jobs:
       run: |
         apt-get update
         apt-get --no-install-recommends -y install admesh git imagemagick jekyll make openscad python3 python3-yaml xauth xvfb
+        bundle install
     - name: checkout
       uses: actions/checkout@v2
     - name: build
@@ -25,7 +26,7 @@ jobs:
         set -xe
         echo "sourceurl: https://github.com/$GITHUB_REPOSITORY" >> _config.yml
         cat _config.yml
-        env JEKYLL_ENV=production xvfb-run make V=2 -O -j$(nproc) jekyll
+        env JEKYLL_ENV=production bundle exec xvfb-run make V=2 -O -j$(nproc) jekyll
     - if: github.event_name == 'push' && github.ref == 'refs/heads/main'
       name: publish
       run: |
diff --git a/.gitignore b/.gitignore
index 7a56ef0..792f6a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.bundle
+.jekyll-cache
 _site/
 resources/gen
 
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..dacb59c
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gem "jekyll"
+gem "jekyll-github-metadata"
+gem "jekyll-seo-tag"
+
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..3f16eab
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,83 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.1.7)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    faraday (1.0.1)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.13.1)
+    forwardable-extended (2.6.0)
+    http_parser.rb (0.6.0)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.1.1)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.1)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (~> 0.4.0)
+      pathutil (~> 0.9)
+      rouge (~> 3.0)
+      safe_yaml (~> 1.0)
+      terminal-table (~> 1.8)
+    jekyll-github-metadata (2.13.0)
+      jekyll (>= 3.4, < 5.0)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-seo-tag (2.6.1)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    multipart-post (2.1.1)
+    octokit (4.18.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (4.0.5)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rexml (3.2.4)
+    rouge (3.22.0)
+    safe_yaml (1.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jekyll
+  jekyll-github-metadata
+  jekyll-seo-tag
+
+BUNDLED WITH
+   2.1.4
diff --git a/README.md b/README.md
index 77c476c..961e2ae 100644
--- a/README.md
+++ b/README.md
@@ -35,10 +35,14 @@ It can optionally have notes, an scad file, scad generation flags, images, and o
 You can refer to a source scad file multiple times with different flags,
 in order to generate related or parametric models.
 
+## One time setup for Jekyll
+
+    $ bundle install
+
 ## Build assets and render Locally
 
     $ make
-    $ jekyll serve --watch
+    $ bundle exec jekyll serve --watch
 
 ## Build locally and push site to github pages