hospital 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dda421b0e01757d0328884312ef0eb7f3e0f56c93a50ae928b64d2621796578
-  data.tar.gz: f56bb16f35eef2b3211a47fefc2c514b17e0b894f9c6e483fcb0819e914d0b76
+  metadata.gz: 015cbd4e1cdf4fe514dae131d12ca4618f38f44794d32828f6142825df2b174c
+  data.tar.gz: 1e50476e5248f25d0035670e0e786afbf06c780c5d61789b841ad7a32c72470f
 SHA512:
-  metadata.gz: 97048efd58fa3d4a758bffca77386b3dd5b94569b2eb953b5087410f5bee68b3fdef7b4cf70b5045e5e094e82e0833100825d88f363846c3b38229df39408fa0
-  data.tar.gz: 4ce02585d62f4fa93d2a2cb03a22abc1be5aa545cbd3157226afcb20dd4ac390a813ad136c98e3608f33dc564d17fcc15fab3266240196da21956c98ac740727
+  metadata.gz: 045c39bff60f84dcb2dc691aa3a2892d902ca5270615721e91354ab60e327a4bca19412aeb508220787db60c867ea833175c155f270944e160e7dd69c5ec6f50
+  data.tar.gz: 19b21cf6489ac8cc2a192b96f39404f616cbeb00e82d401a33401b797afca657866b5721fae190b0f7653b09152e3b9680e91e9d7951082771b5b3547a42a007

data/lib/hospital/checkup.rb

@@ -4,13 +4,13 @@ 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
+    def initialize klass, code, 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
+      @group        = nil
     end
 
     def reset_diagnosis
@@ -35,5 +35,9 @@ module Hospital
     def success?
       diagnosis.success?
     end
+
+    def set_group group
+      @group = group
+    end
   end
 end

data/lib/hospital/checkup_group.rb

@@ -1,6 +1,6 @@
-require_relative "formatter"
+require_relative "string_formatter"
 
-using Formatter
+using StringFormatter
 
 module Hospital
   class CheckupGroup
@@ -18,10 +18,12 @@ module Hospital
     end
 
     def header
-      "\n### #{name.to_s.capitalize.gsub(/_/, ' ')} checks".h1
+      "#{name.to_s.capitalize.gsub(/_/, ' ')} checks"
     end
 
     def add_checkup checkup
+      checkup.set_group self
+
       if checkup.precondition
         @precondition_checkups << checkup
       else

data/lib/hospital/diagnosis.rb

@@ -1,6 +1,6 @@
-require_relative "formatter"
+require_relative "string_formatter"
 
-using Formatter
+using StringFormatter
 
 class Hospital::Diagnosis
   attr_reader :infos, :warnings, :skips, :errors, :name, :results
@@ -49,8 +49,8 @@ class Hospital::Diagnosis
       "#{prefix} #{message.gsub(/\n\z/, '').gsub(/\n/, prefix ? "\n   " : "\n")}"
     end
 
-    def put
-      puts output.indented
+    def put out
+      out.put_diagnosis_result output
     end
   end
 
@@ -94,8 +94,10 @@ class Hospital::Diagnosis
     @results  << error
   end
 
-  def put_results
-    results.each &:put
+  def put_results out
+    results.each do |result|
+      result.put out
+    end
   end
 
   def success?

data/lib/hospital/formatter/base.rb

@@ -0,0 +1,11 @@
+module Hospital
+  module Formatter
+    class Base
+      attr_reader :buffer
+
+      def initialize
+        @buffer = ""
+      end
+    end
+  end
+end

data/lib/hospital/formatter/pre.rb

@@ -0,0 +1,31 @@
+require_relative "base"
+
+using StringFormatter
+
+module Hospital
+  module Formatter
+    class Pre < Base
+      def put_group_header text
+        @buffer << "\n\n### #{text}"
+      end
+
+      def put_diagnosis_header text
+        @buffer << "\n\n## #{text}"
+      end
+
+      def put_summary errors_count, warnings_count
+        @buffer <<  <<~END
+          \n\n
+          #### Summary:
+          Errors:   #{errors_count}
+          Warnings: #{warnings_count}
+        END
+      end
+
+      def put_diagnosis_result text
+        @buffer << "\n#{text}"
+      end
+
+    end
+  end
+end

data/lib/hospital/formatter/shell.rb

@@ -0,0 +1,31 @@
+require_relative "base"
+
+using StringFormatter
+
+module Hospital
+  module Formatter
+    class Shell < Base
+      def put_group_header text
+        @buffer << "\n### #{text}".h1
+      end
+
+      def put_diagnosis_header text
+        @buffer << "\n#{text.h2.indented}"
+      end
+
+      def put_summary errors_count, warnings_count
+        @buffer <<  <<~END
+
+          #{"Summary:".h1}
+          #{"Errors:   #{errors_count}".red}
+          #{"Warnings: #{warnings_count}".yellow}
+        END
+      end
+
+      def put_diagnosis_result text
+        @buffer << "\n#{text.indented}"
+      end
+
+    end
+  end
+end

data/lib/hospital/{formatter.rb → string_formatter.rb}

@@ -1,4 +1,4 @@
-module Formatter
+module StringFormatter
   refine String do
     def bold
       "\e[1m#{self}\e[0m"

data/lib/hospital/tasks/checkup.rake

@@ -2,6 +2,10 @@
 
 require_relative '../../hospital'
 
+# usage:
+# rake doctor
+# rake doctor[true]
+
 desc 'Check system setup sanity.'
 task :doctor, [:verbose] => :environment do |t, args|
   verbose = args[:verbose] == "true"
@@ -13,5 +17,5 @@ task :doctor, [:verbose] => :environment do |t, args|
   end
 
   p "start checkup" if verbose
-  Hospital.do_checkup_all verbose: verbose
+  puts Hospital::Runner.new(verbose: verbose).do_checkup_all
 end

data/lib/hospital/version.rb

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

data/lib/hospital.rb

@@ -1,13 +1,14 @@
 # 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"
+require_relative "hospital/string_formatter"
+require_relative "hospital/formatter/shell"
+require_relative "hospital/formatter/pre"
 
-using Formatter
+using StringFormatter
 
 module Hospital
   require_relative 'railtie' if defined?(Rails)
@@ -22,37 +23,6 @@ module Hospital
       raise Hospital::Error.new("Cannot include Hospital, please extend instead.")
     end
 
-    def do_checkup_all verbose: false
-      errcount  = 0
-      warcount  = 0
-
-      @@groups.each do |group|
-        puts group.header
-        group.run_checkups verbose: verbose
-
-        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.indented
-              diagnosis.put_results
-            elsif verbose
-              puts "Skipped #{diagnosis.name}.".h2.indented
-            end
-          end
-        end
-      end
-
-      puts <<~END
-
-        #{"Summary:".h1}
-        #{"Errors:   #{errcount}".red}
-        #{"Warnings: #{warcount}".yellow}
-      END
-    end
-
     # used to call the checkup for a specific class directly (in specs)
     def do_checkup(klass, verbose: false)
       @@groups.map(&:all_checkups).flatten.select{|cu| cu.klass == klass }.map do |cu|
@@ -67,6 +37,10 @@ module Hospital
       end
       checkup_group
     end
+
+    def groups
+      @@groups
+    end
   end
 
   def checkup if: -> { true }, group: :general, title: nil, precondition: false, &code
@@ -74,13 +48,55 @@ module Hospital
     checkup = Checkup.new(
       self,
       code,
-      group:        group,
       title:        title,
       condition:    binding.local_variable_get('if'),
       precondition: precondition
     )
 
-    # p "adding #{checkup.inspect} to #{group}"
+    # p "adding #{checkup.inspect} to #{group_name}"
     checkup_group.add_checkup checkup
   end
+
+  class Runner
+    attr_reader :verbose
+
+    def initialize verbose: false, formatter: :shell
+      @verbose    = verbose
+      @formatter  = case formatter
+        when :pre then Formatter::Pre
+        else           Formatter::Shell
+      end
+
+      @out = @formatter.new
+      # @out.put_group_header "using formatter #{@formatter}"
+    end
+
+    def do_checkup_all
+      errcount  = 0
+      warcount  = 0
+
+      Hospital.groups.each do |group|
+        @out.put_group_header group.header
+        group.run_checkups verbose: verbose
+
+        group.all_checkups.each do |checkup|
+          if diagnosis = checkup.diagnosis
+            errcount += diagnosis.errors.count
+            warcount += diagnosis.warnings.count
+
+            if !checkup.skipped && (!checkup.group.skipped || checkup.precondition)
+              @out.put_diagnosis_header "Checking #{diagnosis.name}:"
+              diagnosis.put_results @out
+            elsif verbose
+              @out.put_diagnosis_header "Skipped #{diagnosis.name}."
+            end
+          end
+        end
+      end
+
+      @out.put_summary errcount, warcount
+
+      @out.buffer
+    end
+  end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hospital
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Alexander
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-28 00:00:00.000000000 Z
+date: 2024-03-27 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
@@ -52,7 +38,10 @@ files:
 - lib/hospital/checkup.rb
 - lib/hospital/checkup_group.rb
 - lib/hospital/diagnosis.rb
-- lib/hospital/formatter.rb
+- lib/hospital/formatter/base.rb
+- lib/hospital/formatter/pre.rb
+- lib/hospital/formatter/shell.rb
+- lib/hospital/string_formatter.rb
 - lib/hospital/tasks/checkup.rake
 - lib/hospital/version.rb
 - lib/railtie.rb