fontist 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e024a76941056e06491654749b2a467dd1df4212752a3a98e8a9ee58755af281
-  data.tar.gz: d7caaade9c91008f4e0b91b157847d2de4dd26203d88c3558583549fec3bdb5a
+  metadata.gz: 035a1318895900d90f27d2b5db8f08b86c64e6eb5e172ef81038c55305258756
+  data.tar.gz: 5a748c9632995e504b448508d56d0e292a7429b1eaa86d08978bf6e54d67f9e7
 SHA512:
-  metadata.gz: 8d68a69167a89f6aa143f972da95f5bb06d2831e7e243d6c3ef338d47cc924b5b59c9f0404fad95dbd09b5ed870a555fae6a22e043a7a2eaa564b89036ddebfc
-  data.tar.gz: 3497ef80333b61a6a3df80f2493b3442779de017965cffbcffa13fbeb11a056de4f4741121100c8c7b34bd118e8af1aa1deaccad92423d8b68aa4b3b33c05c5a
+  metadata.gz: 1558eb54750ed4efaabe694b79e23a00ce3a51d6c026641ab58796737ff609cce23b92dd141524e90c8d7e55f11cc0537fe405ca849b9d0309e65e47d1b672fe
+  data.tar.gz: 371d9283fa520c1dd036e22f600a5804a75af10b3a2d90bfe775432036ab51c12466696bb33a6614954c4de974889087255cdf2705b91731b6a0afa7ce9bef88

data/README.md

@@ -109,7 +109,7 @@ fonts in your system.
 #### Find formula fonts
 
 Normally, each font name can be associated with multiple styles or collection, for
-example the `Calibri` font might contains a `regular`, `bola` or `italic` styles
+example the `Calibri` font might contains a `regular`, `bold` or `italic` styles
 fonts and if you want a interface that can return the complete list then this is
 your friend. You can use it as following:
 
@@ -153,11 +153,14 @@ Fontist::Manifest::Locations.call(manifest_path)
 ```
 
 ```ruby
-{"Segoe UI"=>
-  {"Regular"=>["/Users/user/.fontist/fonts/SEGOEUI.TTF"],
-   "Bold"=>["/Users/user/.fontist/fonts/SEGOEUIB.TTF"]},
- "Roboto Mono"=>
-  {"Regular"=>[]}}
+{"Segoe UI"=> {
+   "Regular"=>{"full_name"=>"Segoe UI",
+               "paths"=>["/Users/user/.fontist/fonts/SEGOEUI.TTF"]},
+   "Bold"=>{"full_name"=>"Segoe UI Bold",
+            "paths"=>["/Users/user/.fontist/fonts/SEGOEUIB.TTF"]}},
+ "Roboto Mono"=> {
+   "Regular"=>{"full_name"=>nil,
+               "paths"=>[]}}}
 ```
 
 #### Install
@@ -172,11 +175,14 @@ Fontist::Manifest::Install.call(manifest, confirmation: "yes")
 It will install fonts and return their locations:
 
 ```ruby
-{"Segoe UI"=>
-  {"Regular"=>["/Users/user/.fontist/fonts/SEGOEUI.TTF"],
-   "Bold"=>["/Users/user/.fontist/fonts/SEGOEUIB.TTF"]},
- "Roboto Mono"=>
-  {"Regular"=>["/Users/user/.fontist/fonts/RobotoMono-VariableFont_wght.ttf"]}}
+{"Segoe UI"=> {
+   "Regular"=>{"full_name"=>"Segoe UI",
+               "paths"=>["/Users/user/.fontist/fonts/SEGOEUI.TTF"]},
+   "Bold"=>{"full_name"=>"Segoe UI Bold",
+            "paths"=>["/Users/user/.fontist/fonts/SEGOEUIB.TTF"]}},
+ "Roboto Mono"=> {
+   "Regular"=>{"full_name"=>"Roboto Mono Regular",
+               "paths"=>["/Users/user/.fontist/fonts/RobotoMono-VariableFont_wght.ttf"]}}}
 ```
 
 ### CLI
@@ -191,7 +197,8 @@ All searches are case-insensitive for ease of use.
 
 The `install` command is similar to the `Font.install` call. It first checks
 whether this font is already installed, and if not, then installs the font and
-returns its paths. Font or formula could be specified as a name.
+returns its paths. Only font name (not formula name, nor font filename) could
+be used as a parameter.
 
 ```
 $ fontist install "segoe ui"
@@ -274,11 +281,17 @@ $ fontist manifest-locations manifest.yml
 ---
 Segoe UI:
   Regular:
-  - "/Users/user/.fontist/fonts/SEGOEUI.TTF"
+    full_name: Segoe UI
+    paths:
+    - "/Users/user/.fontist/fonts/SEGOEUI.TTF"
   Bold:
-  - "/Users/user/.fontist/fonts/SEGOEUIB.TTF"
+    full_name: Segoe UI Bold
+    paths:
+    - "/Users/user/.fontist/fonts/SEGOEUIB.TTF"
 Roboto Mono:
-  Regular: []
+  Regular:
+    full_name:
+    paths: []
 ```
 
 Since Segoe UI is installed, but Roboto Mono is not.
@@ -292,12 +305,18 @@ $ fontist manifest-install --confirm-license manifest.yml
 ---
 Segoe UI:
   Regular:
-  - "/Users/user/.fontist/fonts/SEGOEUI.TTF"
+    full_name: Segoe UI
+    paths:
+    - "/Users/user/.fontist/fonts/SEGOEUI.TTF"
   Bold:
-  - "/Users/user/.fontist/fonts/SEGOEUIB.TTF"
+    full_name: Segoe UI Bold
+    paths:
+    - "/Users/user/.fontist/fonts/SEGOEUIB.TTF"
 Roboto Mono:
   Regular:
-  - "/Users/user/.fontist/fonts/RobotoMono-VariableFont_wght.ttf"
+    full_name: Roboto Mono Regular
+    paths:
+    - "/Users/user/.fontist/fonts/RobotoMono-VariableFont_wght.ttf"
 ```
 
 #### Help
