zine 0.9.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1d0c74eb3ad2448eca853a98779f43fc8536e39e
-  data.tar.gz: 5bfbce5f7b26a6289aba3b652b4c13c32e7d1c9a
+SHA256:
+  metadata.gz: ec6708f393eb728e1c5683a092f37ee2008c41c292105be0587c89045f9b267a
+  data.tar.gz: c33be8fdc0d2b17ea341cd532827493491d41c665ffb21f0505dab21adfeaf27
 SHA512:
-  metadata.gz: 2316b8ac4c8c8dd10fb6761ec77de852dda18dcced1d5b3ef0862ef2e01446ee04b65e32583e5e0495a43f22674ac278a8c4e1f776ab8f565fdbefd347bfecc2
-  data.tar.gz: d63c8be31dc262b119bb536999c6ccfc3f0a85b3008c72ede9d873625c1495ebb210062df521e66f2b65c9ca27987edf6937441650cf79e5a3dabb7ebe5efb5e
+  metadata.gz: dd3359cbf10d141396f05ab17489eb44d80ff1bd6830dac029e8469a5d0a7d503d332a4892191f1240cf42813657ad10f90afed54ca19106e679710915196f9f
+  data.tar.gz: 51769bedd049eac1a94a9e94cd4c0114303e847861f7cfb38044269d3aa1f05a538c62cdb3e0289a72f1835247d64236849e36bb33586bf963cc3d4d6f312ec5

data/CHANGELOG.md

@@ -117,3 +117,55 @@
 
 - a bug in 'zine notice' involving full & partial paths that duplicated the post to notice on the history page, fixed
 - minor code clean-up in cli.rb and server.rb
+
+# 0.10.0, November 7, 2018
+
+- dependency version bumps
+
+# 0.11.0, November 7, 2018
+
+- fixed a bug where String#split would break apart markdown files on tables as well as at the metadata/markdown boundary
+
+# 0.12.0 - never pushed, used up until April 25, 2019
+
+- added (then removed) Mastodon from the list of contacts, changed the styling a few times, neglected to publish
+
+# 0.13.0 - lucky 13 - May 26, 2019
+
+- added some of the style changes that survived from v12, eg moved social media to the footer
+- added a (permissive as they come) robots.txt file
+- dependency updates, kramdown split into kramdown & kramdown-parser-gfm which seems to be slower :-(
+- bumped the required version of Ruby to 2.3 (for bundler, kramdown, etc)
+- dropped the highline gem (it was only used to get the one input, originally there was going to be more)
+- minor readme updates
+- placeholder site, mostly in case there's ever an app: https://zine.dev
+
+# 0.14.0 - May 27, 2019
+
+- added an AWS S3 uploader
+- added AWS CloudFront invalidation
+- added zine.dev to the footer template
+- bug fix - catch carriage returns as default yes answers to the upload? question
+
+# 0.15.0 - May 26, 2020
+
+- dependency version bumps, year bump in template
+- replaced zine.dev with https://mikekreuzer.com/projects/zine/
+- other minor refactoring & doc rewrites
+
+TO DO
+
+- add canonical links to page headers, means the build order needs to change...
+- generate sitemap.xml
+- fix the SFTP error from 0.7/0.8, also likely applies to S3
+- make sure the server's killed on errors (eg if no credentials) so can run it again later without a port conflict
+- tests, lots of tests
+
+MAY DO
+
+- concurrent-ruby gem
+- migration scripts from eg Jekyll?
+- Apple News
+- much refactoring, frozen_string_literal, split monster classes, etc
+- replace thor with optparse
+- an app... maybe

data/README.md

@@ -1,40 +1,35 @@
 # zine
-Yet another blog aware static site generator.
 
-## Warning: pre-release code
+[![Gem Version](https://badge.fury.io/rb/zine.svg)](https://badge.fury.io/rb/zine)
 
-These are the very early days of zine, expect breaking changes.
-
-## Why yet another static blog engine?
-
-Despite the [proliferation in these things][engine_list] (450!) I still find it more comfortable to use my own tools.
+Zine is an open source, command line, blog-aware, static website generator.
 
 Distinguishing features include:
 
 - ERB templates
 - Sass stylesheets
 - fast incremental builds
-- SFTP file uploads
+- a choice of AWS S3, GitHub & SFTP file uploaders
 
-Presented here in the hope it's of use to someone else too.
+## How do I get it?
 
-## Installation
+Zine is a Ruby Gem, so if you have Ruby on your machine (it comes installed standard on a Mac), open Terminal & type
 
-Install the gem.
+````bash
+gem install zine
+````
 
-```shell
-$ gem install zine
-```
+And you're away.
 
-To generate a new site scaffold, cd to a new folder and:
+To generate a new scaffold site, cd to a new directory and:
 
 ```shell
 $ zine site
 ```
 
-Then update your site's name, your name & so on in zine.yaml. Pay particular care to the Upload section, if you want to use Zine as an SFTP uploader to deploy files that've changed, you'll need to edit this section to include your remote server's details, as well as the path to a YAML file with your username & password (nil for that if you're using SSH without a password).
+Then update your site's name, your name & so on in zine.yaml. Pay particular care to the Upload section, if you want to use Zine to deploy files you've changed, you'll need to edit this section to include your remote server's details, including the path to a YAML file with your credentials.
 
-## Day to day usage
+## Day to day use
 
 To set up a new blog post:
 
@@ -42,15 +37,25 @@ To set up a new blog post:
 $ zine post 'Your chosen title'
 ```
 
-Your new post will have some fields set up in the YAML front matter, feel free to edit them too. Markdown files you create outside of the posts folder will be rendered into HTML in the same relative position in the build folder.
+Your new post will have some fields set up in the YAML front matter, feel free to edit them too.
+
+You can also create other Markdown files outside of the posts folder, those will be rendered into HTML in the same relative position in the build folder. That's how the project, about etc pages on my site are made for example.
 
-Once you're done writing, build your new site:
+Type zine build before you start writing to serve up a local copy of your site that you can refresh to see what the build version will look like.
 
 ```shell
-$ zine build # or zine force
+$ zine build
 ```
 
-Build only writes files for things that have changed while it's running, so the first time you build your site you should use force -- force writes all of the files (& so also uploads them all too if you've set up uploads).
+or
+
+```shell
+$ zine force
+```
+
+Build will only watch for the things that change while it's running, so the first time you build your site you should use force -- force writes all of the files (& so also uploads them all too if you've set up uploads).
+
+Control-C in Terminal when you're done.
 
 ## Design & development
 
@@ -74,16 +79,11 @@ Commands:
   zine version         # Show the version number
 ```
 
-### Up next
-
-This is only a first cut at this gem, the stuff I considered a (barely) minimum viable product. Up next are:
+## Links
 
-- migration scripts from eg Jekyll? Maybe.
-- Apple News
-- much refactoring
-- docs
-- tests, lots of tests
-- and a few other things
+- [Github][github] - show me the code
+- [Ruby gems][rubygems] - show me the Ruby details (pick up some gems while you're there)
+- [Project site][mk] - Zine's home on the web
 
 ## Contributing
 
@@ -92,11 +92,13 @@ Yes please. Bug reports and pull requests are welcome on GitHub at https://githu
 ## Tests
 
 ```shell
-bundle exec rspec spec # or your alias for that
+rake
 ```
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
-[engine_list]: https://staticsitegenerators.net
+[github]: https://github.com/mikekreuzer/zine
+[mk]: https://mikekreuzer/projects/zine/
+[rubygems]: https://rubygems.org/gems/zine

data/lib/zine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'erb'
 require 'rainbow'
 require 'zine/page'
@@ -70,7 +72,7 @@ module Zine
     end
 
     # currently used to say yes on a script's behalf - in #notice
-    class MockHighlineYes
+    class MockYes
       def ask(_question)
         'Y'
       end
@@ -102,11 +104,12 @@ module Zine
       # preview posts_and_guard -- no preview needed...
       return if @options['upload']['method'] == 'none' ||
                 (guard.delete_array.empty? && guard.upload_array.empty?)
-      uploader = Zine::Upload.new @options['directories']['build'],
+
+      uploader = Zine::Upload.new(@options['directories']['build'],
                                   @options['upload'],
                                   guard.delete_array,
-                                  guard.upload_array
-      uploader.upload_decision MockHighlineYes
+                                  guard.upload_array)
+      uploader.upload_decision MockYes
     end
 
     def write_markdown(default_name, src_dir, file)
@@ -158,18 +161,18 @@ module Zine
     end
 
     def init_options
-      @options ||= begin
-        YAML.safe_load File.open('zine.yaml')
-      rescue ArgumentError => err
-        puts Rainbow("Could not parse YAML options: #{err.message}").red
-      end
+      @options ||= YAML.safe_load File.open('zine.yaml')
+    rescue ArgumentError => e
+      puts Rainbow("Could not parse YAML options: #{e.message}").red
     end
 
     def init_templates
+      Encoding.default_external = 'UTF-8'
       tem_array = Dir[File.join(@options['directories']['templates'], '*.erb')]
       tem_array.each do |tem|
         @templates_by_name.merge!(File.basename(tem, '.*') =>
-                                  ERB.new(File.read(tem), 0, '-'))
+          ERB.new(File.read(tem),
+                  trim_mode: '-'))
       end
     end
 

data/lib/zine/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'rainbow'
 require 'time'
@@ -16,6 +18,10 @@ module Zine
       def init_site
         @the_site ||= Zine::Site.new
       end
+
+      def options
+        @the_site.options
+      end
     end
 
     desc 'build', 'Build the site'
@@ -47,7 +53,7 @@ module Zine
     desc 'nuke', 'Delete the build folder'
     def nuke
       init_site
-      FileUtils.remove_dir @the_site.options['directories']['build'],
+      FileUtils.remove_dir options['directories']['build'],
                            force: true
       puts Rainbow('Site nuked. It\'s the only way to be sure.').green
     end
@@ -55,7 +61,6 @@ module Zine
     desc 'post TITLE', 'Create the file for a new blog post, titled TITLE'
     def post(name)
       init_site
-      options = @the_site.options
       option_dir = options['directories']
       Zine::CLI.source_root option_dir['templates']
       @date = DateTime.now
@@ -77,7 +82,7 @@ module Zine
     desc 'style', 'Build the site\'s stylesheet'
     def style
       init_site
-      style = Zine::Style.new(@the_site.options['directories'])
+      style = Zine::Style.new(options['directories'])
       style.process(File)
       puts Rainbow('Stylesheet rendered').green
     end

data/lib/zine/page.rb

@@ -2,6 +2,7 @@ require 'erb'
 require 'date'
 require 'htmlcompressor'
 require 'kramdown'
+require 'kramdown-parser-gfm'
 require 'pathname'
 require 'rainbow'
 require 'yaml'
@@ -39,7 +40,8 @@ module Zine
                   site_URL: site['site_URL'],
                   tags: slugify_tags(front_matter['tags']),
                   title: html_escape(front_matter['title']),
-                  twitter_name: site['twitter_name'] }
+                  twitter_name: site['twitter_name'],
+                  uri: '' } # uri only generated for posts, and not until after markdown, TO DO
       end
 
       def public_binding
@@ -66,7 +68,7 @@ module Zine
 
     def initialize(md_file_name, dest, templates, site_options)
       @source_file = md_file_name
-      file_parts = File.open(md_file_name, 'r').read.split('---')
+      file_parts = File.open(md_file_name, 'r').read.split('---', 3)
       @formatted_data = FormattedData.new(parse_yaml(file_parts[1],
                                                      md_file_name),
                                           site_options)
@@ -104,7 +106,6 @@ module Zine
         input: 'GFM',
         auto_ids: false,
         smart_quotes: %w[apos apos quot quot],
-        syntax_highlighter: 'rouge'
       ).to_html
       @raw_text = nil
     end

data/lib/zine/post.rb

@@ -5,7 +5,7 @@ module Zine
   class Post < Page
     def initialize(md_file_name, templates, site_options)
       @source_file = md_file_name
-      file_parts = File.open(md_file_name, 'r').read.split('---')
+      file_parts = File.open(md_file_name, 'r').read.split('---', 3)
       @formatted_data = FormattedData.new(parse_yaml(file_parts[1],
                                                      md_file_name),
                                           site_options)

data/lib/zine/query.rb

@@ -0,0 +1,10 @@
+module Zine
+  # Returns an answer from the CLI
+  class Query
+    def call(question)
+      puts question
+      result = $stdin.gets.chomp
+      result == '' ? 'Y' : result
+    end
+  end
+end

data/lib/zine/server.rb

@@ -1,4 +1,4 @@
-require 'highline'
+require 'zine/query'
 require 'rainbow'
 require 'rack'
 require 'thin'
@@ -67,7 +67,7 @@ module Zine
                 (@delete_array.empty? && @upload_array.empty?)
       uploader = Zine::Upload.new rel_path_build, upload_options,
                                   @delete_array, @upload_array
-      uploader.upload_decision HighLine
+      uploader.upload_decision Query
     end
   end
 end

data/lib/zine/skeleton/source/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow:

data/lib/zine/skeleton/source/screen.css

@@ -1 +1 @@
-*{margin:0;padding:0}html,body{height:100%}body{background-color:#fff;font-family:GillSansRegular,"Gill Sans MT","Gill Sans","Century Gothic",Calibri,"Trebuchet MS",sans-serif;line-height:1.618;color:#333;text-align:center;font-weight:300}#skiptocontent{height:1px;width:1px;position:absolute;overflow:hidden;top:-10px}h1,h2,h3,h4,h5,h6{color:#333;letter-spacing:0.1em}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{color:#414f7c;text-decoration:none}h1 a:hover,h2 a:hover,h3 a:hover,h4 a:hover,h5 a:hover,h6 a:hover{color:#212721}h1{font-weight:300;font-size:2.618em;margin:1.809em 0 0.809em}h2{font-weight:300;font-size:1.618em;margin:1.809em 0 0.809em}h3,h4,h5,h6{font-weight:400;font-size:1em;margin:1.809em 0 0.809em}p,li{margin:1em 0}ul{margin:0}a{color:#414f7c}a:hover{color:#212721}section{margin-bottom:1.618em}section>section{margin-bottom:3.236em}strong{font-weight:400}body>header{width:43em;text-align:center;margin:0 auto 0}body>header a{text-decoration:none;margin-left:0.5em;margin-right:0.5em}body>header,body>main,body>footer{display:block}body>header a{color:#414f7c}body>header a:hover{color:#212721}body>header a.extra{color:#414f7c;margin-left:1em}body>header a.extra:hover{color:#212721}body>header nav ul li{display:inline;list-style:none}.button{width:30px;height:30px;display:inline-block;background-size:100%;text-indent:-999em;text-align:left;margin:20px}.twitter{background:url("https://mikekreuzer.com/assets/webicon-twitter-m.png");background-image:url("https://mikekreuzer.com/assets/webicon-twitter.svg"),none}.rss{background:url("https://mikekreuzer.com/assets/webicon-rss-m.png");background-image:url("https://mikekreuzer.com/assets/webicon-rss.svg"),none}main{text-align:left;width:43em;margin:3em auto 2em}main li{margin-left:2.618em}.meta{color:#667}footer{width:43em;color:#667;border-top:4px solid #ddd;margin:3em auto 2em;overflow:hidden}footer .column{float:left;width:33%;text-align:left}footer .column ul{list-style:none}footer .column a,.tags a{color:#414f7c;text-decoration:none}footer .column a:hover,.tags a:hover{color:#212721;text-decoration:underline}.tags ul li{list-style:none;display:inline;font-variant:small-caps;font-size:1.2em}.archive a{text-decoration:none}ul.archive,ul.archive ul{margin-left:0}ul.archive li,ul.archive ul li{list-style:none;margin-left:0}.post pre{border:1px solid #ddd;background-color:#fff;padding:0 .4em}p.date{color:#667}pre{background-color:#eee;padding:1em;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word}code{font-family:Consolas,Menlo,Monaco,"Lucida Console","Courier New",monospace,serif;font-size:0.8em}blockquote{margin:2em 2em 2em 1em;padding:0 .75em 0 1.25em;border-left:2px solid #ddd;border-right:0px solid #ddd}@media all and (max-width: 736px){body>header,main,footer{width:86%;margin:0 auto 0;padding:12px 24px 12px}p{margin-bottom:2em}.button{width:50px;height:50px;margin:20px}footer .column{width:100%}}
+*{margin:0;padding:0}html,body{height:100%}body{background-color:#fff;font-family:GillSansRegular,"Gill Sans MT","Gill Sans","Century Gothic",Calibri,"Trebuchet MS",sans-serif;line-height:1.618;color:#333;text-align:center;font-weight:300}#skiptocontent{height:1px;width:1px;position:absolute;overflow:hidden;top:-10px}h1,h2,h3,h4,h5,h6{color:#333;letter-spacing:0.1em}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{color:#414f7c;text-decoration:none}h1 a:hover,h2 a:hover,h3 a:hover,h4 a:hover,h5 a:hover,h6 a:hover{color:#212721}h1{font-weight:300;font-size:2.618em;margin:1.809em 0 0.809em}h2{font-weight:300;font-size:1.618em;margin:1.809em 0 0.809em}h3,h4,h5,h6{font-weight:400;font-size:1em;margin:1.809em 0 0.809em}p,li{margin:1em 0}ul{margin:0}a{color:#414f7c}a:hover{color:#212721}section{margin-bottom:1.618em}section>section{margin-bottom:3.236em}strong{font-weight:400}body>header{width:43em;text-align:center;margin:0 auto 0}body>header a{text-decoration:none;margin-left:0.5em;margin-right:0.5em}body>header,body>main,body>footer{display:block}body>header a{color:#414f7c}body>header a:hover{color:#212721}body>header a.extra{color:#414f7c;margin-left:1em}body>header a.extra:hover{color:#212721}body>header nav ul li{display:inline;list-style:none}.contact-list span{margin-left:40px}.button{width:30px;height:30px;display:inline-block;background-size:100%;text-align:left}.twitter{background:url("/assets/webicon-twitter-m.png");background-image:url("/assets/webicon-twitter.svg"),none}.rss{background:url("/assets/webicon-rss-m.png");background-image:url("/assets/webicon-rss.svg"),none}main{text-align:left;width:43em;margin:3em auto 2em}main li{margin-left:2.618em}.meta{color:#667}footer{width:43em;color:#667;border-top:4px solid #ddd;margin:3em auto 2em;overflow:hidden}footer .column{float:left;padding:1px;text-align:left;width:32%}footer .column ul{list-style:none}footer .column a,.tags a{color:#414f7c;text-decoration:none}footer .column a:hover,.tags a:hover{color:#212721;text-decoration:underline}.tags ul li{list-style:none;display:inline;font-variant:small-caps;font-size:1.2em}.archive a{text-decoration:none}ul.archive,ul.archive ul{margin-left:0}ul.archive li,ul.archive ul li{list-style:none;margin-left:0}.post pre{border:1px solid #ddd;background-color:#fff;padding:0 .4em}p.date{color:#667}pre{background-color:#eee;padding:1em;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word}code{font-family:Consolas,Menlo,Monaco,"Lucida Console","Courier New",monospace,serif;font-size:0.8em}table{border-collapse:collapse;margin:0 auto}th,td{border:solid #ddd 1px;padding:0.5em 1.5em}blockquote{margin:2em 2em 2em 1em;padding:0 .75em 0 1.25em;border-left:2px solid #ddd;border-right:0px solid #ddd}.chart-png{margin:2em 0 2em;width:90%}.logo-png{float:left;margin-bottom:18px;margin-right:24px}@media all and (max-width: 736px){body>header,main,footer{width:86%;margin:0 auto 0;padding:12px 24px 12px}p{margin-bottom:2em}footer .column{width:100%}}

data/lib/zine/skeleton/source/styles/screen.scss

@@ -19,8 +19,6 @@ $desktopWidth: 43em;
 $lightWeight: 300;
 $heavyWeight: 400;
 
-$siteBaseURL: 'https:\/\/mikekreuzer.com';
-
 $regularFont: GillSansRegular, 'Gill Sans MT', 'Gill Sans', 'Century Gothic', Calibri, 'Trebuchet MS', sans-serif;
 $monoFont: Consolas, Menlo, Monaco, 'Lucida Console', 'Courier New', monospace, serif;
 
@@ -61,21 +59,21 @@ h1,h2,h3,h4,h5,h6 {
 }
 
 h1 {
-    font-weight: $lightWeight;
-    font-size: 2.618em;
-    margin: 1.809em 0 0.809em;
+  font-weight: $lightWeight;
+  font-size: 2.618em;
+  margin: 1.809em 0 0.809em;
 }
 
 h2 {
-    font-weight: $lightWeight;
-    font-size: 1.618em;
-    margin: 1.809em 0 0.809em;
+  font-weight: $lightWeight;
+  font-size: 1.618em;
+  margin: 1.809em 0 0.809em;
 }
 
 h3, h4, h5, h6 {
-    font-weight: $heavyWeight;
-    font-size: 1em;
-    margin: 1.809em 0 0.809em;
+  font-weight: $heavyWeight;
+  font-size: 1em;
+  margin: 1.809em 0 0.809em;
 }
 
 p, li {
@@ -141,24 +139,26 @@ body > header nav ul li {
   list-style: none;
 }
 
+.contact-list span {
+  margin-left: 40px;
+}
+
 .button {
-    width: 30px;
-    height: 30px;
-    display: inline-block;
-    background-size: 100%;
-    text-indent: -999em;
-    text-align: left;
-    margin: 20px;
+  width: 30px;
+  height: 30px;
+  display: inline-block;
+  background-size: 100%;
+  text-align: left;
 }
 
 .twitter {
-    background: url($siteBaseURL + '/assets/webicon-twitter-m.png');
-    background-image: url($siteBaseURL + '/assets/webicon-twitter.svg'), none;
+  background: url('/assets/webicon-twitter-m.png');
+  background-image: url('/assets/webicon-twitter.svg'), none;
 }
 
 .rss {
-    background: url($siteBaseURL + '/assets/webicon-rss-m.png');
-    background-image: url($siteBaseURL + '/assets/webicon-rss.svg'), none;
+  background: url('/assets/webicon-rss-m.png');
+  background-image: url('/assets/webicon-rss.svg'), none;
 }
 
 main {
@@ -185,8 +185,9 @@ footer {
 
 footer .column {
   float: left;
-  width: 33%;
+  padding: 1px;
   text-align: left;
+  width: 32%;
 }
 
 footer .column ul { list-style: none; }
@@ -194,18 +195,18 @@ footer .column a, .tags a { color:$linkColour; text-decoration: none; }
 footer .column a:hover, .tags a:hover   { color:$hoverColour; text-decoration: underline; }
 
 .tags ul li {
-    list-style: none;
-    display: inline;
-    font-variant: small-caps;
-    font-size:1.2em;
+  list-style: none;
+  display: inline;
+  font-variant: small-caps;
+  font-size:1.2em;
 }
 
 .archive a {
-    text-decoration: none;
+  text-decoration: none;
 }
 
 ul.archive, ul.archive ul {
-    margin-left: 0;
+  margin-left: 0;
 }
 
 ul.archive li, ul.archive ul li {
@@ -234,7 +235,7 @@ footer .rss img {
 
 
 p.date {
-    color: $mediumGrey;
+  color: $mediumGrey;
 }
 
 /*.post ul, .post ol {
@@ -242,14 +243,14 @@ p.date {
 }*/
 
 pre {
-    background-color: $codeBackgroundColour;
-    padding: 1em;
-    white-space: pre-wrap;
-    /* why necessary */
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-    white-space: -pre-wrap;      /* Opera 4-6 */
-    white-space: -o-pre-wrap;    /* Opera 7 */
-    word-wrap: break-word;
+  background-color: $codeBackgroundColour;
+  padding: 1em;
+  white-space: pre-wrap;
+  /* why necessary */
+  white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+  white-space: -pre-wrap;      /* Opera 4-6 */
+  white-space: -o-pre-wrap;    /* Opera 7 */
+  word-wrap: break-word;
 }
 
 code {
@@ -268,6 +269,16 @@ code {
   background-color: $codeBackgroundColour;
 }*/
 
+table {
+  border-collapse: collapse;
+  margin: 0 auto;
+}
+
+th, td {
+  border: solid $lightGrey 1px;
+  padding: 0.5em 1.5em;
+}
+
 /* quotes */
 blockquote {
   margin: 2em 2em 2em 1em;
@@ -276,6 +287,17 @@ blockquote {
   border-right: 0px solid $borderColour;
 }
 
+.chart-png {
+  margin: 2em 0 2em;
+  width:90%; 
+}
+
+.logo-png {
+  float:left;
+  margin-bottom:18px;
+  margin-right: 24px;
+}
+
 @media all and (max-width: 736px) {
     /* was max-device-width: 1242px */
 	body > header, main, footer {
@@ -286,11 +308,11 @@ blockquote {
   p {
     margin-bottom:2em;
   }
-  .button {
+  /*.button {
     width: 50px;
     height: 50px;
     margin: 20px;
-  }
+  }*/
   footer .column {
     width: 100%;
   }

data/lib/zine/skeleton/source/templates/footer_partial.erb

@@ -1,23 +1,26 @@
   <footer>
-    <div class="column">
-      <h3>Contact me</h3>
-      <p>Twitter:&nbsp;<a href="https://twitter.com/<%= page[:twitter_name] %>">@<%= page[:twitter_name] %></a></p>
-    </div>
-    <div class="column">
-      <h3>Me elsewhere</h3>
-      <ul>
-      <% for @link in page[:links_array] %>
-        <li><a href="<%= @link['uri'] %>"><%= @link['name'] %></a></li>
-      <% end %>
+  <div class="column">
+    <h3>Contact me</h3>
+    <ul class="contact-list">
+      <li><a href="https://twitter.com/<%= page[:twitter_name] %>" class="button twitter"><span>Twitter</span></a></li>
+      <li><a href="<%= page[:site_URL] %>/rss.xml" rel="home" type="application/rss+xml" class="button rss"><span>Subscribe</span></a></li>
     </ul>
-    </div>
-    <div class="column">
-      <h3>The fine print</h3>
-      <ul>
-        <li>Built with <a href="https://github.com/mikekreuzer/zine">Zine</a></li>
-        <li>&copy; 2017<span> <%= page[:site_author] %></span></li>
-      </ul>
-    </div>
+  </div>
+  <div class="column">
+    <h3>Me elsewhere</h3>
+    <ul>
+    <% for @link in page[:links_array] %>
+      <li><a href="<%= @link['uri'] %>"><%= @link['name'] %></a></li>
+    <% end %>
+  </ul>
+  </div>
+  <div class="column">
+    <h3>The fine print</h3>
+    <ul>
+      <li>Built with <a href="https://mikekreuzer.com/projects/zine/">Zine</a></li>
+      <li>&copy; 2020<span> <%= page[:site_author] %></span></li>
+    </ul>
+  </div>
   </footer>
-  </body>
+</body>
 </html>

data/lib/zine/skeleton/source/templates/header_partial.erb

@@ -6,8 +6,9 @@
     <meta name="description" content="<%= page[:site_description] %>">
     <title><%= page[:site_name] %> | <%= page[:title] %></title>
     <link rel="home" href="<%= page[:site_URL] %>/rss.xml" type="application/rss+xml" title="<%= page[:site_name] %>">
-    <link rel="stylesheet" href="<%= page[:site_URL] %>/screen.css">
-    <link rel="apple-touch-icon" href="<%= page[:site_URL] %>/apple-touch-icon.png">
+    <link rel="stylesheet" href="/screen.css">
+    <link rel="apple-touch-icon" href="/apple-touch-icon.png">
+    <!--<link rel="canonical" href="<%= page[:uri] %>" />-->
   </head>
   <body>
     <div id="skiptocontent">
@@ -19,9 +20,10 @@
       <nav>
         <ul>
           <li><a href="<%= page[:site_URL] %>">Home</a></li>
-          <li><a href="<%= page[:site_URL] %>/articles.html">Articles</a></li>
-          <li><a href="<%= page[:site_URL] %>/about.html">About</a></li>
-        </ul><a href="https://twitter.com/<%= page[:twitter_name] %>" class="button twitter">Argue with me on Twitter</a><a href="<%= page[:site_URL] %>/rss.xml" rel="home" type="application/rss+xml" class="button rss">RSS Feed</a>
+          <li><a href="/articles.html">Articles</a></li>
+          <li><a href="/tags/index.html">Tags</a></li>
+          <li><a href="/about.html">About</a></li>
+        </ul>
       </nav>
     </header>
     <a name="maincontent"></a>

data/lib/zine/skeleton/zine.yaml

@@ -33,8 +33,9 @@ templates:
   tag: tag
   tag_index: tag_index
 upload:
+  cloudfront_distrib: ID or ''
   credentials: /local/absolute/path/to/yaml/file/with/username/password/or/access_token
-  host: 127.0.0.1
-  method: none|github|sftp
+  host: eg 127.0.0.1, or for AWS region:bucket_name
+  method: none|aws|github|sftp
   path_or_repo: /remote/absolute/path/to/html|fullname/repo
   verbose: true

data/lib/zine/upload.rb

@@ -1,12 +1,12 @@
-require 'highline'
 require 'rainbow'
 require 'set'
 require 'zine'
+require 'zine/uploader_aws'
 require 'zine/uploader_github'
 require 'zine/uploader_sftp'
 
 module Zine
-  # Deploy changes to a remote host, via SFTP or using the GitHub Rest API
+  # Deploy changes to a remote host, via SFTP or using the AWS or GitHub API
   class Upload
     def initialize(build_dir, options, delete_file_array, upload_file_array)
       if options['method'] == 'none'
@@ -24,7 +24,7 @@ module Zine
     def upload_decision(query_class)
       return if @no_upload
       cli = query_class.new
-      answer = cli.ask('Upload files? (Y/n)') { |q| q.default = 'Y' }
+      answer = cli.call 'Upload files? (Y/n)'
       return if answer != 'Y'
       puts Rainbow('Connecting...').green
       upload
@@ -46,6 +46,15 @@ module Zine
       exit
     end
 
+    def aws_upload
+      uploader = Zine::UploaderAWS.new(@build_dir,
+                                       @options,
+                                       @credentials,
+                                       @delete_file_array,
+                                       @upload_file_array)
+      uploader.upload
+    end
+
     def github_upload
       uploader = Zine::UploaderGitHub.new(@build_dir,
                                           @options,
@@ -65,7 +74,9 @@ module Zine
     end
 
     def upload
-      if @options['method'] == 'sftp'
+      if @options['method'] == 'aws'
+        aws_upload
+      elsif @options['method'] == 'sftp'
         sftp_upload
       elsif @options['method'] == 'github'
         github_upload

data/lib/zine/uploader_aws.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require 'aws-sdk-cloudfront'
+require 'aws-sdk-s3'
+require 'rack/mime'
+require 'rainbow'
+require 'set'
+
+module Zine
+  # Deploy changes to an AWS S3 bucket and invalidate the Cloudfront cache
+  class UploaderAWS
+    def initialize(build_dir, options, credentials, delete_file_array,
+                   upload_file_array)
+      return unless options['method'] == 'aws'
+
+      @build_dir = build_dir
+      ENV['AWS_REGION'], @bucket_name = options['host'].split(':')
+      @path = options['path_or_repo']
+      @cf_distribution_id = options['cloudfront_distrib']
+
+      @verbose = options['verbose']
+      store_credentials credentials
+      @delete_file_array = Set.new(delete_file_array).to_a
+      @upload_file_array = Set.new(upload_file_array).to_a
+
+      @s3 = Aws::S3::Client.new
+      @cf = Aws::CloudFront::Client.new
+    end
+
+    def upload
+      delete
+      deploy
+      invalidate
+    rescue Aws::S3::Errors::ServiceError => err
+      puts Rainbow("S3 error: #{err}").red
+    end
+
+    private
+
+    def clean_path(path)
+      path.to_s
+          .delete_prefix('/')
+          .delete_suffix('/')
+    end
+
+    def delete
+      @delete_file_array.each do |rel_path|
+        remote_path = clean_path(rel_path)
+        @s3.delete_object(bucket: @bucket_name, key: remote_path)
+        puts "Delete: #{remote_path}" if @verbose
+      end
+    end
+
+    def deploy
+      @upload_file_array.each do |rel_path|
+        deploy_one_file(File.join(@build_dir, rel_path),
+                        clean_path(rel_path))
+      end
+    end
+
+    def deploy_one_file(local_path, remote_path)
+      File.open(local_path, 'rb') do |file|
+        content_type = Rack::Mime.mime_type(File.extname(local_path))
+        @s3.put_object(bucket: @bucket_name,
+                       key: remote_path,
+                       content_type: content_type,
+                       body: file)
+        puts "Add: #{remote_path}" if @verbose
+      end
+    end
+
+    def invalidate
+      changes = Set.new(@upload_file_array + @delete_file_array).to_a
+      return unless changes.count.positive?
+
+      puts 'Invalidating cache' if @verbose
+      string_changes = changes.map do |path|
+        path.to_s
+            .delete_prefix('/')
+            .prepend('/')
+      end
+      string_changes << '/'
+      @cf.create_invalidation(
+        distribution_id: @cf_distribution_id,
+        invalidation_batch: { paths: { quantity: string_changes.count,
+                                       items: string_changes },
+                              caller_reference: Time.now.to_i.to_s }
+      )
+    end
+
+    def store_credentials(creds)
+      ENV['AWS_ACCESS_KEY_ID'] = creds['username']
+      ENV['AWS_SECRET_ACCESS_KEY'] = creds['password']
+    end
+  end
+end

data/lib/zine/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Zine
   # The version
-  VERSION = '0.9.0'.freeze
+  VERSION = '0.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zine
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Mike Kreuzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-01 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,156 +16,184 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.18.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.18.5
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: aws-sdk-cloudfront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.27'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: 1.27.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.27'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: 1.27.1
 - !ruby/object:Gem::Dependency
-  name: htmlcompressor
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '1.66'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
+        version: '1.66'
+- !ruby/object:Gem::Dependency
+  name: htmlcompressor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.2
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.2
+        version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: kramdown-parser-gfm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
@@ -192,54 +220,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.18'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -260,23 +276,23 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 1.0.1
 description: |-
   Yet another blog aware static site generator.
-  These are the very early days of zine, expect breaking changes.
+  There are many like it, but this one is mine.
 email:
 - mike@mikekreuzer.com
 executables:
@@ -296,6 +312,7 @@ files:
 - lib/zine/page.rb
 - lib/zine/post.rb
 - lib/zine/posts_and_headlines.rb
+- lib/zine/query.rb
 - lib/zine/server.rb
 - lib/zine/skeleton/source/about.md
 - lib/zine/skeleton/source/assets/webicon-rss-m.png
@@ -303,6 +320,7 @@ files:
 - lib/zine/skeleton/source/assets/webicon-twitter-m.png
 - lib/zine/skeleton/source/assets/webicon-twitter.svg
 - lib/zine/skeleton/source/posts/2017-01-25-my-new-blog.md
+- lib/zine/skeleton/source/robots.txt
 - lib/zine/skeleton/source/screen.css
 - lib/zine/skeleton/source/styles/screen.scss
 - lib/zine/skeleton/source/templates/articles.erb
@@ -320,11 +338,12 @@ files:
 - lib/zine/tag.rb
 - lib/zine/templates.rb
 - lib/zine/upload.rb
+- lib/zine/uploader_aws.rb
 - lib/zine/uploader_github.rb
 - lib/zine/uploader_sftp.rb
 - lib/zine/version.rb
 - lib/zine/watcher.rb
-homepage: https://github.com/mikekreuzer/zine
+homepage: https://mikekreuzer.com/projects/zine/
 licenses:
 - MIT
 metadata: {}
@@ -336,15 +355,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Yet another blog aware static site generator.