fontist 1.13.0 → 1.14.0

data/lib/fontist/import/macos.rb

@@ -1,141 +1,57 @@
 require "plist"
 require "nokogiri"
-require "fontist/import"
-require_relative "recursive_extraction"
-require_relative "helpers/hash_helper"
-require_relative "manual_formula_builder"
+require "fontist/import/create_formula"
 
 module Fontist
   module Import
     class Macos
       FONT_XML = "/System/Library/AssetsV2/com_apple_MobileAsset_Font6/com_apple_MobileAsset_Font6.xml".freeze # rubocop:disable Layout/LineLength
-      DESCRIPTION = "Fonts included with macOS %<name>s".freeze
-
-      INSTRUCTIONS = <<~INSTRUCTIONS.freeze
-        To download and enable any of these fonts:
-
-        1. Open Font Book, which is in your Applications folder.
-        2. Select All Fonts in the sidebar, or use the Search field to find the font that you want to download. Fonts that are not already downloaded appear dimmed in the list of fonts.
-        3. Select the dimmed font and choose Edit > Download, or Control-click it and choose Download from the pop-up menu.
-      INSTRUCTIONS
-
-      def initialize(options = {})
-        @options = options
-      end
+      HOMEPAGE = "https://support.apple.com/en-om/HT211240#document".freeze
 
       def call
-        downloadable_fonts = fetch_fonts_list
-        links = fetch_links(downloadable_fonts)
-        archives = download(links)
-        store_in_dir(archives) do |dir|
-          create_formula(dir)
+        links.each do |link|
+          create_formula(link)
         end
-      end
 
-      private
-
-      def fetch_fonts_list
-        html = Net::HTTP.get(URI.parse(@options[:fonts_link]))
+        Fontist::Index.rebuild
 
-        document = Nokogiri::HTML.parse(html)
-        document.css("#sections div.grid2col:nth-of-type(3) div ul > li",
-                     "#sections div.grid2col:nth-of-type(4) div ul > li")
-          .map(&:text)
+        Fontist.ui.success("Created #{links.size} formulas.")
       end
 
-      def fetch_links(downloadable_fonts)
-        data = Plist.parse_xml(FONT_XML)
-        assets = downloadable_assets(data, downloadable_fonts)
-        assets_links(assets)
-      end
-
-      def downloadable_assets(data, downloadable_fonts)
-        data["Assets"].select do |x|
-          x["FontInfo4"].any? do |i|
-            downloadable_fonts.find do |d|
-              d.start_with?(i["FontFamilyName"])
-            end
-          end
-        end
-      end
+      private
 
-      def assets_links(assets)
-        assets.map do |x|
+      def links
+        data = Plist.parse_xml(FONT_XML)
+        data["Assets"].map do |x|
           x.values_at("__BaseURL", "__RelativePath").join
         end
       end
 
-      def download(links)
-        links.map do |url|
-          Fontist::Utils::Downloader.download(url, progress_bar: true).path
-        end
-      end
-
-      def store_in_dir(archives)
-        Dir.mktmpdir do |dir|
-          archives.each do |archive|
-            FileUtils.ln(archive, dir)
-          end
-
-          yield dir
-        end
-      end
-
-      def create_formula(archives_dir)
-        extractor = RecursiveExtraction.new(archives_dir)
-        path = save(formula(archives_dir, extractor))
+      def create_formula(url)
+        path = Fontist::Import::CreateFormula.new(
+          url,
+          platforms: platforms,
+          homepage: homepage,
+          requires_license_agreement: license,
+          formula_dir: formula_dir,
+          keep_existing: true,
+        ).call
         Fontist.ui.success("Formula has been successfully created: #{path}")
 
         path
       end
 
-      def formula(archive, extractor)
-        builder = ManualFormulaBuilder.new
-        setup_strings(builder, archive)
-        setup_files(builder, extractor)
-        builder.formula
-      end
-
-      def setup_strings(builder, archive)
-        builder.url = archive
-        builder.archive = archive
-        builder.platforms = platforms
-        builder.instructions = instructions
-        builder.description = description
-        builder.options = builder_options
-      end
-
       def platforms
-        major_version = Sys::Uname.release.split(".").first
-
-        ["macos-#{major_version}"]
-      end
-
-      def instructions
-        INSTRUCTIONS.strip
-      end
-
-      def description
-        format(DESCRIPTION, name: @options[:name])
-      end
-
-      def builder_options
-        @options.merge(homepage: @options[:fonts_link])
+        ["macos"]
       end
 
-      def setup_files(builder, extractor)
-        builder.extractor = extractor
-        builder.font_files = extractor.font_files
-        builder.font_collection_files = extractor.font_collection_files
-        builder.license_text = extractor.license_text
+      def homepage
+        HOMEPAGE
       end
 
