From 24736726ce79435ec84828806d72d5cf207abadb Mon Sep 17 00:00:00 2001 From: bryan Date: Tue, 14 Jul 2020 22:38:32 -0400 Subject: [PATCH] Finish merge and update gemfile.lock --- blog.bryanroessler.com/Gemfile.lock | 26 ++- blog.bryanroessler.com/_config.yml | 10 +- blog.bryanroessler.com/index.html | 65 ++++++++ cv.bryanroessler.com/Gemfile.lock | 72 ++------ landing.bryanroessler.com/Gemfile.lock | 221 +++---------------------- landing.bryanroessler.com/_config.yml | 3 +- landing.bryanroessler.com/index.html | 4 +- 7 files changed, 129 insertions(+), 272 deletions(-) diff --git a/blog.bryanroessler.com/Gemfile.lock b/blog.bryanroessler.com/Gemfile.lock index 0e66b56..b40b240 100644 --- a/blog.bryanroessler.com/Gemfile.lock +++ b/blog.bryanroessler.com/Gemfile.lock @@ -1,3 +1,11 @@ +PATH + remote: . + specs: + beautiful-jekyll-theme (4.0.1) + jekyll (~> 3.8) + jekyll-paginate (~> 1.1) + jekyll-sitemap (~> 1.4) + GEM remote: https://rubygems.org/ specs: @@ -9,12 +17,12 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.12.2) + ffi (1.13.1) forwardable-extended (2.6.0) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.6) + jekyll (3.8.7) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -30,6 +38,8 @@ GEM jekyll-paginate (1.1.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) kramdown (1.17.0) @@ -40,11 +50,12 @@ GEM mercenary (0.3.6) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.3) - rb-fsevent (0.10.3) + public_suffix (4.0.5) + rake (12.3.3) + rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.17.0) + rouge (3.21.0) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) @@ -56,8 +67,9 @@ PLATFORMS ruby DEPENDENCIES - jekyll (~> 3.8.6) - jekyll-paginate + beautiful-jekyll-theme! + bundler (>= 1.16) + rake (~> 12.0) BUNDLED WITH 2.0.2 diff --git a/blog.bryanroessler.com/_config.yml b/blog.bryanroessler.com/_config.yml index dde3524..0648e6b 100644 --- a/blog.bryanroessler.com/_config.yml +++ b/blog.bryanroessler.com/_config.yml @@ -10,6 +10,7 @@ baseurl: "" # Your name to show in the footer author: Bryan Roessler + # --- List of links in the navigation bar --- # navbar-links: @@ -28,7 +29,7 @@ navbar-links: #title-img: "./img/me_square_sepia_small.jpg" # --- Background colour/image options --- # -avatar: "/img/me_square_sepia_small.jpg" +avatar: "/assets/img/me_square_sepia_small.jpg" # By default, the image is cut into a circle. You can disable this behaviour by setting 'round-avatar: false' round-avatar: true @@ -179,6 +180,8 @@ highlighter: rouge permalink: /:year-:month-:day-:title/ paginate: 5 +plugins: [jekyll-paginate] + kramdown: input: GFM @@ -190,9 +193,9 @@ defaults: type: "posts" values: layout: "post" - comments: true # add comments to all blog posts + comments: false # add comments to all blog posts social-share: true # add social media sharing buttons to all blog posts - readtime: false # add estimated reading time on all blog posts + readtime: true # add estimated reading time on all blog posts - scope: path: "" # all files @@ -210,6 +213,7 @@ exclude: - README.md - screenshot.png - docs/ + - vendor/ # Beautiful Jekyll / Dean Attali diff --git a/blog.bryanroessler.com/index.html b/blog.bryanroessler.com/index.html index 6ae4be2..7fe8c22 100644 --- a/blog.bryanroessler.com/index.html +++ b/blog.bryanroessler.com/index.html @@ -5,3 +5,68 @@ subtitle: use-site-title: false --- +
+ {% for post in paginator.posts %} +
+ +

{{ post.title }}

+ + {% if post.subtitle %} +

+ {{ post.subtitle }} +

+ {% endif %} + + +

+ Posted on {{ post.date | date: site.date_format }} +

