openapi-sourcetools 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 211083083a2a3c53321234416ffff41bd1d00320a5ebbdab3ccdcd49576653b3
-  data.tar.gz: 34535443138a6308869974d62e79321d9ec9dbb3f46434c19d571075044751e1
+  metadata.gz: 783a57d4ca224bb9710cb523d3ee2fd2dee0e821cb7382ffc32fa9b8cb36b4f1
+  data.tar.gz: b7c02ac6cd2e30fc4f9f5d9fb87bfcd84b8f60b76007e82d82a1a1bfb7f37e42
 SHA512:
-  metadata.gz: 3c4a5361e25a1cf7903b6038a32f4a94cf42579c0c4fefb21f885fae996c219a02eef322fd91d694dfe0ff668314685b990d3128ca7e6a98c3f30660639494d0
-  data.tar.gz: a563ba480140037e0ef91dbdc89fb62a2175954897726717976760879a74bf8284d673d3a259ce338b7b7493c84fd6c1f5cf4246b90ee42ae1959d3b31c7b21f
+  metadata.gz: eec2859f712324b85f9db32f5c92d4e3947a80021f9bf920f287f9b01a2a56ab7d20e3f2b5d30e039a2e606e57b4ca0f0b5872961e91f1898c44c402eade14ef
+  data.tar.gz: 72bbafa47688fd1eb3dd78d1ff0782d8e1a3510e541e4ad4f4e49ceec056cedaf9c6ebbbbe4dd9c7c6b446f3c0dd4c22d54a23afb0bacfa8f5dea33fe751e55a

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,9 +31,8 @@ def main
   input_name = nil
   output_name = nil
   path = %w[components headers]
-  components = Components.new(path, 'Header')
+  components = ApiObjects::Components.new(path, 'Header')
 
-  ENV['POSIXLY_CORRECT'] = '1'
   parser = OptionParser.new do |opts|
     opts.summary_indent = '  '
     opts.summary_width = 26
@@ -42,7 +42,7 @@ def main
     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|
+    opts.on('-o', '--output FILE', 'Output to FILE, not stdout.') do |f|
       output_name = f
     end
     components.add_options(opts)
@@ -57,17 +57,17 @@ replaces the original with reference.
       exit 0
     end
   end
-  parser.parse!
+  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?
+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,13 +26,43 @@ 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')
 
-  ENV['POSIXLY_CORRECT'] = '1'
   parser = OptionParser.new do |opts|
     opts.summary_indent = '  '
     opts.summary_width = 26
@@ -42,9 +72,12 @@ def main
     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|
+    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}
@@ -52,21 +85,28 @@ 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
     end
   end
-  parser.parse!
+  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,9 +30,8 @@ def main
   input_name = nil
   output_name = nil
   path = %w[components responses]
-  components = Components.new(path, 'Response')
+  components = ApiObjects::Components.new(path, 'Response')
 
-  ENV['POSIXLY_CORRECT'] = '1'
   parser = OptionParser.new do |opts|
     opts.summary_indent = '  '
     opts.summary_width = 26
@@ -42,7 +41,7 @@ def main
     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|
+    opts.on('-o', '--output FILE', 'Output to FILE, not stdout.') do |f|
       output_name = f
     end
     components.add_options(opts)
@@ -57,16 +56,16 @@ replaces the original with reference.
       exit 0
     end
   end
-  parser.parse!
+  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?
+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)
@@ -17,7 +17,7 @@ def remove_subitem(obj, path)
   parent.delete(path.last) || {}
 end
 
-def replace_inlines(obj, components, top_level = false)
+def replace_inlines(obj, components, top_level_name = nil)
   if obj.is_a?(Array)
     obj.each do |o|
       return false unless replace_inlines(o, components)
@@ -25,8 +25,11 @@ def replace_inlines(obj, components, top_level = false)
     return true
   end
   return true unless obj.is_a?(Hash)
-  return true if obj.key?('$ref')
-  # Prior return would be the place to get rid of other keys if so desired.
+  if obj.key?('$ref')
+    components.store_anchor(obj)
+    # Here would be the place to get rid of other keys if so desired.
+    return true
+  end
   # Is inlined, process parts recursively.
   items = obj['allOf']
   items = obj['anyOf'] if items.nil?
@@ -36,6 +39,7 @@ def replace_inlines(obj, components, top_level = false)
   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
@@ -49,17 +53,34 @@ def replace_inlines(obj, components, top_level = false)
       return false unless replace_inlines(props[name], components)
     end
   end
-  obj.replace({ '$ref' => components.reference(obj) }) unless top_level
+  r = components.ref_string(top_level_name) || components.reference(obj)
+  components.store_anchor(obj, r)
+  obj.replace({ '$ref' => r }) if top_level_name.nil?
   true
 end
 
+def replace_anchor_refs(obj, components)
+  if obj.is_a?(Array)
+    obj.each do |o|
+      replace_anchor_refs(o, components)
+    end
+    return
+  end
+  return unless obj.is_a?(Hash)
+  r = obj['$ref']
+  obj['$ref'] = components.anchor_ref_replacement(r) unless r.nil?
+  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
+end
+
 def main
   input_name = nil
   output_name = nil
   path = %w[components schemas]
-  components = Components.new(path, 'Schema')
+  components = ApiObjects::Components.new(path, 'Schema')
 
-  ENV['POSIXLY_CORRECT'] = '1'
   parser = OptionParser.new do |opts|
     opts.summary_indent = '  '
     opts.summary_width = 26
@@ -69,7 +90,7 @@ def main
     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|
+    opts.on('-o', '--output FILE', 'Output to FILE, not stdout.') do |f|
       output_name = f
     end
     components.add_options(opts)
@@ -83,9 +104,9 @@ Loads API document in OpenAPI format and adds a schema for each inline type.
       exit 0
     end
   end
-  parser.parse!
+  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
@@ -93,12 +114,15 @@ Loads API document in OpenAPI format and adds a schema for each inline type.
   components.items = remove_subitem(doc, path)
   # Get rid of inlined types within existing schemas first.
   components.items.keys.sort!.each do |k|
-    return 4 unless replace_inlines(components.items[k], components, true)
+    components.add_schema_name(k)
+    return 4 unless replace_inlines(components.items[k], components, k)
   end
   return 4 unless replace_inlines(doc, components)
-  bury(doc, path, components.items) unless components.items.empty?
+  components.alter_anchors
+  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?
+exit(main) if defined?($unit_test).nil?

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,14 +136,13 @@ 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
   count = true
   keep = false
 
-  ENV['POSIXLY_CORRECT'] = '1'
   parser = OptionParser.new do |opts|
     opts.summary_indent = '  '
     opts.summary_width = 26
@@ -152,22 +152,22 @@ def main
     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|
+    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 #{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 #{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 #{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 #{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 #{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)
@@ -182,19 +182,19 @@ names differ but types match.
 
 Search is performed only at top schema level. References to equivalent types
 are not considered equivalent when references themselves are not equivalent.
-Any allOf, anyOf, oneOf checks merely check the refernces. Hence two different
+Any allOf, anyOf, oneOf checks merely check the references. Hence two different
 allOf schemas may in practice result in equivalent types and that is not
 detected.
 
 Implicit expectation is the openapi-addschemas has been used to process the
-input, as inlined types in requests for example are ignored.
+input, as inlined types in requests, for example, are ignored.
 )
       exit 0
     end
   end
-  parser.parse!
+  parser.order!
 
-  doc = load_source(input_name)
+  doc = Common.load_source(input_name)
   return 2 if doc.nil?
 
   components.items = doc.dig(*path) || {}
@@ -211,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?
+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.parse!
+  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,20 +1,20 @@
 #!/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 = '  '
@@ -28,11 +28,14 @@ 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:
 #{Gen.document.strip}
@@ -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?
 
-  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)
+  return OpenAPISourceTools::Common.aargh("Not a directory: #{output_dir}", 3) unless File.directory?(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)