database_consistency 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 482d9a79d349bbe6d49233cf8ffb05accbf61c9d30db72b8e2d9c5d5517602a6
-  data.tar.gz: 14309f3ef7aab0e6aa0d20e4f9a0c0148a2be89e30d09235fb558cc55085d38d
+  metadata.gz: 2a742a08f374228e004b155fef15ec5ddaa23404c5aacf42b462eb2cb82ba09a
+  data.tar.gz: 8359e199cdbb89fc9d4b8700728bbef938d2d90a1474e4c2400c2aaa6d31f28f
 SHA512:
-  metadata.gz: 7abe1d2b81e1f557b20da7c61a33c9fab8ebe709dd459e78ec16c4b088b3a457b094985428d72f882c6e946d028a444bfaf6aa1058764f03aef6bb54c2ecd89c
-  data.tar.gz: d2b930d6d7a0f639c9f7f139f207d90df85af5409d918d77cf7f3c781602844220996eb3fef6639f0c490f33235efa74f92817a254eb5ee4930ec429c4a4c02d
+  metadata.gz: 962c814731ed2c85427e4b3e765df897c8cd8574f6075e3566e65b72af5effa370a14593019748ff9833a9658a0e55841219acdf3fe9caf212aa9db4bc426df3
+  data.tar.gz: df3aab9a1b6b5d5b2a815ad237b76ff3ffe127cd7921050c09a57e5f53e08087344ad5777224a603c52978382f6568c0c8a19c16038863cb759cac147bb7f9be

data/bin/database_consistency

@@ -1,27 +1,52 @@
 #!/usr/bin/env ruby
 
+require_relative '../lib/database_consistency/configuration'
+
+default_config = DatabaseConsistency::Configuration::DEFAULT_PATH
+
 if ARGV.include?('install')
-  require_relative '../lib/database_consistency/configuration'
-  config_filename = DatabaseConsistency::Configuration::CONFIGURATION_PATH
-  file_exists = File.exists?(config_filename)
+  require 'pathname'
+
+  file_exists = File.exists?(default_config)
   rules = Pathname.new(__FILE__).dirname.join('..', 'lib', 'database_consistency', 'templates', 'rails_defaults.yml').read
-  if file_exists && File.foreach(config_filename).grep(Regexp.new(rules.lines.first.chomp)).any?
-    puts "#{config_filename} is already present"
+  if file_exists && File.foreach(default_config).grep(Regexp.new(rules.lines.first.chomp)).any?
+    puts "#{default_config} is already present"
   else
-    File.open(config_filename, 'a') do |file|
+    File.open(default_config, 'a') do |file|
       file << "\n" * 2 if file_exists
       file << rules
     end
-    puts "#{config_filename} #{file_exists ? 'updated' : 'added'}"
+    puts "#{default_config} #{file_exists ? 'updated' : 'added'}"
   end
   exit 0
-else
-  base_dir = File.join(Dir.pwd, ARGV.first.to_s)
-  unless File.realpath(base_dir).start_with?(Dir.pwd)
-    puts "\nWarning! You are going out of current directory, ruby version may be wrong and some gems may be missing.\n"
+end
+
+require 'optparse'
+
+config = [default_config]
+opt_parser = OptionParser.new do |opts|
+  opts.banner = <<-DESC
+  Usage: database_consistency install - run installation
+         database_consistency [options]
+  DESC
+
+  opts.on('-cFILE', '--config=FILE', 'Use additional configuration file') do |f|
+    config << f
+  end
+
+  opts.on('-h', '--help', 'Prints this help') do
+    puts opts
+    exit
   end
 end
 
+opt_parser.parse!
+
+base_dir = File.join(Dir.pwd, ARGV.first.to_s)
+unless File.realpath(base_dir).start_with?(Dir.pwd)
+  puts "\nWarning! You are going out of current directory, ruby version may be wrong and some gems may be missing.\n"
+end
+
 # Load Rails project
 begin
   require File.join(base_dir, 'config', 'boot')
@@ -41,5 +66,5 @@ $LOAD_PATH.unshift(File.expand_path('lib', __dir__))
 require 'database_consistency'
 
 # Process checks
-code = DatabaseConsistency.run
+code = DatabaseConsistency.run(config)
 exit code

data/lib/database_consistency/configuration.rb

@@ -5,15 +5,20 @@ require 'yaml'
 module DatabaseConsistency
   # The class to access configuration options
   class Configuration
-    CONFIGURATION_PATH = '.database_consistency.yml'
-
-    def initialize(filepath = CONFIGURATION_PATH)
-      @configuration = if filepath && File.exist?(filepath)
-                         data = YAML.load_file(filepath)
-                         data.is_a?(Hash) ? data : {}
-                       else
-                         {}
-                       end
+    DEFAULT_PATH = '.database_consistency.yml'
+
+    def initialize(filepaths = DEFAULT_PATH)
+      @configuration = Array(filepaths).each_with_object({}) do |filepath, result|
+        content =
+          if filepath && File.exist?(filepath)
+            data = YAML.load_file(filepath)
+            data.is_a?(Hash) ? data : {}
+          else
+            {}
+          end
+
+        combine_configs!(result, content)
+      end
     end
 
     def debug?
@@ -48,6 +53,16 @@ module DatabaseConsistency
 
     attr_reader :configuration
 
+    def combine_configs!(config, new_config)
+      config.merge!(new_config) do |_key, val, new_val|
+        if val.is_a?(Hash) && new_val.is_a?(Hash)
+          combine_configs!(val, new_val)
+        else
+          new_val
+        end
+      end
+    end
+
     def settings
       @settings ||= configuration['DatabaseConsistencySettings']
     end

data/lib/database_consistency/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatabaseConsistency
-  VERSION = '1.1.6'
+  VERSION = '1.1.7'
 end

data/lib/database_consistency.rb

@@ -48,8 +48,8 @@ require 'database_consistency/processors/indexes_processor'
 # The root module
 module DatabaseConsistency
   class << self
-    def run
-      configuration = Configuration.new
+    def run(*args)
+      configuration = Configuration.new(*args)
       reports = Processors.reports(configuration)
 
       Writers::SimpleWriter.write(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord