kintsugi 0.5.0 → 0.5.2
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 +4 -4
- data/.github/workflows/release.yml +25 -0
- data/.github/workflows/{ci.yml → tests.yml} +1 -1
- data/Gemfile +0 -5
- data/lib/kintsugi/cli.rb +1 -1
- data/lib/kintsugi/version.rb +1 -1
- metadata +5 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e7dbc48bf6850280ee25c8f9d9f9af95353b2f036113234706ebc803721fafb0
|
|
4
|
+
data.tar.gz: '085d2b5e75db3ba38c6374d21634d403b406a00e06d49e4e26fefd82a85564d1'
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b4f45ab1c32a1932e36568e1ee7826c617681d74ac7dacf363eb0926ad05b2eb51b35e83fafef6d5bedbfa43a357f640adaa833c35b33e28fd41055f12e45d9a
|
|
7
|
+
data.tar.gz: f3fae674c676ae59d21cc948ba4474a48fe87a2ce82ac0e73e74e0e273bf7a2574bc1149b6addeb3a368a0dbb00c9b70ac6ac0d81570645e1af1af2f7f7a4718
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
name: Release
|
|
2
|
+
|
|
3
|
+
on: workflow_dispatch
|
|
4
|
+
|
|
5
|
+
jobs:
|
|
6
|
+
main-job:
|
|
7
|
+
name: Release
|
|
8
|
+
runs-on: ubuntu-latest
|
|
9
|
+
env:
|
|
10
|
+
GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
|
|
11
|
+
|
|
12
|
+
steps:
|
|
13
|
+
- name: Checkout repo
|
|
14
|
+
uses: actions/checkout@v2
|
|
15
|
+
|
|
16
|
+
- name: Set up Ruby
|
|
17
|
+
uses: ruby/setup-ruby@v1
|
|
18
|
+
with:
|
|
19
|
+
ruby-version: 2.5.8
|
|
20
|
+
rubygems: latest
|
|
21
|
+
|
|
22
|
+
- name: Publish to rubygems.org
|
|
23
|
+
run: |
|
|
24
|
+
gem build *.gemspec
|
|
25
|
+
gem push *.gem
|
data/Gemfile
CHANGED
data/lib/kintsugi/cli.rb
CHANGED
|
@@ -109,7 +109,7 @@ module Kintsugi
|
|
|
109
109
|
def global_attributes_file_path
|
|
110
110
|
# The logic to decide the path to the global attributes file is described at:
|
|
111
111
|
# https://git-scm.com/docs/gitattributes.
|
|
112
|
-
config_attributes_file_path = `git config --global core.attributesfile
|
|
112
|
+
config_attributes_file_path = `git config --global core.attributesfile`.chomp
|
|
113
113
|
return config_attributes_file_path unless config_attributes_file_path.empty?
|
|
114
114
|
|
|
115
115
|
if ENV["XDG_CONFIG_HOME"].nil? || ENV["XDG_CONFIG_HOME"].empty?
|
data/lib/kintsugi/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kintsugi
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.5.
|
|
4
|
+
version: 0.5.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ben Yohay
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2022-
|
|
11
|
+
date: 2022-05-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: xcodeproj
|
|
@@ -109,7 +109,8 @@ executables:
|
|
|
109
109
|
extensions: []
|
|
110
110
|
extra_rdoc_files: []
|
|
111
111
|
files:
|
|
112
|
-
- ".github/workflows/
|
|
112
|
+
- ".github/workflows/release.yml"
|
|
113
|
+
- ".github/workflows/tests.yml"
|
|
113
114
|
- ".gitignore"
|
|
114
115
|
- ".rspec"
|
|
115
116
|
- ".rubocop.yml"
|
|
@@ -150,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
150
151
|
- !ruby/object:Gem::Version
|
|
151
152
|
version: '0'
|
|
152
153
|
requirements: []
|
|
153
|
-
|
|
154
|
-
rubygems_version: 2.7.6.3
|
|
154
|
+
rubygems_version: 3.3.12
|
|
155
155
|
signing_key:
|
|
156
156
|
specification_version: 4
|
|
157
157
|
summary: pbxproj files git conflicts solver
|