kintsugi 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3047191981783a65015d6646c15e0c4aa5cba3b3a6f32b6328163a4e8ca7ff37
-  data.tar.gz: 0653aa77f904b249d285feade1d8b5d34a2fbd4ee25bd9431cb32be6462a938e
+  metadata.gz: d48ba29d100ace39635610ad2876a7b6b78b2ff0b7eb56e34b158c962471b0e3
+  data.tar.gz: 719750e48502f5a4bb3a9c924faf2a2b6b959235555a7545c40262ad80b8ee3a
 SHA512:
-  metadata.gz: f15ab16432c5b3bf335a1b25cac66d2e7bc0b20ec29b3b374b6d88010efc804b292750b703af3aed353a2c01666e116b11290ed32d48731ac3471f94a964c70c
-  data.tar.gz: 54220422787ba0bf75c1cb1594ad3dfed6414e7d95df1193de3e2550953aee798396ed99204e433e10522577b51f2655b15e90b98219c7c608dca6379557580e
+  metadata.gz: 26e3adcbe40a0ee5d597cb3bae344f4b124db1de5fb662b5af3d4357d334edc3f46d4367879c33cb26e395b957ca62c2ac824e6d0478fbd3639fe0d71533da13
+  data.tar.gz: 7a71972eb202112a3e83d6923f42b30e509af7b3a0ee4394d83822a89129fa984da8e6e1422046c5ee5c6e43152cbb876101f42dab04bad0c17516b6ba5d329f

data/README.md

@@ -34,7 +34,7 @@ gem 'kintsugi', require: false
 
 ## Usage
 
-When there's a `.pbxproj` file with Git conflicts, run `kintsugi <path_to_pbxproj_file>`.
+When there's a `.pbxproj` file with Git conflicts, and a 3-way merge is possible, run `kintsugi <path_to_pbxproj_file>`.
 
 And see the magic happen! :sparkles:
 

data/bin/kintsugi

@@ -8,6 +8,8 @@ require "json"
 require "optparse"
 
 require "kintsugi"
+require_relative "../lib/kintsugi/version"
+
 
 def parse_options!(argv)
   options_parser = create_options_parser
@@ -26,7 +28,8 @@ end
 
 def create_options_parser
   OptionParser.new do |opts|
-    opts.banner = "Usage: kintsugi [pbxproj_filepath] [options]"
+    opts.banner = "Kintsugi, version #{Kintsugi::Version::STRING}\nCopyright (c) 2021 " \
+                  "Lightricks\n\nUsage: kintsugi [pbxproj_filepath] [options]"
     opts.on("--changes-output-path=PATH", "Path to which changes applied to the project are " \
             "written in JSON format. Used for debug purposes.")
 
@@ -34,6 +37,11 @@ def create_options_parser
       puts opts
       exit
     end
+
+    opts.on_tail("-v", "--version", "Prints version") do
+      puts Kintsugi::Version::STRING
+      exit
+    end
   end
 end
 

data/kintsugi.gemspec

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require_relative "lib/kintsugi/version"
+
 Gem::Specification.new do |spec|
   spec.name          = "kintsugi"
-  spec.version       = "0.1.0"
+  spec.version       = Kintsugi::Version::STRING
   spec.authors       = ["Ben Yohay"]
   spec.email         = ["ben@lightricks.com"]
   spec.required_ruby_version = ">= 2.5.0"

data/lib/kintsugi/version.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Kintsugi
+  # This module holds the Kintsugi version information.
+  module Version
+    STRING = "0.1.1"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kintsugi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ben Yohay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -117,6 +117,7 @@ files:
 - lib/kintsugi.rb
 - lib/kintsugi/apply_change_to_project.rb
 - lib/kintsugi/utils.rb
+- lib/kintsugi/version.rb
 - lib/kintsugi/xcodeproj_extensions.rb
 - logo/kintsugi.png
 - spec/be_equivalent_to_project.rb