kennel 1.94.0 → 1.96.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d984d593aa96ff9c939af26662e0595041e6f7fe24878965c721ead9063ee0f
-  data.tar.gz: 12279d2909c96279d8a69a0cca222bbf29a900bfeb1fadf1a00e375275993cca
+  metadata.gz: dad671ae1433588cff8641dbe5337c5db450d2bda9a05d61ba272a76c2482a5b
+  data.tar.gz: 493cac344bfa4b1e2cab2de6e395887e91eac3d374fea84333af0268b8ee544d
 SHA512:
-  metadata.gz: aeb78440808f08f268b112b91c294f94f199544f49c8a941132dbe9666d721500e00b30360bc5b9aacbfaae13301e04cb9f16531183cb014991f8eb3700d8bf0
-  data.tar.gz: e071f1ce423eaca94cbce0c7bc9906b1caf8a08e114edd201f5a0c4184bae34668bfa70132c72703fdb4eaee6463f70e909865f3e1feb4f63d7fb741ff95e53e
+  metadata.gz: 6048d4264a57b5b1bbda44bbc302965de9b09ba8985f397d5c537910d1d79fad0b0e77b02dfcda9e43b2168bc32b1c3ad335081afb1f9f2a3c09096c811d0b4d
+  data.tar.gz: d4f919fcda3553c30bcfb38719b9996b5eca9189c0f4d7d73718f52b526a5eb84cb35f128463ae35fbac525dd61aacc54f7d2447bcf53eff5ed4f2bc5a30cc22

data/lib/kennel/importer.rb

@@ -149,12 +149,16 @@ module Kennel
     end
 
     def convert_strings_to_heredoc(text)
-      text.gsub(/^(\s*)(.*)"([^"]+\\n[^"]+)"(,)?/) do
+      text.gsub(/^( *)([^" ]+ *)"([^"]+\\n[^"]+)"(,)?\n/) do
         indent = $1
         prefix = $2
         string = $3
         comma = $4
-        "#{indent}#{prefix}<<~TXT#{comma}\n#{indent}  #{string.gsub("\\n", "\n#{indent}  ").rstrip}\n#{indent}TXT"
+        <<~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.0"
+  VERSION = "1.96.0"
 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,7 +133,13 @@ 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
+      ["projects"].each do |folder|
         Dir["#{folder}/**/*.rb"].sort.each { |f| require "./#{f}" }
       end
     end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.94.0
+  version: 1.96.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-10-25 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: []