fontist 1.14.0 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c0b58f3af1125a6a560179502a5ce5845e76b4d4db1c466e5f63f9628203089
-  data.tar.gz: 2176708c4c71239768f8714cf21d393aae208b8a7757402b08ad369ec155ed25
+  metadata.gz: 9061a709e73b5612e94dfb837e10408cacd2d9ad1726b2d772c0b78de6daad02
+  data.tar.gz: fed88c613b73470fce728338c77f98b7901614ffbf1b2863a6da66c0c873f169
 SHA512:
-  metadata.gz: c3875e506d599cfab2e7447e7a9f24518080a02f8bce0018f386b06c13a5048a78ce2e8fa61a4109e60e7445bb10164e84d45d33bcc109b4087ca3a2eeedac49
-  data.tar.gz: 61747670abc9194cba651cb01d5a69d46bbdc84ed99f9de50e0057606a24f2b2efb2b2df782d6cf9b3b99d1c678e33f20d665157655de460e9227075b3a28a0b
+  metadata.gz: d93f552671890e67120fb622b8805b2e14822d043c1b0fa9d560264564fdee25e66c2f5bfb628ce273ac2e7f970165486715bfc8de741f3131e3e937ed6f955d
+  data.tar.gz: 1206ffb6a85f80d363693bcb728440e1e6f64a16b30ec8cdf47de99e07d6148148ac3e954ca3e7d5def43c51af4897f36039eb8065184cc5056ec8d85e696e25

data/.github/workflows/metanorma.yml

@@ -5,6 +5,10 @@ on:
     branches: [ main ]
   pull_request:
 
+concurrency:
+  group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
+  cancel-in-progress: true
+
 jobs:
   test:
     name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
@@ -13,11 +17,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.7', '3.0' ]
+        ruby: [ '2.7', '3.0', '3.1' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ true ]
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
         with:
           repository: metanorma/metanorma
 
@@ -27,7 +31,15 @@ jobs:
 
       - run: 'echo ''gem "fontist", path: "./fontist"'' > Gemfile.devel'
 
-      - uses: ruby/setup-ruby@v1
+      - if: matrix.ruby == '3.0'
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          rubygems: latest
+
+      - if: matrix.ruby != '3.0'
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true

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

@@ -0,0 +1,55 @@
+name: test-and-release
+
+on:
+  push:
+    branches: [ main ]
+    tags: [ 'v*' ]
+  pull_request:
+
+concurrency:
+  group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ contains(matrix.os, 'ubuntu') || matrix.ruby == '3.1' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.6', '2.7', '3.0', '3.1' ]
+        os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - if: matrix.os == 'macos-latest'
+        run: brew install lcdf-typetools
+
+      - if: matrix.os == 'macos-latest'
+        run: bundle exec rspec
+        env:
+          TEST_ENV: CI
+
+      - if: matrix.os != 'macos-latest'
+        run: bundle exec rspec --tag ~dev
+        env:
+          TEST_ENV: CI
+
+  release:
+    name: Release gem
+    needs: test
+    runs-on: ubuntu-latest
+    if: contains(github.ref, 'refs/tags/v')
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: cadwallion/publish-rubygems-action@master
+        env:
+          RUBYGEMS_API_KEY: ${{secrets.FONTIST_CI_RUBYGEMS_API_KEY}}

data/.gitignore

@@ -20,3 +20,6 @@ Gemfile.lock
 
 # remote file cache
 .rubocop-*
+
+# VS Code
+.vscode

data/README.adoc

@@ -1,6 +1,6 @@
 = Fontist
 
-image:https://github.com/fontist/fontist/actions/workflows/rspec.yml/badge.svg["Build Status", link="https://github.com/fontist/fontist/actions/workflows/rspec.yml"]
+image:https://github.com/fontist/fontist/actions/workflows/test-and-release.yml/badge.svg["Build Status", link="https://github.com/fontist/fontist/actions/workflows/test-and-release.yml"]
 image:https://img.shields.io/gem/v/fontist.svg["Gem Version", link="https://rubygems.org/gems/fontist"]
 image:https://img.shields.io/github/issues-pr-raw/fontist/fontist.svg["Pull Requests", link="https://github.com/fontist/fontist/pulls"]
 
@@ -160,17 +160,16 @@ These fonts are removed:
 
 === Status: `fontist status`
 
-Prints installed font paths grouped by formula and font.
+Prints installed font paths with a corresponding formula.
 
 [source,sh]
 ----
 $ fontist status "segoe ui"
-segoe_ui
- Segoe UI
-  Regular (/Users/user/.fontist/fonts/SEGOEUI.TTF)
-  Bold (/Users/user/.fontist/fonts/SEGOEUIB.TTF)
-  Italic (/Users/user/.fontist/fonts/SEGOEUII.TTF)
-  Bold Italic (/Users/user/.fontist/fonts/SEGOEUIZ.TTF)
+Fonts found at:
+- /Users/user/.fontist/fonts/SEGOEUII.TTF (from segoe_ui formula)
+- /Users/user/.fontist/fonts/SEGOEUIZ.TTF (from segoe_ui formula)
+- /Users/user/.fontist/fonts/SEGOEUIB.TTF (from segoe_ui formula)
+- /Users/user/.fontist/fonts/SEGOEUI.TTF (from segoe_ui formula)
 ----
 
 === List: `fontist list`
@@ -242,11 +241,21 @@ Segoe UI:
     - "/Users/user/.fontist/fonts/SEGOEUIB.TTF"
 Roboto Mono:
   Regular:
-    full_name:
-    paths: []
+    full_name: Roboto Mono Regular
+    paths:
+    - "/Users/user/.fontist/fonts/RobotoMono-VariableFont_wght.ttf"
 ----
 
-Since "`Segoe UI`" is installed, but "`Roboto Mono`" is not.
+If one or more of requested fonts are missing, the "3" error code would be
+returned, and a message printed:
+
+[source,sh]
+----
+$ fontist manifest-locations manifest.yml
+'Roboto Mono' 'Regular' font is missing, please run `fontist install 'Roboto Mono'` to download the font.
+$ echo $?
+3
+----
 
 === Install fonts from manifest: `fontist manifest-install`
 
@@ -556,7 +565,7 @@ Fontist::Fontconfig.remove              # disable detection
 Fontist::Fontconfig.remove(force: true) # do not fail if no config exists
 ----
 
-=== Installing macOS-specific add-on fonts
+== Installing macOS-specific add-on fonts
 
 The purpose of Fontist allowing macOS-specific add-on fonts is to allow CI jobs
 on macOS environments to use these specially licensed fonts that are not
@@ -701,27 +710,6 @@ fontist create-formula https://www.latofonts.com/download/lato2ofl-zip/
 cp lato.yml ~/.fontist/formulas/Formulas/
 ----
 
-Though indexes are auto-generated now, maintainers should rebuild indexes in the
-main repo for backward compatibility with Fontist versions prior to v1.9.x.
-
-A formula index should be rebuilt when a new formula is generated or an existing
-one changed:
-
-[source,sh]
-----
-fontist rebuild-index --main-repo
-----
-
-Then, both the formula and the updated indexes should be committed and pushed to
-the formula repository:
-
-[source,sh]
-----
-cd ~/.fontist/formulas
-git add Formulas/lato.yml index.yml filename_index.yml
-git commit -m "Add Lato formula"
-----
-
 === Authentication for private formulas or private formula repositories
 
 Authorization of private archives in private formulas can be implemented with
@@ -784,29 +772,13 @@ WARNING: This section is only for Fontist maintainers.
 https://fonts.google.com[Google Fonts] provides probably the largest collection
 of widely-used, freely and openly licensed fonts.
 
-Fontist's https://github.com/fonitist/formula[formula library] includes support
+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.
 
-A GHA workflow checks for updated fonts on Google Fonts daily.
-
-In case an update is found, it could be fetched to the library by:
-
-[source,sh]
-----
-bin/fontist import google
-----
-
-The script would update formulas which should be committed to a separate
-repository https://github.com/fontist/formulas[formulas]:
-
-[source,sh]
-----
-cd ~/.fontist/versions/{last_version}/formulas
-git add Formulas/google
-git commit -m "Google Fonts update"
-git push
-----
+https://github.com/fontist/formulas/blob/v3/.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.
 
 === Dynamically importing formulas from SIL
 
@@ -833,35 +805,19 @@ git push
 === Dynamically importing formulas from macOS
 
 macOS provides https://support.apple.com/en-om/HT211240#download[fonts] which
-can be manually downloaded with `Font Book.app`. When such font is requested,
-Fontist prints information on how to install it.
+can be manually downloaded with `Font Book.app`.
 
-In order to know which fonts are available in a current version of macOS,
-for each version there is a formula containing all supported fonts.
-
-A new formula can be generated with:
+To update macOS formulas:
 
 [source,sh]
 ----
-fontist import macos --name "Big Sur" --fonts-link "https://support.apple.com/en-om/HT211240#download"
+fontist import macos
 cd ~/.fontist/versions/{last_version}/formulas
 git add Formulas/macos
-git commit -m "Add Big Sur macOS formula"
+git commit -m "Update macOS formulas"
 git push
 ----
 
-Here `--fonts-link` is a link to a page containing a list of available fonts
-in the `Font Book.app`.
-
-If the import is run on a different version of macOS, then a proper version
-should be set in the `platforms` attribute of the generated formula:
-
-[source,yaml]
-----
-platforms:
-- macos-20
-----
-
 
 == Development
 

data/fontist.gemspec

@@ -30,22 +30,21 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "down", "~> 5.0"
   spec.add_runtime_dependency "extract_ttc", "~> 0.1"
   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.0.1"
   spec.add_runtime_dependency "git", "~> 1.0"
   spec.add_runtime_dependency "ttfunk", "~> 1.6"
   spec.add_runtime_dependency "plist", "~> 3.0"
-  spec.add_runtime_dependency "excavate", "~> 0.1"
+  spec.add_runtime_dependency "excavate", "~> 0.3.1"
+  spec.add_runtime_dependency "socksify", "~> 1.7"
 
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry", "~> 0.14"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "gem-release"
   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"
-
-  spec.add_runtime_dependency "socksify"
+  spec.add_development_dependency "rubocop", "~> 1.5"
+  spec.add_development_dependency "rubocop-rails", "~> 2.9"
+  spec.add_development_dependency "rubocop-performance", "~> 1.10"
 end

data/lib/fontist/import/google/new_fonts_fetcher.rb

@@ -121,6 +121,10 @@ module Fontist
           Down.open("https://fonts.google.com/download?family=#{name}")
           true
         rescue Down::NotFound
+          false
+        rescue Down::ClientError => e
+          raise unless e.message == "403 Forbidden"
+
           false
         rescue Down::TimeoutError
           retry unless retries >= 3

data/lib/fontist/utils/cache.rb

@@ -97,8 +97,17 @@ module Fontist
 
       def generate_file_path(source)
         dir = Dir.mktmpdir(nil, Fontist.downloads_path)
-        filename = source.original_filename
-        File.join(dir, filename)
+        File.join(dir, filename(source))
+      end
+
+      def filename(source)
+        if File.extname(source.original_filename).empty? && source.content_type
+          require "mime/types"
+          ext = MIME::Types[source.content_type].first&.preferred_extension
+          return "#{source.original_filename}.#{ext}" if ext
+        end
+
+        source.original_filename
       end
 
       def move(source_file, target_path)

data/lib/fontist/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sys-uname
   requirement: !ruby/object:Gem::Requirement
@@ -128,56 +142,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: socksify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -224,58 +238,44 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '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'
+        version: '1.10'
 description: Install openly-licensed fonts on Windows, Linux and Mac!
 email:
 - open.source@ribose.com
@@ -285,8 +285,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/metanorma.yml"
-- ".github/workflows/release.yml"
-- ".github/workflows/rspec.yml"
+- ".github/workflows/test-and-release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
@@ -384,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Install openly-licensed fonts on Windows, Linux and Mac!

data/.github/workflows/release.yml

@@ -1,38 +0,0 @@
-name: release
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  release:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v1
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '2.6'
-
-      - run: bundle config set path 'vendor/bundle'
-
-      - run: bundle install --jobs 4 --retry 3
-
-      - run: bundle exec rspec --tag ~dev
-        env:
-          TEST_ENV: CI
-
-      - name: Publish to rubygems.org
-        env:
-          RUBYGEMS_API_KEY: ${{secrets.FONTIST_CI_RUBYGEMS_API_KEY}}
-        run: |
-          gem install gem-release
-          touch ~/.gem/credentials
-          cat > ~/.gem/credentials << EOF
-          ---
-          :rubygems_api_key: ${RUBYGEMS_API_KEY}
-          EOF
-          chmod 0600 ~/.gem/credentials
-          git status
-          gem release

data/.github/workflows/rspec.yml

@@ -1,47 +0,0 @@
-name: rspec
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-
-jobs:
-  build:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0' ]
-        os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-
-    steps:
-      - uses: actions/checkout@master
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - if: matrix.os == 'macos-latest'
-        run: brew install lcdf-typetools
-
-      - if: matrix.os == 'macos-latest'
-        run: bundle exec rspec
-        env:
-          TEST_ENV: CI
-
-      - 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