kennel 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a46c529568d7f43abd6c28850b16c3381312d24
-  data.tar.gz: 456543b1003278e2fffb86d06c8e6c6d8f5b8022
+  metadata.gz: c70c6bd2ed964a4e6abd06968705de5897bdcff5
+  data.tar.gz: a8a3823e0c36250246a806a26579b0e1e1f1417f
 SHA512:
-  metadata.gz: ad3248c48a078469a0b750f90cd4d6ab04de6f63d6c70061fe4232c40682d958b6a1b7099e0494d3b6dd6b5a96eb3180d65104fa113887cc8f5b649d38424184
-  data.tar.gz: d1909afe6d889fed5ba51f77e888cc36346ca29febd31ed301e4f904e07f970e09748046da7a55b19bbbfd9b310c0742e4df8068b49d627d418a162c408ae069
+  metadata.gz: c736eb69dec71e163a8f0e7a9bc532a93f8600984d3c56ca20c0b58e81e1d9363ff26fb4276a802d2cbec49a0d7d1ed46da17c72c4a7e53f27599235626dc148
+  data.tar.gz: 4f6566b111f19f0de2244a28ff319fd438dc436e1fba4a532dffba2e6c559c00dee6c06f3235d979c9d332d02a32b9bf7794340512195c993bd4e8f2effd1d1d

data/lib/kennel.rb

@@ -10,10 +10,16 @@ require "kennel/api"
 require "kennel/github_reporter"
 require "kennel/subclass_tracking"
 require "kennel/file_cache"
+require "kennel/template_variables"
 
 require "kennel/models/base"
+
+# parts
 require "kennel/models/monitor"
 require "kennel/models/dash"
+require "kennel/models/screen"
+
+# settings
 require "kennel/models/project"
 require "kennel/models/team"
 

data/lib/kennel/models/dash.rb

@@ -2,7 +2,10 @@
 module Kennel
   module Models
     class Dash < Base
-      settings :id, :title, :description, :graphs, :kennel_id, :graphs, :definitions, :template_variables
+      include TemplateVariables
+
+      API_LIST_INCOMPLETE = true
+      settings :id, :title, :description, :graphs, :kennel_id, :graphs, :definitions
 
       defaults(
         id: -> { nil },

data/lib/kennel/models/monitor.rb

@@ -2,6 +2,7 @@
 module Kennel
   module Models
     class Monitor < Base
+      API_LIST_INCOMPLETE = false
       RENOTIFY_INTERVALS = [0, 10, 20, 30, 40, 50, 60, 90, 120, 180, 240, 300, 360, 720, 1440].freeze # minutes
       QUERY_INTERVALS = ["1m", "5m", "10m", "15m", "30m", "1h", "2h", "4h", "24h"].freeze
       METRIC_TYPES = ["query alert", "metric alert"].freeze

data/lib/kennel/models/screen.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+module Kennel
+  module Models
+    class Screen < Base
+      include TemplateVariables
+
+      API_LIST_INCOMPLETE = true
+
+      settings :id, :board_title, :description, :widgets, :kennel_id
+
+      defaults(
+        description: -> { "" },
+        widgets: -> { [] },
+        id: -> { nil }
+      )
+
+      attr_reader :project
+
+      def initialize(project, *args)
+        @project = project
+        super(*args)
+      end
+
+      def self.api_resource
+        "screen"
+      end
+
+      def as_json
+        return @json if @json
+        @json = {
+          id: id,
+          board_title: "#{board_title}#{LOCK}",
+          description: description,
+          widgets: render_widgets,
+          template_variables: render_template_variables
+        }
+        @json
+      end
+
+      def diff(actual)
+        actual.delete(:disableCog)
+        actual.delete(:disableEditing)
+        actual.delete(:isIntegration)
+        actual.delete(:isShared)
+        actual.delete(:original_title)
+        actual.delete(:read_only)
+        actual.delete(:resource)
+        actual.delete(:title)
+        actual.delete(:title_edited)
+        actual.delete(:created_by)
+        actual.delete(:board_bgtype)
+        actual.delete(:height)
+        actual.delete(:width)
+        actual[:template_variables] ||= []
+        actual[:widgets].each { |w| w.delete :board_id }
+        super
+      end
+
+      def url(id)
+        Utils.path_to_url "/screen/#{id}"
+      end
+
+      private
+
+      def render_widgets
+        widgets.map do |widget|
+          widget = widget_defaults(widget[:type]).merge(widget)
+          if tile = widget[:tile_def]
+            tile[:requests].each { |r| r[:conditional_formats] ||= [] }
+            tile[:autoscale] = true unless widget[:tile_def].key?(:autoscale)
+          end
+          widget
+        end
+      end
+
+      def widget_defaults(type)
+        basics = {
+          title_size: 16,
+          title_align: "left",
+          height: 20,
+          width: 30
+        }
+
+        custom =
+          case type
+          when "free_text"
+            {
+              font_size: "auto",
+              text_align: "left",
+              title_text: "",
+              title: true,
+              color: "#4d4d4d"
+            }
+          when "timeseries"
+            {
+              title: true,
+              legend: false,
+              legend_size: "0",
+              timeframe: "1h"
+            }
+          else
+            {}
+          end
+
+        basics.merge(custom)
+      end
+    end
+  end
+end

data/lib/kennel/syncer.rb

@@ -62,7 +62,7 @@ module Kennel
             id = a.fetch(:id)
 
             if e = delete_matching_expected(a)
-              fill_details(a, cache) if a[:api_resource] == "dash"
+              fill_details(a, cache) if e.class::API_LIST_INCOMPLETE
               if diff = e.diff(a)
                 @update << [id, e, a, diff]
               end
@@ -81,7 +81,8 @@ module Kennel
     def fill_details(a, cache)
       args = [a.fetch(:api_resource), a.fetch(:id)]
       full = cache.fetch(args, a.fetch(:modified)) do
-        @api.show(*args).fetch(a.fetch(:api_resource).to_sym)
+        result = @api.show(*args)
+        result[a.fetch(:api_resource).to_sym] || result # dashes are nested, others are not
       end
       a.merge!(full)
     end
@@ -98,15 +99,15 @@ module Kennel
         m.api_resource
       end
 
-      api_resources.compact.uniq.flat_map do |api_resource|
+      Utils.parallel(api_resources.compact.uniq) do |api_resource|
         # lookup monitors without adding unnecessary downtime information
         results = @api.list(api_resource, with_downtimes: false)
-        if results.is_a?(Hash) # dashes
-          results = results.fetch("#{api_resource}es".to_sym) # dash reply is returned under dashes
+        if results.is_a?(Hash)
+          results = results[results.keys.first]
           results.each { |r| r[:id] = Integer(r.fetch(:id)) }
         end
         results.each { |c| c[:api_resource] = api_resource }
-      end
+      end.flatten(1)
     end
 
     def ensure_all_ids_found

data/lib/kennel/tasks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 namespace :kennel do
   desc "Ensure there are no uncommited changes that would be hidden from PR reviewers"
   task no_diff: :generate do

data/lib/kennel/template_variables.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+module Kennel
+  module TemplateVariables
+    def self.included(base)
+      base.settings :template_variables
+      base.defaults(template_variables: -> { [] })
+    end
+
+    private
+
+    def render_template_variables
+      template_variables.map do |v|
+        v.is_a?(String) ? { default: "*", prefix: v, name: v } : v
+      end
+    end
+  end
+end

data/lib/kennel/utils.rb

@@ -53,6 +53,18 @@ module Kennel
           path
         end
       end
+
+      def parallel(items)
+        items.map do |item|
+          Thread.new do
+            begin
+              yield item
+            rescue StandardError => e
+              e
+            end
+          end
+        end.map(&:value).each { |i| raise i if i.is_a?(StandardError) }
+      end
     end
   end
 end

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-09 00:00:00.000000000 Z
+date: 2017-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -52,11 +52,13 @@ files:
 - lib/kennel/models/dash.rb
 - lib/kennel/models/monitor.rb
 - lib/kennel/models/project.rb
+- lib/kennel/models/screen.rb
 - lib/kennel/models/team.rb
 - lib/kennel/progress.rb
 - lib/kennel/subclass_tracking.rb
 - lib/kennel/syncer.rb
 - lib/kennel/tasks.rb
+- lib/kennel/template_variables.rb
 - lib/kennel/utils.rb
 - lib/kennel/version.rb
 homepage: https://github.com/grosser/kennel