fontist 1.14.4 → 1.14.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: dd2e6dd82f23ca6c5bf67e6895708ad8be3a602ba493409af7f41359301fd9ae
4
- data.tar.gz: 855891bb717b439c1b8d9a39b10b91a7e9cc83f332200dd63500c04348612e81
3
+ metadata.gz: a40e3086d77be088d3e5b9f0fcfbba28432ef3af11c07251c867017fc9b4e3e6
4
+ data.tar.gz: 4bce5f3bf2242a75825f76021064ea833723c133f0f6e8bf76129772d01304cf
5
5
  SHA512:
6
- metadata.gz: bb012711692ab655f43808d965ad082532564e3a24b693c7bc5343934834cba92a9ea524725a0f71e6dc433a71e65e4c53872ddaddb24db20fbea7dfe3dbe72b
7
- data.tar.gz: f189421d98cc7c3ecb6eab190e60237b2486e34dfdb5492881ed418ae43a8d317148161847235fe9c9cd6f9a0bda97514fe9234a7ebf0e68825810106a7b4789
6
+ metadata.gz: cb78481b1ad39f589e05542ef9b2245efd101568653e67b9f8ea9e319c0fc91d3c2610abc3be98becd011ddc5482a7151d25e66573f7ffbb1db724ef0dfec424
7
+ data.tar.gz: 0f698703d50d14838ea8442bd1224ead677132b79a43580c8327df09732926b545607ca21e3239d3092a5561787b32e721bad25f99a4e2073d46b36b054536b2
@@ -10,16 +10,22 @@ concurrency:
10
10
  cancel-in-progress: true
11
11
 
12
12
  jobs:
13
+ prepare:
14
+ uses: metanorma/ci/.github/workflows/prepare-rake.yml@main
15
+
13
16
  test:
14
- name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
17
+ name: Test on Ruby ${{ matrix.ruby.version }} ${{ matrix.os }}
15
18
  runs-on: ${{ matrix.os }}
16
- continue-on-error: ${{ matrix.experimental }}
19
+
20
+ needs: prepare
21
+ if: needs.prepare.outputs.push-for-tag != 'true'
22
+
23
+ continue-on-error: ${{ matrix.ruby.experimental }}
17
24
  strategy:
18
25
  fail-fast: false
19
- matrix:
20
- ruby: [ '2.7', '3.0', '3.1' ]
21
- os: [ ubuntu-latest, windows-latest, macos-latest ]
22
- experimental: [ true ]
26
+ max-parallel: 5
27
+ matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
28
+
23
29
  steps:
24
30
  - uses: actions/checkout@v3
25
31
  with:
@@ -29,21 +35,12 @@ jobs:
29
35
  with:
30
36
  path: "fontist"
31
37
 
32
- - run: 'echo ''gem "fontist", path: "./fontist"'' > Gemfile.devel'
33
-
34
- - if: matrix.ruby == '3.0'
35
- uses: ruby/setup-ruby@v1
36
- with:
37
- ruby-version: ${{ matrix.ruby }}
38
- bundler-cache: true
39
- rubygems: latest
40
-
41
- - if: matrix.ruby != '3.0'
42
- uses: ruby/setup-ruby@v1
38
+ - uses: ruby/setup-ruby@v1
43
39
  with:
44
- ruby-version: ${{ matrix.ruby }}
40
+ ruby-version: ${{ matrix.ruby.version }}
41
+ rubygems: ${{ matrix.ruby.rubygems }}
45
42
  bundler-cache: true
46
43
 
47
- - uses: metanorma/metanorma-build-scripts/inkscape-setup-action@main
44
+ - uses: metanorma/ci/inkscape-setup-action@main
48
45
 
49
46
  - run: bundle exec rake
@@ -11,29 +11,35 @@ concurrency:
11
11
  cancel-in-progress: true
12
12
 
13
13
  jobs:
14
+ prepare:
15
+ uses: metanorma/ci/.github/workflows/prepare-rake.yml@main
16
+
14
17
  test:
15
- name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
18
+ name: Test on Ruby ${{ matrix.ruby.version }} ${{ matrix.os }}
16
19
  runs-on: ${{ matrix.os }}
17
- continue-on-error: false
20
+
21
+ needs: prepare
22
+ if: needs.prepare.outputs.push-for-tag != 'true'
23
+
24
+ continue-on-error: ${{ matrix.ruby.experimental }}
18
25
  strategy:
19
26
  fail-fast: false
20
- matrix:
21
- ruby: [ '2.6', '2.7', '3.0', '3.1' ]
22
- os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
27
+ max-parallel: 5
28
+ matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
23
29
 
24
30
  steps:
25
31
  - uses: actions/checkout@v3
26
32
 
27
33
  - uses: ruby/setup-ruby@v1
28
34
  with:
29
- ruby-version: ${{ matrix.ruby }}
35
+ ruby-version: ${{ matrix.ruby.version }}
36
+ rubygems: ${{ matrix.ruby.rubygems }}
30
37
  bundler-cache: true
31
38
 
32
39
  - if: matrix.os == 'macos-latest'
33
- run: brew install lcdf-typetools
34
-
35
- - if: matrix.os == 'macos-latest'
36
- run: bundle exec rspec
40
+ run: |
41
+ brew install lcdf-typetools
42
+ bundle exec rspec
37
43
  env:
38
44
  TEST_ENV: CI
39
45
 
@@ -42,14 +48,40 @@ jobs:
42
48
  env:
43
49
  TEST_ENV: CI
44
50
 
51
+ archlinux-test:
52
+ name: Test on Arch Linux
53
+ runs-on: ubuntu-latest
54
+ container:
55
+ image: 'archlinux:latest'
56
+ continue-on-error: false
57
+ strategy:
58
+ fail-fast: false
59
+
60
+ steps:
61
+ - uses: actions/checkout@v3
62
+
63
+ - name: Setup packages
64
+ run: pacman -Syu --noconfirm git ruby binutils gcc autoconf make libffi
65
+
66
+ - run: bundle install
67
+
68
+ - name: Test
69
+ run: bundle exec rspec --tag ~dev
70
+
45
71
  release:
46
72
  name: Release gem
47
- needs: test
73
+ needs: [ test, archlinux-test ]
48
74
  runs-on: ubuntu-latest
49
75
  if: contains(github.ref, 'refs/tags/v')
50
76
  steps:
51
77
  - uses: actions/checkout@v3
52
78
 
53
- - uses: cadwallion/publish-rubygems-action@master
54
- env:
55
- RUBYGEMS_API_KEY: ${{secrets.FONTIST_CI_RUBYGEMS_API_KEY}}
79
+ - uses: ruby/setup-ruby@v1
80
+ with:
81
+ ruby-version: 3.1
82
+ bundler-cache: true
83
+
84
+ - uses: actions-mn/gem-release@main
85
+ with:
86
+ api-key: ${{ secrets.FONTIST_CI_RUBYGEMS_API_KEY }}
87
+ release-command: bundle exec rake release
data/.gitignore CHANGED
@@ -23,3 +23,4 @@ Gemfile.lock
23
23
 
24
24
  # VS Code
25
25
  .vscode
26
+ test*
data/lib/fontist/repo.rb CHANGED
@@ -60,7 +60,11 @@ module Fontist
60
60
  if Dir.exist?(path)
61
61
  Git.open(path).pull
62
62
  else
63
- Git.clone(url, path, depth: 1)
63
+ repo = Git.clone(url, path, depth: 1)
64
+ if repo.branches[:main].name != repo.current_branch
65
+ # https://github.com/ruby-git/ruby-git/issues/531
66
+ repo.checkout(:main).pull
67
+ end
64
68
  end
65
69
  end
66
70
 
@@ -37,6 +37,12 @@ module Fontist
37
37
 
38
38
  def self.ask(message, options = {})
39
39
  new.ask(message, options)
40
+ rescue Errno::EBADF
41
+ say(<<~MSG.chomp)
42
+ ERROR: Fontist is unable to obtain agreement without an interactive prompt.
43
+ Please provide explicit agreement at execution or re-run Fontist with an interactive prompt.
44
+ MSG
45
+ "error"
40
46
  end
41
47
 
42
48
  def self.print(message)
@@ -1,3 +1,3 @@
1
1
  module Fontist
2
- VERSION = "1.14.4".freeze
2
+ VERSION = "1.14.6".freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fontist
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.14.4
4
+ version: 1.14.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-08-18 00:00:00.000000000 Z
11
+ date: 2023-02-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: down
@@ -383,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
383
383
  - !ruby/object:Gem::Version
384
384
  version: '0'
385
385
  requirements: []
386
- rubygems_version: 3.3.7
386
+ rubygems_version: 3.3.26
387
387
  signing_key:
388
388
  specification_version: 4
389
389
  summary: Install openly-licensed fonts on Windows, Linux and Mac!