fontist 1.8.13 → 1.10.1

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
@@ -203,9 +208,9 @@ module Fontist
     end
 
     def font_list
-      return unless formula
+      return if formulas.empty?
 
-      list_styles([formula])
+      list_styles(formulas)
     end
 
     def list_styles(formulas)

data/lib/fontist/font_installer.rb

@@ -54,11 +54,12 @@ module Fontist
     end
 
     def download_file(source)
-      url = source.urls.first
+      request = source.urls.first
+      url = request.respond_to?(:url) ? request.url : request
       Fontist.ui.say(%(Downloading font "#{@formula.key}" from #{url}))
 
       Fontist::Utils::Downloader.download(
-        url,
+        request,
         sha: source.sha256,
         file_size: source.file_size,
         progress_bar: !@no_progress

data/lib/fontist/formula.rb

@@ -1,17 +1,12 @@
 require "fontist/index"
 require "fontist/helpers"
+require "fontist/update"
 require "git"
 
 module Fontist
   class Formula
     def self.update_formulas_repo
-      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)
-      end
+      Update.call
     end
 
     def self.all

data/lib/fontist/import/formula_builder.rb

@@ -129,7 +129,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,6 +137,10 @@ 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

data/lib/fontist/import/google_import.rb

@@ -156,6 +156,10 @@ module Fontist
           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)

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

@@ -10,7 +10,8 @@ module Fontist
           otfinfo: Otfinfo::OtfinfoRequirement.new,
         }.freeze
 
-        STYLE_ATTRIBUTES = %i[family_name type full_name post_script_name
+        STYLE_ATTRIBUTES = %i[family_name type preferred_family_name
+                              preferred_type full_name post_script_name
                               version description copyright font
                               source_font].freeze
 
@@ -35,11 +36,19 @@ module Fontist
         end
 
         def family_name
-          info["Preferred family"] || info["Family"]
+          info["Family"]
         end
 
         def type
-          info["Preferred subfamily"] || info["Subfamily"]
+          info["Subfamily"]
+        end
+
+        def preferred_family_name
+          info["Preferred family"]
+        end
+
+        def preferred_type
+          info["Preferred subfamily"]
         end
 
         def full_name

data/lib/fontist/import/otf_style.rb

@@ -7,8 +7,8 @@ module Fontist
       end
 
       def call
-        style = { family_name: @info["Preferred family"] || @info["Family"],
-                  style: @info["Preferred subfamily"] || @info["Subfamily"],
+        style = { family_name: @info["Family"],
+                  style: @info["Subfamily"],
                   full_name: @info["Full name"],
                   post_script_name: @info["PostScript name"],
                   version: version(@info["Version"]),
@@ -16,6 +16,14 @@ module Fontist
                   filename: File.basename(@path),
                   copyright: @info["Copyright"] }
 
+        if @info["Preferred family"]
+          style[:preferred_family_name] = @info["Preferred family"]
+        end
+
+        if @info["Preferred subfamily"]
+          style[:preferred_style] = @info["Preferred subfamily"]
+        end
+
         OpenStruct.new(style)
       end
 

data/lib/fontist/import/otfinfo/template.erb

@@ -2,6 +2,12 @@
           {
             family_name: "<%= s.family_name %>",
             style: "<%= s.style %>",
+            <%- if s.preferred_family_name -%>
+            preferred_family_name: "<%= s.preferred_family_name %>",
+            <%- end -%>
+            <%- if s.preferred_style -%>
+            preferred_type: "<%= s.preferred_style %>",
+            <%- end -%>
             full_name: "<%= s.full_name %>",
             <%- if s.post_script_name -%>
             post_script_name: "<%= s.post_script_name %>",

data/lib/fontist/index.rb

@@ -3,13 +3,44 @@ 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::FontIndex.rebuild
+      Fontist::Indexes::DefaultFamilyFontIndex.rebuild
+      Fontist::Indexes::PreferredFamilyFontIndex.rebuild
       Fontist::Indexes::FilenameIndex.rebuild
+
+      reset_cache
     end
 
     def self.reset_cache
-      Fontist::Indexes::FontIndex.reset_cache
+      Fontist::Indexes::DefaultFamilyFontIndex.reset_cache
+      Fontist::Indexes::PreferredFamilyFontIndex.reset_cache
       Fontist::Indexes::FilenameIndex.reset_cache
     end
   end

data/lib/fontist/indexes/base_index.rb

@@ -5,10 +5,14 @@ module Fontist
     class BaseIndex
       def self.from_yaml
         @from_yaml ||= begin
-          unless File.exist?(path)
-            raise Errors::FormulaIndexNotFoundError.new("Please fetch `#{path}` index with `fontist update`.")
+          unless Dir.exist?(Fontist.formulas_repo_path)
+            raise Errors::MainRepoNotFoundError.new(
+              "Please fetch formulas with `fontist update`.",
+            )
           end
 
+          rebuild unless File.exist?(path)
+
           data = YAML.load_file(path)
           new(data)
         end
@@ -63,6 +67,8 @@ module Fontist
       end
 
       def to_yaml
+        dir = File.dirname(self.class.path)
+        FileUtils.mkdir_p(dir) unless File.exist?(dir)
         File.write(self.class.path, YAML.dump(to_h))
       end
 

data/lib/fontist/indexes/default_family_font_index.rb

@@ -0,0 +1,21 @@
+require_relative "base_index"
+
+module Fontist
+  module Indexes
+    class DefaultFamilyFontIndex < BaseIndex
+      def self.path
+        Fontist.formula_index_path
+      end
+
+      def add_formula(formula)
+        formula.fonts.each do |font|
+          add_index_formula(font.name, formula.to_index_formula)
+        end
+      end
+
+      def normalize_key(key)
+        key.downcase
+      end
+    end
+  end
+end

data/lib/fontist/indexes/font_index.rb

@@ -1,21 +1,16 @@
-require_relative "base_index"
+require_relative "default_family_font_index"
+require_relative "preferred_family_font_index"
 
 module Fontist
   module Indexes
-    class FontIndex < BaseIndex
-      def self.path
-        Fontist.formula_index_path
-      end
-
-      def add_formula(formula)
-        formula.fonts.each do |font|
-          add_index_formula(font.name, formula.to_index_formula)
+    class FontIndex
+      def self.from_yaml
+        if Fontist.preferred_family?
+          PreferredFamilyFontIndex.from_yaml
+        else
+          DefaultFamilyFontIndex.from_yaml
         end
       end
-
-      def normalize_key(key)
-        key.downcase
-      end
     end
   end
 end

data/lib/fontist/indexes/preferred_family_font_index.rb

@@ -0,0 +1,24 @@
+require_relative "base_index"
+
+module Fontist
+  module Indexes
+    class PreferredFamilyFontIndex < BaseIndex
+      def self.path
+        Fontist.formula_preferred_family_index_path
+      end
+
+      def add_formula(formula)
+        formula.fonts.each do |font|
+          font.styles.each do |style|
+            font_name = style.preferred_family_name || font.name
+            add_index_formula(font_name, formula.to_index_formula)
+          end
+        end
+      end
+
+      def normalize_key(key)
+        key.downcase
+      end
+    end
+  end
+end

data/lib/fontist/repo.rb

@@ -0,0 +1,60 @@
+require "git"
+
+module Fontist
+  class Repo
+    class << self
+      def setup(name, url)
+        ensure_private_formulas_path_exists
+        fetch_repo(name, url)
+        Index.rebuild
+      end
+
+      def update(name)
+        path = repo_path(name)
+        unless Dir.exist?(path)
+          raise(Errors::RepoNotFoundError, "No such repo '#{name}'.")
+        end
+
+        Git.open(path).pull
+        Index.rebuild
+      end
+
+      def remove(name)
+        path = repo_path(name)
+        unless Dir.exist?(path)
+          raise(Errors::RepoNotFoundError, "No such repo '#{name}'.")
+        end
+
+        FileUtils.rm_r(path)
+        Index.rebuild
+      end
+
+      def list
+        Dir.glob(Fontist.private_formulas_path.join("*"))
+          .select { |path| File.directory?(path) }
+          .map { |path| File.basename(path) }
+      end
+
+      private
+
+      def ensure_private_formulas_path_exists
+        Fontist.private_formulas_path.tap do |path|
+          FileUtils.mkdir_p(path) unless Dir.exist?(path)
+        end
+      end
+
+      def fetch_repo(name, url)
+        path = repo_path(name)
+        if Dir.exist?(path)
+          Git.open(path).pull
+        else
+          Git.clone(url, path, depth: 1)
+        end
+      end
+
+      def repo_path(name)
+        Fontist.private_formulas_path.join(name)
+      end
+    end
+  end
+end

data/lib/fontist/repo_cli.rb

@@ -0,0 +1,51 @@
+module Fontist
+  class RepoCLI < Thor
+    desc "setup NAME URL",
+         "Setup a custom fontist repo named NAME for the repository at URL " \
+         "and fetches its formulas"
+    def setup(name, url)
+      Repo.setup(name, url)
+      Fontist.ui.success(
+        "Fontist repo '#{name}' from '#{url}' has been successfully set up.",
+      )
+      CLI::STATUS_SUCCESS
+    end
+
+    desc "update NAME", "Update formulas in a fontist repo named NAME"
+    def update(name)
+      Repo.update(name)
+      Fontist.ui.success(
+        "Fontist repo '#{name}' has been successfully updated.",
+      )
+      CLI::STATUS_SUCCESS
+    rescue Errors::RepoNotFoundError
+      handle_repo_not_found(name)
+    end
+
+    desc "remove NAME", "Remove fontist repo named NAME"
+    def remove(name)
+      Repo.remove(name)
+      Fontist.ui.success(
+        "Fontist repo '#{name}' has been successfully removed.",
+      )
+      CLI::STATUS_SUCCESS
+    rescue Errors::RepoNotFoundError
+      handle_repo_not_found(name)
+    end
+
+    desc "list", "List fontist repos"
+    def list
+      Repo.list.each do |name|
+        Fontist.ui.say(name)
+      end
+      CLI::STATUS_SUCCESS
+    end
+
+    private
+
+    def handle_repo_not_found(name)
+      Fontist.ui.error("Fontist repo '#{name}' is not found.")
+      CLI::STATUS_REPO_NOT_FOUND
+    end
+  end
+end