fontist 1.11.1 → 1.11.2

data/lib/fontist/import/google_import.rb

@@ -1,11 +1,7 @@
 require "erb"
 require_relative "google"
 require_relative "google/new_fonts_fetcher"
-require_relative "google/fonts_public.pb"
-require_relative "template_helper"
-require_relative "text_helper"
-require_relative "otf_parser"
-require_relative "otf_style"
+require_relative "create_formula"
 
 module Fontist
   module Import
@@ -13,6 +9,7 @@ module Fontist
       def call
         fonts = new_fonts
         create_formulas(fonts)
+        rebuild_index
       end
 
       private
@@ -22,161 +19,48 @@ module Fontist
       end
 
       def create_formulas(fonts)
+        return puts("Nothing to update") if fonts.empty?
+
         puts "Creating formulas..."
         fonts.each do |path|
           create_formula(path)
         end
       end
 
-      def create_formula(path)
-        puts path
-        metadata = fetch_metadata(path)
-        font = build_font(metadata, path)
-        save_formula(font)
-      end
+      def create_formula(font_path)
+        puts font_path
 
-      def fetch_metadata(path)
-        protobuf = File.read(File.join(path, "METADATA.pb"))
-        ::Google::Fonts::FamilyProto.parse_from_text(protobuf)
-      end
+        path = Fontist::Import::CreateFormula.new(
+          url(font_path),
+          name: Google.metadata_name(font_path),
+          formula_dir: formula_dir,
+          skip_sha: variable_style?(font_path),
+          digest: Google.digest(font_path),
+        ).call
 
-      def build_font(metadata, path)
-        h = from_metadata(metadata)
-          .merge(from_otfinfo(path))
-          .merge(styles: styles_from_otfinfo(path, metadata.fonts))
-          .merge(from_license(path))
-
-        OpenStruct.new(h)
+        Fontist.ui.success("Formula has been successfully created: #{path}")
       end
 
-      def from_metadata(metadata)
-        copyright = metadata.fonts.first.copyright
-
-        Hash.new.tap do |h|
-          h[:fullname] = metadata.name
-          h[:cleanname] = metadata.name.gsub(/ /, "")
-          h[:sha256] = sha256(metadata.name) unless variable_style?(metadata)
-          h[:copyright] = Fontist::Import::TextHelper.cleanup(copyright)
-        end
+      def url(path)
+        name = Google.metadata_name(path)
+        "https://fonts.google.com/download?family=#{ERB::Util.url_encode(name)}"
       end
 
-      def variable_style?(metadata)
-        metadata.fonts.any? do |s|
-          s.filename.match?(/\[(.+,)?wght\]/)
+      def formula_dir
+        @formula_dir ||= Fontist.formulas_path.join("google").tap do |path|
+          FileUtils.mkdir_p(path) unless File.exist?(path)
         end
       end
 
-      def sha256(name)
-        file = Down.download("https://fonts.google.com/download?family=#{name}",
-                             open_timeout: 10,
-                             read_timeout: 10)
-
-        Digest::SHA256.file(file).to_s
-      end
-
-      def from_license(path)
-        file = Dir.glob(File.join(path, "{OFL.txt,UFL.txt,LICENSE.txt}")).first
-        print "warn, no license, " unless file
-        return { license: "" } unless file
-
-        { license: cleanup_text(File.read(file)) }
-      end
-
-      def cleanup_text(text)
-        text.rstrip
-          .gsub("\r\n", "\n")
-          .lines
-          .map(&:rstrip)
-          .drop_while(&:empty?)
-          .join("\n")
-      end
-
-      def from_otfinfo(path)
-        font_file = Dir.glob(File.join(path, "*.ttf")).first
-        otf = OtfParser.new(font_file).call
-
-        { homepage: otf["Vendor URL"],
-          license_url: otf["License URL"] }
-      end
-
-      def styles_from_otfinfo(path, fonts)
-        fonts.map do |f|
-          file_path = File.join(path, f.filename)
-          info = OtfParser.new(file_path).call
-          OtfStyle.new(info, file_path).call
+      def variable_style?(path)
+        fonts = Dir.glob(File.join(path, "*.{ttf,otf}"))
+        fonts.any? do |font|
+          File.basename(font).match?(/\[(.+,)?(wght|opsz)\]/)
         end
       end
 
-      def save_formula(font)
-        hash = formula_hash(font)
-        path = formula_path(font.fullname)
-        save_to_path(hash, path)
-      end
-
-      def formula_hash(font)
-        stringify_keys(name: font.cleanname.sub(/\S/, &:upcase),
-                       description: font.fullname,
-                       homepage: font.homepage,
-                       resources: formula_resource(font),
-                       fonts: [yaml_font(font)],
-                       extract: { format: :zip },
-                       copyright: font.copyright,
-                       license_url: font.license_url,
-                       open_license: font.license)
-      end
-
-      def stringify_keys(hash)
-        JSON.parse(hash.to_json)
-      end
-
-      def formula_resource(font)
-        encoded_name = ERB::Util.url_encode(font.fullname)
-        url = "https://fonts.google.com/download?family=#{encoded_name}"
-
-        options = {}
-        options[:urls] = [url]
-        options[:sha256] = font.sha256 if font.sha256
-
-        { "#{font.cleanname}.zip" => options }
-      end
-
-      def yaml_font(font)
-        { name: font.fullname,
-          styles: yaml_styles(font.styles) }
-      end
-
-      def yaml_styles(styles)
-        styles.map do |s|
-          yaml_style(s)
-        end
-      end
-
-      def yaml_style(style)
-        Hash.new.tap do |h|
-          h.merge!(family_name: style.family_name,
-                   type: style.style,
-                   full_name: style.full_name)
-          if style.preferred_family_name
-            h[:preferred_family_name] = style.preferred_family_name
-          end
-          h[:preferred_type] = style.preferred_style if style.preferred_style
-          h.merge!(style.to_h.select do |k, _|
-            %i(post_script_name version description copyright).include?(k)
-          end.compact)
-          h.merge!(font: fix_variable_filename(style.filename))
-        end
-      end
-
-      def fix_variable_filename(filename)
-        filename.sub("[wght]", "-VariableFont_wght")
-      end
-
-      def formula_path(name)
-        Fontist::Import::Google.formula_path(name)
-      end
-
-      def save_to_path(hash, path)
-        File.write(path, YAML.dump(hash))
+      def rebuild_index
+        Fontist::Index.rebuild
       end
     end
   end

data/lib/fontist/import/helpers/system_helper.rb

@@ -4,7 +4,7 @@ module Fontist
       module SystemHelper
         class << self
           def run(command)
-            Fontist.ui.say("Run `#{command}`")
+            Fontist.ui.say("Run `#{command}`") if Fontist.debug?
 
             result = `#{command}`
             unless $CHILD_STATUS.to_i.zero?

data/lib/fontist/import/otf_parser.rb

@@ -13,6 +13,8 @@ module Fontist
       end
 
       def call
+        raise ArgumentError, "Empty path" unless @path
+
         text = REQUIREMENTS[:otfinfo].call(@path)
         text.split("\n")
           .select { |x| x.include?(":") }

data/lib/fontist/import/recursive_extraction.rb

@@ -3,7 +3,8 @@ require_relative "files/font_detector"
 module Fontist
   module Import
     class RecursiveExtraction
-      LICENSE_PATTERN = /(ofl\.txt|ufl\.txt|licenses?\.txt|copying)$/i.freeze
+      LICENSE_PATTERN =
+        /(ofl\.txt|ufl\.txt|licenses?\.txt|license|copying)$/i.freeze
 
       def initialize(archive, subarchive: nil, subdir: nil)
         @archive = archive

data/lib/fontist/index.rb

@@ -3,33 +3,6 @@ require_relative "indexes/filename_index"
 
 module Fontist
   class Index
-    def self.rebuild_for_main_repo
-      unless Dir.exist?(Fontist.private_formulas_path)
-        return do_rebuild_for_main_repo_with
-      end
-
-      Dir.mktmpdir do |dir|
-        tmp_private_path = File.join(dir, "private")
-        FileUtils.mv(Fontist.private_formulas_path, tmp_private_path)
-
-        do_rebuild_for_main_repo_with
-
-        FileUtils.mv(tmp_private_path, Fontist.private_formulas_path)
-      end
-    end
-
-    def self.do_rebuild_for_main_repo_with
-      Fontist.formula_preferred_family_index_path =
-        Fontist.formulas_repo_path.join("index.yml")
-      Fontist.formula_filename_index_path =
-        Fontist.formulas_repo_path.join("filename_index.yml")
-
-      rebuild
-
-      Fontist.formula_preferred_family_index_path = nil
-      Fontist.formula_filename_index_path = nil
-    end
-
     def self.rebuild
       Fontist::Indexes::DefaultFamilyFontIndex.rebuild
       Fontist::Indexes::PreferredFamilyFontIndex.rebuild

data/lib/fontist/system_font.rb

@@ -1,5 +1,4 @@
 require_relative "system_index"
-require_relative "formula_paths"
 
 module Fontist
   class SystemFont
@@ -51,7 +50,7 @@ module Fontist
     end
 
     def find_styles
-      find_by_index || find_by_formulas
+      find_by_index
     end
 
     private
@@ -61,9 +60,5 @@ module Fontist
     def find_by_index
       SystemIndex.system_index.find(font, style)
     end
-
-    def find_by_formulas
-      FormulaPaths.new(self.class.font_paths).find(font, style)
-    end
   end
 end

data/lib/fontist/update.rb

@@ -1,9 +1,9 @@
 module Fontist
   class Update
-    BRANCH = "v2".freeze
+    VERSION = "v2".freeze
 
     def self.call
-      new(BRANCH).call
+      new(VERSION).call
     end
 
     def initialize(branch = "main")

data/lib/fontist/version.rb

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

data/lib/fontist.rb

@@ -40,7 +40,11 @@ module Fontist
   end
 
   def self.formulas_repo_path
-    Fontist.fontist_path.join("formulas")
+    Fontist.fontist_version_path.join("formulas")
+  end
+
+  def self.fontist_version_path
+    Fontist.fontist_path.join("versions", Update::VERSION)
   end
 
   def self.formulas_repo_url
@@ -48,7 +52,11 @@ module Fontist
   end
 
   def self.formulas_path
-    Fontist.formulas_repo_path.join("Formulas")
+    @formulas_path || Fontist.formulas_repo_path.join("Formulas")
+  end
+
+  def self.formulas_path=(path)
+    @formulas_path = path
   end
 
   def self.private_formulas_path
@@ -84,25 +92,15 @@ module Fontist
   end
 
   def self.formula_preferred_family_index_path
-    @formula_preferred_family_index_path ||
-      Fontist.formula_index_dir.join("formula_index.preferred_family.yml")
-  end
-
-  def self.formula_preferred_family_index_path=(path)
-    @formula_preferred_family_index_path = path
+    Fontist.formula_index_dir.join("formula_index.preferred_family.yml")
   end
 
   def self.formula_filename_index_path
-    @formula_filename_index_path ||
-      Fontist.formula_index_dir.join("filename_index.yml")
-  end
-
-  def self.formula_filename_index_path=(path)
-    @formula_filename_index_path = path
+    Fontist.formula_index_dir.join("filename_index.yml")
   end
 
   def self.formula_index_dir
-    Fontist.fontist_path
+    Fontist.fontist_version_path
   end
 
   def self.preferred_family?
@@ -112,4 +110,12 @@ module Fontist
   def self.preferred_family=(bool)
     @preferred_family = bool
   end
+
+  def self.debug?
+    @debug || false
+  end
+
+  def self.debug=(bool)
+    @debug = bool
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-30 00:00:00.000000000 Z
+date: 2021-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -25,69 +25,69 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: extract_ttc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: ttfunk
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: excavate
+  name: ttfunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: extract_ttc
+  name: excavate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -220,20 +220,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-protocol-buffers
-  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: socksify
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +242,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/check_google.yml"
 - ".github/workflows/metanorma.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/rspec.yml"
@@ -267,7 +252,6 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.adoc
-- README.md
 - Rakefile
 - exe/fontist
 - fontist.gemspec
@@ -278,7 +262,7 @@ files:
 - lib/fontist/font_installer.rb
 - lib/fontist/font_path.rb
 - lib/fontist/formula.rb
-- lib/fontist/formula_paths.rb
+- lib/fontist/google_cli.rb
 - lib/fontist/helpers.rb
 - lib/fontist/import.rb
 - lib/fontist/import/convert_formulas.rb
@@ -289,9 +273,6 @@ files:
 - lib/fontist/import/formula_builder.rb
 - lib/fontist/import/formula_serializer.rb
 - lib/fontist/import/google.rb
-- lib/fontist/import/google/fonts_public.md
-- lib/fontist/import/google/fonts_public.pb.rb
-- lib/fontist/import/google/fonts_public.proto
 - lib/fontist/import/google/new_fonts_fetcher.rb
 - lib/fontist/import/google/skiplist.yml
 - lib/fontist/import/google_check.rb