jekyll-remote-theme 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25fe811cc5335e5f2932bc6db5e74c83b2f7984229d745d13a6ba850396f3e44
-  data.tar.gz: 617b6d962ddea1194a7f0f801124756deada8b6a0960ba9ecabf11bdebb2ef4c
+  metadata.gz: 0fd5c42945efed4017267b250e90d3a9dd3c5b07b1d7e4cd34ab38fb3b5a5f89
+  data.tar.gz: 4997758808b903abf1ff1f2e185c9e408af4c0a94d2a6aabf25c2c5347194e91
 SHA512:
-  metadata.gz: f36daa0ed584f6c5c25f0006b0eab5075c35fc252e7bba19fcbd72a8b225217545c11da7d38dd00c82cbff666cb42fdce3b1d440b4e610cfbc3f74c69f127a80
-  data.tar.gz: a78d981b482904e7f673235a18c5e9a058f33fb0e0714dbeee2788abf64e60552b44b05550634538555daf0fbbd7c95350590f1a2a5d278d5a2630de1f27c234
+  metadata.gz: 1a1bd64eab9afac4223799d871f17f9cfa23601a752879a0b6273e389b7d60301eaf9b963eaaff54c6790614661984cc06a0c466c4b7d4871e6679ade95ae74f
+  data.tar.gz: dc3ebb66ed63e4722813b95f710815b79702245ff59b1431186cf0eb417b2fad5f3284eba10c9dea2b372da37dbb2de92057b0506a3c570223c435979312d37a

data/lib/jekyll-remote-theme/downloader.rb

@@ -97,14 +97,30 @@ module Jekyll
         # File IO is already open, rewind pointer to start of file to read
         zip_file.rewind
 
+        # Extract each entry by hand rather than calling Zip::Entry#extract,
+        # whose signature changed incompatibly in rubyzip 3.0 (the destination
+        # is now resolved relative to a `destination_directory:` keyword,
+        # mangling the absolute paths we pass). Reading each entry's stream and
+        # writing it ourselves behaves identically across rubyzip 1.x–3.x.
         Zip::File.open(zip_file) do |archive|
-          archive.each { |file| file.extract path_without_name_and_ref(file.name) }
+          archive.each { |entry| extract_entry(entry) }
         end
       ensure
         zip_file.close
         zip_file.unlink
       end
 
+      # Writes a single zip entry to its destination within theme.root.
+      # path_without_name_and_ref sandboxes the destination, guarding against
+      # Zip Slip.
+      def extract_entry(entry)
+        return if entry.name.end_with?("/") # skip directory entries
+
+        dest = path_without_name_and_ref(entry.name)
+        FileUtils.mkdir_p File.dirname(dest)
+        entry.get_input_stream { |input| File.binwrite(dest, input.read) }
+      end
+
       # Full URL to codeload zip download endpoint for the given theme
       def zip_url
         @zip_url ||= Addressable::URI.new(

data/lib/jekyll-remote-theme/munger.rb

@@ -63,13 +63,22 @@ module Jekyll
       end
 
       # Initialize GitHub metadata munger if it was loaded after :after_init hook
+      # or if the existing munger needs to be updated for the current site
       def initialize_github_metadata
         return unless defined?(Jekyll::GitHubMetadata::SiteGitHubMunger)
-        return if Jekyll::GitHubMetadata::SiteGitHubMunger.global_munger
 
-        munger = Jekyll::GitHubMetadata::SiteGitHubMunger.new(site)
-        munger.munge!
-        Jekyll::GitHubMetadata::SiteGitHubMunger.global_munger = munger
+        # Create a new munger if one doesn't exist or if it's for a different site
+        current_munger = Jekyll::GitHubMetadata::SiteGitHubMunger.global_munger
+        needs_init = current_munger.nil? ||
+          (Jekyll::GitHubMetadata.respond_to?(:site) &&
+            Jekyll::GitHubMetadata.site != site)
+
+        if needs_init
+          Jekyll.logger.debug LOG_KEY, "Initializing GitHub metadata munger"
+          munger = Jekyll::GitHubMetadata::SiteGitHubMunger.new(site)
+          munger.munge!
+          Jekyll::GitHubMetadata::SiteGitHubMunger.global_munger = munger
+        end
       end
 
       def enqueue_theme_cleanup

data/lib/jekyll-remote-theme/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module RemoteTheme
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-remote-theme
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ben Balter
@@ -92,7 +92,7 @@ dependencies:
         version: 1.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -102,7 +102,7 @@ dependencies:
         version: 1.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jekyll_test_plugin_malicious
   requirement: !ruby/object:Gem::Requirement
@@ -301,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Jekyll plugin for building Jekyll sites with any GitHub-hosted theme
 test_files: []