config_skeleton 0.0.0.1.ENOTAG → 0.0.0.1.ge6b0cac

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 001b8856fcc1b06142090ff8f3318a247b5bc810c438acb42db607a11b909151
-  data.tar.gz: 320df6546c31c1fc350385ef2d66eb0aecfa7c079e4895d1b545fecee5323ab0
+SHA1:
+  metadata.gz: 461d7e8fa2104770057e16c2b18688bab82974dd
+  data.tar.gz: 1dd53059bbd9b0e21c802b95f9132f81f40b5078
 SHA512:
-  metadata.gz: ed0e93b5cdd4f0f4bd81396a6eeb6baef095c2eac0caa039e8dd013a55b764d155359baafcc6667d30a98c3df0f6fa3e1af457086fd72c0a18851ddd220ef8e4
-  data.tar.gz: d069e57a16755b4c6e78664c2bdf521b45a08152c7b7f78145b1f056c8ba8656ca9fce2b66c7970a0f9872812a4e6e70fc0676433ebc38e74fb2ecd6365c96a0
+  metadata.gz: 85df37ce08bb7852f23d3ebe80ae602b64f336eefa66ec68ed11bdcb23df4c522fc8a056ffef6b376efeb291055e16aaf4293a0c89649c7d8d9da47737d7e258
+  data.tar.gz: a955d13e0faa0ad61316f87ae62f30bb64740b5aa592b4339c46b2814f948f47dd739ca109a5e28ab97d508a735959e57385adb6109e02739c2b6c9837fc86e6

data/.gitignore

@@ -4,5 +4,3 @@
 /.yardoc
 /coverage
 /.bundle
-
-.rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml

data/.rubocop.yml

@@ -1 +1,116 @@
-inherit_from: https://raw.githubusercontent.com/discourse/discourse/master/.rubocop.yml
+AllCops:
+  TargetRubyVersion: 2.4
+  DisabledByDefault: true
+  Exclude:
+    - 'db/schema.rb'
+    - 'bundle/**/*'
+    - 'vendor/**/*'
+    - 'node_modules/**/*'
+    - 'public/**/*'
+
+# Prefer &&/|| over and/or.
+Style/AndOr:
+  Enabled: true
+
+# Do not use braces for hash literals when they are the last argument of a
+# method call.
+Style/BracesAroundHashParameters:
+  Enabled: true
+
+# Align `when` with `case`.
+Layout/CaseIndentation:
+  Enabled: true
+
+# Align comments with method definitions.
+Layout/CommentIndentation:
+  Enabled: true
+
+# No extra empty lines.
+Layout/EmptyLines:
+  Enabled: true
+
+# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
+Style/HashSyntax:
+  Enabled: true
+
+# Two spaces, no tabs (for indentation).
+Layout/IndentationWidth:
+  Enabled: true
+
+Layout/SpaceAfterColon:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/SpaceAroundKeyword:
+  Enabled: true
+
+Layout/SpaceAroundOperators:
+  Enabled: true
+
+Layout/SpaceBeforeFirstArg:
+    Enabled: true
+
+# Defining a method with parameters needs parentheses.
+Style/MethodDefParentheses:
+  Enabled: true
+
+# Use `foo {}` not `foo{}`.
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+
+# Use `foo { bar }` not `foo {bar}`.
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+
+# Use `{ a: 1 }` not `{a:1}`.
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+
+Layout/SpaceInsideParens:
+  Enabled: true
+
+# Detect hard tabs, no hard tabs.
+Layout/Tab:
+  Enabled: true
+
+# Blank lines should not have any spaces.
+Layout/TrailingBlankLines:
+  Enabled: true
+
+# No trailing whitespace.
+Layout/TrailingWhitespace:
+  Enabled: true
+
+Lint/Debugger:
+  Enabled: true
+
+Layout/BlockAlignment:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+
+# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+Lint/RequireParentheses:
+  Enabled: true
+
+Lint/ShadowingOuterLocalVariable:
+  Enabled: true
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Layout/AlignHash:
+  Enabled: true
+
+Bundler/OrderedGems:
+  Enabled: false

data/README.md

@@ -41,7 +41,7 @@ conduct](CODE_OF_CONDUCT.md).
 Unless otherwise stated, everything in this repo is covered by the following
 copyright notice:
 
-    Copyright (C) 2020 Civilized Discourse Construction Kit, Inc.
+    Copyright (C) 2018  Civilized Discourse Construction Kit, Inc.
 
     This program is free software: you can redistribute it and/or modify it
     under the terms of the GNU General Public License version 3, as

data/config_skeleton.gemspec

@@ -34,7 +34,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'redcarpet'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'pry-byebug'
 end

data/lib/config_skeleton.rb

@@ -142,18 +142,6 @@ class ConfigSkeleton < ServiceSkeleton
   # If you get this, someone didn't read the documentation.
   class NotImplementedError < Error; end
 
-  # It is useful for consumers to manually request a config regen. An instance
-  # of this class is made via the regen_notifier method.
-  class ConfigRegenNotifier
-    def initialize(io_write)
-      @io_write = io_write
-    end
-
-    def trigger_regen
-      @io_write << "."
-    end
-  end
-
   # Declare a file watch on all instances of the config generator.
   #
   # When you're looking to watch a file whose path is well-known and never-changing, you
@@ -200,18 +188,6 @@ class ConfigSkeleton < ServiceSkeleton
     end
 
     initialize_config_skeleton_metrics
-    @trigger_regen_r, @trigger_regen_w = IO.pipe
-  end
-
-  # Expose the write pipe which can be written to to trigger a config
-  # regeneration with a forced reload; a similar mechanism is used for
-  # shutdown but in that case writes are managed internally.
-  #
-  # Usage: config.regen_notifier.trigger_regen
-  #
-  # @return [ConfigRegenNotifier]
-  def regen_notifier
-    @regen_notifier ||= ConfigRegenNotifier.new(@trigger_regen_w)
   end
 
   # Set the config generator running.
@@ -233,11 +209,7 @@ class ConfigSkeleton < ServiceSkeleton
     @terminate_r, @terminate_w = IO.pipe
 
     loop do
-      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 = IO.select([notifier.to_io, @terminate_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
@@ -245,14 +217,6 @@ class ConfigSkeleton < ServiceSkeleton
         elsif ios.first.include?(@terminate_r)
           logger.debug(logloc) { "triggered by termination pipe" }
           break
-        elsif ios.first.include?(@trigger_regen_r)
-          # we want to wait until everything in the backlog is read
-          # before proceeding so we don't run out of buffer memory
-          # for the pipe
-          while @trigger_regen_r.read_nonblock(20, nil, exception: false) != :wait_readable; end
-
-          logger.debug(logloc) { "triggered by regen pipe" }
-          regenerate_config(force_reload: true)
         else
           logger.error(logloc) { "Mysterious return from select: #{ios.inspect}" }
         end
@@ -296,7 +260,7 @@ class ConfigSkeleton < ServiceSkeleton
   def watch(*files)
     files.each do |f|
       if File.directory?(f)
-        notifier.watch(f, :recursive, :create, :modify, :delete, :move) { |ev| logger.info("#{logloc} watcher") { "detected #{ev.flags.join(", ")} on #{ev.watcher.path}/#{ev.name}; regenerating config" } }
+        notifier.watch(f, :recursive, :create, :modify, :delete, :move) { |ev| logger.info("#{logloc} watcher") { "detected #{ev.flags.join(", ")} on #{ev.watcher.path}/#{ev.file}; regenerating config" } }
       else
         notifier.watch(f, :close_write) { |ev| logger.info("#{logloc} watcher") { "detected #{ev.flags.join(", ")} on #{ev.watcher.path}; regenerating config" } }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_skeleton
 version: !ruby/object:Gem::Version
-  version: 0.0.0.1.ENOTAG
+  version: 0.0.0.1.ge6b0cac
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -164,48 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  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: pry
-  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: pry-byebug
-  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'
 description: 
 email:
 - matt.palmer@discourse.org
@@ -213,9 +171,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".rspec"
 - ".rubocop.yml"
 - ".yardopts"
 - CODE_OF_CONDUCT.md
@@ -242,7 +198,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Dynamically generate configs and reload servers

data/.github/workflows/ruby.yml

@@ -1,47 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - v*
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-      - name: Install dependencies
-        run: bundle install
-      - name: Run specs
-        run: bundle exec rspec
-
-  publish:
-    if: contains(github.ref, 'refs/tags/v')
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Release Gem
-        uses: CvX/publish-rubygems-action@master
-        env:
-          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}

data/.rspec

@@ -1 +0,0 @@
---require spec_helper