config_skeleton 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b419f026421b513b20f2950609f9b45339d86433b88e8372bd94746f6a72091
-  data.tar.gz: 7e0a5ac1b0dfe9ad7ee989aeb9d0051b06d179190328460ba09c273312b36b7d
+  metadata.gz: 99dfaca5fbeaf8f2bd6c5fd921e854294cd1f01be8e27613ad58e7581e7b1bf5
+  data.tar.gz: 552d8592225a20807716bd74ab8eaf1866b25a1d8b7acec75eedb98d22cb95cf
 SHA512:
-  metadata.gz: c36398b332b1bfa53a66d11a2c083af4a0f794e53fba518278fcef7ef41dfc63d51b4b010f508eeb898bf99c10ff55a2f813251bdfefe122a70e3254b87da46a
-  data.tar.gz: 53acc41e5da3aea61cda288cfe90f122e8d8871eea594d5e4b0857d127c01ba20a542df7087884c34e0e75589e968820d53b41db62c3f85f91d49eea9dbf88a2
+  metadata.gz: 4748a0d790e28a991555bf8647d79c71f827ba41d7d9a48156d9783a1e8e7ddefbe1acb4417c92667cb128e9c542b1e2aaa000d4adafa68aaf0a058d1e620d2d
+  data.tar.gz: 8cd5d2474c55a59255d53c1ed87bfb5c1a5bebe8df32117f9c49c4486ba1647a263c397606a0afb5fd67e22edaffd2df6c436ee8fb866b4bb066ff3d395960f9

data/config_skeleton.gemspec

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.name = "config_skeleton"
 
-  s.version = "1.1.0"
+  s.version = "2.0.0"
 
   s.platform = Gem::Platform::RUBY
 
@@ -17,13 +19,14 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'diffy', '~> 3.0'
   s.add_runtime_dependency 'rb-inotify', '~> 0.9'
-  s.add_runtime_dependency 'service_skeleton', "~> 1.0"
+  s.add_runtime_dependency 'service_skeleton', "~> 2.0"
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'github-release'
   s.add_development_dependency 'rake', "~> 12.0"
   s.add_development_dependency 'redcarpet'
   s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-discourse'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'pry'

data/lib/config_skeleton.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'diffy'
 require 'fileutils'
 require 'frankenstein'
@@ -240,16 +242,11 @@ class ConfigSkeleton
     logger.debug(logloc) { "notifier fd is #{notifier.to_io.inspect}" }
 
     loop do
-      if cooldown_duration > 0
-        logger.debug(logloc) { "Sleeping for #{cooldown_duration} seconds (cooldown)" }
-        IO.select([@terminate_r], [], [], cooldown_duration)
-      end
-
-      timeout = sleep_duration - cooldown_duration
-      logger.debug(logloc) { "Sleeping for #{timeout} seconds unless interrupted" }
-      ios = IO.select([notifier.to_io, @terminate_r, @trigger_regen_r], [], [], timeout)
-
-      if ios
+      if ios = IO.select(
+          [notifier.to_io, @terminate_r, @trigger_regen_r],
+          [], [],
+          sleep_duration.tap { |d| logger.debug(logloc) { "Sleeping for #{d} seconds" } }
+      )
         if ios.first.include?(notifier.to_io)
           logger.debug(logloc) { "inotify triggered" }
           notifier.process
@@ -449,21 +446,6 @@ class ConfigSkeleton
     60
   end
 
-  # How long to ignore signals/notifications after a config regeneration
-  #
-  # Hammering a downstream service with reload requests is often a bad idea.
-  # This method exists to allow subclasses to define a 'cooldown' duration.
-  # After each config regeneration, the config generator will sleep for this
-  # duration, regardless of any CONT signals or inotify events. Those events
-  # will be queued up, and processed at the end of the cooldown.
-  #
-  # @return [Integer] the number of seconds to 'cooldown' for.  This *must* be
-  #   greater than zero, and less than sleep_duration
-  #
-  def cooldown_duration
-    5
-  end
-
   # The instance of INotify::Notifier that is holding our file watches.
   #
   # @return [INotify::Notifier]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config_skeleton
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Matt Palmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-discourse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement