fontist 1.11.2 → 1.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13b78039fab8bac4324cc22dc75a21beac4dd1303853ed782cabf1e89b78617c
-  data.tar.gz: d9ddc52af7fce3a9650b227170940c78e757266d27215add37cac136b8710548
+  metadata.gz: d3a779a1f127060501e1c69c59986bcd1a616ab699c5cff439cec4aafc27a0a2
+  data.tar.gz: cbcfe4d0a06ccfbcb309b2c59aac6a58ce09d804c6b23cec5970a6d67b697d43
 SHA512:
-  metadata.gz: 8e88289ff2d6acac6c10599332227163d41ac6fcc7ea2f7acb6d2a4c5e62dec6ab814aecc2e807e08f5de4a3491abf69a88e9648d2ef8829dbd4885dfcd8954c
-  data.tar.gz: 2b67bf621a77b9d9882af25329930e3900c8e852077822dd2582ece1b6528e1fc63ec8c9f7404b89505b8a3d17377e841e476c264e2a7b837dbdab35dfe2c243
+  metadata.gz: d17e2fa944c7ddfd142869d1db9df35fae4ae7aa58c6188290529d31be66b9043e300b0cff2e4cb13545fb1bbdc707820fa4c88f557c914cb59ad4b7a1fef46f
+  data.tar.gz: 98db0b18012107e2a39644d9c892a7ef5330543526da993f1b346300bba2bcefa02b2b17ff417a716f7e6f3e84d0b7589eda24d4b154366a290010bbe8f9ad0a

data/.github/workflows/rspec.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
 
     steps:
@@ -33,7 +33,15 @@ jobs:
         env:
           TEST_ENV: CI
 
-      - if: matrix.os != 'macos-latest'
+      - if: matrix.os == 'windows-latest' && matrix.ruby == '2.4'
+        run: curl -O https://curl.se/ca/cacert.pem
+
+      - if: matrix.os == 'windows-latest' && matrix.ruby == '2.4'
+        run: bundle exec rspec --tag ~dev
+        env:
+          SSL_CERT_FILE: cacert.pem
+
+      - if: matrix.os != 'macos-latest' || matrix.os == 'windows-latest' && matrix.ruby == '2.4'
         run: bundle exec rspec --tag ~dev
         env:
           TEST_ENV: CI

data/README.adoc

@@ -685,8 +685,8 @@ one, please refer to its documentation.
 There is an ability to use private fonts via private Fontist repositories.
 
 A Fontist repository is a Git repo which contains YAML formula files. Formulas can be created
-manually (see https://github.com/fontist/formulas/tree/master/Formulas)[examples],
-or #auto-generate-a-formula[auto-generated from an archive].
+manually (see https://github.com/fontist/formulas/tree/master/Formulas[examples]),
+or xref:Authoring Fontist formulas[auto-generated from an archive].
 
 A repository can be either a HTTPS or SSH Git repo. In case of SSH, a
 corresponding SSH key should be setup with `ssh-agent` in order to access this

data/fontist.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "nokogiri", "~> 1.0"
   spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-benchmark", "~> 0.6"
   spec.add_development_dependency "rubocop", "1.5.2"
   spec.add_development_dependency "rubocop-rails"
   spec.add_development_dependency "rubocop-performance"

data/lib/fontist/font.rb

@@ -62,7 +62,7 @@ module Fontist
     end
 
     def all
-      Fontist::Formula.all.map(&:fonts).flatten
+      all_formulas.map(&:fonts).flatten
     end
 
     private
@@ -99,11 +99,17 @@ module Fontist
     end
 
     def formula
-      @formula ||= Fontist::Formula.find(name)
+      @formula ||= formulas.first
     end
 
     def formulas
       @formulas ||= Fontist::Formula.find_many(name)
+        .select { |f| supported_formula?(f) }
+    end
+
+    def supported_formula?(formula)
+      formula.platforms.nil? ||
+        formula.platforms.include?(Fontist::Utils::System.user_os.to_s)
     end
 
     def downloadable_font
@@ -190,7 +196,7 @@ module Fontist
     end
 
     def all_formulas
-      Fontist::Formula.all
+      Fontist::Formula.all.select { |f| supported_formula?(f) }
     end
 
     def path(style)

data/lib/fontist/font_installer.rb

@@ -54,16 +54,30 @@ module Fontist
     end
 
     def download_file(source)
-      request = source.urls.first
-      url = request.respond_to?(:url) ? request.url : request
-      Fontist.ui.say(%(Downloading font "#{@formula.key}" from #{url}))
+      errors = []
+      source.urls.each do |request|
+        url = request.respond_to?(:url) ? request.url : request
+        Fontist.ui.say(%(Downloading font "#{@formula.key}" from #{url}))
 
+        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)
       Fontist::Utils::Downloader.download(
         request,
         sha: source.sha256,
         file_size: source.file_size,
         progress_bar: !@no_progress
       )
+    rescue Errors::InvalidResourceError => e
+      Fontist.ui.say(e.message)
+      e
     end
 
     def font_file?(path)

data/lib/fontist/formula.rb

@@ -91,6 +91,10 @@ module Fontist
       @data["requires_license_agreement"] ? true : false
     end
 
+    def platforms
+      @data["platforms"]
+    end
+
     def extract
       Helpers.parse_to_object(@data["extract"])
     end

data/lib/fontist/import/recursive_extraction.rb

@@ -4,7 +4,7 @@ module Fontist
   module Import
     class RecursiveExtraction
       LICENSE_PATTERN =
-        /(ofl\.txt|ufl\.txt|licenses?\.txt|license|copying)$/i.freeze
+        /(ofl\.txt|ufl\.txt|licenses?\.txt|license(\.md)?|copying)$/i.freeze
 
       def initialize(archive, subarchive: nil, subdir: nil)
         @archive = archive
@@ -70,6 +70,8 @@ module Fontist
 
       def extract_data(archive)
         Excavate::Archive.new(path(archive)).files(recursive_packages: true) do |path|
+          next unless File.file?(path)
+
           match_license(path)
           match_font(path) if font_directory?(path)
         end

data/lib/fontist/repo.rb

@@ -15,8 +15,20 @@ module Fontist
           raise(Errors::RepoNotFoundError, "No such repo '#{name}'.")
         end
 
-        Git.open(path).pull
+        git = Git.open(path)
+        git.pull("origin", git.current_branch)
+
         Index.rebuild
+      rescue Git::GitExecuteError => e
+        raise Errors::RepoCouldNotBeUpdatedError.new(<<~MSG.chomp)
+          Formulas repo '#{name}' could not be updated.
+          Please consider reinitializing it with:
+            fontist remove #{name}
+            fontist setup #{name} REPO_URL
+
+          Git error:
+          #{e.message}
+        MSG
       end
 
       def remove(name)

data/lib/fontist/system_font.rb

@@ -12,12 +12,20 @@ module Fontist
     end
 
     def self.system_font_paths
+      @system_font_paths ||= load_system_font_paths
+    end
+
+    def self.load_system_font_paths
       config_path = Fontist.system_file_path
       os = Fontist::Utils::System.user_os.to_s
       templates = YAML.load_file(config_path)["system"][os]["paths"]
       patterns = expand_paths(templates)
 
-      Dir.glob(patterns)
+      Dir.glob(patterns, File::FNM_CASEFOLD)
+    end
+
+    def self.reset_system_font_paths_cache
+      @system_font_paths = nil
     end
 
     def self.expand_paths(paths)

data/lib/fontist/system_index.rb

@@ -37,35 +37,39 @@ module Fontist
     LANGUAGE_MAC_ENGLISH = 0
     LANGUAGE_MS_ENGLISH_AMERICAN = 0x409
 
-    attr_reader :font_paths
-
     def self.system_index
-      if Fontist.preferred_family?
-        new(Fontist.system_preferred_family_index_path,
-            SystemFont.font_paths,
-            PreferredFamily.new)
-      else
-        new(Fontist.system_index_path,
-            SystemFont.font_paths,
-            DefaultFamily.new)
-      end
+      path = if Fontist.preferred_family?
+               Fontist.system_preferred_family_index_path
+             else
+               Fontist.system_index_path
+             end
+
+      @system_index ||= {}
+      @system_index[Fontist.preferred_family?] ||= {}
+      @system_index[Fontist.preferred_family?][path] ||=
+        new(path, -> { SystemFont.font_paths }, family)
     end
 
     def self.fontist_index
-      if Fontist.preferred_family?
-        new(Fontist.fontist_preferred_family_index_path,
-            SystemFont.fontist_font_paths,
-            PreferredFamily.new)
-      else
-        new(Fontist.fontist_index_path,
-            SystemFont.fontist_font_paths,
-            DefaultFamily.new)
-      end
+      path = if Fontist.preferred_family?
+               Fontist.fontist_preferred_family_index_path
+             else
+               Fontist.fontist_index_path
+             end
+
+      @fontist_index ||= {}
+      @fontist_index[Fontist.preferred_family?] ||= {}
+      @fontist_index[Fontist.preferred_family?][path] ||=
+        new(path, -> { SystemFont.fontist_font_paths }, family)
     end
 
-    def initialize(index_path, font_paths, family)
+    def self.family
+      Fontist.preferred_family? ? PreferredFamily.new : DefaultFamily.new
+    end
+
+    def initialize(index_path, font_paths_fetcher, family)
       @index_path = index_path
-      @font_paths = font_paths
+      @font_paths_fetcher = font_paths_fetcher
       @family = family
     end
 
@@ -85,7 +89,18 @@ module Fontist
     private
 
     def index
-      @index ||= build_index
+      return @index unless index_changed?
+
+      @index = build_index
+    end
+
+    def index_changed?
+      @index.nil? ||
+        @index.map { |x| x[:path] }.uniq.sort != font_paths.sort
+    end
+
+    def font_paths
+      @font_paths_fetcher.call
     end
 
     def build_index

data/lib/fontist/update.rb

@@ -30,7 +30,14 @@ module Fontist
                          depth: 1)
       end
 
-      git = Git.open(Fontist.formulas_repo_path)
+      git = if Dir.exist?(Fontist.formulas_repo_path.join(".git"))
+              Git.open(Fontist.formulas_repo_path)
+            else
+              Git.init(Fontist.formulas_repo_path.to_s).tap do |g|
+                g.add_remote("origin", Fontist.formulas_repo_url)
+              end
+            end
+
       return git.pull("origin", @branch) if git.current_branch == @branch
 
       git.config("remote.origin.fetch",
@@ -41,36 +48,11 @@ module Fontist
     end
 
     def update_private_repos
-      private_repos.each do |path|
-        update_repo(path)
+      Repo.list.each do |name|
+        Repo.update(name)
       end
     end
 
-    def update_repo(path)
-      Git.open(path).pull
-    rescue Git::GitExecuteError => e
-      name = repo_name(path)
-      raise Errors::RepoCouldNotBeUpdatedError.new(<<~MSG.chomp)
-        Formulas repo '#{name}' could not be updated.
-        Please consider reinitializing it with:
-          fontist remove #{name}
-          fontist setup #{name} REPO_URL
-
-        Git error:
-        #{e.message}
-      MSG
-    end
-
-    def private_repos
-      Dir.glob(Fontist.private_formulas_path.join("*")).select do |path|
-        File.directory?(path)
-      end
-    end
-
-    def repo_name(path)
-      File.basename(path)
-    end
-
     def rebuild_index
       Index.rebuild
     end

data/lib/fontist/utils/downloader.rb

@@ -15,7 +15,7 @@ module Fontist
         @file = file
         @sha = [sha].flatten.compact
         @file_size = file_size.to_i if file_size
-        @progress_bar = set_progress_bar(progress_bar)
+        @progress_bar = progress_bar
         @cache = Cache.new
       end
 
@@ -54,35 +54,48 @@ module Fontist
         options[:download_path] || Fontist.root_path.join("tmp")
       end
 
-      def set_progress_bar(progress_bar)
-        if progress_bar
+      def download_file
+        tries = tries ? tries + 1 : 1
+        do_download_file
+      rescue Down::Error => e
+        retry if tries < 3
+
+        raise Fontist::Errors::InvalidResourceError,
+              "Invalid URL: #{@file}. Error: #{e.inspect}."
+      end
+
+      def do_download_file
+        progress_bar = create_progress_bar
+        file = do_download_file_with_progress_bar(progress_bar)
+        progress_bar.finish
+        file
+      end
+
+      def create_progress_bar
+        if @progress_bar
           ProgressBar.new(@file_size)
         else
           NullProgressBar.new(@file_size)
         end
       end
 
-      def download_file
-        file = Down.download(
+      # rubocop:disable Metrics/MethodLength
+      def do_download_file_with_progress_bar(progress_bar)
+        Down.download(
           url,
           open_timeout: 10,
           read_timeout: 10,
           max_redirects: 10,
           headers: headers,
           content_length_proc: ->(content_length) {
-            @progress_bar.total = content_length if content_length
+            progress_bar.total = content_length if content_length
           },
           progress_proc: -> (progress) {
-            @progress_bar.increment(progress)
+            progress_bar.increment(progress)
           }
         )
-
-        @progress_bar.finish
-
-        file
-      rescue Down::NotFound
-        raise(Fontist::Errors::InvalidResourceError.new("Invalid URL: #{@file}"))
       end
+      # rubocop:enable Metrics/MethodLength
 
       def url
         @file.respond_to?(:url) ? @file.url : @file

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.11.2".freeze
+  VERSION = "1.11.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-11 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement