fontist 1.7.3 → 1.8.1

data/lib/fontist/index.rb

@@ -0,0 +1,72 @@
+require_relative "index_formula"
+
+module Fontist
+  class Index
+    def self.from_yaml
+      unless File.exist?(Fontist.formula_index_path)
+        raise Errors::FormulaIndexNotFoundError.new("Please fetch index with `fontist update`.")
+      end
+
+      data = YAML.load_file(Fontist.formula_index_path)
+      new(data)
+    end
+
+    def self.rebuild
+      index = new
+      index.build
+      index.to_yaml
+    end
+
+    def initialize(data = {})
+      @index = {}
+
+      data.each_pair do |font, paths|
+        paths.each do |path|
+          add_index_formula(font, IndexFormula.new(path))
+        end
+      end
+    end
+
+    def build
+      Formula.all.each do |formula|
+        add_formula(formula)
+      end
+    end
+
+    def add_formula(formula)
+      formula.fonts.each do |font|
+        add_index_formula(font.name, formula.to_index_formula)
+      end
+    end
+
+    def add_index_formula(font_raw, index_formula)
+      font = normalize_font(font_raw)
+      @index[font] ||= []
+      @index[font] << index_formula unless @index[font].include?(index_formula)
+    end
+
+    def load_formulas(font)
+      index_formulas(font).map(&:to_full)
+    end
+
+    def to_yaml
+      File.write(Fontist.formula_index_path, YAML.dump(to_h))
+    end
+
+    def to_h
+      @index.map do |font, index_formulas|
+        [font, index_formulas.map(&:to_s)]
+      end.to_h
+    end
+
+    private
+
+    def index_formulas(font)
+      @index[normalize_font(font)] || []
+    end
+
+    def normalize_font(font)
+      font.downcase
+    end
+  end
+end

data/lib/fontist/index_formula.rb

@@ -0,0 +1,30 @@
+module Fontist
+  class IndexFormula
+    def initialize(path)
+      @path = path
+    end
+
+    def to_s
+      normalized
+    end
+
+    def to_full
+      Formula.new_from_file(full_path)
+    end
+
+    def ==(other)
+      to_s == other.to_s
+    end
+
+    private
+
+    def normalized
+      escaped = Regexp.escape(Fontist.formulas_path.to_s + "/")
+      @path.sub(Regexp.new("^" + escaped), "")
+    end
+
+    def full_path
+      Fontist.formulas_path.join(normalized).to_s
+    end
+  end
+end

data/lib/fontist/manifest/install.rb

@@ -11,17 +11,16 @@ module Fontist
       private
 
       def file_paths(font, style)
-        paths = super
+        paths = find_font_with_name(font, style)
         return paths unless paths["paths"].empty?
 
         install_font(font)
-        super
+
+        find_font_with_name(font, style)
       end
 
       def install_font(font)
-        Fontist::Font.try_install(font, confirmation: @confirmation)
-      rescue Fontist::Errors::LicensingError
-        [] # try to install other fonts
+        Fontist::Font.install(font, force: true, confirmation: @confirmation)
       end
     end
   end

data/lib/fontist/manifest/locations.rb

@@ -53,7 +53,15 @@ module Fontist
       end
 
       def file_paths(font, style)
-        Fontist::SystemFont.find_with_name(font, style).transform_keys(&:to_s)
+        find_font_with_name(font, style).tap do |x|
+          if x["paths"].empty?
+            raise Errors::MissingFontError.new("Could not find font #{font} #{style}.")
+          end
+        end
+      end
+
+      def find_font_with_name(font, style)
+        Fontist::SystemFont.find_with_name(font, style).map { |k, v| [k.to_s, v] }.to_h
       end
     end
   end

data/lib/fontist/system_font.rb

@@ -1,4 +1,5 @@
 require_relative "system_index"
+require_relative "formula_paths"
 
 module Fontist
   class SystemFont
@@ -78,35 +79,7 @@ module Fontist
     end
 
     def find_by_formulas
-      styles = find_styles_by_formulas(font, style)
-      return if styles.empty?
-
-      fonts = styles.uniq { |s| s["font"] }.flat_map do |s|
-        paths = search_font_paths(s["font"])
-        paths.map do |path|
-          { full_name: s["full_name"],
-            path: path }
-        end
-      end
-
-      fonts.empty? ? nil : fonts
-    end
-
-    def find_styles_by_formulas(font, style)
-      if style
-        Formula.find_styles(font, style)
-      else
-        fonts = Formula.find_fonts(font)
-        return [] unless fonts
-
-        fonts.flat_map(&:styles)
-      end
-    end
-
-    def search_font_paths(filename)
-      font_paths.select do |path|
-        File.basename(path) == filename
-      end
+      FormulaPaths.new(font_paths).find(font, style)
     end
   end
 end

data/lib/fontist/system_index.rb

@@ -45,7 +45,7 @@ module Fontist
     end
 
     def detect_fonts(path)
-      case File.extname(path).delete_prefix(".").downcase
+      case File.extname(path).gsub(/^\./, "").downcase
       when "ttf", "otf"
         detect_file_font(path)
       when "ttc"

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.3".freeze
+  VERSION = "1.8.1".freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.8.1
 platform: ruby
 authors:
 - Ribose Inc.
 - Abu Nashir
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2020-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -165,6 +165,20 @@ 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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -259,9 +273,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"
@@ -270,24 +283,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
@@ -321,10 +327,11 @@ files:
 - lib/fontist/import/recursive_extraction.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
@@ -363,7 +370,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project:
+rubygems_version: 2.6.14.4
 signing_key:
 specification_version: 4
 summary: A libarary find or download fonts

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