fontist 1.10.0 → 1.11.3

data/lib/fontist/import/helpers/system_helper.rb

@@ -4,7 +4,7 @@ module Fontist
       module SystemHelper
         class << self
           def run(command)
-            Fontist.ui.say("Run `#{command}`")
+            Fontist.ui.say("Run `#{command}`") if Fontist.debug?
 
             result = `#{command}`
             unless $CHILD_STATUS.to_i.zero?

data/lib/fontist/import/otf/font_file.rb

@@ -106,7 +106,11 @@ module Fontist
         end
 
         def detect_extension
-          Files::FontDetector.standard_extension(@path)
+          detected = Files::FontDetector.standard_extension(@path)
+          file_extension = File.extname(File.basename(@path)).sub(/^\./, "")
+          return file_extension if file_extension.casecmp?(detected)
+
+          detected
         end
       end
     end

data/lib/fontist/import/otf_parser.rb

@@ -13,6 +13,8 @@ module Fontist
       end
 
       def call
+        raise ArgumentError, "Empty path" unless @path
+
         text = REQUIREMENTS[:otfinfo].call(@path)
         text.split("\n")
           .select { |x| x.include?(":") }

data/lib/fontist/import/recursive_extraction.rb

@@ -3,7 +3,8 @@ require_relative "files/font_detector"
 module Fontist
   module Import
     class RecursiveExtraction
-      LICENSE_PATTERN = /(ofl\.txt|ufl\.txt|licenses?\.txt|copying)$/i.freeze
+      LICENSE_PATTERN =
+        /(ofl\.txt|ufl\.txt|licenses?\.txt|license(\.md)?|copying)$/i.freeze
 
       def initialize(archive, subarchive: nil, subdir: nil)
         @archive = archive
@@ -69,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/index.rb

@@ -3,33 +3,6 @@ require_relative "indexes/filename_index"
 
 module Fontist
   class Index
-    def self.rebuild_for_main_repo
-      unless Dir.exist?(Fontist.private_formulas_path)
-        return do_rebuild_for_main_repo_with
-      end
-
-      Dir.mktmpdir do |dir|
-        tmp_private_path = File.join(dir, "private")
-        FileUtils.mv(Fontist.private_formulas_path, tmp_private_path)
-
-        do_rebuild_for_main_repo_with
-
-        FileUtils.mv(tmp_private_path, Fontist.private_formulas_path)
-      end
-    end
-
-    def self.do_rebuild_for_main_repo_with
-      Fontist.formula_preferred_family_index_path =
-        Fontist.formulas_repo_path.join("index.yml")
-      Fontist.formula_filename_index_path =
-        Fontist.formulas_repo_path.join("filename_index.yml")
-
-      rebuild
-
-      Fontist.formula_preferred_family_index_path = nil
-      Fontist.formula_filename_index_path = nil
-    end
-
     def self.rebuild
       Fontist::Indexes::DefaultFamilyFontIndex.rebuild
       Fontist::Indexes::PreferredFamilyFontIndex.rebuild

data/lib/fontist/system_font.rb

@@ -1,5 +1,4 @@
 require_relative "system_index"
-require_relative "formula_paths"
 
 module Fontist
   class SystemFont
@@ -13,6 +12,10 @@ 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"]
@@ -21,6 +24,10 @@ module Fontist
       Dir.glob(patterns)
     end
 
+    def self.reset_system_font_paths_cache
+      @system_font_paths = nil
+    end
+
     def self.expand_paths(paths)
       paths.map do |path|
         require "etc"
@@ -51,7 +58,7 @@ module Fontist
     end
 
     def find_styles
-      find_by_index || find_by_formulas
+      find_by_index
     end
 
     private
@@ -61,9 +68,5 @@ module Fontist
     def find_by_index
       SystemIndex.system_index.find(font, style)
     end
-
-    def find_by_formulas
-      FormulaPaths.new(self.class.font_paths).find(font, style)
-    end
   end
 end

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 self.family
+      Fontist.preferred_family? ? PreferredFamily.new : DefaultFamily.new
     end
 
-    def initialize(index_path, font_paths, family)
+    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
@@ -148,6 +163,11 @@ module Fontist
       else
         raise Errors::UnknownFontTypeError.new(path)
       end
+    rescue StandardError
+      Fontist.ui.error($!.message)
+      Fontist.ui.error(
+        "Warning: File at #{path} not recognized as a font file.",
+      )
     end
 
     def detect_file_font(path)
@@ -155,9 +175,6 @@ module Fontist
       file = TTFunk::File.new(content)
 
       parse_font(file, path)
-    rescue StandardError
-      warn $!.message
-      warn "Warning: File at #{path} not recognized as a font file."
     end
 
     def detect_collection_fonts(path)
@@ -166,9 +183,6 @@ module Fontist
           parse_font(file, path)
         end
       end
-    rescue StandardError
-      warn $!.message
-      warn "Warning: File at #{path} not recognized as a font file."
     end
 
     def parse_font(file, path)

data/lib/fontist/update.rb

@@ -1,7 +1,13 @@
 module Fontist
   class Update
+    VERSION = "v2".freeze
+
     def self.call
-      new.call
+      new(VERSION).call
+    end
+
+    def initialize(branch = "main")
+      @branch = branch
     end
 
     def call
@@ -17,13 +23,21 @@ module Fontist
       dir = File.dirname(Fontist.formulas_repo_path)
       FileUtils.mkdir_p(dir) unless File.exist?(dir)
 
