jekyll-octopod 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9da6ebdac9915e6402bcda7c71a9c944ece4c004bd031220c733f49c3dfb47ec
-  data.tar.gz: b7052cf7e51011da39291849d35b14bedfa27caca156dd09a97c7957dee1ad3c
+  metadata.gz: 3e95c321128dfae975297d56250d21c9f7f47183ee0a4e54aaad16dd2541d210
+  data.tar.gz: 7cab5b2868fece52002befdef60aa5a286fdcd87584e004cf06d3462598090f1
 SHA512:
-  metadata.gz: 2a054d404659a2434861da157840782ba71175259f8d5bd864da5f2369e599ad3fe69ae8aae7b6b547fa80d91d24de0682d9bf925b0329e19b3abdd849c5af78
-  data.tar.gz: 031da38de9086d544004abf870553125926d839186c6873cda4a00cab5e83161bdb973f95c3adcb1bc0798785d990bd79eb6bd1496db9bb5635ce7b371caaf2a
+  metadata.gz: 3331337c0ff0ee9b95376ab00899364f7032b549711bf8a6fa4e556c5d61a190fd495e08b4fa73e2847890b4a161eac4614ec6ab0f7a3cb490dc38d509d52836
+  data.tar.gz: 52d377821ee236e2d25e578835e742811a2aa25d93f517a7898f542c4cc23e474a5e3812fae2164c6d8e91d7ab8b893b149a6f1f15268329d74985b1ff8ae4eb

data/bin/octopod

@@ -120,9 +120,42 @@ def remove_theme_served_path(path)
     FileUtils.rmdir(path, verbose: true) if Dir.exist?(path) && Dir.empty?(path)
   elsif !path.end_with?('.md')
     FileUtils.rm(path, verbose: true)
+    # Clean up now-empty parent directories this file leaves behind (e.g. img/logo/ once every
+    # generic favicon file under it is gone), but never touch PWD itself and never remove a
+    # directory that still holds real, unrelated content (a site's own photos alongside the
+    # generic ones, say) - Dir.empty? guards that.
+    parent = File.dirname(path)
+    while parent != PWD && Dir.exist?(parent) && Dir.empty?(parent)
+      FileUtils.rmdir(parent, verbose: true)
+      parent = File.dirname(parent)
+    end
   end
 end
 
+# 'now_theme_served' used to list '_layouts' and 'img' wholesale, on the assumption that a legacy
+# site's copies of those directories were 100% gem output. That's wrong whenever a site added its
+# own files alongside them - a custom '_layouts/presentation.html' with no gem equivalent, or real
+# content photos dropped into 'img/' - since a whole-directory delete has no way to tell those apart
+# from the generic files it's supposed to clean up. This instead lists the theme gem's *actual*
+# shipped filenames in those two directories, read from the installed jekyll-octopod-bulma gem
+# itself (same reasoning as the version-constraint lookup in update_gemfile_and_theme_config: read
+# from the gem so this can't drift out of sync as its shipped file list changes) - so 'update' only
+# ever removes a file that's actually theme content, and leaves anything else in place.
+def theme_shipped_generic_files
+  theme_gem_dir = begin
+    Gem::Specification.find_by_name('jekyll-octopod-bulma').gem_dir
+  rescue Gem::MissingSpecError
+    nil
+  end
+  return [] unless theme_gem_dir
+
+  layouts = Dir.glob(File.join(theme_gem_dir, '_layouts', '*')).map { |f| "_layouts/#{File.basename(f)}" }
+  img = Dir.glob(File.join(theme_gem_dir, 'assets', 'img', '**', '*'), File::FNM_DOTMATCH)
+            .reject { |f| File.directory?(f) }
+            .map { |f| f.sub("#{theme_gem_dir}/assets/", '') }
+  layouts + img
+end
+
 # Points a site's Gemfile and _config.yml at jekyll-octopod-bulma instead of the old direct
 # jekyll-bulma dependency/theme setting. Mirrors the version constraint this gem itself declares on
 # jekyll-octopod-bulma (see jekyll-octopod.gemspec) rather than hardcoding one here, so it can't
@@ -371,8 +404,8 @@ if ARGV.size > 0 && (ARGV[0] == 'episode' || ARGV[0] == 'deploy' || ARGV[0] == '
     # point at it - so 'update' removes them outright, same "trust git diff, don't special-case"
     # philosophy as the rest of this command. Any '.md' file is kept no matter where it's found,
     # since that's real content, never theme boilerplate.
-    now_theme_served = %w[
-      _layouts podlove-player subscribe-button img favicon.ico apple-touch-icon-precomposed.png
+    now_theme_served = theme_shipped_generic_files + %w[
+      podlove-player subscribe-button favicon.ico apple-touch-icon-precomposed.png
       _includes/sidebar.html _includes/post_header.html _includes/post.html _includes/post_line.html
       _includes/disqus_thread.html _includes/disqus_count.html _includes/isso_thread.html
     ]

data/lib/octopod/version.rb

@@ -3,7 +3,7 @@ module Jekyll
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 18
-      TINY  = 1
+      TINY  = 2
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

metadata

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