Initial commit

action.yml

@@ -1,5 +1,5 @@
-name: "Append on Merge"
-description: "Github Action to combine files while preventing PR conflicts"
+name: "Merge on Merge"
+description: "Github Action to combine JSON files while preventing PR conflicts"
 inputs:
   github_token:
     description: "Github Token"
@@ -10,17 +10,21 @@ inputs:
     required: false
     default: "preview"
   input_path:
-    description: "input_path"
+    description: "JSON input folder"
     required: false
     default: "input"
   base:
     description: "base"
     required: false
-    default: "README.md"
+    default: "out.json"
+  merge_json_path:
+    description: "JSON traverse path to merge the input in, use dot notation"
+    required: false
+    default: "json.path.to.merge"
   output:
     description: "output"
     required: false
-    default: "README.md"
+    default: "out.json"
   processed_path:
     description: "processed_path"
     required: false
@@ -34,16 +38,10 @@ runs:
   steps:
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.1
+        ruby-version: 3.2
 
-    # Change path, run the code
-    # - run: echo "${{ github.action_path }}" >> $GITHUB_PATH
-    #   shell: bash
     - shell: bash
-      run: ruby ${{ github.action_path }}/append_on_merge.rb "${{ inputs.input_path }}" "${{ inputs.base }}" "${{ inputs.output }}" "${{ inputs.processed_path }}"
-
-    # - shell: bash
-    #   run: git status
+      run: ruby ${{ github.action_path }}/merge_on_merge.rb "${{ inputs.input_path }}" "${{ inputs.base }}" "${{ inputs.merge_json_path }}" "${{ inputs.output }}" "${{ inputs.processed_path }}"
 
     # See diff & output diff for comment
     - id: diff

merge_on_merge.rb

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'json'
+require "debug"
+
+def run(input_path, base, merge_json_path, output, processed_path)
+  FileUtils.mkdir_p(processed_path)
+  FileUtils.mkdir_p(input_path)
+
+  puts "Consuming files in #{input_path} path"
+
+  files = Dir.open(input_path) do |input_dir|
+    FileUtils.touch File.join(Dir.pwd, input_dir, '.gitkeep')
+
+    Dir.glob(File.join(Dir.pwd, input_dir, '*.json'))
+  end
+
+  puts "Merging files to #{output}, using #{base} as base"
+
+  base = JSON.load_file!(base)
+  base_dest = base.dig(*merge_json_path.split("."))
+
+  files.each do |input_path|
+    json = JSON.load_file!(input_path)
+
+    base_dest.append(json)
+  end
+
+  output_json = JSON.pretty_generate(base)
+
+  puts "Writing to #{output}:"
+  puts output_json
+  puts '<EOF>'
+
+  File.open(output, 'w') do |f|
+    f.write(output_json)
+  end
+
+  # Move files to processed_path folder
+  FileUtils.mv files, processed_path, verbose: true
+end
+
+run(*ARGV)