fontist 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12ad24d94f6220992c66f06c21872135932b1b64f7ae17c7aa414c2f80f12ad
-  data.tar.gz: 29665a7556a8fbeda7449616c688a90e694b8060c7f2b8158abcc41e049579c4
+  metadata.gz: 4b392969d430a5af69c38a73069d5a98cf90a6ef1c246f8cca215a7cd4c1202c
+  data.tar.gz: 97ca59729bf50acefa0bfe5ab23b82050eed8fd6ba4782a6d814a77e44939b4b
 SHA512:
-  metadata.gz: 92b8942a88a3f02c57fd9840060c8ba333f0378611477bf1ff9435296792a4b79f97616da3520ea8d6fbe1088498c6d15d9c885c02e740fdc4bc26811988b176
-  data.tar.gz: 41aab015006c2109db2a52ea6ace23aeaaa571e5153559c53e327c448be4684189c7d72d5785811ecf505b124a48fa5016f5cfe62cd0946f92d0d6aab6d9b870
+  metadata.gz: b5911d154187149d2d8ebc81e776b7c4b12e0a8eddf4f2540f3914b41fd29c582a29287b5ed1d3d7cccbe696aeb40908f5039bf350c281e315ac08fffe76e110
+  data.tar.gz: 49a7e53eff6d6b750248141a608cb3e92c03c19130f75f4ff8806c7e55ca0d478cec376ed9eaa273dedff3e05b31057892c0c47367a48f1a3eadd5599ecaf968

data/lib/fontist.rb

@@ -62,4 +62,8 @@ module Fontist
   def self.formula_index_path
     Fontist.formulas_repo_path.join("index.yml")
   end
+
+  def self.formula_filename_index_path
+    Fontist.formulas_repo_path.join("filename_index.yml")
+  end
 end

data/lib/fontist/cli.rb

@@ -52,12 +52,11 @@ module Fontist
     end
     map remove: :uninstall
 
-    desc "status [FONT]", "Show status of FONT or all fonts in fontist"
+    desc "status [FONT]", "Show paths of FONT or all fonts"
     def status(font = nil)
-      formulas = Fontist::Font.status(font)
-      return error("No font is installed.", STATUS_MISSING_FONT_ERROR) if formulas.empty?
+      paths = Fontist::Font.status(font)
+      return error("No font is installed.", STATUS_MISSING_FONT_ERROR) if paths.empty?
 
-      print_formulas(formulas)
       success
     rescue Fontist::Errors::GeneralError => e
       handle_error(e)
@@ -155,20 +154,6 @@ module Fontist
       Fontist.ui.say(YAML.dump(object))
     end
 
-    def print_formulas(formulas)
-      formulas.each do |formula, fonts|
-        Fontist.ui.success(formula.key)
-
-        fonts.each do |font, styles|
-          Fontist.ui.success(" #{font.name}")
-
-          styles.each do |style, path|
-            Fontist.ui.success("  #{style.type} (#{path})")
-          end
-        end
-      end
-    end
-
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def print_list(formulas)
       formulas.each do |formula, fonts|

data/lib/fontist/font.rb

@@ -1,4 +1,5 @@
 require "fontist/font_installer"
+require "fontist/font_path"
 
 module Fontist
   class Font
@@ -47,9 +48,9 @@ module Fontist
     end
 
     def status
-      return installed_statuses unless @name
+      return installed_paths unless @name
 
-      font_status || downloadable_font || raise_non_supported_font
+      find_system_font || downloadable_font || raise_non_supported_font
     end
 
     def list
@@ -73,9 +74,14 @@ module Fontist
         return
       end
 
+      print_paths(paths)
+    end
+
+    def print_paths(paths)
       Fontist.ui.say("Fonts found at:")
       paths.each do |path|
-        Fontist.ui.say("- #{path}")
+        font_path = FontPath.new(path)
+        Fontist.ui.say(font_path.to_s)
       end
     end
 
@@ -161,37 +167,14 @@ module Fontist
       Fontist::FontistFont.find(name)
     end
 
-    def installed_statuses
-      installed_styles(all_formulas)
+    def installed_paths
+      print_paths(SystemFont.font_paths)
     end
 
     def all_formulas
       Fontist::Formula.all
     end
 
-    def font_status
-      return unless formula
-
-      statuses = installed_styles([formula])
-      statuses.empty? ? nil : statuses
-    end
-
-    def installed_styles(formulas)
-      filter_blank(formulas) do |formula|
-        filter_blank(formula.fonts) do |font|
-          filter_blank(font.styles) do |style|
-            path(style)
-          end
-        end
-      end
-    end
-
-    def filter_blank(elements)
-      elements.map { |e| [e, yield(e)] }
-        .to_h
-        .reject { |_k, v| v.nil? || v.empty? }
-    end
-
     def path(style)
       font_paths.detect do |path|
         File.basename(path) == style.font

data/lib/fontist/font_path.rb

@@ -0,0 +1,29 @@
+require "fontist/indexes/filename_index"
+
+module Fontist
+  class FontPath
+    def initialize(path)
+      @path = path
+    end
+
+    def to_s
+      [].tap do |s|
+        s << "-"
+        s << @path
+        s << "(from #{formulas.join(' or ')} formula)" if formulas.any?
+      end.join(" ")
+    end
+
+    def formulas
+      @formulas ||= if fontist_font?
+                      Indexes::FilenameIndex.from_yaml.load_index_formulas(File.basename(@path)).map(&:name)
+                    else
+                      []
+                    end
+    end
+
+    def fontist_font?
+      @path.start_with?(Fontist.fonts_path.to_s)
+    end
+  end
+end

data/lib/fontist/formula.rb

@@ -21,11 +21,11 @@ module Fontist
     end
 
     def self.find(font_name)
-      Index.from_yaml.load_formulas(font_name).first
+      Indexes::FontIndex.from_yaml.load_formulas(font_name).first
     end
 
     def self.find_fonts(font_name)
-      formulas = Index.from_yaml.load_formulas(font_name)
+      formulas = Indexes::FontIndex.from_yaml.load_formulas(font_name)
 
       formulas.map do |formula|
         formula.fonts.select do |f|
@@ -35,7 +35,7 @@ module Fontist
     end
 
     def self.find_styles(font_name, style_name)
-      formulas = Index.from_yaml.load_formulas(font_name)
+      formulas = Indexes::FontIndex.from_yaml.load_formulas(font_name)
 
       formulas.map do |formula|
         formula.fonts.map do |f|
@@ -57,7 +57,7 @@ module Fontist
     end
 
     def to_index_formula
-      IndexFormula.new(path)
+      Indexes::IndexFormula.new(path)
     end
 
     def path

data/lib/fontist/index.rb

@@ -1,72 +1,11 @@
-require_relative "index_formula"
+require_relative "indexes/font_index"
+require_relative "indexes/filename_index"
 
 module Fontist
   class Index
-    def self.from_yaml
-      unless File.exist?(Fontist.formula_index_path)
-        raise Errors::FormulaIndexNotFoundError.new("Please fetch index with `fontist update`.")
-      end
-
-      data = YAML.load_file(Fontist.formula_index_path)
-      new(data)
-    end
-
     def self.rebuild
-      index = new
-      index.build
-      index.to_yaml
-    end
-
-    def initialize(data = {})
-      @index = {}
-
-      data.each_pair do |font, paths|
-        paths.each do |path|
-          add_index_formula(font, IndexFormula.new(path))
-        end
-      end
-    end
-
-    def build
-      Formula.all.each do |formula|
-        add_formula(formula)
-      end
-    end
-
-    def add_formula(formula)
-      formula.fonts.each do |font|
-        add_index_formula(font.name, formula.to_index_formula)
-      end
-    end
-
-    def add_index_formula(font_raw, index_formula)
-      font = normalize_font(font_raw)
-      @index[font] ||= []
-      @index[font] << index_formula unless @index[font].include?(index_formula)
-    end
-
-    def load_formulas(font)
-      index_formulas(font).map(&:to_full)
-    end
-
-    def to_yaml
-      File.write(Fontist.formula_index_path, YAML.dump(to_h))
-    end
-
-    def to_h
-      @index.map do |font, index_formulas|
-        [font, index_formulas.map(&:to_s)]
-      end.to_h
-    end
-
-    private
-
-    def index_formulas(font)
-      @index[normalize_font(font)] || []
-    end
-
-    def normalize_font(font)
-      font.downcase
+      Fontist::Indexes::FontIndex.rebuild
+      Fontist::Indexes::FilenameIndex.rebuild
     end
   end
 end

data/lib/fontist/indexes/base_index.rb