+ +
+ {% if post.image %} +
+ + + +
+ {% endif %} +
+ {{ post.excerpt | strip_html | xml_escape | truncatewords: site.excerpt_length }} + {% assign excerpt_word_count = post.excerpt | number_of_words %} + {% if post.content != post.excerpt or excerpt_word_count > site.excerpt_length %} + [Read More] + {% endif %} +
+
+ + {% if post.tags.size > 0 %} +
+ Tags: + {% if site.link-tags %} + {% for tag in post.tags %} + {{- tag -}} + {% endfor %} + {% else %} + {{ post.tags | join: ", " }} + {% endif %} +
+ {% endif %} + +
+ {% endfor %} +
+ +{% if paginator.total_pages > 1 %} + +{% endif %} diff --git a/cv.bryanroessler.com/Gemfile.lock b/cv.bryanroessler.com/Gemfile.lock index a1ab50d..448ab53 100644 --- a/cv.bryanroessler.com/Gemfile.lock +++ b/cv.bryanroessler.com/Gemfile.lock @@ -1,19 +1,12 @@ GEM remote: https://rubygems.org/ specs: -<<<<<<< HEAD - activesupport (6.0.2.1) -======= - activesupport (5.2.4.3) ->>>>>>> origin/gh-pages + activesupport (6.0.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) -<<<<<<< HEAD - zeitwerk (~> 2.2) -======= ->>>>>>> origin/gh-pages + zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) coffee-script (2.4.1) @@ -32,24 +25,15 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) eventmachine (1.2.7) -<<<<<<< HEAD - execjs (2.7.0) - faraday (1.0.0) - multipart-post (>= 1.2, < 3) - ffi (1.12.2) -======= - eventmachine (1.2.7-x64-mingw32) execjs (2.7.0) faraday (1.0.1) multipart-post (>= 1.2, < 3) - ffi (1.12.2) - ffi (1.12.2-x64-mingw32) ->>>>>>> origin/gh-pages + ffi (1.13.1) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (204) + github-pages (206) github-pages-health-check (= 1.16.1) - jekyll (= 3.8.5) + jekyll (= 3.8.7) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) jekyll-commonmark-ghpages (= 0.1.6) @@ -88,7 +72,7 @@ GEM mercenary (~> 0.3) minima (= 2.5.1) nokogiri (>= 1.10.4, < 2.0) - rouge (= 3.13.0) + rouge (= 3.19.0) terminal-table (~> 1.4) github-pages-health-check (1.16.1) addressable (~> 2.3) @@ -96,13 +80,13 @@ GEM octokit (~> 4.0) public_suffix (~> 3.0) typhoeus (~> 1.3) - html-pipeline (2.12.3) + html-pipeline (2.13.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.5) + jekyll (3.8.7) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -218,44 +202,24 @@ GEM jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) -<<<<<<< HEAD - minitest (5.14.0) - multipart-post (2.1.1) - nokogiri (1.10.9) - mini_portile2 (~> 2.4.0) - octokit (4.17.0) -======= minitest (5.14.1) multipart-post (2.1.1) - nokogiri (1.10.9) - mini_portile2 (~> 2.4.0) - nokogiri (1.10.9-x64-mingw32) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) octokit (4.18.0) ->>>>>>> origin/gh-pages faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (3.1.1) -<<<<<<< HEAD rake (13.0.1) - rb-fsevent (0.10.3) - rb-inotify (0.10.1) - ffi (~> 1.0) - rouge (3.13.0) - ruby-enum (0.7.2) - i18n - rubyzip (2.3.0) -======= rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.13.0) + rouge (3.19.0) ruby-enum (0.8.0) i18n - rubyzip (1.3.0) ->>>>>>> origin/gh-pages + rubyzip (2.3.0) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) @@ -268,20 +232,12 @@ GEM terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) -<<<<<<< HEAD - typhoeus (1.3.1) - ethon (>= 0.9.0) - tzinfo (1.2.6) - thread_safe (~> 0.1) - unicode-display_width (1.7.0) - zeitwerk (2.3.0) -======= typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (1.2.7) thread_safe (~> 0.1) unicode-display_width (1.7.0) ->>>>>>> origin/gh-pages + zeitwerk (2.4.0) PLATFORMS ruby @@ -291,8 +247,4 @@ DEPENDENCIES rake BUNDLED WITH -<<<<<<< HEAD 2.0.2 -======= - 2.1.4 ->>>>>>> origin/gh-pages diff --git a/landing.bryanroessler.com/Gemfile.lock b/landing.bryanroessler.com/Gemfile.lock index c62fdf4..f529b5e 100644 --- a/landing.bryanroessler.com/Gemfile.lock +++ b/landing.bryanroessler.com/Gemfile.lock @@ -1,93 +1,28 @@ +PATH + remote: . + specs: + beautiful-jekyll-theme (4.0.1) + jekyll (~> 3.8) + jekyll-paginate (~> 1.1) + jekyll-sitemap (~> 1.4) + GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.11.1) colorator (1.1.0) - commonmarker (0.17.13) - ruby-enum (~> 0.5) concurrent-ruby (1.1.6) - dnsruby (1.61.3) - addressable (~> 2.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - ethon (0.12.0) - ffi (>= 1.3.0) eventmachine (1.2.7) - execjs (2.7.0) - faraday (1.0.0) - multipart-post (>= 1.2, < 3) - ffi (1.12.2) + ffi (1.13.1) forwardable-extended (2.6.0) - gemoji (3.0.1) - github-pages (197) - activesupport (= 4.2.10) - github-pages-health-check (= 1.16.1) - jekyll (= 3.7.4) - jekyll-avatar (= 0.6.0) - jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.1.5) - jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.11.0) - jekyll-gist (= 1.5.0) - jekyll-github-metadata (= 2.12.1) - jekyll-mentions (= 1.4.1) - jekyll-optional-front-matter (= 0.3.0) - jekyll-paginate (= 1.1.0) - jekyll-readme-index (= 0.2.0) - jekyll-redirect-from (= 0.14.0) - jekyll-relative-links (= 0.6.0) - jekyll-remote-theme (= 0.3.1) - jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.5.0) - jekyll-sitemap (= 1.2.0) - jekyll-swiss (= 0.4.0) - jekyll-theme-architect (= 0.1.1) - jekyll-theme-cayman (= 0.1.1) - jekyll-theme-dinky (= 0.1.1) - jekyll-theme-hacker (= 0.1.1) - jekyll-theme-leap-day (= 0.1.1) - jekyll-theme-merlot (= 0.1.1) - jekyll-theme-midnight (= 0.1.1) - jekyll-theme-minimal (= 0.1.1) - jekyll-theme-modernist (= 0.1.1) - jekyll-theme-primer (= 0.5.3) - jekyll-theme-slate (= 0.1.1) - jekyll-theme-tactile (= 0.1.1) - jekyll-theme-time-machine (= 0.1.1) - jekyll-titles-from-headings (= 0.5.1) - jemoji (= 0.10.2) - kramdown (= 1.17.0) - liquid (= 4.0.0) - listen (= 3.1.5) - mercenary (~> 0.3) - minima (= 2.5.0) - nokogiri (>= 1.8.5, < 2.0) - rouge (= 2.2.1) - terminal-table (~> 1.4) - github-pages-health-check (1.16.1) - addressable (~> 2.3) - dnsruby (~> 1.60) - octokit (~> 4.0) - public_suffix (~> 3.0) - typhoeus (~> 1.3) - html-pipeline (2.12.3) - activesupport (>= 2) - nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.4) + jekyll (3.8.7) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -100,152 +35,42 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) - jekyll-coffeescript (1.1.1) - coffee-script (~> 2.2) - coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.3.1) - commonmarker (~> 0.14) - jekyll (>= 3.7, < 5.0) - jekyll-commonmark-ghpages (0.1.5) - commonmarker (~> 0.17.6) - jekyll-commonmark (~> 1) - rouge (~> 2) - jekyll-default-layout (0.1.4) - jekyll (~> 3.0) - jekyll-feed (0.11.0) - jekyll (~> 3.3) - jekyll-gist (1.5.0) - octokit (~> 4.2) - jekyll-github-metadata (2.12.1) - jekyll (~> 3.4) - octokit (~> 4.0, != 4.4.0) - jekyll-mentions (1.4.1) - html-pipeline (~> 2.3) - jekyll (~> 3.0) - jekyll-optional-front-matter (0.3.0) - jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-readme-index (0.2.0) - jekyll (~> 3.0) - jekyll-redirect-from (0.14.0) - jekyll (~> 3.3) - jekyll-relative-links (0.6.0) - jekyll (~> 3.3) - jekyll-remote-theme (0.3.1) - jekyll (~> 3.5) - rubyzip (>= 1.2.1, < 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.5.0) - jekyll (~> 3.3) - jekyll-sitemap (1.2.0) - jekyll (~> 3.3) - jekyll-swiss (0.4.0) - jekyll-theme-architect (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.5.3) - jekyll (~> 3.5) - jekyll-github-metadata (~> 2.9) - jekyll-seo-tag (~> 2.0) - jekyll-theme-slate (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-titles-from-headings (0.5.1) - jekyll (~> 3.3) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.10.2) - gemoji (~> 3.0) - html-pipeline (~> 2.2) - jekyll (~> 3.0) kramdown (1.17.0) - liquid (4.0.0) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + liquid (4.0.3) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.4.0) - minima (2.5.0) - jekyll (~> 3.5) - jekyll-feed (~> 0.9) - jekyll-seo-tag (~> 2.1) - minitest (5.14.0) - multipart-post (2.1.1) - nokogiri (1.10.9) - mini_portile2 (~> 2.4.0) - octokit (4.16.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.1.1) - rb-fsevent (0.10.3) + public_suffix (4.0.5) + rake (12.3.3) + rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rouge (2.2.1) - ruby-enum (0.7.2) - i18n - ruby_dep (1.5.0) - rubyzip (2.2.0) + rouge (3.21.0) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - 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) - thread_safe (0.3.6) - typhoeus (1.3.1) - ethon (>= 0.9.0) - tzinfo (1.2.6) - thread_safe (~> 0.1) - unicode-display_width (1.6.1) PLATFORMS ruby DEPENDENCIES - github-pages (= 197) + beautiful-jekyll-theme! + bundler (>= 1.16) jekyll - jekyll-paginate + rake (~> 12.0) BUNDLED WITH 2.0.2 diff --git a/landing.bryanroessler.com/_config.yml b/landing.bryanroessler.com/_config.yml index 3abaaee..21d5f16 100644 --- a/landing.bryanroessler.com/_config.yml +++ b/landing.bryanroessler.com/_config.yml @@ -7,7 +7,6 @@ url: "https://bryanroessler.com" baseurl: "" - # Name of website title: Bryan Roessler @@ -32,7 +31,7 @@ navbar-links: # Image to show in the navigation bar - works best with a square image # Remove this parameter if you don't want an image in the navbar -avatar: "/img/me_square_sepia_small.jpg" +avatar: "/assets/img/me_square_sepia_small.jpg" # By default, the image is cut into a circle. You can disable this behaviour by setting 'round-avatar: false' round-avatar: true diff --git a/landing.bryanroessler.com/index.html b/landing.bryanroessler.com/index.html index 1151f19..b183cfb 100644 --- a/landing.bryanroessler.com/index.html +++ b/landing.bryanroessler.com/index.html @@ -9,6 +9,6 @@ I identify problems and pursue state-of-the-art software solutions. I'm currently working on migrating high-performance computing to the cloud using container orchestration. -My working repositories can be found [here](https://git.bryanroessler.com) and my release quality projects are automatically mirrored to [Github](https://github.com/cryobry/). Some of my long-term projects are not public (yet), but I do try and regularly open-source development tools that I have written along the way. Occasionally I'll even write a tutorial [blog post](https://blog.bryanroessler.com) if something needs additional documentation. +My working repositories can be found here and my release quality projects are automatically mirrored to Github. Some of my long-term projects are not public (yet), but I do try and regularly open-source development tools that I have written along the way. Occasionally I'll even write a tutorial blog post if something needs additional documentation. -Please [contact me](mailto:bryanroessler@gmail.com) if you would like to collaborate or chat about a project. +Please contact me if you would like to collaborate or chat about a project.