fontist 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 035a1318895900d90f27d2b5db8f08b86c64e6eb5e172ef81038c55305258756
-  data.tar.gz: 5a748c9632995e504b448508d56d0e292a7429b1eaa86d08978bf6e54d67f9e7
+  metadata.gz: bfbc7b0d13e8084d44fe41d69ff1719a203a375cd75970cf8efa0abd2cd711af
+  data.tar.gz: 1a259f0e45ea264ca55c1e112cb25bd672f41532ae82c58989cf368f058d2374
 SHA512:
-  metadata.gz: 1558eb54750ed4efaabe694b79e23a00ce3a51d6c026641ab58796737ff609cce23b92dd141524e90c8d7e55f11cc0537fe405ca849b9d0309e65e47d1b672fe
-  data.tar.gz: 371d9283fa520c1dd036e22f600a5804a75af10b3a2d90bfe775432036ab51c12466696bb33a6614954c4de974889087255cdf2705b91731b6a0afa7ce9bef88
+  metadata.gz: 82a25bf83f43b02f1e8a77717d9d240ebd55910bc0c529ce0ff09d434cad829c862c8db9564597159a3214b6cffa9dce2ee8f64a6f841f5dc589e10571a94c44
+  data.tar.gz: 91771cd423b516b6db27db7ef5e55cd24f01bea9fb368aa4331e0bc75a887e3df35d84a4fa08748e98bc41a16d8f80861cf584ff9cc6a61e938c3b7392ee94ee

data/README.md

@@ -136,20 +136,18 @@ operation you would do in any ruby object.
 
 #### Locations
 
-Fontist lets find font locations from a YAML manifest of the following format:
+Fontist lets find font locations from a manifest of the following format:
 
-```yml
-Segoe UI:
-- Regular
-- Bold
-Roboto Mono:
-- Regular
+```ruby
+{"Segoe UI"=>["Regular", "Bold"],
+ "Roboto Mono"=>["Regular"]}
 ```
 
-Calling the following code returns a nested hash with font paths.
+Calling the following code returns a nested hash with font paths and names.
+Font name is useful to choose a specific font in a font collection file (TTC).
 
 ```ruby
-Fontist::Manifest::Locations.call(manifest_path)
+Fontist::Manifest::Locations.from_hash(manifest)
 ```
 
 ```ruby
@@ -169,7 +167,7 @@ Fontist lets not only to get font locations but also to install fonts from the
 manifest:
 
 ```ruby
-Fontist::Manifest::Install.call(manifest, confirmation: "yes")
+Fontist::Manifest::Install.from_hash(manifest, confirmation: "yes")
 ```
 
 It will install fonts and return their locations:
@@ -185,6 +183,27 @@ It will install fonts and return their locations:
                "paths"=>["/Users/user/.fontist/fonts/RobotoMono-VariableFont_wght.ttf"]}}}
 ```
 
+#### Support of YAML format
+
+Both commands support a YAML file as an input with a `from_file` method. For
+example, if there is a `manifest.yml` file containing:
+
+```yaml
+Segoe UI:
+- Regular
+- Bold
+Roboto Mono:
+- Regular
+```
+
+Then the following calls would return font names and paths, as from the
+`from_hash` method (see [Locations](#locations) and [Install](#install)).
+
+```ruby
+Fontist::Manifest::Locations.from_file("manifest.yml")
+Fontist::Manifest::Install.from_file("manifest.yml", confirmation: "yes")
+```
+
 ### CLI
 
 These commands makes possible to operate with fonts via command line. The CLI

data/lib/fontist/cli.rb

@@ -70,7 +70,7 @@ module Fontist
     desc "manifest-locations MANIFEST",
          "Get locations of fonts from MANIFEST (yaml)"
     def manifest_locations(manifest)
-      paths = Fontist::Manifest::Locations.call(manifest)
+      paths = Fontist::Manifest::Locations.from_file(manifest)
       print_yaml(paths)
       success
     rescue Fontist::Errors::ManifestCouldNotBeFoundError
@@ -82,7 +82,7 @@ module Fontist
     desc "manifest-install MANIFEST", "Install fonts from MANIFEST (yaml)"
     option :confirm_license, type: :boolean, desc: "Confirm license agreement"
     def manifest_install(manifest)
-      paths = Fontist::Manifest::Install.call(
+      paths = Fontist::Manifest::Install.from_file(
         manifest,
         confirmation: options[:confirm_license] ? "yes" : "no"
       )

data/lib/fontist/manifest/install.rb

@@ -8,10 +8,6 @@ module Fontist
         @confirmation = confirmation
       end
 
-      def self.call(manifest, confirmation: "no")
-        new(manifest, confirmation: confirmation).call
-      end
-
       private
 
       def file_paths(font, style)

data/lib/fontist/manifest/locations.rb

@@ -5,8 +5,21 @@ module Fontist
         @manifest = manifest
       end
 
-      def self.call(manifest)
-        new(manifest).call
+      def self.from_file(file, **keywords)
+        raise Fontist::Errors::ManifestCouldNotBeFoundError unless File.exist?(file)
+
+        manifest = YAML.load_file(file)
+        raise Fontist::Errors::ManifestCouldNotBeReadError unless manifest.is_a?(Hash)
+
+        from_hash(manifest, **keywords)
+      end
+
+      def self.from_hash(manifest, **keywords)
+        if keywords.empty?
+          new(manifest).call
+        else
+          new(manifest, **keywords).call
+        end
       end
 
       def call
@@ -15,27 +28,14 @@ module Fontist
 
       private
 
-      def font_names
-        fonts.keys
-      end
-
-      def fonts
-        @fonts ||= begin
-          unless File.exist?(@manifest)
-            raise Fontist::Errors::ManifestCouldNotBeFoundError
-          end
-
-          fonts = YAML.load_file(@manifest)
-          unless fonts.is_a?(Hash)
-            raise Fontist::Errors::ManifestCouldNotBeReadError
-          end
+      attr_reader :manifest
 
-          fonts
-        end
+      def font_names
+        manifest.keys
       end
 
       def font_paths
-        fonts.map do |font, styles|
+        manifest.map do |font, styles|
           styles_to_ary = [styles].flatten
           style_paths_map(font, styles_to_ary)
         end

data/lib/fontist/version.rb

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

metadata

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