fontist 1.6.0 → 1.8.1

data/lib/fontist/utils/zip_extractor.rb

@@ -4,41 +4,49 @@ require "pathname"
 module Fontist
   module Utils
     module ZipExtractor
-      # fonts_sub_dir is unused now, but formulas have this option
-      # rubocop:disable Lint/UnusedMethodArgument
-      def zip_extract(resource, download: true, fonts_sub_dir: "")
+      def zip_extract(resource, download: true, fonts_sub_dir: nil)
         zip_file = download_file(resource) if download
         zip_file ||= resource.urls.first
 
-        Fontist.ui.say(%(Installing font "#{key}".))
-        fonts_paths = unzip_fonts(zip_file)
+        Fontist.ui.say(%(Installing font "#{formula.key}".))
+        fonts_paths = unzip_fonts(zip_file, fonts_sub_dir)
         block_given? ? yield(fonts_paths) : fonts_paths
       end
-      # rubocop:enable Lint/UnusedMethodArgument
 
       alias_method :unzip, :zip_extract
 
       private
 
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      def unzip_fonts(file)
+      def unzip_fonts(file, subdir)
         Zip.on_exists_proc = true
 
         Array.new.tap do |fonts|
           Zip::File.open(file) do |zip_file|
-            zip_file.glob("**/*.{ttf,ttc,otf}").each do |entry|
+            zip_file.each do |entry|
               if entry.name
-                filename = Pathname.new(entry.name).basename
-                font_path = fonts_path.join(filename.to_s)
-                fonts.push(font_path.to_s)
+                filename = Pathname.new(entry.name).basename.to_s
+                if font_directory?(entry.name, subdir) && font_file?(filename)
+                  target_filename = target_filename(filename)
+                  font_path = fonts_path.join(target_filename)
+                  fonts.push(font_path.to_s)
 
-                entry.extract(font_path)
+                  entry.extract(font_path)
+                end
               end
             end
           end
         end
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
+      def font_directory?(path, subdir)
+        return true unless subdir
+
+        dirname = File.dirname(path)
+        normalized_pattern = subdir.chomp("/")
+        File.fnmatch?(normalized_pattern, dirname)
+      end
     end
   end
 end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.6.0".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.6.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Ribose Inc.
 - Abu Nashir
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2020-12-20 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,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
@@ -245,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"
@@ -256,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
@@ -284,6 +304,8 @@ files:
 - lib/fontist/import/extractors/seven_zip_extractor.rb
 - lib/fontist/import/extractors/zip_extractor.rb
 - lib/fontist/import/files/collection_file.rb
+- lib/fontist/import/files/file_requirement.rb
+- lib/fontist/import/files/font_detector.rb
 - lib/fontist/import/formula_builder.rb
 - lib/fontist/import/formula_serializer.rb
 - lib/fontist/import/google.rb
@@ -305,17 +327,19 @@ 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/common.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
 - lib/fontist/utils/dsl.rb
+- lib/fontist/utils/dsl/collection_font.rb
 - lib/fontist/utils/dsl/font.rb
 - lib/fontist/utils/exe_extractor.rb
 - lib/fontist/utils/msi_extractor.rb
@@ -346,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

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

data/lib/fontist/font_formula.rb

@@ -1,130 +0,0 @@
-module Fontist
-  class FontFormula
-    include Singleton
-    extend Fontist::Utils::Dsl
-    include Fontist::Utils::ZipExtractor
-    include Fontist::Utils::ExeExtractor
-    include Fontist::Utils::MsiExtractor
-    include Fontist::Utils::SevenZipExtractor
-
-    attr_accessor :license, :license_url, :license_required, :copyright
-    attr_accessor :key, :homepage, :description, :options, :temp_resource
-
-    def font_list
-      @font_list ||= []
-    end
-
-    def resources
-      @resources ||= {}
-    end
-
-    def fonts
-      @fonts ||= font_list.uniq
-    end
-
-    def extract_font_styles(options)
-      extract_from_file(options) ||
-        extract_from_collection(options) || default_font
-    end
-
-    def reinitialize
-      @downloaded = false
-      @matched_fonts = []
-    end
-
-    def self.fetch_font(name, confirmation:)
-      if instance.license_required && confirmation.downcase != "yes"
-        raise(Fontist::Errors::LicensingError)
-      end
-
-      instance.reinitialize
-      instance.install_font(name, confirmation)
-    end
-
-    def install_font(name, confirmation)
-      run_in_temp_dir { extract }
-      matched_fonts_uniq = matched_fonts.flatten.uniq
-      matched_fonts_uniq.empty? ? nil : matched_fonts_uniq
-    end
-
-    private
-
-    attr_reader :downloaded, :matched_fonts
-
-    def resource(name, &block)
-      source = resources[name]
-      block_given? ? yield(source) : source
-    end
-
-    def fonts_path
-      @fonts_path = Fontist.fonts_path
-    end
-
-    def default_font
-      [{ type: "Regular", font: temp_resource[:filename] }]
-    end
-
-    def run_in_temp_dir(&block)
-      Dir.mktmpdir(nil, Dir.tmpdir) do |dir|
-        @temp_dir = Pathname.new(dir)
-
-        yield
-        @temp_dir = nil
-      end
-    end
-
-    def extract_from_file(options)
-      styles = options.fetch(:match_styles_from_file, [])
-
-      unless styles.empty?
-        styles.map do |attributes|
-          Fontist::Utils::Dsl::Font.new(attributes).attributes
-        end
-      end
-    end
-
-    def match_fonts(fonts_dir, font_name)
-      fonts = map_names_to_fonts(font_name).join("|")
-      font = fonts_dir.grep(/#{fonts}/i)
-      @matched_fonts.push(font) if font
-
-      font
-    end
-
-    def extract_from_collection(options)
-      styles = options.fetch(:extract_styles_from_collection, [])
-
-      unless styles.empty?
-        styles.map do |type, file|
-          { type: type, collection: file, font: temp_resource[:filename] }
-        end
-      end
-    end
-
-    def map_names_to_fonts(font_name)
-      fonts = Fontist::Formula.find_fonts(font_name)
-      fonts = fonts.map { |font| font.styles.map(&:font) }.flatten if fonts
-
-      fonts || []
-    end
-
-    def download_file(source)
-      url = source[:urls].first
-      Fontist.ui.say(%(Downloading font "#{key}" from #{url}))
-
-      downloaded_file = Fontist::Utils::Downloader.download(
-        url,
-        sha: source[:sha256],
-        file_size: source[:file_size],
-        progress_bar: is_progress_bar_enabled
-      )
-
-      @downloaded = true
-      downloaded_file
-    end
-
-    def is_progress_bar_enabled
-      options.nil? ? true : options.fetch(:progress_bar, true)
-    end
-  end
-end