openapi-sourcetools 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71267174b8f95f5a510b93590f8fcdb8daf2737df19db6d2d7ebf48410444cf8
-  data.tar.gz: cf682ab07dcc557c9f3a2b9785f46aded117c4b50d840a6e8dd0b31e80840a63
+  metadata.gz: 93117ebfa33920b762da40afe48264ead793574ad336628487d3cfb3b6019987
+  data.tar.gz: 67cb3400cd879b3625e58b72db11cfc860a87179d069ff341a6202391f8d61f5
 SHA512:
-  metadata.gz: efe4f67e9903c4b65e404fe349e668ff659e538ddff7bc7e28a59bd7f98167e16faabb4876d5b45e1142562ad6e6c4e22c7471e1f374c3debc4e204855a7e169
-  data.tar.gz: 3ab4a1cf50426d6405cb1281f4c159d43480ead4f11414f8642b6e0a5d7cb4eca4f3769fb43cff4c5f1884ef5a72d88fdcc9b9c09bbdeb80f4624b008cfba059
+  metadata.gz: af4681c719424375326d4149ede787f0d6a58d33ff28082d7c1f7b00db4b40186f6406bfe99707012aeae0ac03d4504fb14cd49b6e587f55d91c1f2cb353a3b3
+  data.tar.gz: f6c84c0a9e6b20040fefa9611c8abf211abc1fb65c6a3c3041ce1f96f3b3482fa1789eb2eb16460c5a1d892d56fd843164ae4d7dfb9c4cdb6e3a13f26977d323

data/bin/openapi-addheaders

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2024 Ismo Kärkkäinen
+# Copyright © 2024-2025 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require_relative '../lib/apiobjects'
-require_relative '../lib/common'
+require_relative '../lib/openapi/sourcetools/apiobjects'
+require_relative '../lib/openapi/sourcetools/common'
 require 'optparse'
 require 'yaml'
+include OpenAPISourceTools
 
 
 def replace_headers(obj, components)
@@ -30,7 +31,7 @@ def main
   input_name = nil
   output_name = nil
   path = %w[components headers]
-  components = Components.new(path, 'Header')
+  components = ApiObjects::Components.new(path, 'Header')
 
   parser = OptionParser.new do |opts|
     opts.summary_indent = '  '
@@ -58,15 +59,15 @@ replaces the original with reference.
   end
   parser.order!
 
-  doc = load_source(input_name)
+  doc = Common.load_source(input_name)
   return 2 if doc.nil?
 
   components.items = doc.dig(*path) || {}
   replace_headers(doc.dig('components', 'responses') || {}, components)
   replace_headers(doc.fetch('paths', {}), components)
-  bury(doc, path, components.items) unless components.items.empty?
+  Common.bury(doc, path, components.items) unless components.items.empty?
 
-  dump_result(output_name, doc, 3)
+  Common.dump_result(output_name, doc, 3)
 end
 
 exit(main) if defined?($unit_test).nil?

data/bin/openapi-addparameters

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2024 Ismo Kärkkäinen
+# Copyright © 2024-2025 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require_relative '../lib/apiobjects'
-require_relative '../lib/common'
+require_relative '../lib/openapi/sourcetools/apiobjects'
+require_relative '../lib/openapi/sourcetools/common'
 require 'optparse'
-require 'yaml'
+include OpenAPISourceTools
 
 def replace_parameter(p, components)
   return p unless p.is_a?(Hash) # Could complain.
@@ -26,11 +26,42 @@ def replace_parameters(obj, components)
   end
 end
 
+def ref_name(ref)
+  idx = ref.rindex('/') || -1
+  ref[(idx + 1)..]
+end
+
+def nameloc2ref(params, referenced)
+  nl2r = {}
+  params.each do |ref|
+    rn = ref_name(ref['$ref'])
+    refd = referenced[rn]
+    nl2r["#{refd['name']} #{refd['in']}"] = ref
+  end
+  nl2r
+end
+
+def add_operations_parameters(paths, referenced)
+  # Top level is path item objects.
+  # Below that are operations objects.
+  paths.each_value do |item|
+    top_nameloc2ref = nameloc2ref(item['parameters'] || [], referenced)
+    oos = ApiObjects.operation_objects(item)
+    oos.each_value do |operation|
+      nl2r = nameloc2ref(operation['parameters'] || [], referenced)
+      params = top_nameloc2ref.merge(nl2r)
+      # Map also avoids alias creation at YAML saving.
+      operation['parameters'] = params.keys.sort!.map { |k| { '$ref' => params[k]['$ref'] } }
+    end
+  end
+end
+
 def main
   input_name = nil
   output_name = nil
+  add2operations = false
   path = %w[components parameters]
-  components = Components.new(path, 'Parameter')
+  components = ApiObjects::Components.new(path, 'Parameter')
 
   parser = OptionParser.new do |opts|
     opts.summary_indent = '  '
@@ -44,6 +75,9 @@ def main
     opts.on('-o', '--output FILE', 'Output to FILE, not stdout.') do |f|
       output_name = f
     end
+    opts.on('-a', '--add', 'Add parameters to operations objects.') do
+      add2operations = true
+    end
     components.add_options(opts)
     opts.on('-h', '--help', 'Print this help and exit.') do
       $stdout.puts %(#{opts}
@@ -51,6 +85,10 @@ def main
 Loads API document in OpenAPI format and moves parameters under components and
 replaces the original with reference.
 
+Optionally adds parameters to all operations objects by copying parameters
+from path item and replacing ones referred to in operations object. The
+path item parameters are left in place. Even empty arrays are added.
+
 #{components.help}
 )
       exit 0
@@ -58,14 +96,17 @@ replaces the original with reference.
   end
   parser.order!
 
-  doc = load_source(input_name)
+  doc = Common.load_source(input_name)
   return 2 if doc.nil?
 
   components.items = doc.dig(*path) || {}
   replace_parameters(doc.fetch('paths', {}), components)
-  bury(doc, path, components.items) unless components.items.empty?
+  Common.bury(doc, path, components.items) unless components.items.empty?
+  # If nothing has parameters, this adds empty arrays.
+  # Consistency might be desired for code generation templates.
+  add_operations_parameters(doc.fetch('paths', {}), components.items) if add2operations
 
-  dump_result(output_name, doc, 3)
+  Common.dump_result(output_name, doc, 3)
 end
 
-exit(main) if defined?($unit_test).nil?
+exit(main) unless defined?($unit_test)

data/bin/openapi-addresponses

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2024 Ismo Kärkkäinen
+# Copyright © 2024-2025 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require_relative '../lib/apiobjects'
-require_relative '../lib/common'
+require_relative '../lib/openapi/sourcetools/apiobjects'
+require_relative '../lib/openapi/sourcetools/common'
 require 'optparse'
-require 'yaml'
+include OpenAPISourceTools
 
 
 def replace_responses(obj, components)
@@ -30,7 +30,7 @@ def main
   input_name = nil
   output_name = nil
   path = %w[components responses]
-  components = Components.new(path, 'Response')
+  components = ApiObjects::Components.new(path, 'Response')
 
   parser = OptionParser.new do |opts|
     opts.summary_indent = '  '
@@ -58,14 +58,14 @@ replaces the original with reference.
   end
   parser.order!
 
-  doc = load_source(input_name)
+  doc = Common.load_source(input_name)
   return 2 if doc.nil?
 
   components.items = doc.dig(*path) || {}
   replace_responses(doc.fetch('paths', {}), components)
-  bury(doc, path, components.items) unless components.items.empty?
+  Common.bury(doc, path, components.items) unless components.items.empty?
 
-  dump_result(output_name, doc, 3)
+  Common.dump_result(output_name, doc, 3)
 end
 
 exit(main) if defined?($unit_test).nil?

data/bin/openapi-addschemas

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2024 Ismo Kärkkäinen
+# Copyright © 2024-2025 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require_relative '../lib/apiobjects'
-require_relative '../lib/common'
+require_relative '../lib/openapi/sourcetools/apiobjects'
+require_relative '../lib/openapi/sourcetools/common'
 require 'optparse'
