fontist 1.14.4 → 1.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd2e6dd82f23ca6c5bf67e6895708ad8be3a602ba493409af7f41359301fd9ae
-  data.tar.gz: 855891bb717b439c1b8d9a39b10b91a7e9cc83f332200dd63500c04348612e81
+  metadata.gz: a40e3086d77be088d3e5b9f0fcfbba28432ef3af11c07251c867017fc9b4e3e6
+  data.tar.gz: 4bce5f3bf2242a75825f76021064ea833723c133f0f6e8bf76129772d01304cf
 SHA512:
-  metadata.gz: bb012711692ab655f43808d965ad082532564e3a24b693c7bc5343934834cba92a9ea524725a0f71e6dc433a71e65e4c53872ddaddb24db20fbea7dfe3dbe72b
-  data.tar.gz: f189421d98cc7c3ecb6eab190e60237b2486e34dfdb5492881ed418ae43a8d317148161847235fe9c9cd6f9a0bda97514fe9234a7ebf0e68825810106a7b4789
+  metadata.gz: cb78481b1ad39f589e05542ef9b2245efd101568653e67b9f8ea9e319c0fc91d3c2610abc3be98becd011ddc5482a7151d25e66573f7ffbb1db724ef0dfec424
+  data.tar.gz: 0f698703d50d14838ea8442bd1224ead677132b79a43580c8327df09732926b545607ca21e3239d3092a5561787b32e721bad25f99a4e2073d46b36b054536b2

data/.github/workflows/metanorma.yml

@@ -10,16 +10,22 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  prepare:
+    uses: metanorma/ci/.github/workflows/prepare-rake.yml@main
+
   test:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    name: Test on Ruby ${{ matrix.ruby.version }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
+
+    needs: prepare
+    if: needs.prepare.outputs.push-for-tag != 'true'
+
+    continue-on-error: ${{ matrix.ruby.experimental }}
     strategy:
       fail-fast: false
-      matrix:
-        ruby: [ '2.7', '3.0', '3.1' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ true ]
+      max-parallel: 5
+      matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
+
     steps:
       - uses: actions/checkout@v3
         with:
@@ -29,21 +35,12 @@ jobs:
         with:
           path: "fontist"
 
-      - run: 'echo ''gem "fontist", path: "./fontist"'' > Gemfile.devel'
-
-      - if: matrix.ruby == '3.0'
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-          rubygems: latest
-
-      - if: matrix.ruby != '3.0'
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby.version }}
+          rubygems: ${{ matrix.ruby.rubygems }}
           bundler-cache: true
 
-      - uses: metanorma/metanorma-build-scripts/inkscape-setup-action@main
+      - uses: metanorma/ci/inkscape-setup-action@main
 
       - run: bundle exec rake

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

@@ -11,29 +11,35 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  prepare:
+    uses: metanorma/ci/.github/workflows/prepare-rake.yml@main
+
   test:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    name: Test on Ruby ${{ matrix.ruby.version }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    continue-on-error: false
+
+    needs: prepare
+    if: needs.prepare.outputs.push-for-tag != 'true'
+
+    continue-on-error: ${{ matrix.ruby.experimental }}
     strategy:
       fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.7', '3.0', '3.1' ]
-        os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
+      max-parallel: 5
+      matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
 
     steps:
       - uses: actions/checkout@v3
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby.version }}
+          rubygems: ${{ matrix.ruby.rubygems }}
           bundler-cache: true
 
       - if: matrix.os == 'macos-latest'
-        run: brew install lcdf-typetools
-
-      - if: matrix.os == 'macos-latest'
-        run: bundle exec rspec
+        run: |
+          brew install lcdf-typetools
+          bundle exec rspec
         env:
           TEST_ENV: CI
 
@@ -42,14 +48,40 @@ jobs:
         env:
           TEST_ENV: CI
 
+  archlinux-test:
+    name: Test on Arch Linux
+    runs-on: ubuntu-latest
+    container:
+      image: 'archlinux:latest'
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup packages
+        run: pacman -Syu --noconfirm git ruby binutils gcc autoconf make libffi
+
+      - run: bundle install
+
+      - name: Test
+        run: bundle exec rspec --tag ~dev
+
   release:
     name: Release gem
-    needs: test
+    needs: [ test, archlinux-test ]
     runs-on: ubuntu-latest
     if: contains(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/checkout@v3
 
-      - uses: cadwallion/publish-rubygems-action@master
-        env:
-          RUBYGEMS_API_KEY: ${{secrets.FONTIST_CI_RUBYGEMS_API_KEY}}
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1
+          bundler-cache: true
+
+      - uses: actions-mn/gem-release@main
+        with:
+          api-key: ${{ secrets.FONTIST_CI_RUBYGEMS_API_KEY }}
+          release-command: bundle exec rake release

data/.gitignore

@@ -23,3 +23,4 @@ Gemfile.lock
 
 # VS Code
 .vscode
+test*

data/lib/fontist/repo.rb

@@ -60,7 +60,11 @@ module Fontist
         if Dir.exist?(path)
           Git.open(path).pull
         else
-          Git.clone(url, path, depth: 1)
+          repo = Git.clone(url, path, depth: 1)
+          if repo.branches[:main].name != repo.current_branch
+            # https://github.com/ruby-git/ruby-git/issues/531
+            repo.checkout(:main).pull
+          end
         end
       end
 

data/lib/fontist/utils/ui.rb

@@ -37,6 +37,12 @@ module Fontist
 
       def self.ask(message, options = {})
         new.ask(message, options)
+      rescue Errno::EBADF
+        say(<<~MSG.chomp)
+          ERROR: Fontist is unable to obtain agreement without an interactive prompt.
+          Please provide explicit agreement at execution or re-run Fontist with an interactive prompt.
+        MSG
+        "error"
       end
 
       def self.print(message)

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.14.4".freeze
+  VERSION = "1.14.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.14.4
+  version: 1.14.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -383,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Install openly-licensed fonts on Windows, Linux and Mac!