fontist 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c0b58f3af1125a6a560179502a5ce5845e76b4d4db1c466e5f63f9628203089
-  data.tar.gz: 2176708c4c71239768f8714cf21d393aae208b8a7757402b08ad369ec155ed25
+  metadata.gz: bc5e7576ced5478fb9dc9752a5aa7f514491f112d5bb66b12f86f82b3d8a2f99
+  data.tar.gz: 123b39db27bb75fcbd120caae26adb60a7f9f39e9eabd06613ee50c98adde004
 SHA512:
-  metadata.gz: c3875e506d599cfab2e7447e7a9f24518080a02f8bce0018f386b06c13a5048a78ce2e8fa61a4109e60e7445bb10164e84d45d33bcc109b4087ca3a2eeedac49
-  data.tar.gz: 61747670abc9194cba651cb01d5a69d46bbdc84ed99f9de50e0057606a24f2b2efb2b2df782d6cf9b3b99d1c678e33f20d665157655de460e9227075b3a28a0b
+  metadata.gz: '08091fefee390b3b349d6f7ccd7ac7bb921274c778f91452e05d19f56eac0399604db310aba1ea59fcfa7eafb1c1945aaa6d5454c1141850a7931fa6c44fd9b2'
+  data.tar.gz: d086b630b7d5e32435215d2498b023a3de3238f69c143436e09d0112860c14112167e9dcaa11e8fc1870affb5b63a53b46b9d5a236d00394ec7eeeb6b587e8af

data/README.adoc

@@ -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,6 +30,7 @@ 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"

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.1".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.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-04-05 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