-require 'yaml'
+include OpenAPISourceTools
 
 
 def remove_subitem(obj, path)
@@ -39,6 +39,7 @@ def replace_inlines(obj, components, top_level_name = nil)
   t = obj['type']
   if t.nil? # Some kind of intermediate-level object.
     (obj.keys.sort! { |a, b| a.to_s <=> b.to_s }).each do |key|
+      next if key == 'securitySchemes'
       return false unless replace_inlines(obj[key], components)
     end
     return true
@@ -68,7 +69,7 @@ def replace_anchor_refs(obj, components)
   return unless obj.is_a?(Hash)
   r = obj['$ref']
   obj['$ref'] = components.anchor_ref_replacement(r) unless r.nil?
-  obj.values.each do |value|
+  obj.each_value do |value|
     # Loops over $ref value but that is a string so nothing done to it.
     replace_anchor_refs(value, components)
   end
@@ -78,7 +79,7 @@ def main
   input_name = nil
   output_name = nil
   path = %w[components schemas]
-  components = Components.new(path, 'Schema')
+  components = ApiObjects::Components.new(path, 'Schema')
 
   parser = OptionParser.new do |opts|
     opts.summary_indent = '  '
@@ -105,7 +106,7 @@ Loads API document in OpenAPI format and adds a schema for each inline type.
   end
   parser.order!
 
-  doc = load_source(input_name)
+  doc = Common.load_source(input_name)
   return 2 if doc.nil?
 
   # Find schema object and remove it temporarily to prevent being
@@ -118,10 +119,10 @@ Loads API document in OpenAPI format and adds a schema for each inline type.
   end
   return 4 unless replace_inlines(doc, components)
   components.alter_anchors
-  bury(doc, path, components.items) unless components.items.empty?
+  Common.bury(doc, path, components.items) unless components.items.empty?
   replace_anchor_refs(doc, components)
 
-  dump_result(output_name, doc, 3)
+  Common.dump_result(output_name, doc, 3)
 end
 
 exit(main) if defined?($unit_test).nil?

data/bin/openapi-addsecurityschemes

@@ -0,0 +1,108 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Copyright © 2025 Ismo Kärkkäinen
+# Licensed under Universal Permissive License. See LICENSE.txt.
+
+require_relative '../lib/openapi/sourcetools/apiobjects'
+require_relative '../lib/openapi/sourcetools/common'
+require 'optparse'
+include OpenAPISourceTools
+
+
+def add_combinations(combinations, security)
+  security.each do |s|
+    subset = s.keys.sort!
+    next if subset.empty?
+    combinations.add(subset)
+  end
+end
+
+def gather_security(doc)
+  combinations = Set.new
+  security = doc.fetch('security', [])
+  add_combinations(combinations, security)
+  operation_objects = []
+  doc.fetch('paths', {}).each_value do |item|
+    oos = ApiObjects.operation_objects(item).values
+    oos.each do |oo|
+      add_combinations(combinations, oo['security'] || [])
+      operation_objects.push(oo)
+    end
+  end
+  [security, operation_objects, combinations]
+end
+
+def check_security(doc, combinations)
+  singles = Set.new
+  combinations.each do |c|
+    c.each do |s|
+      singles.add(s)
+    end
+  end
+  available = Set.new((doc.dig('components', 'securitySchemes') || {}).keys)
+  missing = false
+  singles.each do |s|
+    unless available.include?(s)
+      $stderr.puts "Security scheme unavailable: #{s}"
+      missing = true
+    end
+  end
+  !missing
+end
+
+def namelist2security(item)
+  item.keys.sort!.join(' ')
+end
+
+def security2hash(security)
+  out = {}
+  security.each { |s| out[namelist2security(s)] = s }
+  out
+end
+
+def add_security_to_operations(operation_objects, top_level_security)
+  operation_objects.each do |oo|
+    sec = security2hash(oo['security'] || top_level_security)
+    oo['security'] = sec.keys.sort!.map { |k| Marshal.load(Marshal.dump(sec[k])) }
+  end
+end
+
+def main
+  input_name = nil
+  output_name = nil
+
+  parser = OptionParser.new do |opts|
+    opts.summary_indent = '  '
+    opts.summary_width = 26
+    opts.banner = 'Usage: openapi-addsecurityschemes [options]'
+    opts.separator ''
+    opts.separator 'Options:'
+    opts.on('-i', '--input FILE', 'Read API spec from FILE, not stdin.') do |f|
+      input_name = f
+    end
+    opts.on('-o', '--output FILE', 'Output to FILE, not stdout.') do |f|
+      output_name = f
+    end
+    opts.on('-h', '--help', 'Print this help and exit.') do
+      $stdout.puts %(#{opts}
+
+Loads API document in OpenAPI format and moves security schemes under components and
+replaces the original with reference.
+)
+      exit 0
+    end
+  end
+  parser.order!
+
+  doc = Common.load_source(input_name)
+  return 2 if doc.nil?
+
+  security, operation_objects, combinations = gather_security(doc)
+  return 4 unless check_security(doc, combinations)
+  add_security_to_operations(operation_objects, security)
+
+  Common.dump_result(output_name, doc, 3)
+end
+
+exit(main) unless defined?($unit_test)

data/bin/openapi-checkschemas

@@ -1,18 +1,19 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2024 Ismo Kärkkäinen
+# Copyright © 2024-2025 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require_relative '../lib/apiobjects'
-require_relative '../lib/common'
+require_relative '../lib/openapi/sourcetools/apiobjects'
+require_relative '../lib/openapi/sourcetools/common'
 require 'optparse'
 require 'yaml'
+include OpenAPISourceTools
 
 
 def typesame(a, b, ignored_keys)
-  return same(a, b, ignored_keys) unless a['type'] == 'object'
-  return same(a, b, ignored_keys) unless b['type'] == 'object'
+  return ApiObjects.same(a, b, ignored_keys) unless a['type'] == 'object'
+  return ApiObjects.same(a, b, ignored_keys) unless b['type'] == 'object'
   # For each property in a, find out unused mathing property in b that is
   # also either required or not.
   # Requiring property affects e.g. C++ by allowing direct membership or
@@ -54,7 +55,7 @@ def gather_equivalencies(components)
   (order.size - 1).times do |k|
     item = components.items[order[k]]
     ((k + 1)...order.size).each do |n|
-      if same(item, components.items[order[n]], components.ignored_keys)
+      if ApiObjects.same(item, components.items[order[n]], components.ignored_keys)
         result[order[k]].push(order[n])
         result[order[n]].push(order[k])
       end
@@ -120,7 +121,7 @@ def drop_untouched(refs, report, prefix)
   %w[equivalent typematch].each do |s|
     r = report[s]
     next if r.nil?
-    r.keys.each { |k| touched.add("#{prefix}#{k}") }
+    r.each_key { |k| touched.add("#{prefix}#{k}") }
   end
   refs.delete_if { |k, _v| !touched.member?(k) }
 end
@@ -135,7 +136,7 @@ def main
   input_name = nil
   output_name = nil
   path = %w[components schemas]
-  components = Components.new(path, '')
+  components = ApiObjects::Components.new(path, '')
   equivalent = true
   typematch = false
   references = false
@@ -154,19 +155,19 @@ def main
     opts.on('-o', '--output FILE', 'Output to FILE, not stdout.') do |f|
       output_name = f
     end
-    opts.on('-e', '--[no-]equivalent', "Report equivalent schemas, default #{yesno(equivalent)}") do |b|
+    opts.on('-e', '--[no-]equivalent', "Report equivalent schemas, default #{Common.yesno(equivalent)}") do |b|
       equivalent = b
     end
-    opts.on('-t', '--[no-]typematch', "Report typematch schemas, default #{yesno(typematch)}") do |b|
+    opts.on('-t', '--[no-]typematch', "Report typematch schemas, default #{Common.yesno(typematch)}") do |b|
       typematch = b
     end
-    opts.on('-r', '--[no-]reference', "Report schema references, default #{yesno(references)}") do |b|
+    opts.on('-r', '--[no-]reference', "Report schema references, default #{Common.yesno(references)}") do |b|
       references = b
     end
-    opts.on('-c', '--[no-]count', "Report schema reference counts, default #{yesno(count)}") do |b|
+    opts.on('-c', '--[no-]count', "Report schema reference counts, default #{Common.yesno(count)}") do |b|
       count = b
     end
-    opts.on('-k', '--[no-]keep', "Keep all schema references/counts, default #{yesno(keep)}") do |b|
+    opts.on('-k', '--[no-]keep', "Keep all schema references/counts, default #{Common.yesno(keep)}") do |b|
       keep = b
     end
     components.add_options(opts)
@@ -193,7 +194,7 @@ input, as inlined types in requests, for example, are ignored.
   end
   parser.order!
 
-  doc = load_source(input_name)
+  doc = Common.load_source(input_name)
   return 2 if doc.nil?
 
   components.items = doc.dig(*path) || {}
@@ -210,7 +211,7 @@ input, as inlined types in requests, for example, are ignored.
   end
   # Filter reference counts that are not for type in equivalent or typematch.
   # Could check for pretty-printed output format here.
-  dump_result(output_name, YAML.dump(report, line_width: 80), 3)
+  Common.dump_result(output_name, YAML.dump(report, line_width: 80), 3)
 end
 
 exit(main) if defined?($unit_test).nil?

data/bin/openapi-frequencies

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021-2024 Ismo Kärkkäinen
+# Copyright © 2021-2025 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require_relative '../lib/common'
+require_relative '../lib/openapi/sourcetools/apiobjects'
+require_relative '../lib/openapi/sourcetools/common'
 require 'optparse'
-require 'yaml'
+include OpenAPISourceTools
 
 def main
   input_name = nil
@@ -32,47 +33,44 @@ def main
       $stdout.puts %(#{opts}
 
 Matches given OpenAPI document file paths with paths from file and adds
-into each path object matching count as "freq".
+into each path object matching count as "x-openapi-sourcetools-freq".
 )
       exit 0
     end
   end
   parser.order!
 
-  return aargh('Path log file name must be given.', 1) if paths_name.nil?
+  return Common.aargh('Path log file name must be given.', 1) if paths_name.nil?
 
-  doc = load_source(input_name)
+  doc = Common.load_source(input_name)
   return 2 if doc.nil?
 
+  doc['paths'].each do |path, item|
+    item[:path] = ApiObjects::ServerPath.new(Common.split_path(path, true))
+    item['x-openapi-sourcetools-freq'] = 0
+  end
+
   begin
     # Expect one path per line with nothing else. Query is allowed and ignored.
     f = File.new(paths_name, 'rt')
     f.each_line do |line|
-      p = ServerPath.new(split_path(line))
-      doc['paths'].each_value do |info|
-        next unless (p <=> info['parts']).zero?
-        info['freq'] = info.fetch('freq', 0) + 1
-        # Lookalikes are the others that can be matched, since path has no
-        # variables so any change in fixed parts (not a lookalike) will be a
-        # mismatch with path.
-        info['lookalike'].each do |path|
-          cand = doc['paths'][path]
-          next unless (p <=> cand['parts']).zero?
-          cand['freq'] = cand.fetch('freq', 0) + 1
-        end
-        break
+      p = ApiObjects::ServerPath.new(Common.split_path(line))
+      doc['paths'].each_value do |item|
+        item['x-openapi-sourcetools-freq'] += 1 if p.compare(item[:path]).zero?
       end
     end
     f.close
   rescue Errno::ENOENT
-    return aargh("Could not read path log file: #{paths_name}", 4)
-  rescue NoMethodError
-    return aargh('Is input file an output of openapi-processpaths?', 5)
+    return Common.aargh("Could not read path log file: #{paths_name}", 4)
   rescue StandardError => e
-    return aargh(e.to_s, 6)
+    return Common.aargh(e.to_s, 6)
+  end
+
+  doc['paths'].each_value do |item|
+    item.delete(:path)
   end
 
-  dump_result(output_name, YAML.dump(doc), 3)
+  Common.dump_result(output_name, doc, 3)
 end
 
-exit(main) if defined?($unit_test).nil?
+exit(main) unless defined?($unit_test)

data/bin/openapi-generate

@@ -1,24 +1,24 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021-2024 Ismo Kärkkäinen
+# Copyright © 2021-2025 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require_relative '../lib/common'
-require_relative '../lib/loaders'
-require_relative '../lib/gen'
-require_relative '../lib/generate'
+require_relative '../lib/openapi/sourcetools/common'
+require_relative '../lib/openapi/sourcetools/loaders'
+require_relative '../lib/openapi/sourcetools/gen'
+require_relative '../lib/openapi/sourcetools/generate'
 require 'optparse'
-require 'yaml'
 
 
 def main
   input_name = nil
   output_dir = nil
+  config_prefix = 'openapi-generate'
 
   parser = OptionParser.new do |opts|
     opts.summary_indent = '  '
-    opts.summary_width = 26
+    opts.summary_width = 20
     opts.banner = 'Usage: openapi-generate [options] generator-names...'
     opts.separator ''
     opts.separator 'Options:'
@@ -28,13 +28,16 @@ def main
     opts.on('-o', '--outdir DIR', 'Output directory.') do |d|
       output_dir = d
     end
+    opts.on('-c', '--config', "Internal configuration prefix, default: #{config_prefix}") do |c|
+      config_prefix = c
+    end
     opts.on('-h', '--help', 'Print this help and exit.') do
       $stdout.puts %(#{opts}
 Loads API document in OpenAPI format and generator names. Built-in generator
 or additional document loaders accept the following:
-#{Loaders.document.strip}
+#{OpenAPISourceTools::Loaders.document.strip}
 
-During load each generator can add and modify tasks via Gen module:
+During load each generator can add and modify tasks via Gen singleton:
 #{Gen.document.strip}
 
 After all generators have loaded succesfully, tasks are run.
@@ -44,15 +47,15 @@ After all generators have loaded succesfully, tasks are run.
   end
   parser.order!
 
-  return aargh('Generator names must be given.', 1) if ARGV.empty?
+  return OpenAPISourceTools::Common.aargh('Generator names must be given.', 1) if ARGV.empty?
+  return OpenAPISourceTools::Common.aargh("Not a directory: #{output_dir}", 3) unless File.directory?(output_dir)
 
-  a = load_source(input_name)
+  a = OpenAPISourceTools::Common.load_source(input_name)
   return 2 if a.nil?
-  return aargh("Not a directory: #{output_dir}", 3) unless File.directory?(output_dir)
-  gen = Generator.new(a, input_name, output_dir)
+  gen = OpenAPISourceTools::Generator.new(a, input_name, output_dir, config_prefix)
   ec = gen.load(ARGV)
   return ec unless ec.zero?
   gen.run
 end
 
-exit(main) if defined?($unit_test).nil?
+exit(main) unless defined?($unit_test)

data/bin/openapi-merge

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021-2024 Ismo Kärkkäinen
+# Copyright © 2021-2025 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require_relative '../lib/common'
+require_relative '../lib/openapi/sourcetools/common'
 require 'optparse'
-require 'yaml'
 require 'set'
+include OpenAPISourceTools
 
 def raise_se(message)
   raise StandardError, message
@@ -149,16 +149,16 @@ allowed only to append to the merged document, not re-define anything in it.
   max_depths['tags'] = 1
   merged = {}
   ARGV.each do |filename|
-    s = load_source(filename)
+    s = Common.load_source(filename)
     return 2 if s.nil?
     add_undefined(merged, s, filename, [], max_depths)
   rescue StandardError => e
-    return aargh(e.to_s, 4)
+    return Common.aargh(e.to_s, 4)
   end
 
   prune(merged) unless keep
 
-  dump_result(output_file, YAML.dump(merged), 3)
+  Common.dump_result(output_file, merged, 3)
 end
 
 exit(main) if defined?($unit_test).nil?