@@ -308,6 +327,15 @@ List of all commands could be seen by:
 fontist help
 ```
 
+### Configuration
+
+By default Fontist uses the `~/.fontist` directory to store fonts and its
+files. It could be changed with the `FONTIST_PATH` environment variable.
+
+```sh
+FONTIST_PATH=~/.fontist_new fontist update
+```
+
 ## Development
 
 We are following Sandi Metz's Rules for this gem, you can read the

data/lib/fontist.rb

@@ -29,7 +29,7 @@ module Fontist
   end
 
   def self.fontist_path
-    Pathname.new(Dir.home).join(".fontist")
+    Pathname.new(ENV["FONTIST_PATH"] || File.join(Dir.home, ".fontist"))
   end
 
   def self.fonts_path

data/lib/fontist/cli.rb

@@ -9,7 +9,7 @@ module Fontist
       false
     end
 
-    desc "install FONT", "Install font by font or formula"
+    desc "install FONT", "Install font"
     option :force, type: :boolean, aliases: :f,
                    desc: "Install even if it's already installed in system"
     option :confirm_license, type: :boolean, desc: "Confirm license agreement"

data/lib/fontist/font_formula.rb

@@ -83,12 +83,30 @@ module Fontist
       end
     end
 
-    def match_fonts(fonts_dir, font_name)
-      fonts = map_names_to_fonts(font_name).join("|")
-      font = fonts_dir.grep(/#{fonts}/i)
-      @matched_fonts.push(font) if font
+    def match_fonts(fonts_paths, font_name)
+      filenames = filenames_by_font_name(font_name)
+      paths = search_for_filenames(fonts_paths, filenames)
+      @matched_fonts.push(*paths)
 
-      font
+      paths
+    end
+
+    def filenames_by_font_name(font_name)
+      fonts.map do |f|
+        if f[:name].casecmp?(font_name)
+          f[:styles].map do |s|
+            s[:font]
+          end
+        end
+      end.flatten.compact
+    end
+
+    def search_for_filenames(paths, filenames)
+      paths.select do |path|
+        filenames.any? do |filename|
+          File.basename(path) == filename
+        end
+      end
     end
 
     def extract_from_collection(options)
@@ -103,13 +121,6 @@ module Fontist
       end
     end
 
-    def map_names_to_fonts(font_name)
-      fonts = Fontist::Formula.find_fonts(font_name)
-      fonts = fonts.map { |font| font.styles.map(&:font) }.flatten if fonts
-
-      fonts || []
-    end
-
     def download_file(source)
       url = source[:urls].first
       Fontist.ui.say(%(Downloading font "#{key}" from #{url}))

data/lib/fontist/formula.rb

@@ -28,79 +28,39 @@ module Fontist
     end
 
     def find
-      [find_formula].flatten.first
+      formulas.values.detect do |formula|
+        formula.fonts.any? do |f|
+          f.name.casecmp?(font_name)
+        end
+      end
     end
 
     def find_fonts
-      formulas = [find_formula].flatten
-      fonts = take_fonts(formulas)
-      fonts.empty? ? nil : fonts
+      formulas.values.map do |formula|
+        formula.fonts.select do |f|
+          f.name.casecmp?(font_name)
+        end
+      end.flatten
     end
 
     def find_styles
-      formulas.values.flat_map do |formula|
-        formula.fonts.flat_map do |f|
+      formulas.values.map do |formula|
+        formula.fonts.map do |f|
           f.styles.select do |s|
             f.name.casecmp?(font_name) && s.type.casecmp?(style_name)
           end
         end
-      end
+      end.flatten
     end
 
     private
 
     attr_reader :font_name, :style_name
 
-    def find_formula
-      find_by_key || find_by_font_name || find_by_font || []
-    end
-
     def formulas
       @formulas ||= all.to_h
     end
 
-    def take_fonts(formulas)
-      formulas.map(&:fonts).flatten
-    end
-
-    def find_by_key
-      matched_formulas = formulas.select do |key, _value|
-        key.to_s.casecmp?(font_name)
-      end
-
-      matched_formulas.empty? ? nil : matched_formulas.values
-    end
-
-    def find_by_font_name
-      matched_formulas = formulas.select do |key, value|
-        !value.fonts.map(&:name).grep(/#{font_name}/i).empty?
-      end
-
-      matched_formulas.empty? ? nil : matched_formulas.values
-    end
-
-    # Note
-    #
-    # These interface recursively look into every single font styles,
-    # so ideally try to avoid using it when possible, and that's why
-    # we've added it as last option in formula finder.
-    #
-    def find_by_font
-      matched_formulas = formulas.select do |key, value|
-        match_in_font_styles?(value[:fonts])
-      end
-
-      matched_formulas.empty? ? nil : matched_formulas.values
-    end
-
-    def match_in_font_styles?(fonts)
-      styles = fonts.select do |font|
-        !font.styles.map(&:font).grep(/#{font_name}/i).empty?
-      end
-
-      styles.empty? ? false : true
-    end
-
     def check_and_register_font_formulas
       $check_and_register_font_formulas ||= Fontist::Formulas.register_formulas
     end

data/lib/fontist/system_font.rb

@@ -17,10 +17,10 @@ module Fontist
     end
 
     def find
-      paths = grep_font_paths(font)
-      paths = lookup_using_font_name || []  if paths.empty?
+      styles = find_styles
+      return unless styles
 
-      paths.empty? ? nil : paths
+      styles.map { |x| x[:path] }
     end
 
     def find_with_name
@@ -45,25 +45,6 @@ module Fontist
       end
     end
 
-    def grep_font_paths(font, style = nil)
-      pattern = prepare_pattern(font, style)
-
-      paths = font_paths.map { |path| [File.basename(path), path] }.to_h
-      files = paths.keys
-      matched = files.grep(pattern)
-      paths.values_at(*matched).compact
-    end
-
-    def prepare_pattern(font, style = nil)
-      style = nil if style&.casecmp?("regular")
-
-      s = [font, style].compact.map { |x| Regexp.quote(x) }
-        .join(".*")
-        .gsub("\\ ", "\s?") # space independent
-
-      Regexp.new(s, Regexp::IGNORECASE)
-    end
-
     def font_paths
       @font_paths ||= Dir.glob((
         user_sources +
@@ -72,11 +53,6 @@ module Fontist
       ).flatten.uniq)
     end
 
-    def lookup_using_font_name
-      font_names = map_name_to_valid_font_names || []
-      font_paths.grep(/#{font_names.join("|")}/i) unless font_names.empty?
-    end
-
     def fontist_fonts_path
       @fontist_fonts_path ||= Fontist.fonts_path
     end
@@ -85,17 +61,12 @@ module Fontist
       Fontist::Utils::System.user_os
     end
 
-    def map_name_to_valid_font_names
-      fonts =  Formula.find_fonts(font)
-      fonts.map { |font| font.styles.map(&:font) }.flatten if fonts
-    end
-
     def system_path_file
       File.open(Fontist.system_file_path)
     end
 
     def default_sources
-      @default_sources ||= YAML.load(system_path_file)["system"][user_os.to_s]
+      @default_sources ||= YAML.safe_load(system_path_file)["system"][user_os.to_s]
     end
 
     def find_styles

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.7.1".freeze
+  VERSION = "1.7.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-05 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down