fontist 1.19.0 → 1.21.1

data/lib/fontist/resources/archive_resource.rb

@@ -0,0 +1,55 @@
+module Fontist
+  module Resources
+    class ArchiveResource
+      def initialize(resource, options = {})
+        @resource = resource
+        @options = options
+      end
+
+      def files(_source_names, &block)
+        excavate.files(recursive_packages: true, &block)
+      end
+
+      private
+
+      def excavate
+        Excavate::Archive.new(archive.path)
+      end
+
+      def archive
+        download_file(@resource)
+      end
+
+      def download_file(source)
+        errors = []
+        source.urls.each do |request|
+          result = try_download_file(request, source)
+          return result unless result.is_a?(Errors::InvalidResourceError)
+
+          errors << result
+        end
+
+        raise Errors::InvalidResourceError, errors.join(" ")
+      end
+
+      def try_download_file(request, source)
+        info_log(request)
+
+        Fontist::Utils::Downloader.download(
+          request,
+          sha: source.sha256,
+          file_size: source.file_size,
+          progress_bar: !@options[:no_progress],
+        )
+      rescue Errors::InvalidResourceError => e
+        Fontist.ui.say(e.message)
+        e
+      end
+
+      def info_log(request)
+        url = request.respond_to?(:url) ? request.url : request
+        Fontist.ui.say(%(Downloading from #{url}))
+      end
+    end
+  end
+end

data/lib/fontist/resources/google_resource.rb

@@ -0,0 +1,64 @@
+module Fontist
+  module Resources
+    class GoogleResource
+      def initialize(resource, options = {})
+        @resource = resource
+        @options = options
+      end
+
+      def files(source_names)
+        cached_paths = download_fonts(source_names)
+
+        cached_paths.map do |path|
+          Dir.mktmpdir do |dir|
+            FileUtils.cp(path, dir)
+
+            yield File.join(dir, File.basename(path))
+          end
+        end
+      end
+
+      private
+
+      def download_fonts(source_names)
+        urls = font_urls(source_names)
+
+        urls.map do |url|
+          download(url)
+        end
+      end
+
+      def font_urls(source_names)
+        @resource.files.select do |url|
+          source_names.include?(path_to_source_file(url))
+        end
+      end
+
+      def path_to_source_file(path)
+        format_filename(File.basename(path))
+      end
+
+      # TODO: remove duplication, another in Cache
+      def format_filename(filename)
+        return filename unless filename.length > 255
+
+        ext = File.extname(filename)
+        target_size = 255 - ext.length
+        cut_filename = filename.slice(0, target_size)
+        "#{cut_filename}#{ext}"
+      end
+
+      def download(url)
+        Fontist.ui.say(%(Downloading from #{url}))
+
+        file = Utils::Downloader.download(
+          url,
+          use_content_length: false,
+          progress_bar: !@options[:no_progress],
+        )
+
+        file.path
+      end
+    end
+  end
+end

data/lib/fontist/style_version.rb

@@ -4,6 +4,10 @@ module Fontist
       @text = text
     end
 
+    def to_s
+      value.join(" . ")
+    end
+
     def value
       @value ||= numbers || default_value
     end

data/lib/fontist/utils/cache.rb

@@ -1,6 +1,8 @@
 module Fontist
   module Utils
     class Cache
+      MAX_FILENAME_SIZE = 255
+
       include Locking
 
       def self.lock_path(path)
@@ -110,6 +112,11 @@ module Fontist
       end
 
       def filename(source)
+        filename = response_to_filename(source)
+        format_filename(filename)
+      end
+
+      def response_to_filename(source)
         if File.extname(source.original_filename).empty? && source.content_type
           require "mime/types"
           ext = MIME::Types[source.content_type].first&.preferred_extension
@@ -119,6 +126,15 @@ module Fontist
         source.original_filename
       end
 
+      def format_filename(filename)
+        return filename unless filename.length > MAX_FILENAME_SIZE
+
+        ext = File.extname(filename)
+        target_size = MAX_FILENAME_SIZE - ext.length
+        cut_filename = filename.slice(0, target_size)
+        "#{cut_filename}#{ext}"
+      end
+
       def move(source_file, target_path)
         # Windows requires file descriptors to be closed before files are moved
         source_file.close

data/lib/fontist/utils/downloader.rb

@@ -10,12 +10,17 @@ module Fontist
         ruby2_keywords :download if respond_to?(:ruby2_keywords, true)
       end
 
-      def initialize(file, file_size: nil, sha: nil, progress_bar: nil)
+      def initialize(file,
+                     file_size: nil,
+                     sha: nil,
+                     progress_bar: nil,
+                     use_content_length: true)
         # TODO: If the first mirror fails, try the second one
         @file = file
         @sha = [sha].flatten.compact
         @file_size = file_size.to_i if file_size
         @progress_bar = progress_bar
+        @use_content_length = use_content_length
         @cache = Cache.new
       end
 
@@ -85,7 +90,9 @@ module Fontist
           max_redirects: 10,
           headers: headers,
           content_length_proc: ->(content_length) {
-            progress_bar.total = content_length if content_length
+            if @use_content_length && content_length
+              progress_bar.total = content_length
+            end
           },
           progress_proc: -> (progress) {
             progress_bar.increment(progress)

data/lib/fontist/utils/ui.rb

@@ -16,7 +16,15 @@ module Fontist
       end
 
       def self.level
-        @level || default_level
+        @level ||= env_level || default_level
+      end
+
+      def self.env_level
+        ENV["FONTIST_LOG"]&.to_sym
+      end
+
+      def self.debug?
+        log_levels.include?(:debug)
       end
 
       def self.default_level
@@ -50,7 +58,7 @@ module Fontist
       end
 
       def self.debug(message)
-        new.say(message) if log_levels.include?(:debug)
+        new.say(message) if debug?
       end
 
       def self.log_levels

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.19.0".freeze
+  VERSION = "1.21.1".freeze
 end

data/lib/fontist.rb

@@ -49,7 +49,7 @@ module Fontist
   end
 
   def self.formulas_version
-    "v3"
+    "v4"
   end
 
   def self.formulas_repo_url
@@ -151,4 +151,16 @@ module Fontist
   def self.log_level=(level)
     Fontist.ui.level = level
   end
+
+  def self.interactive?
+    @interactive || false
+  end
+
+  def self.interactive=(bool)
+    @interactive = bool
+  end
+
+  def self.google_fonts_key
+    ENV["GOOGLE_FONTS_API_KEY"] || config[:google_fonts_key]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.21.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-22 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: fuzzy_match
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -296,6 +310,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Install openly-licensed fonts on Windows, Linux and Mac!
 email:
 - open.source@ribose.com
@@ -304,6 +346,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/deploy-pages.yml"
+- ".github/workflows/tebako-pack.yml"
 - ".github/workflows/test-and-release.yml"
 - ".gitignore"
 - ".hound.yml"
@@ -313,12 +357,27 @@ files:
 - LICENSE.txt
 - README.adoc
 - Rakefile
+- docs/.gitignore
+- docs/.vitepress/config.ts
+- docs/guide/api-ruby.md
+- docs/guide/ci.md
+- docs/guide/fontconfig.md
+- docs/guide/index.md
+- docs/guide/proxy.md
+- docs/guide/why.md
+- docs/index.md
+- docs/package-lock.json
+- docs/package.json
+- docs/public/hero.png
+- docs/public/logo.png
+- docs/reference/index.md
 - exe/fontist
 - fontist.gemspec
 - lib/fontist.rb
 - lib/fontist/cache_cli.rb
 - lib/fontist/cli.rb
 - lib/fontist/cli/class_options.rb
+- lib/fontist/cli/thor_ext.rb
 - lib/fontist/collection_file.rb
 - lib/fontist/config.rb
 - lib/fontist/config_cli.rb
@@ -332,6 +391,7 @@ files:
 - lib/fontist/fontconfig_cli.rb
 - lib/fontist/formula.rb
 - lib/fontist/formula_picker.rb
+- lib/fontist/formula_suggestion.rb
 - lib/fontist/helpers.rb
 - lib/fontist/import.rb
 - lib/fontist/import/convert_formulas.rb
@@ -342,9 +402,8 @@ files:
 - lib/fontist/import/formula_builder.rb
 - lib/fontist/import/formula_serializer.rb
 - lib/fontist/import/google.rb
-- lib/fontist/import/google/new_fonts_fetcher.rb
-- lib/fontist/import/google/skiplist.yml
-- lib/fontist/import/google_check.rb
+- lib/fontist/import/google/api.rb
+- lib/fontist/import/google/create_google_formula.rb
 - lib/fontist/import/google_import.rb
 - lib/fontist/import/helpers/hash_helper.rb
 - lib/fontist/import/helpers/system_helper.rb
@@ -374,6 +433,8 @@ files:
 - lib/fontist/manifest/locations.rb
 - lib/fontist/repo.rb
 - lib/fontist/repo_cli.rb
+- lib/fontist/resources/archive_resource.rb
+- lib/fontist/resources/google_resource.rb
 - lib/fontist/style_version.rb
 - lib/fontist/system.yml
 - lib/fontist/system_font.rb
@@ -409,7 +470,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Install openly-licensed fonts on Windows, Linux and Mac!

data/lib/fontist/import/google/new_fonts_fetcher.rb

@@ -1,146 +0,0 @@
-require_relative "../google"
-require_relative "../otf_parser"
-
-module Fontist
-  module Import
-    module Google
-      class NewFontsFetcher
-        REPO_PATH = Fontist.fontist_path.join("google", "fonts")
-        REPO_URL = "https://github.com/google/fonts.git".freeze
-        SKIPLIST_PATH = File.expand_path("skiplist.yml", __dir__)
-
-        def initialize(logging: false, limit: nil)
-          @logging = logging
-          @limit = limit
-        end
-
-        def call
-          update_repo
-          fetch_new_paths
-        end
-
-        private
-
-        def update_repo
-          if Dir.exist?(REPO_PATH)
-            `cd #{REPO_PATH} && git pull`
-          else
-            FileUtils.mkdir_p(File.dirname(REPO_PATH))
-            `git clone --depth 1 #{REPO_URL} #{REPO_PATH}`
-          end
-        end
-
-        def fetch_new_paths
-          new_paths = []
-
-          fetch_fonts_paths.each do |path|
-            new = log_font(path) do
-              new?(path)
-            end
-
-            next unless new
-
-            new_paths << path
-            return new_paths if @limit && new_paths.size >= @limit
-          end
-
-          new_paths
-        end
-
-        def fetch_fonts_paths
-          Dir[File.join(REPO_PATH, "apache", "*"),
-              File.join(REPO_PATH, "ofl", "*"),
-              File.join(REPO_PATH, "ufl", "*")].sort
-        end
-
-        def log_font(path)
-          return yield unless @logging
-
-          print "#{path}, "
-          new = yield
-          puts(new ? "new" : "skipped")
-          new
-        end
-
-        def new?(path)
-          metadata_name = Google.metadata_name(path)
-          return unless metadata_name
-          return if in_skiplist?(metadata_name)
-          return if up_to_date?(metadata_name, path)
-          return unless downloadable?(metadata_name)
-
-          true
-        end
-
-        def in_skiplist?(name)
-          @skiplist ||= YAML.safe_load(File.open(SKIPLIST_PATH))
-          @skiplist.include?(name)
-        end
-
-        def up_to_date?(metadata_name, path)
-          formula = formula(metadata_name)
-          return false unless formula
-
-          repo_digest_up_to_date?(formula, path) ||
-            fonts_up_to_date?(formula, path)
-        end
-
-        def repo_digest_up_to_date?(formula, path)
-          return unless formula.digest
-
-          formula.digest == Google.digest(path)
-        end
-
-        def fonts_up_to_date?(formula, path)
-          styles = formula_styles(formula)
-          repo_fonts(path).all? do |font|
-            style = styles.find { |s| s.font == repo_to_archive_name(font) }
-            return false unless style
-
-            otfinfo_version(font) == style.version
-          end
-        end
-
-        def formula_styles(formula)
-          formula.fonts.map(&:styles).flatten
-        end
-
-        def repo_fonts(path)
-          Dir.glob(File.join(path, "*.{ttf,otf}"))
-        end
-
-        def repo_to_archive_name(font_path)
-          File.basename(font_path)
-            .sub("[wght]", "-VariableFont_wght")
-            .sub("[opsz]", "-Regular-VariableFont_opsz")
-        end
-
-        def formula(font_name)
-          path = Fontist::Import::Google.formula_path(font_name)
-          Formula.new_from_file(path) if File.exist?(path)
-        end
-
-        def otfinfo_version(path)
-          info = OtfParser.new(path).call
-          Fontist::Import::Google.style_version(info["Version"])
-        end
-
-        def downloadable?(name)
-          retries ||= 0
-          retries += 1
-          Down.open("https://fonts.google.com/download?family=#{name}")
-          true
-        rescue Down::NotFound
-          false
-        rescue Down::ClientError => e
-          raise unless e.message == "403 Forbidden"
-
-          false
-        rescue Down::TimeoutError
-          retry unless retries >= 3
-          false
-        end
-      end
-    end
-  end
-end

data/lib/fontist/import/google/skiplist.yml

@@ -1,12 +0,0 @@
-- Montserrat
-- Montserrat Alternates
-- Overpass
-- Overpass Mono
-- Lato
-- Open Sans
-- Work Sans
-- Fira Code
-- Andika
-- Harmattan
-- Padauk
-- STIX Two Math

data/lib/fontist/import/google_check.rb

@@ -1,27 +0,0 @@
-require_relative "google/new_fonts_fetcher"
-
-module Fontist
-  module Import
-    class GoogleCheck
-      def call
-        fonts = new_fonts
-        indicate(fonts)
-      end
-
-      private
-
-      def new_fonts
-        Fontist::Import::Google::NewFontsFetcher.new(logging: true).call
-      end
-
-      def indicate(new_paths)
-        return if new_paths.empty?
-
-        puts "New fonts are available in:"
-        new_paths.each do |path|
-          puts path
-        end
-      end
-    end
-  end
-end