Added use of Gemfile.

1 year ago · 08b4cd5af7
5 changed files with 100 additions and 31 deletions
--- a/5
+++ b/5
@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'jekyll', '~>4.0'
+gem 'jekyll-sitemap'
+gem 'forwardable', '=1.2.0'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -0,0 +1,72 @@
+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.8)
+    em-websocket (0.5.2)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.15.0)
+    forwardable (1.2.0)
+    forwardable-extended (2.6.0)
+    http_parser.rb (0.6.0)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.2.0)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (~> 0.4.0)
+      pathutil (~> 0.9)
+      rouge (~> 3.0)
+      safe_yaml (~> 1.0)
+      terminal-table (~> 2.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (2.3.1)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.5.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (4.0.6)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rexml (3.2.5)
+    rouge (3.26.0)
+    safe_yaml (1.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  forwardable (= 1.2.0)
+  jekyll (~> 4.0)
+  jekyll-sitemap
+
+BUNDLED WITH
+   2.2.16
--- a/9
+++ b/9
@ -9,6 +9,7 @@ default: install-dev
 install-dev:
 	pipenv install --dev
 	pipenv run pre-commit install
+	bundle install

 uninstall-dev:
 	pipenv --rm
@ -16,15 +17,15 @@ uninstall-dev:
 all: clean build serve-global

 build:
-	@jekyll build --trace --strict_front_matter --verbose --safe -t --future
+	bundle exec jekyll build --trace --strict_front_matter --verbose --safe -t --future

 serve:
-	@jekyll serve --trace --future
+	bundle exec jekyll serve --trace --future

 serve-global:
-	@jekyll serve --trace --host=0.0.0.0 --port=$(PORT) --future
+	bundle exec jekyll serve --trace --host=0.0.0.0 --port=$(PORT) --future

 clean:
-	@rm -rf _site
+	rm -rf _site

 .PHONY: default install-dev uninstall-dev all build serve serve-global clean
--- a/2
+++ b/2
@ -9,4 +9,4 @@ name = "pypi"
 pre-commit = '~=2.12'

 [requires]
-python_version = "3.9"
+python_version = "*"
--- a/README.md
+++ b/README.md
@ -16,12 +16,12 @@ Jekyll theme.
  - [Dependencies](#dependencies)
  - [Installation](#installation)
    - [Arch Linux based distros](#arch-linux-based-distros)
+    - [Debian based distros](#debian-based-distros)
+    - [Common](#common)
  - [Upgrading](#upgrading)
-    - [Upgrading from Jekyll 3.x to Jekyll 4.x](#upgrading-from-jekyll-3x-to-jekyll-4x)
-    - [Upgrading from the flux-of-though 0.x to 1.x](#upgrading-from-the-flux-of-though-0x-to-1x)
-    - [Upgrading from the flux-of-though 1.x to 2.x](#upgrading-from-the-flux-of-though-1x-to-2x)
  - [Building and serving](#building-and-serving)
    - [Locally](#locally)
+    - [Self-hosted](#self-hosted)
    - [GitLab Pages](#gitlab-pages)
  - [Tutorial](#tutorial)
    - [Commenting system](#commenting-system)
@ -94,43 +94,30 @@ be installed on your system.
 |---------|------------|-----------------|-----------------|
 | [Ruby](https://www.ruby-lang.org/en/) | `/bin/ruby` | `$ ruby --version` | `ruby 2.7.1p83 (2020-03-31 revision a0c7c23c9c)` |
 | [RDoc](https://ruby.github.io/rdoc/) | `/bin/rdoc` | `$ rdoc --version` |  `6.2.1` |
-| [Jekyll](https://jekyllrb.com/) | `~/.gem/ruby/2.7.0/bin/jekyll` | `$ jekyll --version` | `jekyll 4.0.1` |
-| [Jekyll Sitemap Generator Plugin](https://github.com/jekyll/jekyll-sitemap) | - | - | `1.4.0` |
 | [GNU Make](http://www.gnu.org/software/make) | `/bin/make` | `$ make --version` | `GNU Make 4.3` |
 | [krmadown](https://kramdown.gettalong.org/index.html) | `~/.gem/ruby/2.7.0/bin/kramdown` | `$ kramdown --version` | `2.2.1` |
 | [Rouge](https://github.com/jneen/rouge) | `~/.gem/ruby/2.7.0/bin/rougify` | `$ rougify --version` | `3.19.0` |

+
 ## Installation

 ### Arch Linux based distros

    # pacman -S ruby ruby-rdoc
-    $ gem update
-    $ gem install jekyll jekyll-sitemap kramdown rouge
-
-## Upgrading
-
-### Upgrading from Jekyll 3.x to Jekyll 4.x
-
-In case you get something like `'private': nil is not a symbol nor a string (TypeError)`,
-run:

+### Debian based distros

-    $ gem uninstall forwardable --version 1.3.0
-    $ gem install forwardable --version 1.2.0
+    # apt-get install ruby ruby-dev

+### Common

-See also [this issue](https://github.com/jekyll/jekyll/issues/7930)
-and [this document](https://jekyllrb.com/docs/upgrading/3-to-4/)
-
-### Upgrading from the flux-of-though 0.x to 1.x
-
-Yaml keys in the configuration file have changed. Be sure to to fix your configuration
-file appropriately.
+    $ gem update
+    $ gem install bundle
+    $ make install-dev

-### Upgrading from the flux-of-though 1.x to 2.x
+## Upgrading

-The original CSS has been replaced with a minimal CSS. See [this](https://webdesign.tutsplus.com/articles/undress-to-impress-check-your-websites-without-css--cms-22489)
+Run `$ make install`

 ## Building and serving

@ -146,6 +133,10 @@ Global serving, on `0.0.0.0`

 Connect to `http://127.0.0.1:5555/the-flux-of-thought/`.

+### Self-hosted
+
+See https://blog.franco.net.eu.org/notes/new-hosting.html
+
 ### GitLab Pages

 If you use [GitLab Pages](https://about.gitlab.com/product/pages/) put the
@ -625,7 +616,7 @@ The MIT License (MIT)

 Copyright (c) 2015 Heiswayi Nrird

-Copyright (c) 2017-2020 Franco Masotti <franco.masotti@live.com>
+Copyright (c) 2017-2021 Franco Masotti <franco.masotti@live.com>

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal