jekyll-octopod 0.16.1 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e97c76791da4caf394541907199b2009985f42854b547c8644321d057f1ca36
-  data.tar.gz: 0e0b22eba05771002edc86a2894dbae32fa67ad1bda9d9b348b601d5c794b006
+  metadata.gz: 241f37f4351eb2298f41b9b28476283589b7ce79ac82a70fe2926de580e43796
+  data.tar.gz: f0a1fe92888438a64c9f340a1f8520f3a5158e90c45cc6be2150227935dd1843
 SHA512:
-  metadata.gz: b5bef749f76e82144d8b4755339710ff8a87392e8bfea9f0c30899c7fbc67c22913c6f4b100a0ad2a05b91f68a2817d1759ca7a52c169c1370dd0e123e248601
-  data.tar.gz: 65125e024416c0d9218ca8543fc4c641fd1dbefa1af2d9b2f9ba67a3a7f875825ef08be5adf5c711c2d47ed2c034843fe709d2714e1da792e5661ce5f285ebc3
+  metadata.gz: d87e120cb798a302dc0a45e57eeaa574cdfec3eda5addb3a7ae01f3ca5272bfc8d31c9c9b3d09ecefa3da351498d5eedaf7f2ceb87b0badfdc3ed815d1d15bc5
+  data.tar.gz: ae65359cd2e30620cd8d75edcbdb0d368f277a948c98d64ddc71df6bc39b1f21f1e13249688578dff3812a71f2a412c726d272758de56f70fede708c6b9108e5

data/bin/octopod

@@ -2,7 +2,8 @@
 # require "byebug"
 PWD = Dir.pwd
 
-GEM_DIR = Gem::Specification.find_by_name("jekyll-octopod").gem_dir
+GEM_SPEC = Gem::Specification.find_by_name("jekyll-octopod")
+GEM_DIR = GEM_SPEC.gem_dir
 # HAS20170501 disgusting hack for development
 # GEM_DIR = "/home/user/jekyll/jekyll-octopod/"
 
@@ -28,6 +29,11 @@ Basic Command Line Usage:
   Additional Octopod commands:
     octopod episode                                           # adds a template for a new episode
     octopod deploy                                            # deploys your site
+    octopod update                                            # updates template files from an existing setup to
+                                                                # the currently installed jekyll-octopod version,
+                                                                # without touching posts, imprint.md or index.md,
+                                                                # and rewrites the old '{% podigee_player %}' tag
+                                                                # to '{% podlove_player %}' wherever it's still used
 
   See 'octopod <command> --help' for more information on a specific command.
 
@@ -110,7 +116,7 @@ def get_stdin(message)
   STDIN.gets.chomp
 end
 
-if ARGV.size > 0 && (ARGV[0] == 'episode' || ARGV[0] == 'deploy' || ARGV[0] == 'setup')
+if ARGV.size > 0 && (ARGV[0] == 'episode' || ARGV[0] == 'deploy' || ARGV[0] == 'setup' || ARGV[0] == 'update')
   options = YAML.load_file(File.join(PWD, '_config.yml'))
   options['posts_dir'] = File.join(PWD, '_posts')
 
@@ -271,6 +277,44 @@ if ARGV.size > 0 && (ARGV[0] == 'episode' || ARGV[0] == 'deploy' || ARGV[0] == '
       FileUtils.cp(GEM_DIR + "/assets/_config.yml.sample", PWD + "/_config.yml", verbose: true)
     end
     puts "===== ... done ===== ", ""
+
+  when 'update'
+    # Paths that are always left alone: real posts, hand-written content pages, and the gem's
+    # demo episode audio. Unlike 'setup', these are skipped outright rather than offered as a
+    # per-file prompt, since this command targets sites that are already live.
+    skip_on_update = %w[_posts imprint.md index.md episodes]
+
+    update_file = lambda do |file|
+      relative = file.split(GEM_DIR + "/assets")[1]
+      next if skip_on_update.any? { |skip| relative == "/#{skip}" || relative.start_with?("/#{skip}/") }
+      copy_file_or_create_dir(file)
+    end
+
+    puts "", "===== Updating template files to jekyll-octopod #{GEM_SPEC.version} ... ====="
+    puts "_posts/, imprint.md, index.md and the demo episodes/ directory are left untouched."
+    puts "You'll be asked before any other existing file gets overwritten.", ""
+
+    Dir.glob(GEM_DIR + "/assets/**/*").each(&update_file)
+    Dir.glob(GEM_DIR + "/assets/**/.*").each(&update_file)
+    puts "===== ... done ===== ", ""
+
+    puts "", "===== Rewriting the old '{% podigee_player %}' tag to '{% podlove_player %}' ... ====="
+    podigee_player_tag = /\{%-?\s*podigee_player\b.*?-?%\}/
+    updated_posts = Dir.glob(File.join(options['posts_dir'], '**', '*')).select do |post_file|
+      next false unless File.file?(post_file)
+      content = File.read(post_file)
+      next false unless content.match?(podigee_player_tag)
+      File.write(post_file, content.gsub(podigee_player_tag, '{% podlove_player %}'))
+      true
+    end
+
+    if updated_posts.empty?
+      puts "No posts used the old 'podigee_player' tag."
+    else
+      puts "Updated:"
+      updated_posts.each { |post_file| puts "  #{post_file}" }
+    end
+    puts "===== ... done ===== ", ""
   end
 else
   puts octopod_help if ARGV.size > 0 && ARGV[0] == '--help'

data/lib/jekyll/line_awesome.rb

@@ -25,15 +25,26 @@
 # Line Awesome Icons Liquid Tag
 # Documentation can be found at https://icons8.com/line-awesome
 #
+# Line Awesome ships three icon families sharing one glyph namespace: 'las' (solid, the
+# default here), 'lar' (regular/outline) and 'lab' (brands - Twitter, Facebook, Apple, etc.,
+# who only exist in this family). Because all three families' CSS rules carry equal
+# specificity, whichever one is declared last in the compiled stylesheet always wins if more
+# than one is present on the same element - so brand icons render nothing under the default
+# 'las' class, and must explicitly switch families rather than add 'lab' alongside it.
+#
 # Example:
 #    {% icon la-camera-retro %}
 #    {% icon la-camera-retro la-lg %}
 #    {% icon la-spinner la-spin %}
 #    {% icon la-shield la-rotate-90 %}
+#    {% icon la-twitter lab %}     # brand icon: replaces the family, doesn't just add a class
+#    {% icon la-star lar %}        # outline/regular style instead of the default solid
 
 module Jekyll
   class LineAwesomeTag < Liquid::Tag
 
+    ICON_FAMILIES = %w[las lar lab].freeze
+
     def render(context)
       if tag_contents = determine_arguments(@markup.strip)
         icon_class, icon_extra = tag_contents[0], tag_contents[1]
@@ -47,6 +58,7 @@ Syntax error in tag 'icon' while parsing the following markup:
 Valid syntax:
   for icons: {% icon la-camera-retro %}
   for icons with size/spin/rotate: {% icon la-camera-retro la-lg %}
+  for a non-default family (lar/lab): {% icon la-twitter lab %}
 eos
       end
     end
@@ -59,10 +71,13 @@ eos
     end
 
     def icon_tag(icon_class, icon_extra = nil)
-      if icon_extra.empty?
-        "<i class=\"las #{icon_class}\"></i>"
+      family = ICON_FAMILIES.include?(icon_extra) ? icon_extra : 'las'
+      modifier = ICON_FAMILIES.include?(icon_extra) ? nil : icon_extra
+
+      if modifier.nil? || modifier.empty?
+        "<i class=\"#{family} #{icon_class}\"></i>"
       else
-        "<i class=\"las #{icon_class} #{icon_extra}\"></i>"
+        "<i class=\"#{family} #{icon_class} #{modifier}\"></i>"
       end
     end
   end

data/lib/octopod/version.rb

@@ -2,7 +2,7 @@ module Jekyll
   class Octopod
     module VERSION #:nodoc:
       MAJOR = 0
-      MINOR = 16
+      MINOR = 17
       TINY  = 1
 
       STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-octopod
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.1
 platform: ruby
 authors:
 - Arne Eilermann