gemstack 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08b7f22bd22a410de8638e6249f629fc05d73c55c451ee15aaf5060aaceed7e9'
-  data.tar.gz: c4729f7d3833d7645abf7f1ca70f7e281b9a4ec8406d0482baedf0f039668162
+  metadata.gz: 470fa3d30b1554cfa0aa75c71518f3ec47807a2f09f634c964720133c3cbe0d8
+  data.tar.gz: 1b11a77cbac038b67fc22c1b746ef2dd8011bf729a3523b7d99bb32857c62ea5
 SHA512:
-  metadata.gz: 8892c3a10498fda83a04ab4323c86f29898eb250f9a4cae8f3c90aa2b32c83ae60f0c79e87459c28f6eaa7bdc99812d0acb675062a79de981ec942ec450052f1
-  data.tar.gz: b3d2dc8f1d33abb5eca014e4679e5aa8a6a37772c1fb30d5720fcc638923787902a5324aeaaa2652476e1ce0e9815693f22f149d3a8e8b33e28a4bd288868ed6
+  metadata.gz: 7f52cbd61e22fc289cc33b7eaa9097ad5b3f8271a5b284599a164bd688547ccbda631268256d78c8f0bee9eb253f3b9b3adc74a86ac085292ffcd6896294f516
+  data.tar.gz: ff4886ab02478e6a1355f47fbe0d072886b49be8c8c33060a06b706137f47836dfe31f2ee52db0335c71de9b82a46f980728b1a9a26e5f0614e01c8dd584b741

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.2
+
+See the [GemStack changelog](https://github.com/gemstack-rb/gemstack/blob/main/CHANGELOG.md).
+
 ## 0.4.1
 
 See the [GemStack changelog](https://github.com/gemstack-rb/gemstack/blob/main/CHANGELOG.md).

data/lib/gemstack/cli/template_update.rb

@@ -76,7 +76,11 @@ module GemStack
     #   template unchanged            skipped (your edits are yours)
     #   new in this version           created
     #   you never edited the file     updated
-    #   you edited it                 you choose: overwrite, skip, diff, or save as FILE.new
+    #   you edited it                 you choose: merge, overwrite, skip, diff, or save as FILE.new
+    #
+    # Merge is a three-way merge (git merge-file): the release's changes to the
+    # template are applied to your copy, keeping your edits. Where both changed
+    # the same lines the file gets <<<<<<< conflict markers to resolve.
     #
     # Apps record the templates they're on in .gemstack/version. Older apps don't,
     # so each file is compared with every earlier release's template: matching
@@ -88,9 +92,10 @@ module GemStack
       # (db/migrations/) are the app's history and never part of an update.
       MANAGED = %w[Gemfile .gemstack/version].freeze
 
-      # created/updated/saved (as FILE.new) are done; conflicts were left for you;
-      # removed are files you deleted, which stay deleted.
-      Result = Struct.new(:created, :updated, :saved, :conflicts, :removed, keyword_init: true)
+      # created/updated/merged/saved (as FILE.new) are done; marked were merged
+      # with conflict markers to resolve; conflicts were left for you; removed
+      # are files you deleted, which stay deleted.
+      Result = Struct.new(:created, :updated, :merged, :marked, :saved, :conflicts, :removed, keyword_init: true)
 
       def self.recorded_version(root)
         path = File.join(root, VERSION_FILE)
@@ -109,7 +114,7 @@ module GemStack
           $stdin.gets.to_s.strip.downcase
         }
         @old_templates = old_templates
-        @result = Result.new(created: [], updated: [], saved: [], conflicts: [], removed: [])
+        @result = Result.new(created: [], updated: [], merged: [], marked: [], saved: [], conflicts: [], removed: [])
       end
 
       def run
@@ -210,7 +215,7 @@ module GemStack
         return @result.removed << path if mine.nil?
         return update(path, file, :updated) if olds.include?(mine) # an unedited, older copy
 
-        conflict(path, file, mine)
+        conflict(path, file, mine, olds.compact.uniq)
       end
 
       def create(path, file)
@@ -225,12 +230,16 @@ module GemStack
         status("update", path)
       end
 
-      def conflict(path, file, mine)
+      def conflict(path, file, mine, bases)
         return record_conflict(path) unless @interactive
 
         loop do
-          case @prompt.call("#{path} changed in this version and you edited it — [o]verwrite, [s]kip, " \
-                            "[d]iff, save as [n]ew file?")
+          case @prompt.call("#{path} changed in this version and you edited it — [m]erge (keeps your edits), " \
+                            "[o]verwrite, [s]kip, [d]iff, save as [n]ew file?")
+          when "m"
+            return if merge(path, file, mine, bases)
+
+            @output.puts("  Can't merge: it needs git and the earlier template (not available). Choose another option.")
           when "o" then return update(path, file, :updated)
           when "n" then return save_new(path, file)
           when "d" then @output.puts(diff(mine, file.content, path))
@@ -239,6 +248,39 @@ module GemStack
         end
       end
 
+      # Applies the release's template changes to your copy. Without a recorded
+      # version the starting template isn't known: each earlier release's is
+      # tried (newest first) and the merge with the fewest conflicts wins.
+      def merge(path, file, mine, bases)
+        merges = bases.reverse.filter_map { |base| merge_file(path, mine, base, file.content) }
+        return false if merges.empty?
+
+        text, conflicts = merges.min_by { |_, count| count }
+        write(path, AppFile.new(text, file.mode))
+        if conflicts.zero?
+          @result.merged << path
+          status("merge", path)
+        else
+          @result.marked << path
+          status("merge", "#{path} — #{conflicts} conflict#{"s" if conflicts > 1}: resolve the <<<<<<< markers")
+        end
+        true
+      end
+
+      # [merged text, number of conflicts], or nil without git.
+      def merge_file(path, mine, base, theirs)
+        Dir.mktmpdir("gemstack-merge") do |dir|
+          files = { "yours" => mine, "base" => base, "new" => theirs }.map do |name, content|
+            File.join(dir, name).tap { |file| File.binwrite(file, content) }
+          end
+          labels = ["#{path} (yours)", "#{path} (earlier GemStack)", "#{path} (GemStack #{GemStack::VERSION})"]
+          out, status = Open3.capture2("git", "merge-file", "-p", *labels.flat_map { |label| ["-L", label] }, *files)
+          [out, status.exitstatus] if status.exitstatus.between?(0, 127)
+        end
+      rescue SystemCallError
+        nil
+      end
+
       def save_new(path, file)
         write("#{path}.new", file)
         @result.saved << path
@@ -275,7 +317,8 @@ module GemStack
       end
 
       def report
-        done = { "created" => @result.created, "updated" => @result.updated, "saved as .new" => @result.saved,
+        done = { "created" => @result.created, "updated" => @result.updated, "merged" => @result.merged,
+                 "merged with conflicts to resolve" => @result.marked, "saved as .new" => @result.saved,
                  "left for you" => @result.conflicts }.reject { |_, paths| paths.empty? }
         if done.empty?
           @output.puts("  nothing to update")

data/lib/gemstack/cli.rb

@@ -241,7 +241,7 @@ module GemStack
       are updated, and for ones you edited you choose: overwrite, skip, see the diff, or FILE.new.
 
         gemstack update                       # the latest release
-        gemstack update 0.4.1                 # a specific version
+        gemstack update 0.4.2                 # a specific version
         gemstack update --templates --dry-run # only the template step, preview
         gemstack update --templates --from 0.3.5
     DESC

data/lib/gemstack/version.rb

@@ -2,5 +2,5 @@
 
 module GemStack
   # All GemStack gems are released together under a single version.
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemstack
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Adware Technologies
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement