fontist 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec379d37ecb9239452d66b8aa021461c964bce56e6015eba86a15a1069300e49
-  data.tar.gz: 2106b76aca75123fc12435cd2b248d0ac39054024cce87d715483e6f5550e2aa
+  metadata.gz: e2cce6f6f02c9c70f594e7b6084ac854a74b903f27b49252047e898d47137a1f
+  data.tar.gz: d9cb729ca432229c90bf2cb0da204cf0cc401f997e1cd915e853e240613e35ea
 SHA512:
-  metadata.gz: 14a2206e5c36b7957189bf02ea96e3bf07c3912a9ea4439358fbec6a0b3505d8cc50ee17480fc1cd01f62b68b1a5435eaaf08575b4b96855e8860f78100d5acb
-  data.tar.gz: c2253d10aff19bd03c620e019fab3027b1005bac46d27fa547e3746acc409a47f147333cfcd8385bddd4defeaac709a2cdc896889ad0bbb386ab18f417ca4691
+  metadata.gz: 6a5f1250db7da8b327716fcb1a22abf71c2ab3c57f58b4954efc82b2273f7e880c3d8519693925b13d3c3adf81fb5f261a912b13d95e69f0711b5716bd349d53
+  data.tar.gz: 293524c79e1be4ebbc8ef6db50a7de91e195d5921abd9e8fd1791597bfd80616bfe4d8d82eada54e71fcbdfaeab1baf6d72659e334111cf460b84c0d5193be1a

data/.github/workflows/metanorma.yml

@@ -2,7 +2,7 @@ name: metanorma
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, v1.9.x ]
   pull_request:
 
 jobs:

data/.github/workflows/rspec.yml

@@ -2,7 +2,7 @@ name: rspec
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, v1.9.x ]
   pull_request:
 
 jobs:

data/lib/fontist/update.rb

@@ -1,7 +1,13 @@
 module Fontist
   class Update
+    BRANCH = "master".freeze
+
     def self.call
-      new.call
+      new(BRANCH).call
+    end
+
+    def initialize(branch = "main")
+      @branch = branch
     end
 
     def call
@@ -17,13 +23,21 @@ module Fontist
       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)
+      unless Dir.exist?(Fontist.formulas_repo_path)
+        return Git.clone(Fontist.formulas_repo_url,
+                         Fontist.formulas_repo_path,
+                         branch: @branch,
+                         depth: 1)
       end
+
+      git = Git.open(Fontist.formulas_repo_path)
+      return git.pull("origin", @branch) if git.current_branch == @branch
+
+      git.config("remote.origin.fetch",
+                 "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
+      git.fetch
+      git.checkout(@branch)
+      git.pull("origin", @branch)
     end
 
     def update_private_repos

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.9.2".freeze
+  VERSION = "1.9.3".freeze
 end

metadata

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