jekyll-remote-theme 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 415c69a1e7f672bd5ff2b794521e2cb63313fb2acb53dcb2cd6fd6e097c9d8fc
-  data.tar.gz: ae79306ad3180f4d5bb24b811a2a15f72b14bbbf38e26a9bf365073b874e683e
+  metadata.gz: e39b39cafa24a34892141eb0d7d386988faa47a922a50195eb33458f0ec5cb18
+  data.tar.gz: 3ebfdb2d308084fabce1d92a5eba50fde22aa1be8cd742a7c44bcd9bc5f75e33
 SHA512:
-  metadata.gz: ede198efdb562ac9b1f7704d1faa3b492d53e2ebcd62ba064b10d89acca36c28c6f4111b7eff004909e6c694927c3c3d7c438e1dc16536c24e6ad8d3b8b25583
-  data.tar.gz: d860bc2b58ab158b61f68be85a32b4fa7a1f656559214a0734c4b13dc85315a649c8cac4ca66ba624132aa42a1e296329580c954ed0e6af01479b1eb8760adf4
+  metadata.gz: dfc7198186058021058cfcd85b34330fb1b8df153cc6ee2ae5ac280afac7e21a26e0c3257c8285890a676c9b14f600bdf1a8bf893997cf1370e95279353f0271
+  data.tar.gz: 93f287e3f8455eef42f66595d97e11b55aa378e2bda0e94cb644793d2ceb8429d71ab094d097d36aa036f59b4ade98c4f5af6b39cead00064939c684c003e946

data/lib/jekyll-remote-theme.rb

@@ -4,7 +4,7 @@ require "jekyll"
 require "fileutils"
 require "tempfile"
 require "addressable"
-require "typhoeus"
+require "net/http"
 require "zip"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -32,5 +32,3 @@ end
 Jekyll::Hooks.register :site, :after_reset do |site|
   Jekyll::RemoteTheme.init(site)
 end
-
-Ethon.logger = Jekyll.logger.writer

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

@@ -5,12 +5,12 @@ module Jekyll
     class Downloader
       HOST = "https://codeload.github.com".freeze
       PROJECT_URL = "https://github.com/benbalter/jekyll-remote-theme".freeze
-      TYPHOEUS_OPTIONS = {
-        :headers => {
-          :user_agent => "Jekyll Remote Theme/#{VERSION} (+#{PROJECT_URL})",
-        },
-        :verbose => (Jekyll.logger.level == :debug),
-      }.freeze
+      USER_AGENT = "Jekyll Remote Theme/#{VERSION} (+#{PROJECT_URL})".freeze
+      MAX_FILE_SIZE = 1 * (1024 * 1024 * 1024) # Size in bytes (1 GB)
+      NET_HTTP_ERRORS = [
+        Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+        Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
+      ].freeze
 
       attr_reader :theme
       private :theme
@@ -27,8 +27,6 @@ module Jekyll
 
         download
         unzip
-
-        @downloaded = true
       end
 
       def downloaded?
@@ -38,16 +36,40 @@ module Jekyll
       private
 
       def zip_file
-        @zip_file ||= Tempfile.new([TEMP_PREFIX, ".zip"])
+        @zip_file ||= Tempfile.new([TEMP_PREFIX, ".zip"], :binmode => true)
       end
 
       def download
         Jekyll.logger.debug LOG_KEY, "Downloading #{zip_url} to #{zip_file.path}"
-        request = Typhoeus::Request.new zip_url, TYPHOEUS_OPTIONS
-        request.on_headers  { |response| raise_if_unsuccessful(response) }
-        request.on_body     { |chunk| zip_file.write(chunk) }
-        request.on_complete { |response| raise_if_unsuccessful(response) }
-        request.run
+        Net::HTTP.start(zip_url.host, zip_url.port, :use_ssl => true) do |http|
+          http.request(request) do |response|
+            raise_unless_sucess(response)
+            enforce_max_file_size(response.content_length)
+            response.read_body do |chunk|
+              zip_file.write chunk
+            end
+          end
+        end
+        @downloaded = true
+      rescue *NET_HTTP_ERRORS => e
+        raise DownloadError, e.message
+      end
+
+      def request
+        return @request if defined? @request
+        @request = Net::HTTP::Get.new zip_url.request_uri
+        @request["User-Agent"] = USER_AGENT
+        @request
+      end
+
+      def raise_unless_sucess(response)
+        return if response.is_a?(Net::HTTPSuccess)
+        raise DownloadError, "#{response.code} - #{response.message}"
+      end
+
+      def enforce_max_file_size(size)
+        return unless size && size > MAX_FILE_SIZE
+        raise DownloadError, "Maximum file size of #{MAX_FILE_SIZE} bytes exceeded"
       end
 
       def unzip
@@ -59,13 +81,14 @@ module Jekyll
         Zip::File.open(zip_file) do |archive|
           archive.each { |file| file.extract path_without_name_and_ref(file.name) }
         end
-
+      ensure
+        zip_file.close
         zip_file.unlink
       end
 
       # Full URL to codeload zip download endpoint for the given theme
       def zip_url
-        Addressable::URI.join(
+        @zip_url ||= Addressable::URI.join(
           HOST, "#{theme.owner}/", "#{theme.name}/", "zip/", theme.git_ref
         ).normalize
       end
@@ -78,17 +101,6 @@ module Jekyll
         Dir["#{theme.root}/*"].empty?
       end
 
-      def raise_if_unsuccessful(response)
-        if response.timed_out?
-          raise DownloadError, "Request timed out"
-        elsif response.code.zero?
-          raise DownloadError, response.return_message
-        elsif response.code != 200
-          msg = "Request failed with #{response.code} - #{response.status_message}"
-          raise DownloadError, msg
-        end
-      end
-
       # Codeload generated zip files contain a top level folder in the form of
       # THEME_NAME-GIT_REF/. While requests for Git repos are case insensitive,
       # the zip subfolder will respect the case in the repository's name, thus

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

@@ -9,16 +9,43 @@ module Jekyll
       extend Forwardable
       def_delegator :theme, :root, :full_gem_path
 
+      DEPENDENCY_PREFIX = %r!^\s*[a-z]+\.add_(?:runtime_)?dependency!
+      DEPENDENCY_REGEX = %r!#{DEPENDENCY_PREFIX}\(?\s*["']([a-z_-]+)["']!
+
       def initialize(theme)
         @theme = theme
       end
 
       def runtime_dependencies
-        []
+        @runtime_dependencies ||= dependency_names.map do |name|
+          Gem::Dependency.new(name)
+        end
       end
 
       private
 
+      def contents
+        @contents ||= File.read(path, :encoding => "utf-8") if path
+      end
+
+      def path
+        @path ||= potential_paths.find { |path| File.exist? path }
+      end
+
+      def potential_paths
+        [theme.name, "jekyll-theme-#{theme.name}"].map do |filename|
+          File.expand_path "#{filename}.gemspec", theme.root
+        end
+      end
+
+      def dependency_names
+        @dependency_names ||= if contents
+                                contents.scan(DEPENDENCY_REGEX).flatten
+                              else
+                                []
+                              end
+      end
+
       attr_reader :theme
     end
   end

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

@@ -53,6 +53,7 @@ module Jekyll
         site.theme = theme
         site.theme.configure_sass
         site.send(:configure_include_paths)
+        site.plugin_manager.require_theme_deps
       end
 
       def enqueue_theme_cleanup

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

@@ -2,6 +2,6 @@
 
 module Jekyll
   module RemoteTheme
-    VERSION = "0.2.4".freeze
+    VERSION = "0.3.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-remote-theme
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -45,39 +45,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: jekyll-theme-primer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+        version: '0.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: jekyll-theme-primer
+  name: jekyll_test_plugin_malicious
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +107,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -120,6 +117,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.49.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: 
 email:
 - ben.balter@github.com