kintsugi 0.5.2 → 0.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/release.yml +8 -0
- data/.github/workflows/tests.yml +1 -0
- data/.rubocop.yml +3 -0
- data/bin/kintsugi +2 -30
- data/kintsugi.gemspec +2 -1
- data/lib/kintsugi/apply_change_to_project.rb +382 -135
- data/lib/kintsugi/cli.rb +8 -0
- data/lib/kintsugi/merge.rb +146 -0
- data/lib/kintsugi/settings.rb +18 -0
- data/lib/kintsugi/version.rb +1 -1
- data/lib/kintsugi/xcodeproj_extensions.rb +84 -0
- data/lib/kintsugi.rb +29 -148
- data/spec/kintsugi_apply_change_to_project_spec.rb +346 -111
- data/spec/kintsugi_integration_spec.rb +148 -0
- metadata +23 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6c3458553d6a093c7ecdb473c8005cfbac4426709759b42adcf8a2ca2194a996
|
4
|
+
data.tar.gz: e6d67a33e803fddc41400e8c6df5670461ac33e7f524f6cf989a6f1730bde4f6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a223924c1211a436829f79138f2e125d1acb231c53d98b029fcb5a7fff2120be64c28562cba0844d0ccb65e73f3bc85e559d7c927b4721881bbd751cb94f83a6
|
7
|
+
data.tar.gz: a904e53a5439af6df1257d0c17684a14015f75bed0fb5d9673308a1642cf86c836066b784ad743e609b7b9e976db4eaee9aa577eb89e0f5bbcd48b39724bb176
|
@@ -19,6 +19,14 @@ jobs:
|
|
19
19
|
ruby-version: 2.5.8
|
20
20
|
rubygems: latest
|
21
21
|
|
22
|
+
- name: Draft a new release
|
23
|
+
run: |
|
24
|
+
echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
|
25
|
+
version="v$(grep STRING lib/kintsugi/version.rb | cut -d \" -f 2)"
|
26
|
+
git tag $version
|
27
|
+
git push --tag
|
28
|
+
gh release create $version --generate-notes
|
29
|
+
|
22
30
|
- name: Publish to rubygems.org
|
23
31
|
run: |
|
24
32
|
gem build *.gemspec
|
data/.github/workflows/tests.yml
CHANGED
data/.rubocop.yml
CHANGED
data/bin/kintsugi
CHANGED
@@ -5,37 +5,9 @@
|
|
5
5
|
# Created by Ben Yohay.
|
6
6
|
|
7
7
|
require "kintsugi"
|
8
|
-
require_relative "../lib/kintsugi/cli"
|
9
|
-
require_relative "../lib/kintsugi/error"
|
10
|
-
|
11
|
-
def parse_options!(command, argv)
|
12
|
-
options = {}
|
13
|
-
command.option_parser.parse!(argv, into: options)
|
14
|
-
options
|
15
|
-
end
|
16
|
-
|
17
|
-
def name_of_subcommand?(subcommands, argument)
|
18
|
-
subcommands.include?(argument)
|
19
|
-
end
|
20
|
-
|
21
|
-
first_argument = ARGV[0]
|
22
|
-
cli = Kintsugi::CLI.new
|
23
|
-
command =
|
24
|
-
if name_of_subcommand?(cli.subcommands, first_argument)
|
25
|
-
ARGV.shift
|
26
|
-
cli.subcommands[first_argument]
|
27
|
-
else
|
28
|
-
cli.root_command
|
29
|
-
end
|
30
|
-
|
31
|
-
options = parse_options!(command, ARGV)
|
32
8
|
|
33
9
|
begin
|
34
|
-
|
35
|
-
rescue ArgumentError
|
36
|
-
puts "#{e.class}: #{e}"
|
37
|
-
exit(1)
|
38
|
-
rescue Kintsugi::MergeError => e
|
39
|
-
puts e
|
10
|
+
Kintsugi.run(ARGV)
|
11
|
+
rescue ArgumentError, Kintsugi::MergeError
|
40
12
|
exit(1)
|
41
13
|
end
|
data/kintsugi.gemspec
CHANGED
@@ -22,8 +22,9 @@ Gem::Specification.new do |spec|
|
|
22
22
|
spec.test_files = spec.files.grep(%r{^(spec)/})
|
23
23
|
spec.require_paths = ["lib"]
|
24
24
|
|
25
|
-
spec.add_dependency "xcodeproj", ">= 1.19.0", "<= 1.
|
25
|
+
spec.add_dependency "xcodeproj", ">= 1.19.0", "<= 1.22.0"
|
26
26
|
|
27
|
+
spec.add_development_dependency "git", "~> 1.11"
|
27
28
|
spec.add_development_dependency "rake", "~> 13.0"
|
28
29
|
spec.add_development_dependency "rspec", "~> 3.9"
|
29
30
|
spec.add_development_dependency "rubocop", "1.12.0"
|