fontist 1.8.13 → 1.10.1

data/lib/fontist/system_font.rb

@@ -3,10 +3,9 @@ require_relative "formula_paths"
 
 module Fontist
   class SystemFont
-    def initialize(font:, style: nil, sources: nil)
+    def initialize(font:, style: nil)
       @font = font
       @style = style
-      @user_sources = sources || []
     end
 
     def self.font_paths
@@ -36,8 +35,8 @@ module Fontist
       Dir.glob(Fontist.fonts_path.join("**"))
     end
 
-    def self.find(font, sources: [])
-      new(font: font, sources: sources).find
+    def self.find(font)
+      new(font: font).find
     end
 
     def self.find_styles(font, style)
@@ -57,18 +56,14 @@ module Fontist
 
     private
 
-    attr_reader :font, :style, :user_sources
+    attr_reader :font, :style
 
     def find_by_index
-      SystemIndex.new(all_paths).find(font, style)
+      SystemIndex.system_index.find(font, style)
     end
 
     def find_by_formulas
-      FormulaPaths.new(all_paths).find(font, style)
-    end
-
-    def all_paths
-      @all_paths ||= Dir.glob(user_sources) + self.class.font_paths
+      FormulaPaths.new(self.class.font_paths).find(font, style)
     end
   end
 end

data/lib/fontist/system_index.rb

@@ -4,22 +4,73 @@ module Fontist
   class SystemIndex
     include Utils::Locking
 
+    class DefaultFamily
+      def family_name(name)
+        name.font_family
+      end
+
+      def type(name)
+        name.font_subfamily
+      end
+    end
+
+    class PreferredFamily
+      def family_name(name)
+        return name.font_family if name.preferred_family.empty?
+
+        name.preferred_family
+      end
+
+      def type(name)
+        return name.font_subfamily if name.preferred_subfamily.empty?
+
+        name.preferred_subfamily
+      end
+    end
+
+    PLATFORM_MACINTOSH = 1
+    PLATFORM_MICROSOFT = 3
+
+    ENCODING_MAC_ROMAN = 0
+    ENCODING_MS_UNICODE_BMP = 1
+
+    LANGUAGE_MAC_ENGLISH = 0
+    LANGUAGE_MS_ENGLISH_AMERICAN = 0x409
+
     attr_reader :font_paths
 
-    def self.find(font, style)
-      new(SystemFont.font_paths).find(font, style)
+    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
     end
 
-    def self.rebuild
-      new(SystemFont.font_paths).rebuild
+    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
     end
 
-    def initialize(font_paths)
+    def initialize(index_path, font_paths, family)
+      @index_path = index_path
       @font_paths = font_paths
+      @family = family
     end
 
     def find(font, style)
-      fonts = system_index.select do |file|
+      fonts = index.select do |file|
         file[:family_name].casecmp?(font) &&
           (style.nil? || file[:type].casecmp?(style))
       end
@@ -28,27 +79,27 @@ module Fontist
     end
 
     def rebuild
-      build_system_index
+      build_index
     end
 
     private
 
-    def system_index
-      @system_index ||= build_system_index
+    def index
+      @index ||= build_index
     end
 
-    def build_system_index
+    def build_index
       lock(lock_path) do
-        do_build_system_index
+        do_build_index
       end
     end
 
     def lock_path
-      Fontist.system_index_path.to_s + ".lock"
+      "#{@index_path}.lock"
     end
 
-    def do_build_system_index
-      previous_index = load_system_index
+    def do_build_index
+      previous_index = load_index
       updated_index = detect_paths(font_paths, previous_index)
       updated_index.tap do |index|
         save_index(index) if changed?(updated_index, previous_index)
@@ -59,21 +110,23 @@ module Fontist
       this.map { |x| x[:path] }.uniq.sort != other.map { |x| x[:path] }.uniq.sort
     end
 
-    def load_system_index
-      index = File.exist?(Fontist.system_index_path) ? YAML.load_file(Fontist.system_index_path) : []
+    def load_index
+      index = File.exist?(@index_path) ? YAML.load_file(@index_path) : []
+      check_index(index)
+      index
+    end
 
+    def check_index(index)
       index.each do |item|
         missing_keys = %i[path full_name family_name type] - item.keys
         unless missing_keys.empty?
           raise(Errors::FontIndexCorrupted, <<~MSG.chomp)
             Font index is corrupted.
             Item #{item.inspect} misses required attributes: #{missing_keys.join(', ')}.
-            You can remove the index file (#{Fontist.system_index_path}) and try again.
+            You can remove the index file (#{@index_path}) and try again.
           MSG
         end
       end
-
-      index
     end
 
     def detect_paths(paths, index)
@@ -98,7 +151,9 @@ module Fontist
     end
 
     def detect_file_font(path)
-      file = TTFunk::File.open(path)
+      content = File.read(path, mode: "rb")
+      file = TTFunk::File.new(content)
+
       parse_font(file, path)
     rescue StandardError
       warn $!.message
@@ -111,6 +166,9 @@ 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)
@@ -118,20 +176,42 @@ module Fontist
 
       {
         path: path,
-        full_name: parse_text(x.font_name.first),
-        family_name: parse_text(x.preferred_family.first || x.font_family.first),
-        type: parse_text(x.preferred_subfamily.first || x.font_subfamily.first),
+        full_name: english_name(x.font_name),
+        family_name: english_name(@family.family_name(x)),
+        type: english_name(@family.type(x)),
       }
     end
 
-    def parse_text(text)
+    def english_name(name)
+      visible_characters(find_english(name))
+    end
+
+    def find_english(name)
+      name.find { |x| microsoft_english?(x) } ||
+        name.find { |x| mac_english?(x) } ||
+        name.last
+    end
+
+    def microsoft_english?(string)
+      string.platform_id == PLATFORM_MICROSOFT &&
+        string.encoding_id == ENCODING_MS_UNICODE_BMP &&
+        string.language_id == LANGUAGE_MS_ENGLISH_AMERICAN
+    end
+
+    def mac_english?(string)
+      string.platform_id == PLATFORM_MACINTOSH &&
+        string.encoding_id == ENCODING_MAC_ROMAN &&
+        string.language_id == LANGUAGE_MAC_ENGLISH
+    end
+
+    def visible_characters(text)
       text.gsub(/[^[:print:]]/, "").to_s
     end
 
     def save_index(index)
-      dir = File.dirname(Fontist.system_index_path)
+      dir = File.dirname(@index_path)
       FileUtils.mkdir_p(dir) unless File.exist?(dir)
-      File.write(Fontist.system_index_path, YAML.dump(index))
+      File.write(@index_path, YAML.dump(index))
     end
   end
 end

data/lib/fontist/update.rb

@@ -0,0 +1,64 @@
+module Fontist
+  class Update
+    def self.call
+      new.call
+    end
+
+    def call
+      update_main_repo
+      update_private_repos
+    ensure
+      rebuild_index
+    end
+
+    private
+
+    def update_main_repo
+      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)
+      end
+    end
+
+    def update_private_repos
+      private_repos.each do |path|
+        update_repo(path)
+      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
+  end
+end

data/lib/fontist/utils/downloader.rb

@@ -20,7 +20,7 @@ module Fontist
       end
 
       def download
-        file = @cache.fetch(@file) do
+        file = @cache.fetch(url) do
           download_file
         end
 
@@ -56,9 +56,10 @@ module Fontist
 
       def download_file
         file = Down.download(
-          @file,
+          url,
           open_timeout: 10,
           read_timeout: 10,
+          headers: headers,
           content_length_proc: ->(content_length) {
             @progress_bar.total = content_length if content_length
           },
@@ -73,6 +74,17 @@ module Fontist
       rescue Down::NotFound
         raise(Fontist::Errors::InvalidResourceError.new("Invalid URL: #{@file}"))
       end
+
+      def url
+        @file.respond_to?(:url) ? @file.url : @file
+      end
+
+      def headers
+        @file.respond_to?(:headers) &&
+          @file.headers &&
+          @file.headers.to_h.map { |k, v| [k.to_s, v] }.to_h || # rubocop:disable Style/HashTransformKeys, Metrics/LineLength
+          {}
+      end
     end
 
     class ProgressBar

data/lib/fontist/utils/locking.rb

@@ -11,6 +11,7 @@ module Fontist
         yield
       ensure
         f.flock(File::LOCK_UN)
+        f.close
       end
     end
   end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.8.13".freeze
+  VERSION = "1.10.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.13
+  version: 1.10.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.75.0
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.75.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: socksify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
@@ -252,6 +266,7 @@ files:
 - ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
+- README.adoc
 - README.md
 - Rakefile
 - exe/fontist
@@ -262,7 +277,6 @@ files:
 - lib/fontist/font.rb
 - lib/fontist/font_installer.rb
 - lib/fontist/font_path.rb
-- lib/fontist/fontist_font.rb
 - lib/fontist/formula.rb
 - lib/fontist/formula_paths.rb
 - lib/fontist/helpers.rb
@@ -296,15 +310,20 @@ files:
 - lib/fontist/import/text_helper.rb
 - lib/fontist/index.rb
 - lib/fontist/indexes/base_index.rb
+- lib/fontist/indexes/default_family_font_index.rb
 - lib/fontist/indexes/filename_index.rb
 - lib/fontist/indexes/font_index.rb
 - lib/fontist/indexes/index_formula.rb
+- lib/fontist/indexes/preferred_family_font_index.rb
 - lib/fontist/manifest.rb
 - lib/fontist/manifest/install.rb
 - lib/fontist/manifest/locations.rb
+- lib/fontist/repo.rb
+- lib/fontist/repo_cli.rb
 - lib/fontist/system.yml
 - lib/fontist/system_font.rb
 - lib/fontist/system_index.rb
+- lib/fontist/update.rb
 - lib/fontist/utils.rb
 - lib/fontist/utils/cache.rb
 - lib/fontist/utils/downloader.rb
@@ -337,8 +356,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Install openly-licensed fonts on Windows, Linux and Mac!
 test_files: []