hospital 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c2d250697eb93225f8674b4374369688af80a6d32efcbfc70406ae2130d0bba
-  data.tar.gz: bb30e0f93629c922d9723c943061e9dddad28fcab7406ab24496cd5f893a5b6d
+  metadata.gz: 3dda421b0e01757d0328884312ef0eb7f3e0f56c93a50ae928b64d2621796578
+  data.tar.gz: f56bb16f35eef2b3211a47fefc2c514b17e0b894f9c6e483fcb0819e914d0b76
 SHA512:
-  metadata.gz: 6ca63659e83bd3a662612b41b2a645776ca06132241fd5033c169f8fb4be1547445fb34e2160731adced86f7ba6a8995f92a6d1fa573751002ce6d2c85869c70
-  data.tar.gz: 91f8b05eddcbfc0fbbc1cb44b7d9a0c340312207267bd4589237480f9fd95a5473af493d0c274d4231c6aaa914fb2820b7e3985039b1ad089eb523764d5ce89c
+  metadata.gz: 97048efd58fa3d4a758bffca77386b3dd5b94569b2eb953b5087410f5bee68b3fdef7b4cf70b5045e5e094e82e0833100825d88f363846c3b38229df39408fa0
+  data.tar.gz: 4ce02585d62f4fa93d2a2cb03a22abc1be5aa545cbd3157226afcb20dd4ac390a813ad136c98e3608f33dc564d17fcc15fab3266240196da21956c98ac740727

data/lib/hospital/checkup.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Hospital
+  class Checkup
+    attr_reader :code, :condition, :diagnosis, :group, :skipped, :klass, :precondition
+
+    def initialize klass, code, group: :general, title: nil, condition: -> { true }, precondition: false
+      @klass        = klass
+      @code         = code
+      @group        = group
+      @condition    = condition
+      @diagnosis    = Hospital::Diagnosis.new([klass.to_s, title].compact.join(' - '))
+      @precondition = precondition
+    end
+
+    def reset_diagnosis
+      diagnosis.reset
+    end
+
+    def check verbose: false
+      diagnosis.reset
+
+      if condition.nil? || condition.call
+        @skipped = false
+        code.call(diagnosis)
+        diagnosis
+      else
+        @skipped = true
+        nil
+      end
+    rescue StandardError => e
+      diagnosis.add_error "Unrescued exception in #{klass}.checkup:\n#{e.full_message}.\nThis is a bug inside the checkup method that should be fixed!"
+    end
+
+    def success?
+      diagnosis.success?
+    end
+  end
+end

data/lib/hospital/checkup_group.rb

@@ -0,0 +1,53 @@
+require_relative "formatter"
+
+using Formatter
+
+module Hospital
+  class CheckupGroup
+    attr_reader :name, :checkups, :precondition_checkups, :skipped
+
+    def initialize name
+      @name                   = name
+      @precondition_checkups  = []
+      @checkups               = []
+      @skipped                = false
+    end
+
+    def all_checkups
+      @precondition_checkups + @checkups
+    end
+
+    def header
+      "\n### #{name.to_s.capitalize.gsub(/_/, ' ')} checks".h1
+    end
+
+    def add_checkup checkup
+      if checkup.precondition
+        @precondition_checkups << checkup
+      else
+                     @checkups << checkup
+      end
+    end
+
+    def run_checkups verbose: false
+      run_precondition_checkups verbose: verbose
+
+      unless @skipped
+        run_dependent_checkups verbose: verbose
+      end
+    end
+
+    def run_precondition_checkups verbose: false
+      @precondition_checkups.each do |checkup|
+        checkup.check verbose: verbose
+        @skipped = true unless checkup.success?
+      end
+    end
+
+    def run_dependent_checkups verbose: false
+      @checkups.each do |checkup|
+        checkup.check verbose: verbose
+      end
+    end
+  end
+end

data/lib/hospital/diagnosis.rb

@@ -1,5 +1,9 @@
-class Hospital::Diagnosis  
-  attr_reader :infos, :warnings, :errors, :name, :results
+require_relative "formatter"
+
+using Formatter
+
+class Hospital::Diagnosis
+  attr_reader :infos, :warnings, :skips, :errors, :name, :results
 
   def initialize name
     @name = name.to_s
@@ -9,6 +13,7 @@ class Hospital::Diagnosis
   def reset
     @infos    = []
     @warnings = []
+    @skips    = []
     @errors   = []
     @results  = []
   end
@@ -44,8 +49,8 @@ class Hospital::Diagnosis
       "#{prefix} #{message.gsub(/\n\z/, '').gsub(/\n/, prefix ? "\n   " : "\n")}"
     end
 
-    def put 
-      puts output
+    def put
+      puts output.indented
     end
   end
 
@@ -54,11 +59,15 @@ class Hospital::Diagnosis
   end
 
   class Warning < Result
-    def prefix; '🟠'; end
+    def prefix; '🟠' end
+  end
+
+  class Skip < Result
+    def prefix; '🟠' end
   end
 
   class Error < Result
-    def prefix; '🔴'; end
+    def prefix; '🔴' end
   end
 
   def add_info message
@@ -73,6 +82,12 @@ class Hospital::Diagnosis
     @results  << warning
   end
 
+  def add_skip message
+    skip = Skip.new message
+    @skips    << skip
+    @results  << skip
+  end
+
   def add_error message
     error = Error.new message
     @errors   << error
@@ -82,4 +97,14 @@ class Hospital::Diagnosis
   def put_results
     results.each &:put
   end
+
+  def success?
+    errors.count == 0 && skips.count == 0
+  end
+
+  def on_success_message message
+    if success?
+      add_info message
+    end
+  end
 end

data/lib/hospital/formatter.rb

@@ -1,11 +1,19 @@
 module Formatter
   refine String do
+    def bold
+      "\e[1m#{self}\e[0m"
+    end
+
+    def underline
+      "\e[4m#{self}\e[0m"
+    end
+
     def h1
-      "\n\e[4m\e[1m#{self}\e[0m"
+      "\n#{self}".underline.bold
     end
 
     def h2
-      "\n\e[4m#{self}\e[0m"
+      "\n#{self}".underline
     end
 
     def red
@@ -15,5 +23,9 @@ module Formatter
     def yellow
       "\e[33m#{self}\e[0m"
     end
+
+    def indented
+      "#{self}"
+    end
   end
 end

data/lib/hospital/tasks/checkup.rake

@@ -4,15 +4,6 @@ require_relative '../../hospital'
 
 desc 'Check system setup sanity.'
 task :doctor, [:verbose] => :environment do |t, args|
-  # at_exit { Rake::Task['doctor:summary'].invoke if $!.nil? }
-
-  ActiveRecord::Base.connection_pool.disconnect!
-  ActiveSupport.on_load(:active_record) do
-    config = ActiveRecord::Base.configurations[Rails.env]
-    config['pool'] = 100
-    ActiveRecord::Base.establish_connection(config)
-  end
-  
   verbose = args[:verbose] == "true"
 
   # silence warnings about double constant definitions
@@ -20,7 +11,7 @@ task :doctor, [:verbose] => :environment do |t, args|
     p "eager load all classes" if verbose
     Rails.application.eager_load!
   end
-  
+
   p "start checkup" if verbose
   Hospital.do_checkup_all verbose: verbose
 end

data/lib/hospital/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hospital
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/hospital.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
+require "byebug"
 require_relative "hospital/version"
+require_relative "hospital/checkup"
+require_relative "hospital/checkup_group"
 require_relative "hospital/diagnosis"
 require_relative "hospital/formatter"
 
@@ -11,38 +14,7 @@ module Hospital
 
   class Error < StandardError; end
 
-  class Checkup 
-    attr_reader :code, :condition, :diagnosis, :group, :skipped, :klass
-
-    def initialize klass, code, group: :general, title: nil, condition: -> { true }
-      @klass      = klass
-      @code       = code
-      @group      = group
-      @condition  = condition
-      @diagnosis  = Hospital::Diagnosis.new([klass.to_s, title].compact.join(' - '))
-    end
-
-    def reset_diagnosis
-      diagnosis.reset
-    end
-
-    def check verbose: false
-      diagnosis.reset
-
-      if condition.nil? || condition.call
-        @skipped = false
-        code.call(diagnosis)
-        diagnosis
-      else
-        @skipped = true
-        nil
-      end
-    rescue StandardError => e
-      diagnosis.add_error "Unrescued exception in #{klass}.checkup:\n#{e.inspect}.\nThis is a bug inside the checkup method that should be fixed!"
-    end
-  end
-
-  @@checkups = {}
+  @@groups = []
 
   class << self
 
@@ -50,40 +22,24 @@ module Hospital
       raise Hospital::Error.new("Cannot include Hospital, please extend instead.")
     end
 
-    def extended(klass)
-      # only relevant if the class does not yet define a real checkup method
-      @@checkups[klass] = Checkup.new klass, -> (diagnosis) do
-        diagnosis.add_warning("#{klass}: No checks defined! Please call checkup with a lambda.")
-      end, group: :general
-    end
-
     def do_checkup_all verbose: false
       errcount  = 0
       warcount  = 0
 
-      threads = @@checkups.map do |klass, checkup|
-        Thread.new do
-          Thread.current.report_on_exception = false
-          checkup.check(verbose: verbose)
-        end
-      end
-
-      threads.each &:join
+      @@groups.each do |group|
+        puts group.header
+        group.run_checkups verbose: verbose
 
-      @@checkups.group_by{|klass, checkup| checkup.group}.map do |group, checkups|
-        puts group_header(group)
-        first = false
-
-        checkups.each do |klass, checkup|
+        group.all_checkups.each do |checkup|
           if diagnosis = checkup.diagnosis
             errcount += diagnosis.errors.count
             warcount += diagnosis.warnings.count
 
             if !checkup.skipped
-              puts "Checking #{diagnosis.name}:".h2
+              puts "Checking #{diagnosis.name}:".h2.indented
               diagnosis.put_results
             elsif verbose
-              puts "Skipped #{diagnosis.name}.".h2
+              puts "Skipped #{diagnosis.name}.".h2.indented
             end
           end
         end
@@ -98,17 +54,33 @@ module Hospital
     end
 
     # used to call the checkup for a specific class directly (in specs)
-    def do_checkup(klass)
-      @@checkups[klass].check
+    def do_checkup(klass, verbose: false)
+      @@groups.map(&:all_checkups).flatten.select{|cu| cu.klass == klass }.map do |cu|
+        cu.check verbose: verbose
+      end
     end
 
-    def group_header group
-      "### #{group.to_s.capitalize.gsub(/_/, ' ')} checks".h1
+    def find_or_create_checkup_group name
+      unless checkup_group = @@groups.detect{|g| g.name == name }
+        checkup_group = CheckupGroup.new name
+        @@groups << checkup_group
+      end
+      checkup_group
     end
   end
 
-  def checkup if: -> { true }, group: :general, title: nil, &code
-    @@checkups[self] = Checkup.new self, code, group: group, title: title, condition: binding.local_variable_get('if')
+  def checkup if: -> { true }, group: :general, title: nil, precondition: false, &code
+    checkup_group = Hospital.find_or_create_checkup_group group
+    checkup = Checkup.new(
+      self,
+      code,
+      group:        group,
+      title:        title,
+      condition:    binding.local_variable_get('if'),
+      precondition: precondition
+    )
+
+    # p "adding #{checkup.inspect} to #{group}"
+    checkup_group.add_checkup checkup
   end
-
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: hospital
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Alexander
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-26 00:00:00.000000000 Z
-dependencies: []
+date: 2024-01-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Imagine a team of little doctors creating diagnoses and creating a useful
   report.
 email:
@@ -21,6 +49,8 @@ files:
 - LICENSE.txt
 - README.md
 - lib/hospital.rb
+- lib/hospital/checkup.rb
+- lib/hospital/checkup_group.rb
 - lib/hospital/diagnosis.rb
 - lib/hospital/formatter.rb
 - lib/hospital/tasks/checkup.rake