fontist 1.20.0 → 1.21.2

data/lib/fontist/utils/ui.rb

@@ -16,7 +16,15 @@ module Fontist
       end
 
       def self.level
-        @level || default_level
+        @level ||= env_level || default_level
+      end
+
+      def self.env_level
+        ENV["FONTIST_LOG"]&.to_sym
+      end
+
+      def self.debug?
+        log_levels.include?(:debug)
       end
 
       def self.default_level
@@ -50,7 +58,7 @@ module Fontist
       end
 
       def self.debug(message)
-        new.say(message) if log_levels.include?(:debug)
+        new.say(message) if debug?
       end
 
       def self.log_levels

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.20.0".freeze
+  VERSION = "1.21.2".freeze
 end

data/lib/fontist.rb

@@ -49,7 +49,7 @@ module Fontist
   end
 
   def self.formulas_version
-    "v3"
+    "v4"
   end
 
   def self.formulas_repo_url
@@ -159,4 +159,8 @@ module Fontist
   def self.interactive=(bool)
     @interactive = bool
   end
+
+  def self.google_fonts_key
+    ENV["GOOGLE_FONTS_API_KEY"] || config[:google_fonts_key]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.21.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -113,6 +113,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
@@ -120,6 +123,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
@@ -347,6 +353,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/deploy-pages.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/tebako-pack.yml"
 - ".github/workflows/test-and-release.yml"
 - ".gitignore"
@@ -377,6 +384,7 @@ files:
 - lib/fontist/cache_cli.rb
 - lib/fontist/cli.rb
 - lib/fontist/cli/class_options.rb
+- lib/fontist/cli/thor_ext.rb
 - lib/fontist/collection_file.rb
 - lib/fontist/config.rb
 - lib/fontist/config_cli.rb
@@ -401,9 +409,8 @@ files:
 - lib/fontist/import/formula_builder.rb
 - lib/fontist/import/formula_serializer.rb
 - lib/fontist/import/google.rb
-- lib/fontist/import/google/new_fonts_fetcher.rb
-- lib/fontist/import/google/skiplist.yml
-- lib/fontist/import/google_check.rb
+- lib/fontist/import/google/api.rb
+- lib/fontist/import/google/create_google_formula.rb
 - lib/fontist/import/google_import.rb
 - lib/fontist/import/helpers/hash_helper.rb
 - lib/fontist/import/helpers/system_helper.rb
@@ -433,6 +440,8 @@ files:
 - lib/fontist/manifest/locations.rb
 - lib/fontist/repo.rb
 - lib/fontist/repo_cli.rb
+- lib/fontist/resources/archive_resource.rb
+- lib/fontist/resources/google_resource.rb
 - lib/fontist/style_version.rb
 - lib/fontist/system.yml
 - lib/fontist/system_font.rb
@@ -468,7 +477,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Install openly-licensed fonts on Windows, Linux and Mac!

data/lib/fontist/import/google/new_fonts_fetcher.rb

@@ -1,146 +0,0 @@
-require_relative "../google"
-require_relative "../otf_parser"
-
-module Fontist
-  module Import
-    module Google
-      class NewFontsFetcher
-        REPO_PATH = Fontist.fontist_path.join("google", "fonts")
-        REPO_URL = "https://github.com/google/fonts.git".freeze
-        SKIPLIST_PATH = File.expand_path("skiplist.yml", __dir__)
-
-        def initialize(logging: false, limit: nil)
-          @logging = logging
-          @limit = limit
-        end
-
-        def call
-          update_repo
-          fetch_new_paths
-        end
-
-        private
-
-        def update_repo
-          if Dir.exist?(REPO_PATH)
-            `cd #{REPO_PATH} && git pull`
-          else
-            FileUtils.mkdir_p(File.dirname(REPO_PATH))
-            `git clone --depth 1 #{REPO_URL} #{REPO_PATH}`
-          end
-        end
-
-        def fetch_new_paths
-          new_paths = []
-
-          fetch_fonts_paths.each do |path|
-            new = log_font(path) do
-              new?(path)
-            end
-
-            next unless new
-
-            new_paths << path
-            return new_paths if @limit && new_paths.size >= @limit
-          end
-
-          new_paths
-        end
-
-        def fetch_fonts_paths
-          Dir[File.join(REPO_PATH, "apache", "*"),
-              File.join(REPO_PATH, "ofl", "*"),
-              File.join(REPO_PATH, "ufl", "*")].sort
-        end
-
-        def log_font(path)
-          return yield unless @logging
-
-          print "#{path}, "
-          new = yield
-          puts(new ? "new" : "skipped")
-          new
-        end
-
-        def new?(path)
-          metadata_name = Google.metadata_name(path)
-          return unless metadata_name
-          return if in_skiplist?(metadata_name)
-          return if up_to_date?(metadata_name, path)
-          return unless downloadable?(metadata_name)
-
-          true
-        end
-
-        def in_skiplist?(name)
-          @skiplist ||= YAML.safe_load(File.open(SKIPLIST_PATH))
-          @skiplist.include?(name)
-        end
-
-        def up_to_date?(metadata_name, path)
-          formula = formula(metadata_name)
-          return false unless formula
-
-          repo_digest_up_to_date?(formula, path) ||
-            fonts_up_to_date?(formula, path)
-        end
-
-        def repo_digest_up_to_date?(formula, path)
-          return unless formula.digest
-
-          formula.digest == Google.digest(path)
-        end
-
-        def fonts_up_to_date?(formula, path)
-          styles = formula_styles(formula)
-          repo_fonts(path).all? do |font|
-            style = styles.find { |s| s.font == repo_to_archive_name(font) }
-            return false unless style
-
-            otfinfo_version(font) == style.version
-          end
-        end
-
-        def formula_styles(formula)
-          formula.fonts.map(&:styles).flatten
-        end
-
-        def repo_fonts(path)
-          Dir.glob(File.join(path, "*.{ttf,otf}"))
-        end
-
-        def repo_to_archive_name(font_path)
-          File.basename(font_path)
-            .sub("[wght]", "-VariableFont_wght")
-            .sub("[opsz]", "-Regular-VariableFont_opsz")
-        end
-
-        def formula(font_name)
-          path = Fontist::Import::Google.formula_path(font_name)
-          Formula.new_from_file(path) if File.exist?(path)
-        end
-
-        def otfinfo_version(path)
-          info = OtfParser.new(path).call
-          Fontist::Import::Google.style_version(info["Version"])
-        end
-
-        def downloadable?(name)
-          retries ||= 0
-          retries += 1
-          Down.open("https://fonts.google.com/download?family=#{name}")
-          true
-        rescue Down::NotFound
-          false
-        rescue Down::ClientError => e
-          raise unless e.message == "403 Forbidden"
-
-          false
-        rescue Down::TimeoutError
-          retry unless retries >= 3
-          false
-        end
-      end
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-- Montserrat
-- Montserrat Alternates
-- Overpass
-- Overpass Mono
-- Lato
-- Open Sans
-- Work Sans
-- Fira Code
-- Andika
-- Harmattan
-- Padauk
-- STIX Two Math

data/lib/fontist/import/google_check.rb

@@ -1,27 +0,0 @@
-require_relative "google/new_fonts_fetcher"
-
-module Fontist
-  module Import
-    class GoogleCheck
-      def call
-        fonts = new_fonts
-        indicate(fonts)
-      end
-
-      private
-
-      def new_fonts
-        Fontist::Import::Google::NewFontsFetcher.new(logging: true).call
-      end
-
-      def indicate(new_paths)
-        return if new_paths.empty?
-
-        puts "New fonts are available in:"
-        new_paths.each do |path|
-          puts path
-        end
-      end
-    end
-  end
-end