-      def save(hash)
-        filename = Import.name_to_filename(@options[:name])
-        path = File.join(formula_dir, filename)
-        yaml = YAML.dump(Helpers::HashHelper.stringify_keys(hash))
-        File.write(path, yaml)
-        path
+      def license
+        @license ||= File.read(File.expand_path("macos/macos_license.txt",
+                                                __dir__))
       end
 
       def formula_dir

data/lib/fontist/import/recursive_extraction.rb

@@ -94,12 +94,22 @@ module Fontist
       def match_font(path)
         case Files::FontDetector.detect(path)
         when :font
-          @font_files << Otf::FontFile.new(path)
+          file = Otf::FontFile.new(path)
+          @font_files << file unless already_exist?(file)
         when :collection
           @collection_files << Files::CollectionFile.new(path)
         end
       end
 
+      def already_exist?(candidate)
+        @font_files.any? do |file|
+          file.family_name == candidate.family_name &&
+            file.type == candidate.type &&
+            file.version == candidate.version &&
+            file.font == candidate.font
+        end
+      end
+
       def font_directory?(path)
         return true unless subdirectory_pattern
 

data/lib/fontist/import/text_helper.rb

@@ -20,7 +20,7 @@ module Fontist
           min, max = strs.minmax
           idx = min.size.times { |i| break i if min[i] != max[i] }
           prefix = min[0...idx].strip
-          return if prefix.empty?
+          return if prefix.size < 2
 
           prefix
         end

data/lib/fontist/import_cli.rb

@@ -1,18 +1,28 @@
 module Fontist
   class ImportCLI < Thor
+    include CLI::ClassOptions
+
+    desc "google", "Import Google fonts"
+    def google
+      handle_class_options(options)
+      require "fontist/import/google_import"
+      Fontist::Import::GoogleImport.new.call
+      CLI::STATUS_SUCCESS
+    end
+
     desc "macos", "Create formula for on-demand macOS fonts"
-    option :name, desc: "Example: Big Sur", required: true
-    option :fonts_link,
-           desc: "A link to a list of available fonts in a current OS",
-           required: true
-    option :formulas_path, type: :string, desc: "Path to formulas"
     def macos
-      if options[:formulas_path]
-        Fontist.formulas_path = Pathname.new(options[:formulas_path])
-      end
-
+      handle_class_options(options)
       require_relative "import/macos"
-      Import::Macos.new(options).call
+      Import::Macos.new.call
+      CLI::STATUS_SUCCESS
+    end
+
+    desc "sil", "Import formulas from SIL"
+    def sil
+      handle_class_options(options)
+      require "fontist/import/sil_import"
+      Fontist::Import::SilImport.new.call
       CLI::STATUS_SUCCESS
     end
   end

data/lib/fontist/repo_cli.rb

@@ -1,9 +1,12 @@
 module Fontist
   class RepoCLI < Thor
+    include CLI::ClassOptions
+
     desc "setup NAME URL",
          "Setup a custom fontist repo named NAME for the repository at URL " \
          "and fetches its formulas"
     def setup(name, url)
+      handle_class_options(options)
       Repo.setup(name, url)
       Fontist.ui.success(
         "Fontist repo '#{name}' from '#{url}' has been successfully set up.",
@@ -13,6 +16,7 @@ module Fontist
 
     desc "update NAME", "Update formulas in a fontist repo named NAME"
     def update(name)
+      handle_class_options(options)
       Repo.update(name)
       Fontist.ui.success(
         "Fontist repo '#{name}' has been successfully updated.",
@@ -24,6 +28,7 @@ module Fontist
 
     desc "remove NAME", "Remove fontist repo named NAME"
     def remove(name)
+      handle_class_options(options)
       Repo.remove(name)
       Fontist.ui.success(
         "Fontist repo '#{name}' has been successfully removed.",
@@ -35,6 +40,7 @@ module Fontist
 
     desc "list", "List fontist repos"
     def list
+      handle_class_options(options)
       Repo.list.each do |name|
         Fontist.ui.say(name)
       end

data/lib/fontist/utils/downloader.rb

@@ -24,7 +24,7 @@ module Fontist
           download_file
         end
 
-        raise_if_tampered(file)
+        check_tampered(file)
 
         file
       end
@@ -33,15 +33,12 @@ module Fontist
 
       attr_reader :file, :sha, :file_size
 
-      def raise_if_tampered(file)
+      def check_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)}",
-            ),
+          Fontist.ui.error(
+            "SHA256 checksum mismatch for #{url}: #{file_checksum}, " \
+            "should be #{sha.join(', or ')}.",
           )
         end
       end

