fontist 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ef3c1df1ab7760fa50abdca9dc9c760d7f953dfc209f3841a8c01b9297760e9
-  data.tar.gz: b6e32f79b2cdeb3af88ec2ae3bdbf9ad767f41d3721dcfa2991f670e74ceaade
+  metadata.gz: b05f079e527eb6128f6525bd4923886e5181d266a4cf88151a4131551694de15
+  data.tar.gz: 1b8ab3e7b58c1c96aa9565d0b244475e047d48823ae9deec6fb194ed95201de0
 SHA512:
-  metadata.gz: bb6f7c6325ba122a79e6713b642dd6ca4967f6622f013dc1c56b41a03e0228da6e5a7e3707211dd293d78d9a3e4a07eec7edc545710f9b322c45f0f7b4c0e7e1
-  data.tar.gz: 2e42062f05fa332dcea0b93fde315db285c8d5894f029e85fdcfcda9f3f57eeed60dc55ed816cb33405c80581a7b313e15cb44e2c13eedafab1d011043b20336
+  metadata.gz: 5aa9bbfcf8b155bd876c5f9d28f37fcbe13d1cb6729ecf7056e298457834370973d0898e80af6515a96e904255fe1da027545a0f3c6d601dc41cc26cd211c060
+  data.tar.gz: 6bae05a6ee7445abb41ee724fb01f07ebf2d7a7222ffc09744bb8b5acd4e2119949b35860f7b21d6bbdc2f8e81545a8115ccd7f2846beab1397842c5ae6b3e76

data/lib/fontist/cache_cli.rb

@@ -2,13 +2,27 @@ module Fontist
   class CacheCLI < Thor
     include CLI::ClassOptions
 
-    desc "clear", "Clear fontist download cache"
+    desc "clear", "Clear fontist cache"
     def clear
       handle_class_options(options)
       dir = Fontist.downloads_path
-      dir.each_child(&:delete) if dir.exist?
-      Fontist.ui.success("Download cache has been successfully removed.")
+      dir.each_child(&:rmtree) if dir.exist?
+      clear_indexes
+      Fontist.ui.success("Cache has been successfully removed.")
       CLI::STATUS_SUCCESS
     end
+
+    private
+
+    def clear_indexes
+      delete_file_with_lock(Fontist.system_index_path)
+      delete_file_with_lock(Fontist.system_preferred_family_index_path)
+    end
+
+    def delete_file_with_lock(path)
+      path.delete if path.exist?
+      lock_path = Pathname.new Fontist::Utils::Cache.lock_path(path)
+      lock_path.delete if lock_path.exist?
+    end
   end
 end

data/lib/fontist/system_index.rb

@@ -121,7 +121,7 @@ module Fontist
     end
 
     def lock_path
-      "#{@index_path}.lock"
+      Utils::Cache.lock_path(@index_path)
     end
 
     def do_build_index

data/lib/fontist/utils/cache.rb

@@ -3,6 +3,10 @@ module Fontist
     class Cache
       include Locking
 
+      def self.lock_path(path)
+        "#{path}.lock"
+      end
+
       def fetch(key)
         map = load_cache
         if cache_exist?(map[key])
@@ -79,7 +83,7 @@ module Fontist
       end
 
       def lock_path
-        cache_map_path.to_s + ".lock"
+        Cache.lock_path(cache_map_path)
       end
 
       def move_to_downloads(source)

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.15.0".freeze
+  VERSION = "1.15.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down