fontist 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 398c687688ac621dd160d7245b073764e5203ec1993b4d0db185e9b1ba82ec78
-  data.tar.gz: 20222086aaa6372fcab4c4f8726821bbeffc1808f939b498bfb369130da9218c
+  metadata.gz: a35bdc7e99674109bec5810eb8e57d91516ff93f7cf4aefbb608e0298a010f76
+  data.tar.gz: fc886de884ebc5309acb9dc6168fd6c2d7f460f11e05d9be8a1ffca8177e3b6f
 SHA512:
-  metadata.gz: 60cae1ca82451a485a94ef95c9472dfe78e7dc8d30df79b3bcf44eb9c4861826ab6f59f8caf030008af2278bed8b2eb0a6ac061e8556c73949fb359b0bfc85c8
-  data.tar.gz: b702b24e7da4f8ac71ad0fa347a50e73d09171954b986fc2c0cbf8cd206642aed6b770de7e32db4f86e2e409289d401cd9c7d09fe64f775769c38b03038b585e
+  metadata.gz: 05f4a699ac69711925ebf9f036be06e5f5c302b9fe3cec23974bc7892ff18a73115d2373694784ee11ac8c0620b5df215a50cb9c2f173a6448a1ceb0b688753b
+  data.tar.gz: a41c8f091f5783cb0f2d0beabc0d92e9059f78415f36593f9de6b18eb1175d4059a38cb60710dd5064f0a8280aaa6ab9a13e68190903ed7ebe011e8b9068d39c

data/bin/fontist

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
 require "fontist"
 require "fontist/cli"
 

data/lib/fontist/cli.rb

@@ -97,6 +97,7 @@ module Fontist
     desc "create-formula URL", "Create a new formula with fonts from URL"
     option :name, desc: "Example: Times New Roman"
     option :mirror, repeatable: true
+    option :subarchive, desc: "Subarchive to choose when there are several ones"
     def create_formula(url)
       require "fontist/import/create_formula"
       name = Fontist::Import::CreateFormula.new(url, options).call

data/lib/fontist/import/create_formula.rb

@@ -8,9 +8,9 @@ require_relative "formula_builder"
 module Fontist
   module Import
     class CreateFormula
-      FONT_PATTERN = /(\.ttf|\.otf)$/i.freeze
-      FONT_COLLECTION_PATTERN = /\.ttc$/i.freeze
-      LICENSE_PATTERN = /(OFL\.txt|UFL\.txt|LICENSE\.txt)$/i.freeze
+      FONT_PATTERN = /(\.ttf|\.otf)/i.freeze
+      FONT_COLLECTION_PATTERN = /\.ttc/i.freeze
+      LICENSE_PATTERN = /(OFL\.txt|UFL\.txt|LICENSE\.txt|COPYING)$/i.freeze
 
       def initialize(url, options = {})
         @url = url
@@ -42,7 +42,7 @@ module Fontist
       end
 
       def extractor(archive)
-        RecursiveExtraction.new(archive)
+        RecursiveExtraction.new(archive, subarchive: @options[:subarchive])
       end
 
       def font_files(extractor)

data/lib/fontist/import/formula_builder.rb

@@ -89,7 +89,7 @@ module Fontist
       def download(url)
         Fontist::Utils::Downloader.download(url, progress_bar: true).path
       rescue Errors::InvalidResourceError
-        Fontist.ui.say("WARN: a mirror is not found '#{url}'")
+        Fontist.ui.error("WARN: a mirror is not found '#{url}'")
         nil
       end
 
@@ -98,7 +98,7 @@ module Fontist
         return output.first if output.size == 1
 
         checksums = output.join(", ")
-        Fontist.ui.say("WARN: SHA256 differs (#{checksums})")
+        Fontist.ui.error("WARN: SHA256 differs (#{checksums})")
         output
       end
 
@@ -147,7 +147,13 @@ module Fontist
       end
 
       def open_license
-        return unless @license_text
+        unless @license_text
+          Fontist.ui.error("WARN: please add license manually")
+          return
+        end
+
+        Fontist.ui.error("WARN: ensure it's an open license, otherwise change \
+                          to 'requires_license_agreement'")
 
         TextHelper.cleanup(@license_text)
       end

data/lib/fontist/import/google/skiplist.yml

@@ -4,3 +4,5 @@
 - Overpass Mono
 - Lato
 - Open Sans
+- Work Sans
+- Fira Code

data/lib/fontist/import/otf/font_file.rb

@@ -77,7 +77,9 @@ module Fontist
         def read
           text = REQUIREMENTS[:otfinfo].call(@path)
 
-          text.split("\n")
+          text
+            .encode("UTF-8", invalid: :replace, replace: "")
+            .split("\n")
             .select { |x| x.include?(":") }
             .map { |x| x.split(":", 2) }
             .map { |x| x.map { |y| Fontist::Import::TextHelper.cleanup(y) } }

data/lib/fontist/import/recursive_extraction.rb

@@ -4,11 +4,12 @@ require_relative "extractors"
 module Fontist
   module Import
     class RecursiveExtraction
-      BOTH_FONTS_PATTERN = "**/*.{ttf,otf,ttc}".freeze
+      BOTH_FONTS_PATTERN = "**/*.{ttf,otf,ttc}*".freeze
       ARCHIVE_EXTENSIONS = %w[zip msi exe cab].freeze
 
-      def initialize(archive)
+      def initialize(archive, subarchive: nil)
         @archive = archive
+        @subarchive = subarchive
         @operations = []
       end
 
@@ -57,6 +58,8 @@ module Fontist
 
       def operate_on_archive(archive)
         extractor = choose_extractor(archive)
+        Fontist.ui.say("Extracting #{archive} with #{extractor.class.name}")
+
         save_operation(extractor)
         extractor.extract
       end
@@ -87,9 +90,33 @@ module Fontist
       end
 
       def find_archive(path)
-        Dir.children(path)
-          .map    { |file_name| File.join(path, file_name) }
-          .max_by { |file_path| [file_type(file_path), File.size(file_path)] }
+        paths = Dir.children(path).map { |file| File.join(path, file) }
+        by_subarchive(paths) || by_size(paths)
+      end
+
+      def by_subarchive(paths)
+        return unless @subarchive
+
+        path_found = paths.detect do |path|
+          @subarchive == File.basename(path)
+        end
+
+        return unless path_found
+
+        save_operation_subarchive(path_found)
+
+        path_found
+      end
+
+      def save_operation_subarchive(path)
+        @operations.last[:options] ||= {}
+        @operations.last[:options][:subarchive] = File.basename(path)
+      end
+
+      def by_size(paths)
+        paths.max_by do |path|
+          [file_type(path), File.size(path)]
+        end
       end
 
       def file_type(file_path)

data/lib/fontist/utils/cache.rb

@@ -6,7 +6,7 @@ module Fontist
         return downloaded_path(map[key]) if cache_exist?(map[key])
 
         generated_file = yield
-        path = save_cache(generated_file, key, map)
+        path = save_cache(generated_file, key)
 
         downloaded_path(path)
       end
@@ -29,10 +29,13 @@ module Fontist
         path && File.exist?(Fontist.downloads_path.join(path))
       end
 
-      def save_cache(generated_file, key, map)
+      def save_cache(generated_file, key)
         path = move_to_downloads(generated_file)
+
+        map = load_cache
         map[key] = path
         File.write(cache_map_path, YAML.dump(map))
+
         path
       end
 

data/lib/fontist/utils/exe_extractor.rb

@@ -12,10 +12,10 @@ module Fontist
         block_given? ? yield(fonts_paths) : fonts_paths
       end
 
-      def exe_extract(source)
+      def exe_extract(source, subarchive: nil)
         cab_file = decompressor.search(download_file(source).path)
-        fonts_paths = build_cab_file_hash(cab_file.files)
-        block_given? ? yield(fonts_paths) : fonts_paths
+        subarchive_path = extract_subarchive(cab_file.files, subarchive)
+        block_given? ? yield(subarchive_path) : subarchive_path
       end
 
       private
@@ -47,10 +47,11 @@ module Fontist
         end
       end
 
-      def build_cab_file_hash(file)
+      def extract_subarchive(file, subarchive = nil)
         while file
           filename = file.filename
-          if filename.include?("cab") || filename.include?("msi")
+
+          if subarchive_found?(filename, subarchive)
             file_path = File.join(Dir.mktmpdir, filename)
             decompressor.extract(file, file_path)
 
@@ -60,6 +61,12 @@ module Fontist
           file = file.next
         end
       end
+
+      def subarchive_found?(filename, subarchive)
+        return subarchive == filename if subarchive
+
+        filename.include?("cab") || filename.include?("msi")
+      end
     end
   end
 end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.5.0".freeze
+  VERSION = "1.5.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down