kennel 1.94.1 → 1.96.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 794c9eb35b6b3b66294b4a927ba39e9fd8b52a3aad324704799128b1b1818567
-  data.tar.gz: 2f653b0669dfbfe8972cdad38c96c016f13c2d2d29d332cc53883e879ec9e766
+  metadata.gz: aca7576bcde423ec1f4e559d88f13ee64ed5efb116a212f49e67ac6b792ddb16
+  data.tar.gz: a6b60f7d6a73ca82d2478f565435e0ebb95a79f7d3bd5bcebfd6712a3e9c8cfb
 SHA512:
-  metadata.gz: 1591fab84de0bfbdb77621ef7a449c9f764f5391d73f3135288eb661da84e503109b5305f82e68a4249feee5fbf0a4d8d1abf9a872e25f501b4f5b1b5b3b3d9d
-  data.tar.gz: 571579849c0726f80efdd90ff04e61dc5f897163c0d0f4d2b87572769339e475e0f5a7b01f58ee025be29011241109527d2c3c55763590d053f64748ad275cde
+  metadata.gz: 1767ebe1e61ea9a314b99f14a2cd15a31dc09419dafa2a9100244c83acfc40cd9eba0ccf1e9ad6c4cf9c3026cd1493e6b62cdc6a867b18720ed517908e702768
+  data.tar.gz: 382486fbfb3c52346262ad43c63ed21164676189a880d405914de54539907a0a193960f173daa9aa16f41d847959b140a9c60cee886f85d63473d599bd00b807

data/lib/kennel/importer.rb

@@ -154,7 +154,11 @@ module Kennel
         prefix = $2
         string = $3
         comma = $4
-        "#{indent}#{prefix}<<~TXT#{comma}\n#{indent}  #{string.gsub("\\n", "\n#{indent}  ").rstrip}\n#{indent}TXT\n"
+        <<~CODE.gsub(/ +$/, "")
+          #{indent}#{prefix}<<~TXT#{comma}
+          #{indent}  #{string.gsub("\\n", "\n#{indent}  ").rstrip}
+          #{indent}TXT
+        CODE
       end
     end
 

data/lib/kennel/models/dashboard.rb

@@ -69,7 +69,10 @@ module Kennel
         template_variable_presets: nil
       }.freeze
 
-      settings :title, :description, :definitions, :widgets, :layout_type, :template_variable_presets, :reflow_type
+      settings(
+        :title, :description, :definitions, :widgets, :layout_type, :template_variable_presets, :reflow_type,
+        :tags
+      )
 
       defaults(
         description: -> { "" },
@@ -77,6 +80,10 @@ module Kennel
         widgets: -> { [] },
         template_variable_presets: -> { DEFAULTS.fetch(:template_variable_presets) },
         reflow_type: -> { layout_type == "ordered" ? "auto" : nil },
+        tags: -> do # not inherited by default to make onboarding to using dashboard tags simple
+          team = project.team
+          team.tag_dashboards ? team.tags : []
+        end,
         id: -> { nil }
       )
 
@@ -145,10 +152,12 @@ module Kennel
         return @json if @json
         all_widgets = render_definitions(definitions) + widgets
         expand_q all_widgets
+        tags = tags()
+        tags_as_string = (tags.empty? ? "" : " (#{tags.join(" ")})")
 
         @json = {
           layout_type: layout_type,
-          title: "#{title}#{LOCK}",
+          title: "#{title}#{tags_as_string}#{LOCK}",
           description: description,
           template_variables: render_template_variables,
           template_variable_presets: template_variable_presets,

data/lib/kennel/models/team.rb

@@ -2,10 +2,11 @@
 module Kennel
   module Models
     class Team < Base
-      settings :mention, :tags, :renotify_interval, :kennel_id
+      settings :mention, :tags, :renotify_interval, :kennel_id, :tag_dashboards
       defaults(
         tags: -> { ["team:#{kennel_id.sub(/^teams_/, "")}"] },
-        renotify_interval: -> { 0 }
+        renotify_interval: -> { 0 },
+        tag_dashboards: -> { false }
       )
     end
   end

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "faraday"
 require "json"
+require "zeitwerk"
 require "shellwords"
 require "English"
 
@@ -30,6 +31,10 @@ require "kennel/models/synthetic_test"
 require "kennel/models/project"
 require "kennel/models/team"
 
+# need to define early since we autoload the teams/ folder into it
+module Teams
+end
+
 module Kennel
   class ValidationError < RuntimeError
   end
@@ -128,9 +133,34 @@ module Kennel
     end
 
     def load_all
-      ["teams", "parts", "projects"].each do |folder|
+      loader = Zeitwerk::Loader.new
+      Dir.exist?("teams") && loader.push_dir("teams", namespace: Teams)
+      Dir.exist?("parts") && loader.push_dir("parts")
+      loader.setup
+
+      # TODO: also do projects and update expected path too
+      ["projects"].each do |folder|
         Dir["#{folder}/**/*.rb"].sort.each { |f| require "./#{f}" }
       end
+    rescue NameError => e
+      message = e.message
+      raise unless klass = message[/uninitialized constant (.*)/, 1]
+
+      # inverse of zeitwerk lib/zeitwerk/inflector.rb
+      path = klass.gsub("::", "/").gsub(/([a-z])([A-Z])/, "\\1_\\2").downcase + ".rb"
+      expected_path = (path.start_with?("teams/") ? path : "parts/#{path}")
+
+      # TODO: prefer to raise a new exception with the old backtrace attacked
+      e.define_singleton_method(:message) do
+        "\n" + <<~MSG.gsub(/^/, "  ")
+          #{message}
+          Unable to load #{klass} from #{expected_path}
+          - Option 1: rename the constant or the file it lives in, to make them match
+          - Option 2: Use `require` or `require_relative` to load the constant
+        MSG
+      end
+
+      raise
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.94.1
+  version: 1.96.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 description: 
 email: michael@grosser.it
 executables: []