fontist 1.9.3 → 1.11.2

data/exe/fontist

@@ -3,5 +3,27 @@
 require "fontist"
 require "fontist/cli"
 
-status_code = Fontist::CLI.start(ARGV)
-exit status_code.is_a?(Integer) ? status_code : 1
+fontist_cli = proc {
+  status_code = Fontist::CLI.start(ARGV)
+  exit status_code.is_a?(Integer) ? status_code : 1
+}
+
+if ENV["SOCKS_PROXY"]
+  require "socksify"
+  require "uri"
+  begin
+    proxy = URI.parse(ENV["SOCKS_PROXY"])
+    if proxy.userinfo
+      user, pass = proxy.userinfo.split(":")
+      TCPSocket::socks_username = user
+      TCPSocket::socks_password = pass
+    end
+    Socksify::proxy(proxy.host, proxy.port, &fontist_cli)
+  rescue URI::InvalidURIError
+    warn "Value of ENV.SOCKS_PROXY=#{ENV['SOCKS_PROXY']} is invalid! Droping it"
+    ENV.delete("SOCKS_PROXY")
+    fontist_cli.call
+  end
+else
+  fontist_cli.call
+end

data/fontist.gemspec

@@ -28,12 +28,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
   spec.add_runtime_dependency "down", "~> 5.0"
+  spec.add_runtime_dependency "extract_ttc", "~> 0.1"
   spec.add_runtime_dependency "thor", "~> 1.0.1"
   spec.add_runtime_dependency "git", "~> 1.0"
   spec.add_runtime_dependency "ttfunk", "~> 1.6"
   spec.add_runtime_dependency "excavate", "~> 0.1"
 
-  spec.add_development_dependency "extract_ttc", "~> 0.1"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "gem-release"
@@ -43,5 +43,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "1.5.2"
   spec.add_development_dependency "rubocop-rails"
   spec.add_development_dependency "rubocop-performance"
-  spec.add_development_dependency "ruby-protocol-buffers", "~> 1.0"
+
+  spec.add_runtime_dependency "socksify"
 end

data/lib/fontist/cli.rb

@@ -1,5 +1,6 @@
 require "thor"
 require "fontist/repo_cli"
+require "fontist/google_cli"
 
 module Fontist
   class CLI < Thor
@@ -32,6 +33,10 @@ module Fontist
       false
     end
 
+    class_option :preferred_family,
+                 type: :boolean,
+                 desc: "Use Preferred Family when available"
+
     desc "install FONT", "Install font"
     option :force, type: :boolean, aliases: :f,
                    desc: "Install even if it's already installed in system"
@@ -39,6 +44,7 @@ module Fontist
     option :hide_licenses, type: :boolean, desc: "Hide license texts"
     option :no_progress, type: :boolean, desc: "Hide download progress"
     def install(font)
+      handle_class_options(options)
       Fontist::Font.install(
         font,
         force: options[:force],
@@ -53,6 +59,7 @@ module Fontist
 
     desc "uninstall/remove FONT", "Uninstall font by font or formula"
     def uninstall(font)
+      handle_class_options(options)
       fonts_paths = Fontist::Font.uninstall(font)
       Fontist.ui.success("These fonts are removed:")
       Fontist.ui.success(fonts_paths.join("\n"))
@@ -64,6 +71,7 @@ module Fontist
 
     desc "status [FONT]", "Show paths of FONT or all fonts"
     def status(font = nil)
+      handle_class_options(options)
       paths = Fontist::Font.status(font)
       return error("No font is installed.", STATUS_MISSING_FONT_ERROR) if paths.empty?
 
@@ -74,6 +82,7 @@ module Fontist
 
     desc "list [FONT]", "List installation status of FONT or fonts in fontist"
     def list(font = nil)
+      handle_class_options(options)
       formulas = Fontist::Font.list(font)
       print_list(formulas)
       success
@@ -83,6 +92,7 @@ module Fontist
 
     desc "update", "Update formulas"
     def update
+      handle_class_options(options)
       Formula.update_formulas_repo
       Fontist.ui.success("Formulas have been successfully updated.")
       success
@@ -94,6 +104,7 @@ module Fontist
     desc "manifest-locations MANIFEST",
          "Get locations of fonts from MANIFEST (yaml)"
     def manifest_locations(manifest)
+      handle_class_options(options)
       paths = Fontist::Manifest::Locations.from_file(manifest)
       print_yaml(paths)
       success
@@ -105,6 +116,7 @@ module Fontist
     option :accept_all_licenses, type: :boolean, aliases: "--confirm-license", desc: "Accept all license agreements"
     option :hide_licenses, type: :boolean, desc: "Hide license texts"
     def manifest_install(manifest)
+      handle_class_options(options)
       paths = Fontist::Manifest::Install.from_file(
         manifest,
         confirmation: options[:accept_all_licenses] ? "yes" : "no",
@@ -124,6 +136,7 @@ module Fontist
     option :subdir, desc: "Subdirectory to take fonts from, starting with the " \
       "root dir, e.g.: stixfonts-2.10/fonts/static_otf. May include `fnmatch` patterns."
     def create_formula(url)
+      handle_class_options(options)
       require "fontist/import/create_formula"
       name = Fontist::Import::CreateFormula.new(url, options).call
       Fontist.ui.say("#{name} formula has been successfully created")
@@ -137,22 +150,16 @@ module Fontist
       It is done automatically when formulas are updated, or private formulas
       are set up.
     LONGDESC
-    option :main_repo, type: :boolean,
-                       desc: "Updates indexes in the main repo (for backward " \
-                             "compatibility with versions prior to 1.9)"
     def rebuild_index
-      if options[:main_repo]
-        Fontist::Index.rebuild_for_main_repo
-      else
-        Fontist::Index.rebuild
-      end
-
+      handle_class_options(options)
+      Fontist::Index.rebuild
       Fontist.ui.say("Formula index has been rebuilt.")
       STATUS_SUCCESS
     end
 
     desc "import-sil", "Import formulas from SIL"
     def import_sil
+      handle_class_options(options)
       require "fontist/import/sil_import"
       Fontist::Import::SilImport.new.call
     end
@@ -160,8 +167,15 @@ module Fontist
     desc "repo SUBCOMMAND ...ARGS", "Manage custom repositories"
     subcommand "repo", Fontist::RepoCLI
 
+    desc "google SUBCOMMAND ...ARGS", "Manage Google formulas"
+    subcommand "google", Fontist::GoogleCLI
+
     private
 
+    def handle_class_options(options)
+      Fontist.preferred_family = options[:preferred_family]
+    end
+
     def success
       STATUS_SUCCESS
     end

data/lib/fontist/font.rb

@@ -166,7 +166,7 @@ module Fontist
     end
 
     def uninstall_font
-      paths = find_fontist_font
+      paths = find_fontist_paths
       return unless paths
 
       paths.each do |path|
@@ -176,8 +176,13 @@ module Fontist
       paths
     end
 
-    def find_fontist_font
-      Fontist::FontistFont.find(name)
+    def find_fontist_paths
+      fonts = Fontist::SystemIndex.fontist_index.find(name, nil)
+      return unless fonts
+
+      fonts.map do |font|
+        font[:path]
+      end
     end
 
     def installed_paths

data/lib/fontist/formula.rb

@@ -103,6 +103,10 @@ module Fontist
       @fonts ||= Helpers.parse_to_object(hash_collection_fonts + hash_fonts)
     end
 
+    def digest
+      @data["digest"]
+    end
+
     private
 
     def default_key

data/lib/fontist/google_cli.rb

@@ -0,0 +1,29 @@
+module Fontist
+  class GoogleCLI < Thor
+    class_option :formulas_path, type: :string, desc: "Path to formulas"
+
+    desc "check", "Check Google fonts for updates"
+    def check
+      handle_class_options(options)
+      require "fontist/import/google_check"
+      Fontist::Import::GoogleCheck.new.call
+      CLI::STATUS_SUCCESS
+    end
+
+    desc "import", "Import Google fonts"
+    def import
+      handle_class_options(options)
+      require "fontist/import/google_import"
+      Fontist::Import::GoogleImport.new.call
+      CLI::STATUS_SUCCESS
+    end
+
+    private
+
+    def handle_class_options(options)
+      if options[:formulas_path]
+        Fontist.formulas_path = Pathname.new(options[:formulas_path])
+      end
+    end
+  end
+end

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 digest 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
@@ -59,6 +60,18 @@ module Fontist
       end
 
       def resource_options
+        if @options[:skip_sha]
+          resource_options_without_sha
+        else
+          resource_options_with_sha
+        end
+      end
+
+      def resource_options_without_sha
+        { urls: [@url] + mirrors }
+      end
+
+      def resource_options_with_sha
         urls = []
         sha = []
         downloads do |url, path|
@@ -129,7 +142,7 @@ module Fontist
 
         fonts = groups.map do |name, group|
           { name: name,
-            styles: group.map(&style_type) }
+            styles: styles_from_files(group, style_type) }
         end
 
         fonts.sort_by do |x|
@@ -137,16 +150,20 @@ module Fontist
         end
       end
 
+      def styles_from_files(files, style_type)
+        files.map(&style_type).sort_by { |x| x[:type] }
+      end
+
       def extract
         @extractor.operations
       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
@@ -161,6 +178,14 @@ module Fontist
 
         TextHelper.cleanup(@license_text)
       end
+
+      def digest
+        @options[:digest]
+      end
+
+      def command
+        Shellwords.shelljoin(ARGV)
+      end
     end
   end
 end

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

@@ -1,4 +1,3 @@
-require_relative "fonts_public.pb"
 require_relative "../google"
 require_relative "../otf_parser"
 
@@ -6,7 +5,7 @@ module Fontist
   module Import
     module Google
       class NewFontsFetcher
-        REPO_PATH = Fontist.root_path.join("tmp", "fonts")
+        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__)
 
@@ -25,7 +24,8 @@ module Fontist
           if Dir.exist?(REPO_PATH)
             `cd #{REPO_PATH} && git pull`
           else
-            `git clone #{REPO_URL} #{REPO_PATH}`
+            FileUtils.mkdir_p(File.dirname(REPO_PATH))
+            `git clone --depth 1 #{REPO_URL} #{REPO_PATH}`
           end
         end
 
@@ -53,23 +53,11 @@ module Fontist
         end
 
         def new?(path)
-          metadata = fetch_metadata(path)
-          return unless metadata
-
-          font_new?(metadata, path)
-        end
-
-        def fetch_metadata(path)
-          metadata_path = File.join(path, "METADATA.pb")
-          return unless File.exists?(metadata_path)
-
-          ::Google::Fonts::FamilyProto.parse_from_text(File.read(metadata_path))
-        end
-
-        def font_new?(metadata, path)
-          return if in_skiplist?(metadata.name)
-          return if up_to_date?(metadata, path)
-          return unless downloadable?(metadata.name)
+          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
@@ -79,29 +67,47 @@ module Fontist
           @skiplist.include?(name)
         end
 
-        def up_to_date?(metadata, path)
-          formula = formula(metadata.name)
+        def up_to_date?(metadata_name, path)
+          formula = formula(metadata_name)
           return false unless formula
 
-          styles = formula.fonts.map(&:styles).flatten
+          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
 
-          styles.all? do |style|
-            style.version == otfinfo_version(font_path(style.font, path))
+          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(font_name)
-          klass = font_name.gsub(/ /, "").sub(/\S/, &:upcase)
-          @formulas ||= Fontist::Formula.all
-          @formulas["Fontist::Formulas::#{klass}Font"]
+        def formula_styles(formula)
+          formula.fonts.map(&:styles).flatten
         end
 
-        def font_path(filename, directory)
-          File.join(directory, fix_variable_filename(filename))
+        def repo_fonts(path)
+          Dir.glob(File.join(path, "*.{ttf,otf}"))
         end
 
-        def fix_variable_filename(filename)
-          filename.sub("-VariableFont_wght", "[wght]")
+        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)
@@ -110,10 +116,15 @@ module Fontist
         end
 
         def downloadable?(name)
+          retries ||= 0
+          retries += 1
           Down.open("https://fonts.google.com/download?family=#{name}")
           true
         rescue Down::NotFound
           false
+        rescue Down::TimeoutError
+          retry unless retries >= 3
+          false
         end
       end
     end