kintsugi 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd0bf9dde374b1b29b0e386ff0f4f051f6686e04b140199c8b62d6a73c053285
-  data.tar.gz: 8845644c3e18fb6244f402d2b432966a0f6e437ced4f441cdd1d43a06369ef51
+  metadata.gz: 4d6a3f2f971989db51d411587800237c653c8c09f23ed14a5d6e7ab4acbdc0c0
+  data.tar.gz: f9eb196e1cb97a9a683ec237d71d4943eb11371409ddd918500d898059c4f16f
 SHA512:
-  metadata.gz: 0fd505102998df8f7b0c16d7a0fe7b437e5b6402db784383f752f7b0272fe5b7f2ab2c7b9c18e3de2ee3c071b5cf21577bb4089c792a6ca15286efa3f1f9ae7d
-  data.tar.gz: 85d252a8135e10b536b042156dc787e9a8d9ac5286736d01113ea4380a49d049f8837430d15490f15c3d14cbdf0f7a3cf75ac5dc4f2047bef55cc7f6fb00f837
+  metadata.gz: caa76ce1cae66040d14851dc37f9cbe63269e6565be887f7f31db0016249af5a95bc05e414041aa1f4a2d4e23d534a976383faacf391f6f9bfd2ab880cb524f0
+  data.tar.gz: e92ee6af254ea336b067abd7bfc805bc5d878873f5de74ed4d06c2847e75e24b836a8ad2a4f81edfee78d0c9db8378f6e84f41a6fc210b69ee6e5f31a7b938e1

data/lib/kintsugi/cli.rb

@@ -31,21 +31,12 @@ module Kintsugi
     Command = Struct.new(:option_parser, :action, :description, keyword_init: true)
 
     def create_driver_subcommand
-      option_parser =
-        OptionParser.new do |opts|
-          opts.banner = "Usage: kintsugi driver BASE OURS THEIRS ORIGINAL_FILE_PATH [options]\n" \
-            "Uses Kintsugi as a Git merge driver. Parameters " \
-            "should be the path to base version of the file, path to ours version, path to " \
-            "theirs version, and the original file path."
-
-          opts.on("--interactive-resolution=FLAG", TrueClass, "In case a conflict that requires " \
-            "human decision to resolve, show an interactive prompt with choices to resolve it")
-
-          opts.on("-h", "--help", "Prints this help") do
-            puts opts
-            exit
-          end
-        end
+      option_parser = create_base_option_parser
+      option_parser.banner = "Usage: kintsugi driver BASE OURS THEIRS ORIGINAL_FILE_PATH " \
+          "[options]\n" \
+          "Uses Kintsugi as a Git merge driver. Parameters " \
+          "should be the path to base version of the file, path to ours version, path to " \
+          "theirs version, and the original file path."
 
       driver_action = lambda { |options, arguments|
         if arguments.count != 4
@@ -54,9 +45,7 @@ module Kintsugi
           exit(1)
         end
 
-        unless options[:"interactive-resolution"].nil?
-          Settings.interactive_resolution = options[:"interactive-resolution"]
-        end
+        update_settings(options)
 
         Kintsugi.three_way_merge(arguments[0], arguments[1], arguments[2], arguments[3])
         warn "\e[32mKintsugi auto-merged #{arguments[3]}\e[0m"
@@ -70,17 +59,10 @@ module Kintsugi
     end
 
     def create_install_driver_subcommand
-      option_parser =
-        OptionParser.new do |opts|
-          opts.banner = "Usage: kintsugi install-driver [driver-options]\n" \
-            "Installs Kintsugi as a Git merge driver globally. `driver-options` will be passed " \
-            "to `kintsugi driver`."
-
-          opts.on("-h", "--help", "Prints this help") do
-            puts opts
-            exit
-          end
-        end
+      option_parser = create_base_option_parser
+      option_parser.banner = "Usage: kintsugi install-driver [driver-options]\n" \
+          "Installs Kintsugi as a Git merge driver globally. `driver-options` will be passed " \
+          "to `kintsugi driver`."
 
       action = lambda { |options, arguments|
         if arguments.count != 0
@@ -94,7 +76,9 @@ module Kintsugi
           exit(1)
         end
 
-        install_kintsugi_driver_globally(options)
+        driver_options = extract_driver_options(options, option_parser)
+
+        install_kintsugi_driver_globally(driver_options)
         puts "Done! 🪄"
       }
 
@@ -105,9 +89,30 @@ module Kintsugi
       )
     end
 
+    def extract_driver_options(options, option_parser)
+      options.map do |option_name, option_value|
+        switch = option_parser.top.search(:long, option_name.to_s)
+        prefix = "--"
+        if switch.nil?
+          switch = option_parser.top.search(:short, option_name.to_s)
+          prefix = "-"
+        end
+        case switch
+        when OptionParser::Switch::NoArgument
+          [prefix + option_name.to_s]
+        when NilClass
+          puts "Invalid flag #{option_name} passed to 'install-driver' subcommand\n\n"
+          puts option_parser
+          exit(1)
+        else
+          [prefix + option_name.to_s, option_value]
+        end
+      end.flatten
+    end
+
     def install_kintsugi_driver_globally(options)
       `git config --global merge.kintsugi.name "Kintsugi driver"`
-      kintsugi_command = "kintsugi driver %O %A %B %P #{options}"
+      kintsugi_command = "kintsugi driver %O %A %B %P #{options.join(" ")}".rstrip
       `git config --global merge.kintsugi.driver "#{kintsugi_command}"`
 
       attributes_file_path = global_attributes_file_path
@@ -173,33 +178,21 @@ module Kintsugi
     end
 
     def create_root_command
-      option_parser = OptionParser.new do |opts|
-        opts.banner = "Kintsugi, version #{Version::STRING}\n" \
-                      "Copyright (c) 2021 Lightricks\n\n" \
-                      "Usage: kintsugi <pbxproj_filepath> [options]\n" \
-                      "       kintsugi <subcommand> [options]"
-
-        opts.separator ""
-        opts.on("--changes-output-path=PATH", "Path to which changes applied to the project are " \
-                "written in JSON format. Used for debug purposes.")
-
-        opts.on("-h", "--help", "Prints this help") do
-          puts opts
-          exit
-        end
-
-        opts.on("-v", "--version", "Prints version") do
-          puts Version::STRING
-          exit
-        end
-
-        opts.on("--allow-duplicates", "Allow to add duplicates of the same entity")
+      option_parser = create_base_option_parser
+      option_parser.banner = "Kintsugi, version #{Version::STRING}\n" \
+          "Copyright (c) 2021 Lightricks\n\n" \
+          "Usage: kintsugi <pbxproj_filepath> [options]\n" \
+          "       kintsugi <subcommand> [options]"
+
+      option_parser.on("-v", "--version", "Prints version") do
+        puts Version::STRING
+        exit
+      end
 
-        opts.on("--interactive-resolution=FLAG", TrueClass, "In case a conflict that requires " \
-                "human decision to resolve, show an interactive prompt with choices to resolve it")
+      option_parser.on("--changes-output-path=PATH", "Path to which changes applied to the " \
+          "project are written in JSON format. Used for debug purposes.")
 
-        opts.on_tail("\nSUBCOMMANDS\n#{subcommands_descriptions(subcommands)}")
-      end
+      option_parser.on_tail("\nSUBCOMMANDS\n#{subcommands_descriptions(subcommands)}")
 
       root_action = lambda { |options, arguments|
         if arguments.count != 1
@@ -208,13 +201,7 @@ module Kintsugi
           exit(1)
         end
 
-        if options[:"allow-duplicates"]
-          Settings.allow_duplicates = true
-        end
-
-        unless options[:"interactive-resolution"].nil?
-          Settings.interactive_resolution = options[:"interactive-resolution"]
-        end
+        update_settings(options)
 
         project_file_path = File.expand_path(arguments[0])
         Kintsugi.resolve_conflicts(project_file_path, options[:"changes-output-path"])
@@ -228,6 +215,32 @@ module Kintsugi
       )
     end
 
+    def create_base_option_parser
+      OptionParser.new do |opts|
+        opts.separator ""
+
+        opts.on("-h", "--help", "Prints this help") do
+          puts opts
+          exit
+        end
+
+        opts.on("--allow-duplicates", "Allow to add duplicates of the same entity")
+
+        opts.on("--interactive-resolution=FLAG", TrueClass, "In case a conflict that requires " \
+                "human decision to resolve, show an interactive prompt with choices to resolve it")
+      end
+    end
+
+    def update_settings(options)
+      if options[:"allow-duplicates"]
+        Settings.allow_duplicates = true
+      end
+
+      unless options[:"interactive-resolution"].nil?
+        Settings.interactive_resolution = options[:"interactive-resolution"]
+      end
+    end
+
     def subcommands_descriptions(subcommands)
       longest_subcommand_length = subcommands.keys.map(&:length).max + 4
       format_string = "    %-#{longest_subcommand_length}s%s"

data/lib/kintsugi/version.rb

@@ -3,6 +3,6 @@
 module Kintsugi
   # This module holds the Kintsugi version information.
   module Version
-    STRING = "0.7.0"
+    STRING = "0.7.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kintsugi
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Ben Yohay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt