database_consistency 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70ba9a02302f513c147cd81271d10fbb361b8d8dcb5d578c8c564adb72f85092
-  data.tar.gz: 1f1bb5d6af4ba890576f56196d40a3214aca8cbbca5fc854716db9c42f048dec
+  metadata.gz: 73fc6eabb9e2451dad6a2f238102f9eea3ee79ae7561c05649599e12301cacf3
+  data.tar.gz: f6251f161e8c5b2ce232c6632eb1176b9333d74b23c91a421ef21c9622ff85de
 SHA512:
-  metadata.gz: 3d5a79bf854a548cde49ba478d0ce25b9db0653a7dc726850c0dd39856da33eaaa3c382a01b360a8b3fbba865b59871fd097e2547989da42a899e035dfe04d43
-  data.tar.gz: 1bec8cabd5ee6380b74115856ed9956974048f43e0480e8e614f5d1391e1a14c03837b7b53b9df5ae92e5db50a666eb45850ea0a778a7cee9d993fa26201e148
+  metadata.gz: a5417be3a2afe6072884395e6fd54e3c9b4134f953d052d8c83b6cad8652c78f7db39c42a5b698cd6e1f6b7fab3cf8f0ae6316748e9eb1a816d684d57b6fbf17
+  data.tar.gz: c7844e3f18f15768b85e75c121328301b7f0d78e145c52485f1d27c577d35f531fffdbb078e6c33e2f35dca736849be18a11c4a52708a6092c954731ebdea033

data/bin/database_consistency

@@ -22,10 +22,6 @@ Rails.application.eager_load! if defined?(Rails)
 $LOAD_PATH.unshift(File.expand_path('lib', __dir__))
 require 'database_consistency'
 
-# Welcome message
-puts 'Thank you for using the gem. Any contribution is welcome https://github.com/djezzzl/database_consistency!'
-puts "(c) Evgeniy Demin <lawliet.djez@gmail.com>\n\n"
-
 # Process checks
 result = DatabaseConsistency.run
 exit result

data/lib/database_consistency.rb

@@ -35,7 +35,7 @@ module DatabaseConsistency
 
       Writers::SimpleWriter.write(
         reports,
-        ENV['LOG_LEVEL'] || 'INFO'
+        config: configuration
       )
 
       reports.empty? ? 0 : 1

data/lib/database_consistency/checkers/missing_index_checker.rb

@@ -34,9 +34,19 @@ module DatabaseConsistency
 
       def index
         @index ||= association.klass.connection.indexes(association.klass.table_name).find do |index|
-          index.columns[0] == association.foreign_key.to_s
+          index_keys(index) == association_keys
         end
       end
+
+      def association_keys
+        @association_keys ||= [association.foreign_key, association.type].compact.map(&:to_s).sort
+      end
+
+      def index_keys(index)
+        return unless index.columns.is_a?(Array)
+
+        index.columns[0...association_keys.size].sort
+      end
     end
   end
 end

data/lib/database_consistency/configuration.rb

@@ -16,6 +16,18 @@ module DatabaseConsistency
                        end
     end
 
+    def debug?
+      log_level.to_s.match?(/DEBUG/i)
+    end
+
+    def colored?
+      if ENV.key?('COLOR')
+        ENV['COLOR'].match?(/1|true|yes/)
+      else
+        settings && settings['color']
+      end
+    end
+
     # @return [Boolean]
     def enabled?(*path)
       current = configuration
@@ -35,5 +47,18 @@ module DatabaseConsistency
     private
 
     attr_reader :configuration
+
+    def settings
+      @settings ||= configuration['DatabaseConsistencySettings']
+    end
+
+    def log_level
+      @log_level ||=
+        if ENV.key?('LOG_LEVEL')
+          ENV['LOG_LEVEL']
+        else
+          settings && settings['log_level']
+        end
+    end
   end
 end

data/lib/database_consistency/version.rb

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

data/lib/database_consistency/writers/base_writer.rb

@@ -4,23 +4,19 @@ module DatabaseConsistency
   module Writers
     # The base class for writers
     class BaseWriter
-      attr_reader :results, :log_level
+      attr_reader :results, :config
 
-      def initialize(results, log_level)
+      def initialize(results, config: Configuration.new)
         @results = results
-        @log_level = log_level
+        @config = config
       end
 
       def write?(status)
-        status == :fail || debug?
+        status == :fail || config.debug?
       end
 
-      def debug?
-        log_level == 'DEBUG'
-      end
-
-      def self.write(results, log_level)
-        new(results, log_level).write
+      def self.write(results, config: Configuration.new)
+        new(results, config: config).write
       end
     end
   end

data/lib/database_consistency/writers/simple_writer.rb

@@ -5,22 +5,46 @@ module DatabaseConsistency
   module Writers
     # The simplest formatter
     class SimpleWriter < BaseWriter
+      COLORS = {
+        blue: "\e[34m",
+        yellow: "\e[33m",
+        green: "\e[32m",
+        red: "\e[31m"
+      }.freeze
+
       def write
-        puts format unless format.empty?
+        results.each do |result|
+          next unless write?(result.status)
+
+          puts msg(result)
+        end
+      end
+
+      def msg(result)
+        msg = "#{status_text(result)} #{key_text(result)} #{result.message}"
+        msg += " (checker: #{result.checker_name})" if config.debug?
+        msg
       end
 
-      def format
-        results.map do |result|
-          next unless write?(result[:status])
+      private
 
-          line(result)
-        end.tap(&:compact!).map(&:lstrip).delete_if(&:empty?).join("\n")
+      def key_text(result)
+        "#{colorize(result.table_or_model_name, :blue)} #{colorize(result.column_or_attribute_name, :yellow)}"
       end
 
-      def line(result)
-        s = "#{result.status} #{result.table_or_model_name} #{result.column_or_attribute_name} #{result.message}"
-        s += " (checker: #{result.checker_name})" if debug?
-        s
+      def status_text(result)
+        color = case result.status
+                when :ok then :green
+                when :fail then :red
+                end
+
+        colorize(result.status, color)
+      end
+
+      def colorize(text, color)
+        return text unless config.colored? && color
+
+        "#{COLORS[color]}#{text}\e[0m"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord