kintsugi 0.1.0 → 0.1.1
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/README.md +1 -1
- data/bin/kintsugi +9 -1
- data/kintsugi.gemspec +3 -1
- data/lib/kintsugi/version.rb +8 -0
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d48ba29d100ace39635610ad2876a7b6b78b2ff0b7eb56e34b158c962471b0e3
|
|
4
|
+
data.tar.gz: 719750e48502f5a4bb3a9c924faf2a2b6b959235555a7545c40262ad80b8ee3a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 26e3adcbe40a0ee5d597cb3bae344f4b124db1de5fb662b5af3d4357d334edc3f46d4367879c33cb26e395b957ca62c2ac824e6d0478fbd3639fe0d71533da13
|
|
7
|
+
data.tar.gz: 7a71972eb202112a3e83d6923f42b30e509af7b3a0ee4394d83822a89129fa984da8e6e1422046c5ee5c6e43152cbb876101f42dab04bad0c17516b6ba5d329f
|
data/README.md
CHANGED
|
@@ -34,7 +34,7 @@ gem 'kintsugi', require: false
|
|
|
34
34
|
|
|
35
35
|
## Usage
|
|
36
36
|
|
|
37
|
-
When there's a `.pbxproj` file with Git conflicts, run `kintsugi <path_to_pbxproj_file>`.
|
|
37
|
+
When there's a `.pbxproj` file with Git conflicts, and a 3-way merge is possible, run `kintsugi <path_to_pbxproj_file>`.
|
|
38
38
|
|
|
39
39
|
And see the magic happen! :sparkles:
|
|
40
40
|
|
data/bin/kintsugi
CHANGED
|
@@ -8,6 +8,8 @@ require "json"
|
|
|
8
8
|
require "optparse"
|
|
9
9
|
|
|
10
10
|
require "kintsugi"
|
|
11
|
+
require_relative "../lib/kintsugi/version"
|
|
12
|
+
|
|
11
13
|
|
|
12
14
|
def parse_options!(argv)
|
|
13
15
|
options_parser = create_options_parser
|
|
@@ -26,7 +28,8 @@ end
|
|
|
26
28
|
|
|
27
29
|
def create_options_parser
|
|
28
30
|
OptionParser.new do |opts|
|
|
29
|
-
opts.banner = "
|
|
31
|
+
opts.banner = "Kintsugi, version #{Kintsugi::Version::STRING}\nCopyright (c) 2021 " \
|
|
32
|
+
"Lightricks\n\nUsage: kintsugi [pbxproj_filepath] [options]"
|
|
30
33
|
opts.on("--changes-output-path=PATH", "Path to which changes applied to the project are " \
|
|
31
34
|
"written in JSON format. Used for debug purposes.")
|
|
32
35
|
|
|
@@ -34,6 +37,11 @@ def create_options_parser
|
|
|
34
37
|
puts opts
|
|
35
38
|
exit
|
|
36
39
|
end
|
|
40
|
+
|
|
41
|
+
opts.on_tail("-v", "--version", "Prints version") do
|
|
42
|
+
puts Kintsugi::Version::STRING
|
|
43
|
+
exit
|
|
44
|
+
end
|
|
37
45
|
end
|
|
38
46
|
end
|
|
39
47
|
|
data/kintsugi.gemspec
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
+
require_relative "lib/kintsugi/version"
|
|
4
|
+
|
|
3
5
|
Gem::Specification.new do |spec|
|
|
4
6
|
spec.name = "kintsugi"
|
|
5
|
-
spec.version =
|
|
7
|
+
spec.version = Kintsugi::Version::STRING
|
|
6
8
|
spec.authors = ["Ben Yohay"]
|
|
7
9
|
spec.email = ["ben@lightricks.com"]
|
|
8
10
|
spec.required_ruby_version = ">= 2.5.0"
|
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.1.
|
|
4
|
+
version: 0.1.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ben Yohay
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-06-
|
|
11
|
+
date: 2021-06-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: xcodeproj
|
|
@@ -117,6 +117,7 @@ files:
|
|
|
117
117
|
- lib/kintsugi.rb
|
|
118
118
|
- lib/kintsugi/apply_change_to_project.rb
|
|
119
119
|
- lib/kintsugi/utils.rb
|
|
120
|
+
- lib/kintsugi/version.rb
|
|
120
121
|
- lib/kintsugi/xcodeproj_extensions.rb
|
|
121
122
|
- logo/kintsugi.png
|
|
122
123
|
- spec/be_equivalent_to_project.rb
|