fontist 1.10.1 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d84a50748e0877ef76056095c21debe35d0d3c158cdb52288ee179045e3e7bc
-  data.tar.gz: fd7254ad078c082f72e22098cace2f937afbbc7715b30c830d76db5aef9ad82f
+  metadata.gz: 2f06401d4ccf76cfda39bcd4eae443dbfb2f5284876c4f5a9361fcb56bb97f5a
+  data.tar.gz: 5730fc169549b7b3dda74f6e9cae5d3fb3b15c27d1f7d107f16ab5b1be9cdeb8
 SHA512:
-  metadata.gz: dcc9e36af40e5ec08170151f0c9177e3f21f3e0a6cbdf87b7b0ea8b7f6aa3505c05a31828bbc20953787e50232e9805e4f2506c3f17723521001d0d47877370b
-  data.tar.gz: '0045179af59b9639c89d05a9c8b21a2bae720df2513f832af5f0006fe16c1d8ff32c524040e3c9ea60046671750594a9d46fc74452487fb23889d4629e38a41f'
+  metadata.gz: bcc0837022c84b93e97e07a19494cd2b28bd51a41834809d4833fb1a453a0314fa37f6249ddb171e6b8f12e8f31c56fa660f661376895c7d9f1a417542626a1c
+  data.tar.gz: c46f1f7610213bf168f485d724e215bd2fd5f276802481a647eba9580e4dfc8d0307e3b014a3ee29ceda992548f294251d1600a64efc3086ff1b101420ced3a1

data/.github/workflows/metanorma.yml

@@ -2,8 +2,11 @@ name: metanorma
 
 on:
   push:
-    branches: [ main ]
-  pull_request:
+    # restore the main branch after metanorma upgrade
+    # branches: [ main ]
+    branches: [ unknown ]
+  # restore after metanorma upgrade
+  # pull_request:
 
 jobs:
   test:

data/lib/fontist/import/files/collection_file.rb

@@ -11,7 +11,7 @@ module Fontist
         def initialize(path)
           @path = path
           @fonts = read
-          @extension = "ttc"
+          @extension = detect_extension
         end
 
         def filename
@@ -46,6 +46,15 @@ module Fontist
             File.join(tmp_dir, filename)
           end
         end
+
+        def detect_extension
+          base_extension = "ttc"
+
+          file_extension = File.extname(File.basename(@path)).sub(/^\./, "")
+          return file_extension if file_extension.casecmp?(base_extension)
+
+          base_extension
+        end
       end
     end
   end

data/lib/fontist/import/formula_builder.rb

@@ -1,3 +1,4 @@
+require "shellwords"
 require_relative "text_helper"
 
 module Fontist
@@ -5,7 +6,7 @@ module Fontist
     class FormulaBuilder
       FORMULA_ATTRIBUTES = %i[name description homepage resources
                               font_collections fonts extract copyright
-                              license_url open_license].freeze
+                              license_url open_license command].freeze
 
       attr_accessor :archive,
                     :url,
@@ -49,7 +50,7 @@ module Fontist
       end
 
       def homepage
-        both_fonts.first.homepage
+        both_fonts.map(&:homepage).compact.first
       end
 
       def resources
@@ -146,11 +147,11 @@ module Fontist
       end
 
       def copyright
-        both_fonts.first.copyright
+        both_fonts.map(&:copyright).compact.first
       end
 
       def license_url
-        both_fonts.first.license_url
+        both_fonts.map(&:license_url).compact.first
       end
 
       def open_license
@@ -165,6 +166,10 @@ module Fontist
 
         TextHelper.cleanup(@license_text)
       end
+
+      def command
+        Shellwords.shelljoin(ARGV)
+      end
     end
   end
 end

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

@@ -106,7 +106,11 @@ module Fontist
         end
 
         def detect_extension
-          Files::FontDetector.standard_extension(@path)
+          detected = Files::FontDetector.standard_extension(@path)
+          file_extension = File.extname(File.basename(@path)).sub(/^\./, "")
+          return file_extension if file_extension.casecmp?(detected)
+
+          detected
         end
       end
     end

data/lib/fontist/system_index.rb

@@ -148,6 +148,11 @@ module Fontist
       else
         raise Errors::UnknownFontTypeError.new(path)
       end
+    rescue StandardError
+      Fontist.ui.error($!.message)
+      Fontist.ui.error(
+        "Warning: File at #{path} not recognized as a font file.",
+      )
     end
 
     def detect_file_font(path)
@@ -155,9 +160,6 @@ module Fontist
       file = TTFunk::File.new(content)
 
       parse_font(file, path)
-    rescue StandardError
-      warn $!.message
-      warn "Warning: File at #{path} not recognized as a font file."
     end
 
     def detect_collection_fonts(path)
@@ -166,9 +168,6 @@ module Fontist
           parse_font(file, path)
         end
       end
-    rescue StandardError
-      warn $!.message
-      warn "Warning: File at #{path} not recognized as a font file."
     end
 
     def parse_font(file, path)

data/lib/fontist/update.rb

@@ -1,7 +1,13 @@
 module Fontist
   class Update
+    BRANCH = "v2".freeze
+
     def self.call
-      new.call
+      new(BRANCH).call
+    end
+
+    def initialize(branch = "main")
+      @branch = branch
     end
 
     def call
@@ -17,13 +23,21 @@ module Fontist
       dir = File.dirname(Fontist.formulas_repo_path)
       FileUtils.mkdir_p(dir) unless File.exist?(dir)
 
-      if Dir.exist?(Fontist.formulas_repo_path)
-        Git.open(Fontist.formulas_repo_path).pull
-      else
-        Git.clone(Fontist.formulas_repo_url,
-                  Fontist.formulas_repo_path,
-                  depth: 1)
+      unless Dir.exist?(Fontist.formulas_repo_path)
+        return Git.clone(Fontist.formulas_repo_url,
+                         Fontist.formulas_repo_path,
+                         branch: @branch,
+                         depth: 1)
       end
+
+      git = Git.open(Fontist.formulas_repo_path)
+      return git.pull("origin", @branch) if git.current_branch == @branch
+
+      git.config("remote.origin.fetch",
+                 "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
+      git.fetch
+      git.checkout(@branch)
+      git.pull("origin", @branch)
     end
 
     def update_private_repos

data/lib/fontist/utils/downloader.rb

@@ -24,12 +24,7 @@ module Fontist
           download_file
         end
 
-        if !sha.empty? && !sha.include?(Digest::SHA256.file(file).to_s)
-          raise(Fontist::Errors::TamperedFileError.new(
-            "The downloaded file from #{@file} doesn't " \
-            "match with the expected sha256 checksum!"
-          ))
-        end
+        raise_if_tampered(file)
 
         file
       end
@@ -38,6 +33,19 @@ module Fontist
 
       attr_reader :file, :sha, :file_size
 
+      def raise_if_tampered(file)
+        file_checksum = Digest::SHA256.file(file).to_s
+        if !sha.empty? && !sha.include?(file_checksum)
+          raise(
+            Fontist::Errors::TamperedFileError.new(
+              "The downloaded file from #{@file} doesn't " \
+              "match with the expected sha256 checksum (#{file_checksum})!\n" \
+              "Beginning of content: #{File.read(file, 3000)}",
+            ),
+          )
+        end
+      end
+
       def byte_to_megabyte
         @byte_to_megabyte ||= 1024 * 1024
       end
@@ -59,6 +67,7 @@ module Fontist
           url,
           open_timeout: 10,
           read_timeout: 10,
+          max_redirects: 10,
           headers: headers,
           content_length_proc: ->(content_length) {
             @progress_bar.total = content_length if content_length

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.10.1".freeze
+  VERSION = "1.11.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down