-      if Dir.exist?(Fontist.formulas_repo_path)
-        Git.open(Fontist.formulas_repo_path).pull
-      else
-        Git.clone(Fontist.formulas_repo_url,
-                  Fontist.formulas_repo_path,
-                  depth: 1)
+      unless Dir.exist?(Fontist.formulas_repo_path)
+        return Git.clone(Fontist.formulas_repo_url,
+                         Fontist.formulas_repo_path,
+                         branch: @branch,
+                         depth: 1)
       end
+
+      git = Git.open(Fontist.formulas_repo_path)
+      return git.pull("origin", @branch) if git.current_branch == @branch
+
+      git.config("remote.origin.fetch",
+                 "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
+      git.fetch
+      git.checkout(@branch)
+      git.pull("origin", @branch)
     end
 
     def update_private_repos

data/lib/fontist/utils/downloader.rb

@@ -24,12 +24,7 @@ module Fontist
           download_file
         end
 
-        if !sha.empty? && !sha.include?(Digest::SHA256.file(file).to_s)
-          raise(Fontist::Errors::TamperedFileError.new(
-            "The downloaded file from #{@file} doesn't " \
-            "match with the expected sha256 checksum!"
-          ))
-        end
+        raise_if_tampered(file)
 
         file
       end
@@ -38,6 +33,19 @@ module Fontist
 
       attr_reader :file, :sha, :file_size
 
+      def raise_if_tampered(file)
+        file_checksum = Digest::SHA256.file(file).to_s
+        if !sha.empty? && !sha.include?(file_checksum)
+          raise(
+            Fontist::Errors::TamperedFileError.new(
+              "The downloaded file from #{@file} doesn't " \
+              "match with the expected sha256 checksum (#{file_checksum})!\n" \
+              "Beginning of content: #{File.read(file, 3000)}",
+            ),
+          )
+        end
+      end
+
       def byte_to_megabyte
         @byte_to_megabyte ||= 1024 * 1024
       end
@@ -59,6 +67,7 @@ module Fontist
           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

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.10.0".freeze
+  VERSION = "1.11.3".freeze
 end

data/lib/fontist.rb

@@ -40,7 +40,11 @@ module Fontist
   end
 
   def self.formulas_repo_path
-    Fontist.fontist_path.join("formulas")
+    Fontist.fontist_version_path.join("formulas")
+  end
+
+  def self.fontist_version_path
+    Fontist.fontist_path.join("versions", Update::VERSION)
   end
 
   def self.formulas_repo_url
@@ -48,7 +52,11 @@ module Fontist
   end
 
   def self.formulas_path
-    Fontist.formulas_repo_path.join("Formulas")
+    @formulas_path || Fontist.formulas_repo_path.join("Formulas")
+  end
+
+  def self.formulas_path=(path)
+    @formulas_path = path
   end
 
   def self.private_formulas_path
@@ -84,25 +92,15 @@ module Fontist
   end
 
   def self.formula_preferred_family_index_path
-    @formula_preferred_family_index_path ||
-      Fontist.formula_index_dir.join("formula_index.preferred_family.yml")
-  end
-
-  def self.formula_preferred_family_index_path=(path)
-    @formula_preferred_family_index_path = path
+    Fontist.formula_index_dir.join("formula_index.preferred_family.yml")
   end
 
   def self.formula_filename_index_path
-    @formula_filename_index_path ||
-      Fontist.formula_index_dir.join("filename_index.yml")
-  end
-
-  def self.formula_filename_index_path=(path)
-    @formula_filename_index_path = path
+    Fontist.formula_index_dir.join("filename_index.yml")
   end
 
   def self.formula_index_dir
-    Fontist.fontist_path
+    Fontist.fontist_version_path
   end
 
   def self.preferred_family?
@@ -112,4 +110,12 @@ module Fontist
   def self.preferred_family=(bool)
     @preferred_family = bool
   end
+
+  def self.debug?
+    @debug || false
+  end
+
+  def self.debug=(bool)
+    @debug = bool
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-17 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -25,69 +25,69 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: extract_ttc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: ttfunk
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: excavate
+  name: ttfunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: extract_ttc
+  name: excavate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -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
@@ -221,19 +235,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-protocol-buffers
+  name: socksify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 description: Install openly-licensed fonts on Windows, Linux and Mac!
 email:
 - open.source@ribose.com
@@ -242,7 +256,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/check_google.yml"
 - ".github/workflows/metanorma.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/rspec.yml"
@@ -252,7 +265,7 @@ files:
 - ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
-- README.md
+- README.adoc
 - Rakefile
 - exe/fontist
 - fontist.gemspec
@@ -263,7 +276,7 @@ files:
 - lib/fontist/font_installer.rb
 - lib/fontist/font_path.rb
 - lib/fontist/formula.rb
-- lib/fontist/formula_paths.rb
+- lib/fontist/google_cli.rb
 - lib/fontist/helpers.rb
 - lib/fontist/import.rb
 - lib/fontist/import/convert_formulas.rb
@@ -274,9 +287,6 @@ files:
 - lib/fontist/import/formula_builder.rb
 - lib/fontist/import/formula_serializer.rb
 - lib/fontist/import/google.rb
-- lib/fontist/import/google/fonts_public.md
-- lib/fontist/import/google/fonts_public.pb.rb
-- lib/fontist/import/google/fonts_public.proto
 - lib/fontist/import/google/new_fonts_fetcher.rb
 - lib/fontist/import/google/skiplist.yml
 - lib/fontist/import/google_check.rb