fontist 1.18.2 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7df8791fd4754d729546380e67e6c29866f12e4d85bb917b427284c1be610dff
-  data.tar.gz: be7991cacf763d3abc89aeea2841d02b4cc58b7e3a24c99551ee48639b07a3f8
+  metadata.gz: 2f726f1ac899163c9c7346d540f5bcaf831d522dd59f3e3afd5bed661560ea40
+  data.tar.gz: a94c77482bd16d9f751b2d3d713e13bf1aefd78703d7bba973c8d2649469035d
 SHA512:
-  metadata.gz: 5ec6f6dfa9169caddd99e3641d05864d49bb1bfa2f59ae4887dd72b703c18c599628711fa5f414cb5863832f14751fddc7536cea549358eebbb926231eaf7651
-  data.tar.gz: a87e924b0741861b59114ae75ea93a09ba86eb43510787501f20980a488ec3a181bba20ea0307e6b7f51f83d989c0edaf7db7ea1c74680534eec3280dc1a8d47
+  metadata.gz: 9d0fbfe9abf98ee2b28b2cf7f1aa73d0d3003519345d2f68f684043fb462f5df26a19a662e005ff07eb882923e3becbd52c616254ab6a704423a08f7c4588797
+  data.tar.gz: 74dd96f8a564fbcfab6d6372e0729b4aab1c3e80d14fd358626e8beaec505acdeb21b3e4de1eb589a13c9a490c8f595dc1e3ca40fc9650ae24dc29e68234a214

data/README.adoc

@@ -306,11 +306,13 @@ Roboto Mono:
 
 Fontist supports system-wide settings for the following parameters:
 
+`fonts_path`:: Sets path where to install fonts (default: `~/.fontist/fonts`)
+
 `open_timeout`:: Sets timeout for opening a connection during download
-(default: 10)
+(default: `10`)
 
 `read_timeout`:: Sets timeout for reading the opened connection during download
-(default: 10)
+(default: `10`)
 
 Show current attributes in the config:
 
@@ -377,7 +379,7 @@ List of all commands could be seen by:
 fontist help
 ----
 
-=== Configuration
+=== Configuration with environment variables
 
 By default Fontist uses the `~/.fontist` directory to store fonts and its
 files. It could be changed with the `FONTIST_PATH` environment variable.

data/lib/fontist/cli.rb

@@ -27,6 +27,7 @@ module Fontist
     STATUS_FONTCONFIG_NOT_FOUND = 14
     STATUS_FONTCONFIG_FILE_NOT_FOUND = 15
     STATUS_FONTIST_VERSION_ERROR = 15
+    STATUS_INVALID_CONFIG_ATTRIBUTE = 16
 
     ERROR_TO_STATUS = {
       Fontist::Errors::UnsupportedFontError => [STATUS_NON_SUPPORTED_FONT_ERROR],

data/lib/fontist/config.rb

@@ -15,42 +15,58 @@ module Fontist
     end
 
     def set(key, value)
+      attr = key.to_sym
+      unless default_values.key?(attr)
+        raise Errors::InvalidConfigAttributeError,
+              "No such attribute '#{attr}' exists."
+      end
+
       v = normalize_value(value)
-      @custom_values[key.to_s] = v
+      if respond_to?("#{attr}=")
+        public_send("#{attr}=", v)
+      else
+        @custom_values[attr] = v
+      end
 
       persist
     end
 
     def delete(key)
-      @custom_values.delete(key.to_s)
+      @custom_values.delete(key.to_sym)
 
       persist
     end
 
     def default_value(key)
-      default_values[key.to_s]
+      default_values[key.to_sym]
     end
 
     def default_values
-      { open_timeout: 10,
-        read_timeout: 10 }.transform_keys(&:to_s)
+      { fonts_path: Fontist.fontist_path.join("fonts"),
+        open_timeout: 10,
+        read_timeout: 10 }
     end
 
     def persist
+      values = @custom_values.transform_keys(&:to_s)
       FileUtils.mkdir_p(File.dirname(Fontist.config_path))
-      File.write(Fontist.config_path, YAML.dump(@custom_values))
+      File.write(Fontist.config_path, YAML.dump(values))
     end
 
     def load
       @custom_values = load_config_file
     end
 
+    def fonts_path=(value)
+      @custom_values[:fonts_path] = File.expand_path(value)
+    end
+
     private
 
     def load_config_file
       return {} unless File.exist?(Fontist.config_path)
 
-      YAML.load_file(Fontist.config_path)
+      YAML.load_file(Fontist.config_path).transform_keys(&:to_sym)
     end
 
     def normalize_value(value)

data/lib/fontist/config_cli.rb

@@ -2,15 +2,19 @@ module Fontist
   class ConfigCLI < Thor
     include CLI::ClassOptions
 
-    STATUS_SUCCESS = 0
-
     desc "show", "Show values of the current config"
     def show
       handle_class_options(options)
       values = Config.instance.custom_values
-      Fontist.ui.success("Current config:")
-      Fontist.ui.success(format_hash(values))
-      STATUS_SUCCESS
+
+      if values.empty?
+        Fontist.ui.success("Config is empty.")
+      else
+        Fontist.ui.success("Current config:")
+        Fontist.ui.success(format_hash(values))
+      end
+
+      CLI::STATUS_SUCCESS
     end
 
     desc "set KEY VALUE", "Set the KEY attribute to VALUE in the current config"
@@ -18,7 +22,10 @@ module Fontist
       handle_class_options(options)
       Config.instance.set(key, value)
       Fontist.ui.success("'#{key}' set to '#{value}'.")
-      STATUS_SUCCESS
+      CLI::STATUS_SUCCESS
+    rescue Errors::InvalidConfigAttributeError => e
+      Fontist.ui.error(e.message)
+      CLI::STATUS_INVALID_CONFIG_ATTRIBUTE
     end
 
     desc "delete KEY", "Delete the KEY attribute from the current config"
@@ -28,13 +35,24 @@ module Fontist
       Fontist.ui.success(
         "'#{key}' reset to default ('#{Config.instance.default_value(key)}').",
       )
-      STATUS_SUCCESS
+      CLI::STATUS_SUCCESS
+    end
+
+    desc "keys", "Print all available config attributes"
+    def keys
+      handle_class_options(options)
+      Fontist.ui.say("Available keys:")
+      Config.instance.default_values.each do |key, value|
+        Fontist.ui.say("#{key} (default: #{value})")
+      end
+      CLI::STATUS_SUCCESS
     end
 
     private
 
     def format_hash(hash)
-      YAML.dump(hash).gsub(/^---.*$/, "").strip
+      h = hash.transform_keys(&:to_s)
+      YAML.dump(h).gsub(/^---.*$/, "").strip
     end
   end
 end

data/lib/fontist/errors.rb

@@ -40,6 +40,8 @@ module Fontist
 
     class MainRepoNotFoundError < FormulaIndexNotFoundError; end
 
+    class InvalidConfigAttributeError < GeneralError; end
+
     class InvalidResourceError < GeneralError; end
 
     class LicensingError < GeneralError; end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.18.2".freeze
+  VERSION = "1.19.0".freeze
 end

data/lib/fontist.rb

@@ -37,7 +37,7 @@ module Fontist
   end
 
   def self.fonts_path
-    Fontist.fontist_path.join("fonts")
+    Pathname.new(config[:fonts_path])
   end
 
   def self.formulas_repo_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.18.2
+  version: 1.19.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down