RubyGems - bundler-merge - Versions diffs - 0.1.0 - Mend

bundler-merge 0.1.0

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.

Files changed (3) hide show

checksums.yaml ADDED Viewed

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: '0796111c27239fe0ddcefe28599af439ccc1d4215ee755c602eaa06371c4d33f'
+  data.tar.gz: 2cf800c59580e18b1a545dbefa0d85c01658f90b353fad4f39c0962e47726c84
+SHA512:
+  metadata.gz: 3b3b6e2dd9550be1a4c1bf0b8c5801b0cd19c3282eff6b10557bda247cd0a862d18239e55ac6bb1b29442e381624e0eb6268f75ffba5666a7af95e136fd34247
+  data.tar.gz: 18dac0c8aee1b97f4698993403fb8a31f848b98e3274de11b2223a9ebb4027cfe4ada65c791388541fe66b923906c422d3e58badca5c2182ef40c6fe9ab444c2

data/bin/bundler-merge ADDED Viewed

@@ -0,0 +1,149 @@
+#!/usr/bin/env ruby
+# [merge "bundler"]
+#   name = Gemfile.lock merge driver
+#   driver = bundler-merge %O %A %B
+# Known sections:
+# * GIT
+# * PATH
+# * GEM
+# * PLATFORMS
+# * DEPENDENCIES
+# * BUNDLED WITH
+# * RUBY VERSION
+Section = Struct.new(:name, :text) do
+  def key
+    case name
+    when "GIT", "PATH", "GEM"
+      remote = text[/^  remote: (.+)$/, 1] || fail("remote missing")
+      "#{name}:#{remote}"
+    else
+      name
+    end
+  end
+  def self.build(name, internal)
+    new(name, "#{name}\n#{internal}")
+  end
+end
+class Lockfile
+  attr_reader :sections, :path
+  def initialize(path)
+    @path = path
+    @sections = []
+    section = nil
+    File.foreach(path) do |line|
+      if line == "\n"
+        section = nil
+      elsif line =~ /\A[A-Z]/
+        name = line.chomp
+        section = Section.new(name, line.dup)
+        @sections << section
+      else
+        section.text << line
+      end
+    end
+  end
+end
+class Diff3
+  Chunk = Struct.new(:o, :a, :b) do
+    alias_method :original, :o
+  end
+  def initialize(o, a, b)
+    @chunks = Hash.new { |h, k| h[k] = Chunk.new }
+    o.each { |s| @chunks[key(s)].o = s }
+    a.each { |s| @chunks[key(s)].a = s }
+    b.each { |s| @chunks[key(s)].b = s }
+  end
+  def key(x)
+    x
+  end
+  def merge(x)
+    fail("conflict")
+  end
+  def result
+    @chunks.values.map do |chunk|
+      if chunk.original == chunk.a
+        # only changed by B (or no change at all)
+        chunk.b
+      elsif chunk.original == chunk.b
+        # only changed by A
+        chunk.a
+      elsif chunk.a == chunk.b
+        # both changed in same way
+        chunk.a
+      else
+        # Ah dang it's a real merge
+        merge(chunk)
+      end
+    end
+  end
+end
+class DependencyDiff3 < Diff3
+  def key(dep)
+    dep[/  ([^ !]+)/, 1]
+  end
+end
+class GemDiff3 < Diff3
+  def key(dep)
+    dep[/    ([^ !]+)/, 1]
+  end
+end
+class LockfileDiff3 < Diff3
+  def key(section)
+    section.key
+  end
+  def merge(chunk)
+    fail("conflict") unless chunk.o
+    name = chunk.o.name
+    if false
+    elsif name == "DEPENDENCIES"
+      diff3 = DependencyDiff3.new(*chunk.to_a.map do |s|
+        s.text.lines[1..]
+      end)
+      Section.build(name, diff3.result.join)
+    elsif name == "GEM"
+      gems = chunk.to_a.map do |s|
+        specs = s.text[/^  specs:\n((:?    .+\n)*)/, 1]
+        specs = specs.split(/^(?=    [^ ])/)
+      end
+      diff3 = GemDiff3.new(*gems)
+      prefix = chunk.o.text[/\A.+\n  specs:\n/m]
+      text = "#{prefix}#{diff3.result.join}"
+      Section.new(name, text)
+    elsif name == "BUNDLED WITH"
+      # Just take ours
+      chunk.a
+    else
+      fail("unimplemented")
+    end
+  end
+end
+argv = ARGV.dup
+stdout = !!argv.delete("-p")
+if argv.size != 3
+  puts "Usage: #$0 %A %O %B"
+  exit 1
+end
+local, base, remote = files = argv
+diff3 = LockfileDiff3.new(*[base, local, remote].map { |f| Lockfile.new(f).sections })
+result = diff3.result.map(&:text).join("\n")
+output = stdout ? STDOUT : File.open(local, "w")
+output.puts result

metadata ADDED Viewed

@@ -0,0 +1,48 @@
+--- !ruby/object:Gem::Specification
+name: bundler-merge
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+platform: ruby
+authors:
+- John Hawthorn
+autorequire:
+bindir: bin
+cert_chain: []
+date: 2024-10-08 00:00:00.000000000 Z
+dependencies: []
+description: A tool to resolve merge conflicts in Gemfile.lock
+email:
+- [email protected]
+executables:
+- bundler-merge
+extensions: []
+extra_rdoc_files: []
+files:
+- bin/bundler-merge
+homepage: https://github.com/jhawthorn/bundler-merge
+licenses:
+- MIT
+metadata:
+  homepage_uri: https://github.com/jhawthorn/bundler-merge
+  source_code_uri: https://github.com/jhawthorn/bundler-merge
+  changelog_uri: https://github.com/jhawthorn/bundler-merge
+post_install_message:
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 2.7.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubygems_version: 3.5.16
+signing_key:
+specification_version: 4
+summary: A merge driver for Gemfile.lock
+test_files: []