data/lib/fontist/utils/system.rb

@@ -28,6 +28,14 @@ module Fontist
       def self.match?(platform)
         user_os_with_version.start_with?(platform)
       end
+
+      def self.fontconfig_installed?
+        Helpers.silence_stream($stderr) do
+          !!Helpers.run("fc-cache -V")
+        end
+      rescue Errno::ENOENT
+        false
+      end
     end
   end
 end

data/lib/fontist/utils/ui.rb

@@ -3,16 +3,36 @@ require "thor"
 module Fontist
   module Utils
     class UI < Thor
+      ALL_LEVELS = %i[debug info warn error fatal unknown].freeze
+
+      def self.level=(level)
+        unless ALL_LEVELS.include?(level)
+          raise Errors::GeneralError,
+                "Unknown log level: #{level.inspect}. " \
+                "Supported levels are #{ALL_LEVELS.map(&:inspect).join(', ')}."
+        end
+
+        @level = level
+      end
+
+      def self.level
+        @level || default_level
+      end
+
+      def self.default_level
+        :fatal
+      end
+
       def self.success(message)
-        new.say(message, :green)
+        new.say(message, :green) if log_levels.include?(:info)
       end
 
       def self.error(message)
-        new.say(message, :red)
+        new.say(message, :red) if log_levels.include?(:warn)
       end
 
       def self.say(message)
-        new.say(message)
+        new.say(message) if log_levels.include?(:info)
       end
 
       def self.ask(message, options = {})
@@ -20,7 +40,16 @@ module Fontist
       end
 
       def self.print(message)
-        super
+        super if log_levels.include?(:info)
+      end
+
+      def self.debug(message)
+        new.say(message) if log_levels.include?(:debug)
+      end
+
+      def self.log_levels
+        @log_levels ||= {}
+        @log_levels[@level] ||= ALL_LEVELS.drop_while { |l| l != level }
       end
     end
   end

data/lib/fontist/utils.rb

@@ -1,9 +1,6 @@
 require "fontist/utils/ui"
 require "fontist/utils/locking"
 require "fontist/utils/system"
-require "fontist/utils/dsl"
-require "fontist/utils/dsl/font"
-require "fontist/utils/dsl/collection_font"
 require "fontist/utils/downloader"
 
 module Fontist

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.13.0".freeze
+  VERSION = "1.14.0".freeze
 end

data/lib/fontist.rb

@@ -119,11 +119,7 @@ module Fontist
     @preferred_family = bool
   end
 
-  def self.debug?
-    @debug || false
-  end
-
-  def self.debug=(bool)
-    @debug = bool
+  def self.log_level=(level)
+    Fontist.ui.level = level
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -299,13 +299,15 @@ files:
 - fontist.gemspec
 - lib/fontist.rb
 - lib/fontist/cli.rb
+- lib/fontist/cli/class_options.rb
 - lib/fontist/errors.rb
 - lib/fontist/font.rb
 - lib/fontist/font_installer.rb
 - lib/fontist/font_path.rb
+- lib/fontist/fontconfig.rb
+- lib/fontist/fontconfig_cli.rb
 - lib/fontist/formula.rb
 - lib/fontist/formula_picker.rb
-- lib/fontist/google_cli.rb
 - lib/fontist/helpers.rb
 - lib/fontist/import.rb
 - lib/fontist/import/convert_formulas.rb
@@ -323,6 +325,7 @@ files:
 - lib/fontist/import/helpers/hash_helper.rb
 - lib/fontist/import/helpers/system_helper.rb
 - lib/fontist/import/macos.rb
+- lib/fontist/import/macos/macos_license.txt
 - lib/fontist/import/manual_formula_builder.rb
 - lib/fontist/import/otf/font_file.rb
 - lib/fontist/import/otf_parser.rb
@@ -355,9 +358,6 @@ files:
 - lib/fontist/utils.rb
 - lib/fontist/utils/cache.rb
 - lib/fontist/utils/downloader.rb
-- lib/fontist/utils/dsl.rb
-- lib/fontist/utils/dsl/collection_font.rb
-- lib/fontist/utils/dsl/font.rb
 - lib/fontist/utils/locking.rb
 - lib/fontist/utils/system.rb
 - lib/fontist/utils/ui.rb

data/lib/fontist/google_cli.rb

@@ -1,29 +0,0 @@
-module Fontist
-  class GoogleCLI < Thor
-    class_option :formulas_path, type: :string, desc: "Path to formulas"
-
-    desc "check", "Check Google fonts for updates"
-    def check
-      handle_class_options(options)
-      require "fontist/import/google_check"
-      Fontist::Import::GoogleCheck.new.call
-      CLI::STATUS_SUCCESS
-    end
-
-    desc "import", "Import Google fonts"
-    def import
-      handle_class_options(options)
-      require "fontist/import/google_import"
-      Fontist::Import::GoogleImport.new.call
-      CLI::STATUS_SUCCESS
-    end
-
-    private
-
-    def handle_class_options(options)
-      if options[:formulas_path]
-        Fontist.formulas_path = Pathname.new(options[:formulas_path])
-      end
-    end
-  end
-end

data/lib/fontist/utils/dsl/collection_font.rb

@@ -1,36 +0,0 @@
-module Fontist
-  module Utils
-    module Dsl
-      class CollectionFont
-        REQUIRED_ATTRIBUTES = %i[style].freeze
-
-        attr_reader :attributes
-
-        def initialize(attributes)
-          REQUIRED_ATTRIBUTES.each do |required_attribute|
-            unless attributes[required_attribute]
-              raise(Fontist::Errors::MissingAttributeError.new(
-                      "Missing attribute: #{required_attribute}"
-                    ))
-            end
-          end
-
-          self.attributes = attributes
-        end
-
-        def attributes=(attrs)
-          @attributes = { family_name: attrs[:family_name],
-                          type: attrs[:style],
-                          collection: attrs[:full_name],
-                          full_name: attrs[:full_name],
-                          post_script_name: attrs[:post_script_name],
-                          version: attrs[:version],
-                          description: attrs[:description],
-                          copyright: attrs[:copyright],
-                          font: attrs[:filename],
-                          source_font: attrs[:source_filename] }
-        end
-      end
-    end
-  end
-end

data/lib/fontist/utils/dsl/font.rb

@@ -1,38 +0,0 @@
-module Fontist
-  module Utils
-    module Dsl
-      class Font
-        REQUIRED_ATTRIBUTES = %i[family_name
-                                 style
-                                 full_name
-                                 filename].freeze
-
-        attr_reader :attributes
-
-        def initialize(attributes)
-          REQUIRED_ATTRIBUTES.each do |required_attribute|
-            unless attributes[required_attribute]
-              raise(Fontist::Errors::MissingAttributeError.new(
-                      "Missing attribute: #{required_attribute}"
-                    ))
-            end
-          end
-
-          self.attributes = attributes
-        end
-
-        def attributes=(attrs)
-          @attributes = { family_name: attrs[:family_name],
-                          type: attrs[:style],
-                          full_name: attrs[:full_name],
-                          post_script_name: attrs[:post_script_name],
-                          version: attrs[:version],
-                          description: attrs[:description],
-                          copyright: attrs[:copyright],
-                          font: attrs[:filename],
-                          source_font: attrs[:source_filename] }
-        end
-      end
-    end
-  end
-end

data/lib/fontist/utils/dsl.rb

@@ -1,85 +0,0 @@
-module Fontist
-  module Utils
-    module Dsl
-      def key(key)
-        instance.key = key
-      end
-
-      def desc(description)
-        instance.description = description
-      end
-
-      def homepage(homepage)
-        instance.homepage = homepage
-      end
-
-      def resource(resource_name, &block)
-        instance.resources[resource_name] ||= {}
-        instance.temp_resource = instance.resources[resource_name]
-
-        yield(block) if block_given?
-        instance.temp_resource = {}
-      end
-
-      def url(url)
-        instance.temp_resource.merge!(urls: [url])
-      end
-
-      def urls(urls = [])
-        instance.temp_resource.merge!(urls: urls)
-      end
-
-      def sha256(sha256)
-        instance.temp_resource.merge!(sha256: sha256)
-      end
-
-      def file_size(file_size)
-        instance.temp_resource.merge!(file_size: file_size )
-      end
-
-      def provides_font_collection(name = nil, &block)
-        instance.temp_resource = {}
-        yield(block) if block_given?
-        instance.temp_resource = {}
-      end
-
-      def filename(name)
-        instance.temp_resource.merge!(filename: name)
-      end
-
-      def source_filename(name)
-        instance.temp_resource.merge!(source_filename: name)
-      end
-
-      def provides_font(font, options = {})
-        font_styles = instance.extract_font_styles(options)
-        instance.font_list.push(name: font, styles: font_styles)
-      end
-
-      def test
-      end
-
-      def requires_license_agreement(license)
-        instance.license = license
-        instance.license_required = true
-      end
-
-      def open_license(license)
-        instance.license = license
-        instance.license_required = false
-      end
-
-      def copyright(copyright)
-        instance.copyright = copyright
-      end
-
-      def license_url(url)
-        instance.license_url = url
-      end
-
-      def display_progress_bar(value )
-        instance.options = (instance.options || {}).merge(progress_bar: value )
-      end
-    end
-  end
-end