gclouder_undefined_resources 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20430b49eb8ba80923b7f889e8ea10e4231a69fd
-  data.tar.gz: 526c81e66012a0d5638deb36cd7f3e062ca52759
+  metadata.gz: 40af15953719621949d13f39d2bee5d890ae2a55
+  data.tar.gz: b61d2d60aacd5c5023930fb938b7aaae13a3fcb2
 SHA512:
-  metadata.gz: b5c005bda0d49fd5ae55b65aab68262a45da0eaa89d170b7634ae59bfb141a8381c70b53dbb7c5fc0ae990075f70406f7d8f5cbb0534451cea1bacfab1d53644
-  data.tar.gz: d9ee105a14940609a5850ebfe1f918aeb428b8c43a04f1899ab9f32048c4f8f7d5f86479b4245d16d70873d12b37da827234b4af284ff00727221cada9aea1bb
+  metadata.gz: 0cc34cdf89b64dfd75373010e14855b93aedb832cef7f8aed4115c45f1fc3fe841d2392477023a2f37cb0ec54325a238e6c7c5071a53ecf25fcb6f71821e4f5a
+  data.tar.gz: 8acc4dd94d2748f4608b5919b845a4dc7e0bb10d7c874650d7f9e63a3db493c3fd0f0da208a98b7baeb5875420df07df0e8ae412d36efb9190553026ebdf7b90

data/lib/gclouder_undefined_resources/remote_resources.rb

@@ -98,7 +98,8 @@ module GClouderUndefinedResources
     end
 
     def display_report
-      status_types = @resources.group_by { |resource| resource.status }
+      status_types = @resources.group_by { |resource| resource.status_and_description }
+      status_types = status_types.sort_by { |_, resources| resources.length }
 
       return if status_types.empty?
 
@@ -106,7 +107,7 @@ module GClouderUndefinedResources
       puts "  report"
       puts
       status_types.each do |status_type, resources|
-        puts "    #{status_type} - #{resources.length}"
+        puts "    #{status_type[0]} - #{resources.length} - #{status_type[1]}"
       end
       puts
     end

data/lib/gclouder_undefined_resources/remote_resources/resource.rb

@@ -95,29 +95,71 @@ module GClouderUndefinedResources
         false
       end
 
-      # FIXME: refactor
+      def custom_marker?(type)
+        filter.key?("marker")
+      end
+
+      def marker(marker, type)
+        if filters.dig("markers", marker.to_s).nil?
+          raise StandardError, "undefined marker type: #{marker}"
+        end
+
+        if filters.dig("markers", marker.to_s, type.to_s).nil?
+          raise StandardError, "undefined type for marker '#{marker}': #{type}"
+        end
+
+        if filters.dig("markers", marker.to_s, type.to_s, "description")
+          description = filters["markers"][marker.to_s][type.to_s]["description"]
+        else
+          description = nil
+        end
+
+        symbol = filters["markers"][marker.to_s][type.to_s]["symbol"]
+        colour = filters["markers"][marker.to_s][type.to_s]["colour"]
+
+        [symbol.send(colour), description]
+      end
+
       def status
-        if self.filtered?
-          if self.defined?
-            if filter.dig("mark", "filtered")
-              filter["mark"]["filtered"]["symbol"].send(filter["mark"]["filtered"]["colour"])
-            else
-              Symbols.tick_filtered
-            end
+        status_and_description[0]
+      end
+
+      def filter_description
+        description = status_and_description[1]
+        if description
+          "# #{description}".gray
+        else
+          "# filter has no description".gray
+        end
+      end
+
+      def status_and_description
+        if self.defined? && !self.filtered?
+          return marker(:unfiltered_default, :defined)
+        end
+
+        if !self.defined? && !self.filtered?
+          return marker(:unfiltered_default, :undefined)
+        end
+
+        if self.defined? && self.filtered?
+          if custom_marker?(:defined)
+            return marker(filter["marker"], :defined)
           else
-            if filter.dig("mark", "unfiltered")
-              filter["mark"]["unfiltered"]["symbol"].send(filter["mark"]["unfiltered"]["colour"])
-            else
-              Symbols.x_filtered
-            end
+            return marker(:filtered_default, :defined)
           end
-        else
-          if self.defined?
-            Symbols.tick
+        end
+
+        if !self.defined? && self.filtered?
+          if custom_marker?(:undefined)
+            return marker(filter["marker"], :undefined)
           else
-            Symbols.x
+            return marker(:filtered_default, :undefined)
           end
         end
+
+        # shouldn't reach this
+        raise StandardError, "there was a problem establishing resource state"
       end
 
       def filter

data/lib/gclouder_undefined_resources/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module GClouderUndefinedResources
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gclouder_undefined_resources
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Rob Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop