hospital 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7abce524070f1b1275fe021c20e42f046a856c460007c30ab859fc1173c6bfd
-  data.tar.gz: f5e1eebdaeab9d799524ce3fdbca6efd9e54ae215b5100a77cf3367b08ac4e1a
+  metadata.gz: a1074319a2f7179076d1ddf35612df2167dfd2ca66e6e77a488c65727090fff4
+  data.tar.gz: 7e1532336e49b8b73c01ee6a519698714fcff224970a5a9f4c23504272b48ba9
 SHA512:
-  metadata.gz: 37f5f27286a859bdcb4c54f380ac3f9af6cd9b907310f4434e340ab3e4bce388bcb5369ddfe2f191b5612a5bdc57bbcd9659bbbea5ddcd01d7b8566d055ce3dd
-  data.tar.gz: 75c6a04304725ebe87adcfff3239d563b7a1a01b04d8af784c127ed68c259d5af609f8a417dfae54a85af38a7dcc9021fb1bfa5733a2e7516c3f8358998e9d73
+  metadata.gz: 07633f2b838a3d8bef495212dd3da16953b29ffc94579a4cf9fe94c5ff0d8a8ff5165207eff071999810afc7ba12bf8c8b32c8d12245c6bc08c5071709369b5a
+  data.tar.gz: 1d70ff1ea84cfe57c6f8ee32a573105737a78189eeefa980e313d2105d585e5a32279d607afbbd125d21555f0984053754a119270f34363568a89aa3c42af5e8

data/lib/hospital/formatter/pre.rb

@@ -13,8 +13,8 @@ module Hospital
         @buffer << "\n\n## Checking #{text}"
       end
 
-      def put_diagnosis_skipped text
-        @buffer << "\n\n## Skipped #{text}"
+      def put_diagnosis_skipped text, verbose: false
+        @buffer << "\n\n## Skipped #{text}" if verbose
       end
 
       def put_summary errors_count, warnings_count, infos_count

data/lib/hospital/formatter/raw.rb

@@ -7,20 +7,24 @@ module Hospital
     class Raw < Base
 
       def initialize
-        @data = {}
+        @data               = {}
         @current_group      = nil
         @current_diagnosis  = nil
       end
 
       def put_group_header text
         @current_group = text
+        @data[@current_group] ||= {}
       end
 
       def put_diagnosis_header text
         @current_diagnosis = text
+        @data[@current_group][@current_diagnosis] ||= []
       end
 
-      def put_diagnosis_skipped text
+      def put_diagnosis_skipped text, verbose: false
+        # don't overwrite existing entry (in case of name collision)
+        @data[@current_group][text] ||= { 'skipped' => true }
       end
 
       def put_summary errors_count, warnings_count, infos_count
@@ -32,8 +36,6 @@ module Hospital
       end
 
       def put_diagnosis_result result
-        @data[@current_group] ||= {}
-        @data[@current_group][@current_diagnosis] ||= []
         @data[@current_group][@current_diagnosis] << {
           'type'    => result.type,
           'message' => result.message

data/lib/hospital/formatter/shell.rb

@@ -13,8 +13,8 @@ module Hospital
         @buffer << "\nChecking #{text.h2.indented}"
       end
 
-      def put_diagnosis_skipped text
-        @buffer << "\nSkipped #{text.h2.indented}"
+      def put_diagnosis_skipped text, verbose: false
+        @buffer << "\nSkipped #{text.h2.indented}" if verbose
       end
 
       def put_summary errors_count, warnings_count, infos_count

data/lib/hospital/version.rb

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

data/lib/hospital.rb

@@ -25,10 +25,34 @@ module Hospital
     end
 
     # used to call the checkup for a specific class directly (in specs)
+    # respects preconditions: runs preconditions first, skips dependents if any fail
     def do_checkup(klass, verbose: false, ignore_condition: false)
-      @@groups.map(&:all_checkups).flatten.select{|cu| cu.klass == klass }.map do |cu|
-        cu.check verbose: verbose, ignore_condition: ignore_condition
+      checkups  = @@groups.map(&:all_checkups).flatten.select { |cu| cu.klass == klass }
+      by_group  = checkups.group_by(&:group)
+      results   = []
+
+      by_group.each do |group, group_checkups|
+        preconditions = group_checkups.select(&:precondition)
+        dependents    = group_checkups.reject(&:precondition)
+
+        # run preconditions first
+        preconditions_passed = true
+        preconditions.each do |cu|
+          result = cu.check verbose: verbose, ignore_condition: ignore_condition
+          results << result if result
+          preconditions_passed = false unless cu.success?
+        end
+
+        # only run dependents if all preconditions passed
+        if preconditions_passed
+          dependents.each do |cu|
+            result = cu.check verbose: verbose, ignore_condition: ignore_condition
+            results << result if result
+          end
+        end
       end
+
+      results
     end
 
     def find_or_create_checkup_group name
@@ -91,8 +115,9 @@ module Hospital
             if !checkup.skipped && (!checkup.group.skipped || checkup.precondition)
               @out.put_diagnosis_header "#{diagnosis.name}:"
               diagnosis.put_results @out
-            elsif verbose
-              @out.put_diagnosis_skipped "Skipped #{diagnosis.name}."
+            elsif !checkup.skipped
+              # checkup was skipped due to group precondition failure
+              @out.put_diagnosis_skipped "#{diagnosis.name}:", verbose: verbose
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hospital
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.4
 platform: ruby
 authors:
 - Alexander