fontist 1.7.0 → 1.8.2

data/lib/fontist/system_index.rb

@@ -0,0 +1,92 @@
+require "ttfunk"
+
+module Fontist
+  class SystemIndex
+    attr_reader :font_paths
+
+    def initialize(font_paths)
+      @font_paths = font_paths
+    end
+
+    def find(font, style)
+      fonts = system_index.select do |file|
+        file[:family_name].casecmp?(font) &&
+          (style.nil? || file[:type].casecmp?(style))
+      end
+
+      fonts.empty? ? nil : fonts
+    end
+
+    private
+
+    def system_index
+      @system_index ||= build_system_index
+    end
+
+    def build_system_index
+      previous_index = load_system_index
+      updated_index = detect_paths(font_paths, previous_index)
+      updated_index.tap do |index|
+        save_index(index)
+      end
+    end
+
+    def load_system_index
+      index = File.exist?(Fontist.system_index_path) ? YAML.load_file(Fontist.system_index_path) : []
+      index.group_by { |x| x[:path] }
+    end
+
+    def detect_paths(paths, indexed)
+      paths.flat_map do |path|
+        next indexed[path] if indexed[path]
+
+        detect_fonts(path)
+      end
+    end
+
+    def detect_fonts(path)
+      case File.extname(path).gsub(/^\./, "").downcase
+      when "ttf", "otf"
+        detect_file_font(path)
+      when "ttc"
+        detect_collection_fonts(path)
+      else
+        raise Errors::UnknownFontTypeError.new(path)
+      end
+    end
+
+    def detect_file_font(path)
+      file = TTFunk::File.open(path)
+      parse_font(file, path)
+    end
+
+    def detect_collection_fonts(path)
+      TTFunk::Collection.open(path) do |collection|
+        collection.map do |file|
+          parse_font(file, path)
+        end
+      end
+    end
+
+    def parse_font(file, path)
+      x = file.name
+
+      {
+        path: path,
+        full_name: parse_text(x.font_name.first),
+        family_name: parse_text(x.preferred_family.first || x.font_family.first),
+        type: parse_text(x.preferred_subfamily.first || x.font_subfamily.first),
+      }
+    end
+
+    def parse_text(text)
+      text.gsub(/[^[:print:]]/, "").to_s
+    end
+
+    def save_index(index)
+      dir = File.dirname(Fontist.system_index_path)
+      FileUtils.mkdir_p(dir) unless File.exist?(dir)
+      File.write(Fontist.system_index_path, YAML.dump(index))
+    end
+  end
+end

data/lib/fontist/utils/exe_extractor.rb

@@ -6,7 +6,7 @@ module Fontist
 
         exe_file = download_file(exe_file).path if download
 
-        Fontist.ui.say(%(Installing font "#{key}".))
+        Fontist.ui.say(%(Installing font "#{formula.key}".))
         cab_file = decompressor.search(exe_file)
         cabbed_fonts = grep_fonts(cab_file.files) || []
         fonts_paths = extract_cabbed_fonts_to_assets(cabbed_fonts)

data/lib/fontist/utils/zip_extractor.rb

@@ -8,7 +8,7 @@ module Fontist
         zip_file = download_file(resource) if download
         zip_file ||= resource.urls.first
 
-        Fontist.ui.say(%(Installing font "#{key}".))
+        Fontist.ui.say(%(Installing font "#{formula.key}".))
         fonts_paths = unzip_fonts(zip_file, fonts_sub_dir)
         block_given? ? yield(fonts_paths) : fonts_paths
       end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.7.0".freeze
+  VERSION = "1.8.2".freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 - Abu Nashir
-autorequire:
-bindir: bin
+autorequire: 
+bindir: exe
 cert_chain: []
-date: 2020-11-28 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -109,6 +109,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ttfunk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: extract_ttc
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +165,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -245,9 +287,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/check_google.yml"
-- ".github/workflows/macosx.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
@@ -256,24 +297,17 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/check_google
-- bin/console
-- bin/convert_formulas
-- bin/fontist
-- bin/generate_otfinfo
-- bin/import_google
-- bin/rspec
-- bin/setup
+- exe/fontist
 - fontist.gemspec
 - lib/fontist.rb
 - lib/fontist/cli.rb
 - lib/fontist/errors.rb
 - lib/fontist/font.rb
-- lib/fontist/font_formula.rb
+- lib/fontist/font_installer.rb
 - lib/fontist/fontist_font.rb
 - lib/fontist/formula.rb
-- lib/fontist/formula_template.rb
-- lib/fontist/formulas.rb
+- lib/fontist/formula_paths.rb
+- lib/fontist/helpers.rb
 - lib/fontist/import.rb
 - lib/fontist/import/convert_formulas.rb
 - lib/fontist/import/create_formula.rb
@@ -305,14 +339,17 @@ files:
 - lib/fontist/import/otfinfo/template.erb
 - lib/fontist/import/otfinfo_generate.rb
 - lib/fontist/import/recursive_extraction.rb
+- lib/fontist/import/sil_import.rb
 - lib/fontist/import/template_helper.rb
 - lib/fontist/import/text_helper.rb
+- lib/fontist/index.rb
+- lib/fontist/index_formula.rb
 - lib/fontist/manifest.rb
 - lib/fontist/manifest/install.rb
 - lib/fontist/manifest/locations.rb
-- lib/fontist/registry.rb
 - lib/fontist/system.yml
 - lib/fontist/system_font.rb
+- lib/fontist/system_index.rb
 - lib/fontist/utils.rb
 - lib/fontist/utils/cache.rb
 - lib/fontist/utils/downloader.rb
@@ -349,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: A libarary find or download fonts
 test_files: []

data/.github/workflows/macosx.yml

@@ -1,33 +0,0 @@
-name: macos
-
-on:
-  push:
-    branches:
-      - master
-
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-
-      - name: Install otfinfo
-        run: brew install lcdf-typetools
-
-      - name: Install bundler
-        run: gem install bundler
-
-      - name: Setup
-        run: bin/setup
-
-      - name: Run tests
-        run: TEST_ENV=CI bin/rspec

data/.github/workflows/ubuntu.yml

@@ -1,30 +0,0 @@
-name: ubuntu
-
-on:
-  push:
-    branches:
-      - master
-
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-
-      - name: Install bundler
-        run: gem install bundler
-
-      - name: Setup
-        run: bin/setup
-
-      - name: Run tests
-        run: TEST_ENV=CI bin/rspec --tag ~dev

data/.github/workflows/windows.yml

@@ -1,32 +0,0 @@
-name: windows
-
-on:
-  push:
-    branches:
-      - master
-
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-          architecture: "x64"
-
-      - name: Setup
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-
-      - name: Run tests
-        run: bundle exec rspec --tag ~skip_in_windows --tag ~dev

data/bin/check_google

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "fontist"
-require "fontist/import/google_check"
-
-Fontist::Import::GoogleCheck.new.call

data/bin/console

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "fontist"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-require "pry"
-Pry.start

data/bin/convert_formulas

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "fontist"
-require "fontist/import/convert_formulas"
-
-Fontist::Import::ConvertFormulas.new.call

data/bin/generate_otfinfo

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "fontist"
-require "fontist/import/otfinfo_generate"
-
-Fontist::Import::OtfinfoGenerate.new(ARGV[0]).call

data/bin/import_google

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "fontist"
-require "fontist/import/google_import"
-
-Fontist::Import::GoogleImport.new.call

data/bin/rspec

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-gem install bundler --conservative
-bundle check || bundle install