fontist 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46371ff826db31f7fc1c4e5fefca2d6f237f0a874a896dbca6c4c2dbcb937255
-  data.tar.gz: dc6a20cb42ce6649791e256a4d6cb8376c29d196c795e2e1869279caa1df8b5a
+  metadata.gz: 06c95de209b578a95a9b0d2bf19d196164ece01155a61685060c638af668743c
+  data.tar.gz: a2d621f546be67a09e94c4cad68f432642ec6c47d745c688e919652e3049ec7a
 SHA512:
-  metadata.gz: 7ac9af8e04948c40b1b1fc488f6eeffebd7e598050d59224557f271b1deb328c639a67d153bad08b1a82e3869dda13525647db87e1b04269c0cf5e0b8c0ae295
-  data.tar.gz: 680fbde53bf5482ae3e36a720b6e6482cac5a62c29efa1b9962b18c1d51d7e7cafd2ce154c2c484cdfd6211002b413f1df45b909341df1d6ac864585aa590450
+  metadata.gz: 938f320740216d01c7dc7e48b7a4a6070bba45d437be0e3b2c5846b3d1c28321967653b4b1ad13a6f112cab3e7ae72e74f708bd027022e875b2e4268693200bb
+  data.tar.gz: 602c750adddfc95ed2b7d83257a085b69c464c563ccbd314dc120f86c074d1e0aec243aacafba5bf4e73969ade9bc953b360764209db78fce7362102d1bff8fc

data/README.md

@@ -399,16 +399,20 @@ bin/rspec
 All formulas are kept in the [formulas][fontist-formulas] repository. If you'd
 like to add a new one or change any existing, please refer to its documentation.
 
-### Privare repos
+### Private repos
 
 There is an ability to use private fonts via private fontist repo. Fontist repo
 is a git repo which contains YAML formula files. Formulas can be created
 manually (see [examples](https://github.com/fontist/formulas/tree/master/Formulas)),
 or [auto-generated from an archive](#auto-generate-a-formula).
 
-A corresponding SSH key should be setup with ssh-agent in order to access this private repo.
+A repo can be either HTTPS or SSH Git repo. In case of SSH, a corresponding SSH key
+should be setup with ssh-agent in order to access this private repo.
 
-Private fontist repo can be set up with:
+The `repo setup` command fetches a repo's formulas, and saves repo's name and url
+for later use.
+
+Internally all repos are stored at `~/.fontist/formulas/Formulas/private`.
 
 ```sh
 fontist repo setup NAME URL
@@ -418,15 +422,24 @@ E.g.
 
 ```sh
 fontist repo setup acme https://example.com/acme/formulas.git
+# or
+fontist repo setup acme git@example.com:acme/formulas.git
+```
+
+Then you can just install fonts from this repo:
+
+```sh
+fontist install "private font"
 ```
 
-Later, to fetch changes the following command can be used:
+There is no need in any additional command to be run, but if you add new
+formulas to your repo, you can fetch them with the `repo update` command:
 
 ```sh
 fontist repo update acme
 ```
 
-If there is a need to avoid using these formulas, the repo can be removed with:
+If there is a need to avoid using private formulas, the repo can be removed with:
 
 ```sh
 fontist repo remove acme

data/lib/fontist/cli.rb

@@ -13,6 +13,7 @@ module Fontist
     STATUS_FONT_INDEX_CORRUPTED = 7
     STATUS_REPO_NOT_FOUND = 8
     STATUS_MAIN_REPO_NOT_FOUND = 9
+    STATUS_REPO_COULD_NOT_BE_UPDATED = 10
 
     ERROR_TO_STATUS = {
       Fontist::Errors::UnsupportedFontError => [STATUS_NON_SUPPORTED_FONT_ERROR],
@@ -83,8 +84,11 @@ module Fontist
     desc "update", "Update formulas"
     def update
       Formula.update_formulas_repo
-      Fontist.ui.say("Formulas have been successfully updated")
+      Fontist.ui.success("Formulas have been successfully updated.")
       success
+    rescue Fontist::Errors::RepoCouldNotBeUpdatedError => e
+      Fontist.ui.error(e.message)
+      STATUS_REPO_COULD_NOT_BE_UPDATED
     end
 
     desc "manifest-locations MANIFEST",

data/lib/fontist/errors.rb

@@ -26,6 +26,8 @@ module Fontist
 
     class RepoNotFoundError < GeneralError; end
 
+    class RepoCouldNotBeUpdatedError < GeneralError; end
+
     class TamperedFileError < GeneralError; end
 
     class TimeoutError < GeneralError; end

data/lib/fontist/formula.rb

@@ -1,22 +1,12 @@
 require "fontist/index"
 require "fontist/helpers"
+require "fontist/update"
 require "git"
 
 module Fontist
   class Formula
     def self.update_formulas_repo
-      dir = File.dirname(Fontist.formulas_repo_path)
-      FileUtils.mkdir_p(dir) unless File.exist?(dir)
-
-      if Dir.exist?(Fontist.formulas_repo_path)
-        Git.open(Fontist.formulas_repo_path).pull
-      else
-        Git.clone(Fontist.formulas_repo_url,
-                  Fontist.formulas_repo_path,
-                  depth: 1)
-      end
-
-      Index.rebuild
+      Update.call
     end
 
     def self.all

data/lib/fontist/repo.rb

@@ -29,6 +29,12 @@ module Fontist
         Index.rebuild
       end
 
+      def list
+        Dir.glob(Fontist.private_formulas_path.join("*"))
+          .select { |path| File.directory?(path) }
+          .map { |path| File.basename(path) }
+      end
+
       private
 
       def ensure_private_formulas_path_exists

data/lib/fontist/repo_cli.rb

@@ -1,7 +1,8 @@
 module Fontist
   class RepoCLI < Thor
     desc "setup NAME URL",
-         "Setup a custom fontist repo named NAME for the repository at URL"
+         "Setup a custom fontist repo named NAME for the repository at URL " \
+         "and fetches its formulas"
     def setup(name, url)
       Repo.setup(name, url)
       Fontist.ui.success(
@@ -32,6 +33,14 @@ module Fontist
       handle_repo_not_found(name)
     end
 
+    desc "list", "List fontist repos"
+    def list
+      Repo.list.each do |name|
+        Fontist.ui.say(name)
+      end
+      CLI::STATUS_SUCCESS
+    end
+
     private
 
     def handle_repo_not_found(name)

data/lib/fontist/update.rb

@@ -0,0 +1,64 @@
+module Fontist
+  class Update
+    def self.call
+      new.call
+    end
+
+    def call
+      update_main_repo
+      update_private_repos
+    ensure
+      rebuild_index
+    end
+
+    private
+
+    def update_main_repo
+      dir = File.dirname(Fontist.formulas_repo_path)
+      FileUtils.mkdir_p(dir) unless File.exist?(dir)
+
+      if Dir.exist?(Fontist.formulas_repo_path)
+        Git.open(Fontist.formulas_repo_path).pull
+      else
+        Git.clone(Fontist.formulas_repo_url,
+                  Fontist.formulas_repo_path,
+                  depth: 1)
+      end
+    end
+
+    def update_private_repos
+      private_repos.each do |path|
+        update_repo(path)
+      end
+    end
+
+    def update_repo(path)
+      Git.open(path).pull
+    rescue Git::GitExecuteError => e
+      name = repo_name(path)
+      raise Errors::RepoCouldNotBeUpdatedError.new(<<~MSG.chomp)
+        Formulas repo '#{name}' could not be updated.
+        Please consider reinitializing it with:
+          fontist remove #{name}
+          fontist setup #{name} REPO_URL
+
+        Git error:
+        #{e.message}
+      MSG
+    end
+
+    def private_repos
+      Dir.glob(Fontist.private_formulas_path.join("*")).select do |path|
+        File.directory?(path)
+      end
+    end
+
+    def repo_name(path)
+      File.basename(path)
+    end
+
+    def rebuild_index
+      Index.rebuild
+    end
+  end
+end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.9.0".freeze
+  VERSION = "1.9.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -307,6 +307,7 @@ files:
 - lib/fontist/system.yml
 - lib/fontist/system_font.rb
 - lib/fontist/system_index.rb
+- lib/fontist/update.rb
 - lib/fontist/utils.rb
 - lib/fontist/utils/cache.rb
 - lib/fontist/utils/downloader.rb