@@ -0,0 +1,82 @@
+require_relative "index_formula"
+
+module Fontist
+  module Indexes
+    class BaseIndex
+      def self.from_yaml
+        @from_yaml ||= begin
+          unless File.exist?(path)
+            raise Errors::FormulaIndexNotFoundError.new("Please fetch `#{path}` index with `fontist update`.")
+          end
+
+          data = YAML.load_file(path)
+          new(data)
+        end
+      end
+
+      def self.path
+        raise NotImplementedError, "Please define path of an index"
+      end
+
+      def self.rebuild
+        index = new
+        index.build
+        index.to_yaml
+      end
+
+      def initialize(data = {})
+        @index = {}
+
+        data.each_pair do |key, paths|
+          paths.each do |path|
+            add_index_formula(key, IndexFormula.new(path))
+          end
+        end
+      end
+
+      def build
+        Formula.all.each do |formula|
+          add_formula(formula)
+        end
+      end
+
+      def add_formula(_formula)
+        raise NotImplementedError, "Please define how to add formula to an index, use #add_index_formula"
+      end
+
+      def add_index_formula(key_raw, index_formula)
+        key = normalize_key(key_raw)
+        @index[key] ||= []
+        @index[key] << index_formula unless @index[key].include?(index_formula)
+      end
+
+      def load_formulas(key)
+        index_formulas(key).map(&:to_full)
+      end
+
+      def load_index_formulas(key)
+        index_formulas(key)
+      end
+
+      def to_yaml
+        File.write(self.class.path, YAML.dump(to_h))
+      end
+
+      def to_h
+        @index.map do |key, index_formulas|
+          [key, index_formulas.map(&:to_s)]
+        end.to_h
+      end
+
+      private
+
+      def index_formulas(key)
+        @index[normalize_key(key)] || []
+      end
+
+      def normalize_key(key)
+        key
+      end
+    end
+  end
+end

data/lib/fontist/indexes/filename_index.rb

@@ -0,0 +1,19 @@
+require_relative "base_index"
+
+module Fontist
+  module Indexes
+    class FilenameIndex < BaseIndex
+      def self.path
+        Fontist.formula_filename_index_path
+      end
+
+      def add_formula(formula)
+        formula.fonts.each do |font|
+          font.styles.each do |style|
+            add_index_formula(style.font, formula.to_index_formula)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fontist/indexes/font_index.rb

@@ -0,0 +1,21 @@
+require_relative "base_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)
+        end
+      end
+
+      def normalize_key(key)
+        key.downcase
+      end
+    end
+  end
+end

data/lib/fontist/indexes/index_formula.rb

@@ -0,0 +1,36 @@
+module Fontist
+  module Indexes
+    class IndexFormula
+      def initialize(path)
+        @path = path
+      end
+
+      def name
+        normalized.sub(/\.yml$/, "")
+      end
+
+      def to_s
+        normalized
+      end
+
+      def to_full
+        Formula.new_from_file(full_path)
+      end
+
+      def ==(other)
+        to_s == other.to_s
+      end
+
+      private
+
+      def normalized
+        escaped = Regexp.escape(Fontist.formulas_path.to_s + "/")
+        @path.sub(Regexp.new("^" + escaped), "")
+      end
+
+      def full_path
+        Fontist.formulas_path.join(normalized).to_s
+      end
+    end
+  end
+end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.8.4".freeze
+  VERSION = "1.8.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arr-pm
@@ -316,6 +316,7 @@ files:
 - lib/fontist/errors.rb
 - lib/fontist/font.rb
 - lib/fontist/font_installer.rb
+- lib/fontist/font_path.rb
 - lib/fontist/fontist_font.rb
 - lib/fontist/formula.rb
 - lib/fontist/formula_paths.rb
@@ -359,7 +360,10 @@ files:
 - lib/fontist/import/template_helper.rb
 - lib/fontist/import/text_helper.rb
 - lib/fontist/index.rb
-- lib/fontist/index_formula.rb
+- lib/fontist/indexes/base_index.rb
+- lib/fontist/indexes/filename_index.rb
+- lib/fontist/indexes/font_index.rb
+- lib/fontist/indexes/index_formula.rb
 - lib/fontist/manifest.rb
 - lib/fontist/manifest/install.rb
 - lib/fontist/manifest/locations.rb
@@ -408,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Install openly-licensed fonts on Windows, Linux and Mac!
 test_files: []

data/lib/fontist/index_formula.rb

@@ -1,30 +0,0 @@
-module Fontist
-  class IndexFormula
-    def initialize(path)
-      @path = path
-    end
-
-    def to_s
-      normalized
-    end
-
-    def to_full
-      Formula.new_from_file(full_path)
-    end
-
-    def ==(other)
-      to_s == other.to_s
-    end
-
-    private
-
-    def normalized
-      escaped = Regexp.escape(Fontist.formulas_path.to_s + "/")
-      @path.sub(Regexp.new("^" + escaped), "")
-    end
-
-    def full_path
-      Fontist.formulas_path.join(normalized).to_s
-    end
-  end
-end