fontist 1.15.0 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ef3c1df1ab7760fa50abdca9dc9c760d7f953dfc209f3841a8c01b9297760e9
-  data.tar.gz: b6e32f79b2cdeb3af88ec2ae3bdbf9ad767f41d3721dcfa2991f670e74ceaade
+  metadata.gz: d98d4d83f8bbfe87d19e6c11dd8d365810ac47ddeef59a8855f3fba7f9d5418d
+  data.tar.gz: 4f349a35dfe3d164e599dee2e077625b8273dd91c6d4b698042bf25a54ba45a0
 SHA512:
-  metadata.gz: bb6f7c6325ba122a79e6713b642dd6ca4967f6622f013dc1c56b41a03e0228da6e5a7e3707211dd293d78d9a3e4a07eec7edc545710f9b322c45f0f7b4c0e7e1
-  data.tar.gz: 2e42062f05fa332dcea0b93fde315db285c8d5894f029e85fdcfcda9f3f57eeed60dc55ed816cb33405c80581a7b313e15cb44e2c13eedafab1d011043b20336
+  metadata.gz: 007af294bcd909651345c08df9f948dae6d62eb7c3e6f26048dc91df3542a53f417a9446c69790f9bfb017e3fd7d9389784938d37274223ff4e16bd1bae47703
+  data.tar.gz: 4068f33a62c9e8afe20b3bd6c135fc642c9dcfc9738faa37b49f1e582a6e5b4d879e7d8df65c34554818b2dd1258bd76ee57b90f85b1a119bd3748263f5d374d

data/.github/workflows/test-and-release.yml

@@ -82,7 +82,7 @@ jobs:
     needs: prepare
     if: needs.prepare.outputs.push-for-tag != 'true'
 
-    continue-on-error: ${{ matrix.ruby.experimental }}
+    continue-on-error: ${{ matrix.ruby.experimental || matrix.os == 'windows-latest' }} # workaround https://github.com/metanorma/metanorma/issues/288
     strategy:
       fail-fast: false
       max-parallel: 5

data/fontist.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "nokogiri", "~> 1.0"
   spec.add_runtime_dependency "mime-types", "~> 3.0"
   spec.add_runtime_dependency "sys-uname", "~> 1.2"
-  spec.add_runtime_dependency "thor", "~> 1.0.1"
+  spec.add_runtime_dependency "thor", "~> 1.2.1"
   spec.add_runtime_dependency "git", "~> 1.0"
   spec.add_runtime_dependency "ttfunk", "~> 1.6"
   spec.add_runtime_dependency "plist", "~> 3.0"

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/repo.rb

@@ -1,6 +1,62 @@
 require "git"
 
 module Fontist
+  class Info
+    attr_reader :name, :metadata, :formulas
+
+    def initialize(name, path)
+      @name = name
+      @metadata = build_metadata(path)
+      @formulas = build_formulas(path)
+    end
+
+    def to_s
+      <<~MSG.chomp
+        Repository info for '#{@name}':
+        #{@metadata.map { |k, v| "  #{k}: #{v}" }.join("\n")}
+        Found #{formulas.count} formulas:
+        #{@formulas.map { |info| "- #{info.description} (#{info.name})" }.join("\n")}
+      MSG
+    end
+
+    private
+
+    def build_metadata(path)
+      repo = Git.open(path)
+
+      {
+        url: repo.config["remote.origin.url"],
+        revision: revision(repo),
+        created: created(repo),
+        updated: updated(repo),
+        dirty: dirty?(repo),
+      }
+    end
+
+    def build_formulas(path)
+      path.glob("*.yml").map do |formula_path|
+        formula = Formula.new_from_file(formula_path)
+        Struct.new(:name, :description).new(formula.key, formula.description)
+      end
+    end
+
+    def revision(repo)
+      repo.log.first.sha[0..6]
+    end
+
+    def created(repo)
+      repo.gcommit(repo.log.last.sha).date
+    end
+
+    def updated(repo)
+      repo.gcommit(repo.log.first.sha).date
+    end
+
+    def dirty?(repo)
+      !repo.status.changed.empty?
+    end
+  end
+
   class Repo
     class << self
       def setup(name, url)
@@ -47,11 +103,20 @@ module Fontist
           .map { |path| File.basename(path) }
       end
 
+      def info(name)
+        path = Pathname.new repo_path(name)
+        unless path.exist?
+          raise(Errors::RepoNotFoundError, "No such repo '#{name}'.")
+        end
+
+        Info.new(name, path)
+      end
+
       private
 
       def ensure_private_formulas_path_exists
         Fontist.private_formulas_path.tap do |path|
-          FileUtils.mkdir_p(path) unless Dir.exist?(path)
+          FileUtils.mkdir_p(path)
         end
       end
 

data/lib/fontist/repo_cli.rb

@@ -47,6 +47,16 @@ module Fontist
       CLI::STATUS_SUCCESS
     end
 
+    desc "info NAME", "Information about repos"
+    def info(name)
+      handle_class_options(options)
+      info = Repo.info(name)
+      Fontist.ui.say(info.to_s)
+      CLI::STATUS_SUCCESS
+    rescue Errors::RepoNotFoundError
+      handle_repo_not_found(name)
+    end
+
     private
 
     def handle_repo_not_found(name)

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.2".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.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement