fontist 1.20.0 → 1.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b84dad2469698853e57c647d63890c7f054f888db3d7c53367e7c17ac3ca3951
-  data.tar.gz: ebc3c36071d189946c187af9c7a1e340ed703dc37b1eb40b821ce7557b4f2b3a
+  metadata.gz: 1f3590888173d9be1196a8ca87bdefb0a8e0f4d7104f89d50bfac819d4890baf
+  data.tar.gz: 77dccd8e142c9f47dd1be79496d1c7d22185594ad3e0a0f927b94fc35c9f08c3
 SHA512:
-  metadata.gz: 3cb8a0632dde13a856ac227b3dfd6af2082fa9e4a4c27357e94664cfb3861b26ed16af5dd0891eb1542d3ec2ae4d82dbc8f57c8ae593f39610c071885f6e45d3
-  data.tar.gz: a792eceef4a821e48acce6ccb7d863a9fbc7602ac8197f488a927a1e1563947740ff4863a6162af004dbfcc40789433980ce31aed0b2a674d6b10d74009b3b7d
+  metadata.gz: 41d6c8bc63c8484fddd51fb3aeca3f6338a58a08b3c880a7016e15e0d43252183dd0a0e9ef743680a9010508c79bda7f4b9d17db5d7e71eae897060ab2278e3e
+  data.tar.gz: 8910f191f347e60de4f0cf1b1c8d68a30c934fb8e4e00880f13246f49f4f42de18024a4c22d4eadd7860b74fe102f021f902ab359c040c5cd1ce08a714c2ce5b

data/.github/workflows/release.yml

@@ -0,0 +1,21 @@
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch (or pre|rc|etc).
+          Also, you can pass 'skip' to skip 'git tag' and do 'gem push' for the current version
+        required: true
+        default: 'skip'
+  repository_dispatch:
+    types: [ do-release ]
+
+jobs:
+  release:
+    uses: fontist/support/.github/workflows/release.yml@main
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+    secrets:
+      rubygems-api-key: ${{ secrets.FONTIST_CI_RUBYGEMS_API_KEY }}

data/.github/workflows/tebako-pack.yml

@@ -1,8 +1,8 @@
 name: tebako-pack
 
 on:
-  push:
-    tags: [ 'v*' ]
+  repository_dispatch:
+    types: [ do-release ]
   workflow_dispatch:
 
 concurrency:

data/.github/workflows/test-and-release.yml

@@ -16,6 +16,7 @@ env:
 # does not cause bundler gem reinstalls
 # bundler/rubygems 2.3.22 is a minimal requirement to support gnu/musl differentiation
 # https://github.com/rubygems/rubygems/pull/4488
+  GOOGLE_FONTS_API_KEY: ${{secrets.FONTIST_CI_GOOGLE_FONTS_API_KEY}}
 
 jobs:
   prepare:
@@ -35,7 +36,7 @@ jobs:
       matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@v1
         with:
@@ -59,6 +60,7 @@ jobs:
 
   archlinux-test:
     name: Test on Arch Linux
+    needs: prepare
     runs-on: ubuntu-latest
     container:
       image: 'archlinux:latest'
@@ -66,12 +68,18 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
-
       - name: Setup packages
-        run: pacman -Syu --noconfirm git ruby binutils gcc autoconf make libffi
+        run: pacman -Syu --noconfirm git binutils gcc autoconf make libffi libyaml gmp
+
+      - uses: actions/checkout@v4
+
+      - uses: asdf-vm/actions/install@v3
+        with:
+          tool_versions: ruby ${{ needs.prepare.outputs.default-ruby-version }}
 
-      - run: bundle install
+      - run: |
+          gem install bundler
+          bundle install
 
       - name: Test
         run: bundle exec rspec --tag ~dev
@@ -83,14 +91,14 @@ jobs:
     needs: prepare
     if: needs.prepare.outputs.push-for-tag != 'true'
 
-    continue-on-error: ${{ matrix.ruby.experimental || matrix.os == 'windows-latest' }} # workaround https://github.com/metanorma/metanorma/issues/288
+    continue-on-error: ${{ matrix.ruby.experimental }}
     strategy:
       fail-fast: false
       max-parallel: 5
       matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: metanorma/metanorma
 
@@ -117,14 +125,12 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.ref, 'refs/tags/v')
     steps:
-      - uses: actions/checkout@v3
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.1
-          bundler-cache: true
+      - uses: actions/checkout@v4
 
-      - uses: actions-mn/gem-release@main
+      - name: Repository ready for release
+        uses: peter-evans/repository-dispatch@v3
         with:
-          api-key: ${{ secrets.FONTIST_CI_RUBYGEMS_API_KEY }}
-          release-command: bundle exec rake release
+          token: ${{ secrets.FONTIST_CI_PAT_TOKEN }}
+          repository: ${{ github.repository }}
+          event-type: do-release
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "type": "do-release"}'

data/README.adoc

@@ -1066,7 +1066,7 @@ Fontist's https://github.com/fontist/formulas[formula library] includes support
 for all openly-licensed fonts provided through Google Fonts, and maintains
 Fontist formulas for all such fonts.
 
-https://github.com/fontist/formulas/blob/v3/.github/workflows/google.yml[A GHA
+https://github.com/fontist/formulas/blob/v4/.github/workflows/google.yml[A GHA
 workflow] checks for updated fonts on Google Fonts daily. In case an update is
 found, it's added to the repo by the workflow.
 

data/exe/fontist

@@ -4,8 +4,7 @@ require "fontist"
 require "fontist/cli"
 
 fontist_cli = proc {
-  status_code = Fontist::CLI.start(ARGV)
-  exit status_code.is_a?(Integer) ? status_code : 1
+  Fontist::CLI.start(ARGV)
 }
 
 if ENV["SOCKS_PROXY"]

data/fontist.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "nokogiri", "~> 1.0"
   spec.add_runtime_dependency "mime-types", "~> 3.0"
   spec.add_runtime_dependency "sys-uname", "~> 1.2"
-  spec.add_runtime_dependency "thor", "~> 1.2.1"
+  spec.add_runtime_dependency "thor", "~> 1.2", ">= 1.2.1"
   spec.add_runtime_dependency "git", "~> 1.0"
   spec.add_runtime_dependency "ttfunk", "~> 1.6"
   spec.add_runtime_dependency "plist", "~> 3.0"

data/lib/fontist/cli/thor_ext.rb

@@ -0,0 +1,79 @@
+require "fontist/utils/ui"
+
+module Fontist
+  module ThorExt
+    # Sources:
+    # - https://github.com/mattbrictson/gem/blob/main/lib/example/thor_ext.rb
+    # - https://mattbrictson.com/blog/fixing-thor-cli-behavior
+    #
+    # Configures Thor to behave more like a typical CLI, with better help
+    # and error handling.
+    #
+    # - Passing -h or --help to a command will show help for that command.
+    # - Unrecognized options will be treated as errors.
+    # - Error messages will be printed in red to stderr, without stack trace.
+    # - Errors will cause Thor to exit with a non-zero status.
+    #
+    # To take advantage of this behavior, your CLI should subclass Thor
+    # and extend this module.
+    #
+    #   class CLI < Thor
+    #     extend ThorExt::Start
+    #   end
+    #
+    # Start your CLI with:
+    #
+    #   CLI.start
+    #
+    # In tests, prevent Kernel.exit from being called when an error occurs,
+    # like this:
+    #
+    #   CLI.start(args, exit_on_failure: false)
+    module Start
+      def self.extended(base)
+        super
+        base.check_unknown_options!
+      end
+
+      def start(given_args = ARGV, config = {})
+        config[:shell] ||= Thor::Base.shell.new
+        handle_help_switches(given_args) do |args|
+          dispatch(nil, args, nil, config)
+        end
+      rescue StandardError => e
+        handle_exception_on_start(e, config)
+      end
+
+      private
+
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+      def handle_help_switches(given_args)
+        yield(given_args.dup)
+      rescue Thor::UnknownArgumentError => e
+        retry_with_args = []
+
+        if given_args.first == "help"
+          retry_with_args = ["help"] if given_args.length > 1
+        elsif e.unknown.intersect?(%w[-h --help])
+          retry_with_args = ["help", (given_args - e.unknown).first]
+        end
+        raise unless retry_with_args.any?
+
+        yield(retry_with_args)
+      end
+
+      def handle_exception_on_start(error, config)
+        return if error.is_a?(Errno::EPIPE)
+        raise if Fontist.ui.debug? || !config.fetch(:exit_on_failure, true)
+
+        message = error.message.to_s
+        if message.empty? || !error.is_a?(Thor::Error)
+          message.prepend("[#{error.class}] ")
+        end
+        config[:shell]&.say_error(message, :red)
+        exit(false)
+      end
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    end
+  end
+end

data/lib/fontist/cli.rb

@@ -1,5 +1,6 @@
 require "thor"
 require "fontist/cli/class_options"
+require "fontist/cli/thor_ext"
 require "fontist/repo_cli"
 require "fontist/cache_cli"
 require "fontist/import_cli"
@@ -9,6 +10,7 @@ require "fontist/config_cli"
 module Fontist
   class CLI < Thor
     include ClassOptions
+    extend ThorExt::Start
 
     STATUS_SUCCESS = 0
     STATUS_UNKNOWN_ERROR = 1

data/lib/fontist/config.rb

@@ -44,7 +44,8 @@ module Fontist
     def default_values
       { fonts_path: Fontist.fontist_path.join("fonts"),
         open_timeout: 10,
-        read_timeout: 10 }
+        read_timeout: 10,
+        google_fonts_key: nil }
     end
 
     def persist

data/lib/fontist/font.rb

@@ -216,6 +216,11 @@ module Fontist
       confirmation = check_and_confirm_required_license(formula)
       paths = font_installer(formula).install(confirmation: confirmation)
 
+      if paths.nil? || paths.empty?
+        Fontist.ui.error("Fonts not found in formula #{formula}")
+        return
+      end
+
       Fontist.ui.say("Fonts installed at:")
       paths.each do |path|
         Fontist.ui.say("- #{path}")

data/lib/fontist/font_installer.rb

@@ -1,5 +1,7 @@
 require "fontist/utils"
 require "excavate"
+require_relative "resources/archive_resource"
+require_relative "resources/google_resource"
 
 module Fontist
   class FontInstaller
@@ -48,63 +50,32 @@ module Fontist
     end
 
     def install_font
-      fonts_paths = run_in_temp_dir { extract }
+      fonts_paths = do_install_font
       fonts_paths.empty? ? nil : fonts_paths
     end
 
-    def run_in_temp_dir
-      Dir.mktmpdir(nil, Dir.tmpdir) do |dir|
-        @temp_dir = Pathname.new(dir)
-
-        result = yield
-
-        @temp_dir = nil
-
-        result
-      end
-    end
-
-    def extract
-      archive = download_file(@formula.resources.first)
-
-      install_fonts_from_archive(archive)
-    end
-
-    def install_fonts_from_archive(archive)
-      Fontist.ui.say(%(Installing font "#{@formula.key}".))
+    def do_install_font
+      Fontist.ui.say(%(Installing from formula "#{@formula.key}".))
 
       Array.new.tap do |fonts_paths|
-        Excavate::Archive.new(archive.path).files(recursive_packages: true) do |path|
+        resource.files(source_files) do |path|
           fonts_paths << install_font_file(path) if font_file?(path)
         end
       end
     end
 
-    def download_file(source)
-      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
+    def resource
+      resource_class = if @formula.source == "google"
+                         Resources::GoogleResource
+                       else
+                         Resources::ArchiveResource
+                       end
 
-      raise Errors::InvalidResourceError, errors.join(" ")
+      resource_class.new(resource_options, no_progress: @no_progress)
     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
+    def resource_options
+      @formula.resources.first
     end
 
     def font_file?(path)
@@ -116,16 +87,16 @@ module Fontist
     end
 
     def source_files
-      @source_files ||= @formula.fonts.flat_map do |font|
-        next [] if @font_name && !font.name.casecmp?(@font_name)
-
-        font_files(font)
+      @source_files ||= fonts.flat_map do |font|
+        font.styles.map do |style|
+          style.source_font || style.font
+        end
       end
     end
 
-    def font_files(font)
-      font.styles.map do |style|
-        style.source_font || style.font
+    def fonts
+      @formula.fonts.select do |font|
+        @font_name.nil? || font.name.casecmp?(@font_name)
       end
     end
 

data/lib/fontist/formula.rb

@@ -109,6 +109,12 @@ module Fontist
       @data.key?("resources")
     end
 
+    def source
+      return unless @data["resources"]
+
+      @data["resources"].values.first["source"]
+    end
+
     def path
       @path
     end

data/lib/fontist/helpers.rb

@@ -1,3 +1,5 @@
+require "ostruct"
+
 module Fontist
   module Helpers
     def self.parse_to_object(data)

data/lib/fontist/import/create_formula.rb

@@ -1,6 +1,5 @@
 require "fontist/import"
 require_relative "recursive_extraction"
-require_relative "helpers/hash_helper"
 require_relative "formula_builder"
 
 module Fontist
@@ -12,31 +11,102 @@ module Fontist
       end
 
       def call
-        save(builder)
+        builder.save
       end
 
       private
 
       def builder
         builder = FormulaBuilder.new
-        setup_strings(builder, archive)
+        setup_strings(builder)
         setup_files(builder)
         builder
       end
 
-      def setup_strings(builder, archive)
-        builder.archive = archive
-        builder.url = @url
+      def setup_strings(builder)
         builder.options = @options
+        builder.resources = resources
       end
 
       def setup_files(builder)
-        builder.extractor = extractor
+        builder.operations = extractor.operations
         builder.font_files = extractor.font_files
         builder.font_collection_files = extractor.font_collection_files
         builder.license_text = extractor.license_text
       end
 
+      def resources
+        @resources ||= { filename(archive) => resource_options }
+      end
+
+      def filename(file)
+        if file.respond_to?(:original_filename)
+          file.original_filename
+        else
+          File.basename(file)
+        end
+      end
+
+      def resource_options
+        if @options[:skip_sha]
+          resource_options_without_sha
+        else
+          resource_options_with_sha
+        end
+      end
+
+      def resource_options_without_sha
+        { urls: [@url] + mirrors, file_size: file_size }
+      end
+
+      def resource_options_with_sha
+        urls = []
+        sha = []
+        downloads do |url, path|
+          urls << url
+          sha << Digest::SHA256.file(path).to_s
+        end
+
+        sha = prepare_sha256(sha)
+
+        { urls: urls, sha256: sha, file_size: file_size }
+      end
+
+      def downloads
+        yield @url, archive
+
+        mirrors.each do |url|
+          path = download_mirror(url)
+          next unless path
+
+          yield url, path
+        end
+      end
+
+      def mirrors
+        @options[:mirror] || []
+      end
+
+      def download_mirror(url)
+        Fontist::Utils::Downloader.download(url, progress_bar: true).path
+      rescue Errors::InvalidResourceError
+        Fontist.ui.error("WARN: a mirror is not found '#{url}'")
+        nil
+      end
+
+      def prepare_sha256(input)
+        output = input.uniq
+        return output.first if output.size == 1
+
+        checksums = output.join(", ")
+        Fontist.ui.error("WARN: SHA256 differs (#{checksums})")
+        output
+      end
+
+      def file_size
+        File.size(archive)
+      end
+
       def extractor
         @extractor ||=
           RecursiveExtraction.new(archive,
@@ -53,34 +123,6 @@ module Fontist
 
         Fontist::Utils::Downloader.download(url, progress_bar: true).path
       end
-
-      def save(builder)
-        path = vacant_path
-        yaml = YAML.dump(Helpers::HashHelper.stringify_keys(builder.formula))
-        File.write(path, yaml)
-        path
-      end
-
-      def vacant_path
-        path = path_from_name
-        return path unless @options[:keep_existing] && File.exist?(path)
-
-        2.upto(9) do |i|
-          candidate = path.sub(/\.yml$/, "#{i}.yml")
-          return candidate unless File.exist?(candidate)
-        end
-
-        raise Errors::GeneralError, "Formula #{path} already exists."
-      end
-
-      def path_from_name
-        filename = Import.name_to_filename(builder.name)
-        if @options[:formula_dir]
-          File.join(@options[:formula_dir], filename)
-        else
-          filename
-        end
-      end
     end
   end
 end