fontist 1.7.3 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: bfbc7b0d13e8084d44fe41d69ff1719a203a375cd75970cf8efa0abd2cd711af
-  data.tar.gz: 1a259f0e45ea264ca55c1e112cb25bd672f41532ae82c58989cf368f058d2374
+SHA1:
+  metadata.gz: 0d083618f330800ccb94e30d93fa8b5bf65d5e0a
+  data.tar.gz: 133e64a85156c8fa5dcfc284ef57b3047fdbec0e
 SHA512:
-  metadata.gz: 82a25bf83f43b02f1e8a77717d9d240ebd55910bc0c529ce0ff09d434cad829c862c8db9564597159a3214b6cffa9dce2ee8f64a6f841f5dc589e10571a94c44
-  data.tar.gz: 91771cd423b516b6db27db7ef5e55cd24f01bea9fb368aa4331e0bc75a887e3df35d84a4fa08748e98bc41a16d8f80861cf584ff9cc6a61e938c3b7392ee94ee
+  metadata.gz: f5a33afe8b4157afadbaa8530e39de7a0b51222904101c396668e6e5d030fc51f6895f9f60478d9a32dc46af1bda7f1cef1aff0f27e2bc10bc3ae0e7b661d71f
+  data.tar.gz: 3b1d0e38e2b42cf5e24f568cec75a34666ff7b3a98b36b673969365a4ec87b4add38b5fe3dac79a16871596d19b9454eac9fd6ada0097764a26af364f7fd5fee

data/.github/workflows/release.yml

@@ -0,0 +1,38 @@
+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

@@ -0,0 +1,58 @@
+name: rspec
+
+on:
+  push:
+    branches: [ master ]
+  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.6', '2.5', '2.4' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
+        include:
+          - ruby: '2.7'
+            os: 'ubuntu-latest'
+            experimental: true
+          - ruby: '2.7'
+            os: 'windows-latest'
+            experimental: true
+          - ruby: '2.7'
+            os: 'macos-latest'
+            experimental: true
+
+    steps:
+      - uses: actions/checkout@master
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
+          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
+
+      - if: matrix.os == 'macos-latest'
+        run: brew install lcdf-typetools
+
+      - run: bundle config set path 'vendor/bundle'
+
+      - run: bundle install --jobs 4 --retry 3
+
+      - 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

data/README.md

@@ -44,7 +44,7 @@ can we find a font in your system.
 
 #### Finding a font
 
-The `Fontist::Fontist.find` interface can be used a find a font in your system.
+The `Fontist::Font.find` interface can be used a find a font in your system.
 It will look into the operating system specific font directories, and also the
 fontist specific `~/.fontist` directory.
 
@@ -249,7 +249,7 @@ Prints installed font paths grouped by formula and font.
 
 ```
 $ fontist status "segoe ui"
-Fontist::Formulas::SegoeUIFont
+segoe_ui
  Segoe UI
   Regular (/Users/user/.fontist/fonts/SEGOEUI.TTF)
   Bold (/Users/user/.fontist/fonts/SEGOEUIB.TTF)
@@ -263,7 +263,7 @@ Lists installation status of fonts supported by Fontist.
 
 ```
 $ fontist list "segoe ui"
-Fontist::Formulas::SegoeUIFont
+segoe_ui
  Segoe UI
   Regular (installed)
   Bold (installed)
@@ -273,7 +273,7 @@ Fontist::Formulas::SegoeUIFont
 
 ```
 $ fontist list "roboto mono"
-Fontist::Formulas::RobotoMonoFont
+google/roboto_mono
  Roboto Mono
   Regular (uninstalled)
   Italic (uninstalled)
@@ -395,8 +395,22 @@ archive:
 ```sh
 fontist create-formula https://www.latofonts.com/download/lato2ofl-zip/
 cp lato.yml ~/.fontist/formulas/Formulas/
+```
+
+A formula index should be rebuild, when a new formula is generated or an
+existing one changed:
+
+```sh
+fontist rebuild-index
+```
+
+Then, both the formula and the updated index should be commited and pushed to
+the formula repository:
+
+```sh
 cd ~/.fontist/formulas
 git add Formulas/lato.yml
+git add index.yml
 git commit -m "Add Lato formula"
 ```
 
@@ -420,6 +434,22 @@ git commit -m "Google Fonts update"
 git push
 ```
 
+### Releasing
+
+Releasing is done automatically with GitHub Action. Just bump and tag with `gem-release`.
+
+For a patch release (0.0.x) use:
+
+```sh
+gem bump --version patch --tag --push
+```
+
+For a minor release (0.x.0) use:
+
+```sh
+gem bump --version minor --tag --push
+```
+
 ## Contributing
 
 First, thank you for contributing! We love pull requests from everyone. By

data/fontist.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(bin|test|spec|features)/})
   end
-  spec.bindir        = "bin"
+  spec.bindir        = "exe"
   spec.executables   = ["fontist"]
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "extract_ttc", "~> 0.1"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "gem-release"
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "0.75.0"

data/lib/fontist.rb

@@ -8,12 +8,11 @@ require "fontist/errors"
 require "fontist/version"
 
 require "fontist/font"
-require "fontist/registry"
-require "fontist/formulas"
 require "fontist/formula"
 require "fontist/system_font"
 require "fontist/fontist_font"
 require "fontist/manifest"
+require "fontist/helpers"
 
 module Fontist
   def self.ui
@@ -59,4 +58,8 @@ module Fontist
   def self.system_index_path
     Fontist.fontist_path.join("system_index.yml")
   end
+
+  def self.formula_index_path
+    Fontist.formulas_repo_path.join("index.yml")
+  end
 end

data/lib/fontist/cli.rb

@@ -3,7 +3,22 @@ require "thor"
 module Fontist
   class CLI < Thor
     STATUS_SUCCESS = 0
-    STATUS_ERROR = 1
+    STATUS_UNKNOWN_ERROR = 1
+    STATUS_NON_SUPPORTED_FONT_ERROR = 2
+    STATUS_MISSING_FONT_ERROR = 3
+    STATUS_LICENSING_ERROR = 4
+    STATUS_MANIFEST_COULD_NOT_BE_FOUND_ERROR = 5
+    STATUS_MANIFEST_COULD_NOT_BE_READ_ERROR = 6
+
+    ERROR_TO_STATUS = {
+      Fontist::Errors::NonSupportedFontError => [STATUS_NON_SUPPORTED_FONT_ERROR],
+      Fontist::Errors::MissingFontError => [STATUS_MISSING_FONT_ERROR],
+      Fontist::Errors::LicensingError => [STATUS_LICENSING_ERROR],
+      Fontist::Errors::ManifestCouldNotBeFoundError => [STATUS_MANIFEST_COULD_NOT_BE_FOUND_ERROR,
+                                                        "Manifest could not be found."],
+      Fontist::Errors::ManifestCouldNotBeReadError => [STATUS_MANIFEST_COULD_NOT_BE_READ_ERROR,
+                                                       "Manifest could not be read."],
+    }.freeze
 
     def self.exit_on_failure?
       false
@@ -19,9 +34,9 @@ module Fontist
         force: options[:force],
         confirmation: options[:confirm_license] ? "yes" : "no"
       )
-      STATUS_SUCCESS
-    rescue Fontist::Errors::NonSupportedFontError
-      could_not_find_font(font)
+      success
+    rescue Fontist::Errors::GeneralError => e
+      handle_error(e)
     end
 
     desc "uninstall/remove FONT", "Uninstall font by font or formula"
@@ -29,26 +44,21 @@ module Fontist
       fonts_paths = Fontist::Font.uninstall(font)
       Fontist.ui.success("These fonts are removed:")
       Fontist.ui.success(fonts_paths.join("\n"))
-      STATUS_SUCCESS
-    rescue Fontist::Errors::MissingFontError => e
-      Fontist.ui.error(e.message)
-      STATUS_ERROR
-    rescue Fontist::Errors::NonSupportedFontError
-      could_not_find_font(font)
+      success
+    rescue Fontist::Errors::GeneralError => e
+      handle_error(e)
     end
     map remove: :uninstall
 
     desc "status [FONT]", "Show status of FONT or all fonts in fontist"
     def status(font = nil)
       formulas = Fontist::Font.status(font)
-      return error("No font is installed.") if formulas.empty?
+      return error("No font is installed.", STATUS_MISSING_FONT_ERROR) if formulas.empty?
 
       print_formulas(formulas)
       success
-    rescue Fontist::Errors::MissingFontError => e
-      error(e.message)
-    rescue Fontist::Errors::NonSupportedFontError
-      could_not_find_font(font)
+    rescue Fontist::Errors::GeneralError => e
+      handle_error(e)
     end
 
     desc "list [FONT]", "List installation status of FONT or fonts in fontist"
@@ -56,15 +66,15 @@ module Fontist
       formulas = Fontist::Font.list(font)
       print_list(formulas)
       success
-    rescue Fontist::Errors::NonSupportedFontError
-      could_not_find_font(font)
+    rescue Fontist::Errors::GeneralError => e
+      handle_error(e)
     end
 
     desc "update", "Update formulas"
     def update
-      Formulas.fetch_formulas
+      Formula.update_formulas_repo
       Fontist.ui.say("Formulas have been successfully updated")
-      STATUS_SUCCESS
+      success
     end
 
     desc "manifest-locations MANIFEST",
@@ -73,10 +83,8 @@ module Fontist
       paths = Fontist::Manifest::Locations.from_file(manifest)
       print_yaml(paths)
       success
-    rescue Fontist::Errors::ManifestCouldNotBeFoundError
-      error("Manifest could not be found.")
-    rescue Fontist::Errors::ManifestCouldNotBeReadError
-      error("Manifest could not be read.")
+    rescue Fontist::Errors::GeneralError => e
+      handle_error(e)
     end
 
     desc "manifest-install MANIFEST", "Install fonts from MANIFEST (yaml)"
@@ -89,10 +97,8 @@ module Fontist
 
       print_yaml(paths)
       success
-    rescue Fontist::Errors::ManifestCouldNotBeFoundError
-      error("Manifest could not be found.")
-    rescue Fontist::Errors::ManifestCouldNotBeReadError
-      error("Manifest could not be read.")
+    rescue Fontist::Errors::GeneralError => e
+      handle_error(e)
     end
 
     desc "create-formula URL", "Create a new formula with fonts from URL"
@@ -104,6 +110,17 @@ module Fontist
       require "fontist/import/create_formula"
       name = Fontist::Import::CreateFormula.new(url, options).call
       Fontist.ui.say("#{name} formula has been successfully created")
+      success
+    end
+
+    desc "rebuild-index", "Rebuild formula index (used by formulas maintainers)"
+    long_desc <<-LONGDESC
+      This index is pre-built and served with formulas, so there is no need
+      update it unless something changes in the formulas repo.
+    LONGDESC
+    def rebuild_index
+      Fontist::Index.rebuild
+      Fontist.ui.say("Formula index has been rebuilt.")
       STATUS_SUCCESS
     end
 
@@ -113,18 +130,16 @@ module Fontist
       STATUS_SUCCESS
     end
 
-    def could_not_find_font(font)
-      error("Font '#{font}' not found locally nor available in the Fontist " \
-            "formula repository.\n" \
-            "Perhaps it is available at the latest Fontist formula " \
-            "repository.\n" \
-            "You can update the formula repository using the command " \
-            "`fontist update` and try again.")
+    def handle_error(exception)
+      status, message = ERROR_TO_STATUS[exception.class]
+      raise exception unless status
+
+      error(message || exception.message, status)
     end
 
-    def error(message)
+    def error(message, status)
       Fontist.ui.error(message)
-      STATUS_ERROR
+      status
     end
 
     def print_yaml(object)
@@ -133,7 +148,7 @@ module Fontist
 
     def print_formulas(formulas)
       formulas.each do |formula, fonts|
-        Fontist.ui.success(formula.installer)
+        Fontist.ui.success(formula.key)
 
         fonts.each do |font, styles|
           Fontist.ui.success(" #{font.name}")
@@ -148,7 +163,7 @@ module Fontist
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def print_list(formulas)
       formulas.each do |formula, fonts|
-        Fontist.ui.say(formula.installer)
+        Fontist.ui.say(formula.key)
 
         fonts.each do |font, styles|
           Fontist.ui.say(" #{font.name}")

data/lib/fontist/errors.rb

@@ -1,16 +1,18 @@
 module Fontist
   module Errors
-    class LicensingError < StandardError; end
-    class MissingFontError < StandardError; end
-    class NonSupportedFontError < StandardError; end
-    class TamperedFileError < StandardError; end
-    class InvalidResourceError < StandardError; end
-    class TimeoutError < StandardError; end
-    class MissingAttributeError < StandardError; end
-    class UnknownFontTypeError < StandardError; end
-    class FontNotFoundError < StandardError; end
-    class BinaryCallError < StandardError; end
-    class ManifestCouldNotBeReadError < StandardError; end
-    class ManifestCouldNotBeFoundError < StandardError; end
+    class GeneralError < StandardError; end
+    class BinaryCallError < GeneralError; end
+    class FontNotFoundError < GeneralError; end
+    class FormulaIndexNotFoundError < GeneralError; end
+    class InvalidResourceError < GeneralError; end
+    class LicensingError < GeneralError; end
+    class ManifestCouldNotBeFoundError < GeneralError; end
+    class ManifestCouldNotBeReadError < GeneralError; end
+    class MissingAttributeError < GeneralError; end
+    class MissingFontError < GeneralError; end
+    class NonSupportedFontError < GeneralError; end
+    class TamperedFileError < GeneralError; end
+    class TimeoutError < GeneralError; end
+    class UnknownFontTypeError < GeneralError; end
   end
 end

data/lib/fontist/font.rb

@@ -1,3 +1,5 @@
+require "fontist/font_installer"
+
 module Fontist
   class Font
     def initialize(options = {})
@@ -20,10 +22,6 @@ module Fontist
       new(name: name, confirmation: confirmation, force: force).install
     end
 
-    def self.try_install(name, confirmation: "no")
-      new(name: name, confirmation: confirmation).try_install
-    end
-
     def self.uninstall(name)
       new(name: name).uninstall
     end
@@ -37,43 +35,31 @@ module Fontist
     end
 
     def find
-      find_system_font || downloadable_font || raise(
-        Fontist::Errors::NonSupportedFontError
-      )
+      find_system_font || downloadable_font || raise_non_supported_font
     end
 
     def install
-      (find_system_font unless @force) || download_font || raise(
-        Fontist::Errors::NonSupportedFontError
-      )
-    end
-
-    def try_install
-      download_font
+      (find_system_font unless @force) || download_font || raise_non_supported_font
     end
 
     def uninstall
-      uninstall_font || downloadable_font || raise(
-        Fontist::Errors::NonSupportedFontError
-      )
+      uninstall_font || downloadable_font || raise_non_supported_font
     end
 
     def status
       return installed_statuses unless @name
 
-      font_status || downloadable_font || raise(
-        Fontist::Errors::NonSupportedFontError
-      )
+      font_status || downloadable_font || raise_non_supported_font
     end
 
     def list
       return all_list unless @name
 
-      font_list || raise(Fontist::Errors::NonSupportedFontError)
+      font_list || raise_non_supported_font
     end
 
     def all
-      Fontist::Formula.all.to_h.map { |_name, formula| formula.fonts }.flatten
+      Fontist::Formula.all.map(&:fonts).flatten
     end
 
     private
@@ -101,7 +87,7 @@ module Fontist
     end
 
     def font_installer(formula)
-      Object.const_get(formula.installer)
+      FontInstaller.new(formula)
     end
 
     def formula
@@ -122,8 +108,7 @@ module Fontist
     def download_font
       if formula
         check_and_confirm_required_license(formula)
-        paths = font_installer(formula).fetch_font(name,
-                                                   confirmation: confirmation)
+        paths = font_installer(formula).install(confirmation: confirmation)
 
         Fontist.ui.say("Fonts installed at:")
         paths.each do |path|
@@ -186,7 +171,7 @@ module Fontist
     end
 
     def all_formulas
-      Fontist::Formula.all.to_h.values
+      Fontist::Formula.all
     end
 
     def font_status
@@ -213,7 +198,9 @@ module Fontist
     end
 
     def path(style)
-      font_paths.grep(/#{style.font}/i).first
+      font_paths.detect do |path|
+        File.basename(path) == style.font
+      end
     end
 
     def font_paths
@@ -247,5 +234,16 @@ module Fontist
     def installed(style)
       path(style) ? true : false
     end
+
+    def raise_non_supported_font
+      raise Fontist::Errors::NonSupportedFontError.new(
+        "Font '#{@name}' not found locally nor available in the Fontist " \
+        "formula repository.\n" \
+        "Perhaps it is available at the latest Fontist formula " \
+        "repository.\n" \
+        "You can update the formula repository using the command " \
+        "`fontist update` and try again."
+      )
+    end
   end
 end