kintsugi 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7efc466f1583ea53deda2b4e77f030a1072ac4e93f8d8687f5eca22e2ea1d60c
-  data.tar.gz: 0c9dd29ad25b68fbb8c7d2b3b7ce4113e95a341234edaa3d3e11277dd691fc04
+  metadata.gz: 35d23332d5548a077db178c966f44413a314276628404a7a9e70d7e2ae45da96
+  data.tar.gz: ea35a4c7587ddb9243103d4c249050900505e630beb8a3764ad7e083360db320
 SHA512:
-  metadata.gz: ee93b9b5f72d5ab35fb37a6fcc5464815e9ea13a9a985296d9132bd04be02edc9f542564b6cf5f495bc1a680b9b06a317bed0c709347ca641f5b31bb3145796e
-  data.tar.gz: c89520181be68ea61548b989a957e3d7fea7cef637b5a5cfa962ca3634b1db8d0e85906f947ea8868fa3a7ec5feed558d0ea156a77887f59d1123e4865bc6062
+  metadata.gz: c9731d92243eff91a6a33ae674a936e274c1cfc58979ceedae1248bdb0d6602fbc51d0c192e6f982aa1a150f1fcc2874d0a0255f11ed9aaa68abefae81212ee7
+  data.tar.gz: a96ac801a8ea82a2893d41b25fc7a7fdfd928fba280f6f837c83a49b7b02358d124fcac6d2bd377230f3ab14d3f5f16d8b4de3c9524a1c96cf2ffff927377233

data/lib/kintsugi/cli.rb

@@ -154,7 +154,10 @@ module Kintsugi
       `git config --global --unset merge.kintsugi.name`
       `git config --global --unset merge.kintsugi.driver`
 
-      `sed -i '' '/\*.pbxproj\ merge=kintsugi/d' "#{global_attributes_file_path}"`
+      attributes_file_path = global_attributes_file_path
+      return unless File.exist?(attributes_file_path)
+
+      `sed -i '' '/\*.pbxproj\ merge=kintsugi/d' "#{attributes_file_path}"`
     end
 
     def create_root_command
@@ -178,10 +181,7 @@ module Kintsugi
           exit
         end
 
-        subcommands_descriptions = @subcommands.map do |command_name, command|
-          "    #{command_name}:    #{command.description}"
-        end.join("\n")
-        opts.on_tail("\nSUBCOMMANDS\n#{subcommands_descriptions}")
+        opts.on_tail("\nSUBCOMMANDS\n#{subcommands_descriptions(subcommands)}")
       end
 
       root_action = lambda { |options, arguments|
@@ -202,5 +202,13 @@ module Kintsugi
         description: nil
       )
     end
+
+    def subcommands_descriptions(subcommands)
+      longest_subcommand_length = subcommands.keys.map(&:length).max + 4
+      format_string = "    %-#{longest_subcommand_length}s%s"
+      subcommands.map do |command_name, command|
+        format(format_string, "#{command_name}:", command.description)
+      end.join("\n")
+    end
   end
 end

data/lib/kintsugi/version.rb

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

data/lib/kintsugi.rb

@@ -139,7 +139,7 @@ module Kintsugi
     def file_has_version_in_stage_numbers?(file_path, stage_numbers)
       file_absolute_path = File.absolute_path(file_path)
       actual_stage_numbers =
-        `git ls-files -u -- #{file_absolute_path}`.split("\n").map do |git_file_status|
+        `git ls-files -u -- "#{file_absolute_path}"`.split("\n").map do |git_file_status|
           git_file_status.split[2]
         end
       (stage_numbers - actual_stage_numbers.map(&:to_i)).empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kintsugi
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ben Yohay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-02 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.6.3
+rubygems_version: 2.7.3
 signing_key:
 specification_version: 4
 summary: pbxproj files git conflicts solver