waylon-core 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f127e3f8c3b91cd3d00f5d394ed63e1280d4e84c05f27e6f1526f44edc7b546a
-  data.tar.gz: 44efb8ef9ee90fb8480d873a1a87faad240936085ac379dc634eb81e255792c2
+  metadata.gz: 5404f5f4a2acd74acace07f67aee9612843a5090ce8973c3d4fd5c1cd0f8895b
+  data.tar.gz: 7ede0703cdf8ccfd30820733e16151b5cdffedd5ed71e838a8fdfa3e82a66774
 SHA512:
-  metadata.gz: 53170a69a5676f06c4ec93eda0766728a4c2ee94e1333f82f22b551862af84d6b6407fa3521579c9b8f27681fe575c6073dbf0cd4c5008d9cf3613149e69fef0
-  data.tar.gz: 52b0a7aa10408bef47cbcf0a12e6d517e5e2c9d8012f0ee2fbd83139826cea53f727c6bb4698820bfbe95040103376284dda9c1f4103f5407f74d5944a871a98
+  metadata.gz: ca92e80bf34a2085cc5c5dd80c995f485e331e3f101702946beb3dfffb87f4d4b7d7d7b420ac6d436ca731a81b303da92803d7d074b389db04ea24b79cf8920b
+  data.tar.gz: 4b5a7285661f2a29622ef283982f7eeb44e2fd2343f12d159c9de3390ddbcc1e945e10fa97846f277b8696b861b070a9c40065fa945f723514225ecf9ace9b9e

data/.roxanne.yml

@@ -1,8 +1,8 @@
 version: 1.0
 stages:
   test:
-    image: ruby:3.1
+    image: ruby:3.2
   release:
-    image: ruby:3.1
+    image: ruby:3.2
     only:
     - main

data/.rubocop.yml

@@ -1,5 +1,9 @@
+require:
+- rubocop-rake
+- rubocop-rspec
+
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.2
   NewCops: enable
 
 Style/MixinUsage:
@@ -43,3 +47,18 @@ Metrics/BlockLength:
   - "**/*_spec.rb"
   - "*.gemspec"
   - "lib/waylon/rspec/matchers/**/*.rb"
+
+RSpec/MultipleExpectations:
+  Max: 6
+
+RSpec/ExampleLength:
+  Max: 10
+
+RSpec/NamedSubject:
+  Enabled: false
+
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
+RSpec/MessageSpies:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-3.1.2
+3.2.2

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    waylon-core (0.2.6)
+    waylon-core (0.3.0)
       addressable (~> 2.8)
-      faraday (~> 1.8)
+      faraday (~> 1.10)
       i18n (~> 1.8)
       json (~> 2.6)
       moneta (~> 1.4)
-      puma (~> 5.5)
+      puma (~> 6.4)
       rbnacl (~> 7.1)
       resque (~> 2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    connection_pool (2.2.5)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    faraday (1.10.2)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -45,110 +45,120 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.15.5)
-    i18n (1.12.0)
+    ffi (1.16.3)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    moneta (1.5.1)
-    mono_logger (1.1.1)
+    moneta (1.6.0)
+    mono_logger (1.1.2)
     multi_json (1.15.0)
-    multipart-post (2.2.3)
-    mustermann (2.0.2)
+    multipart-post (2.3.0)
+    mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    nio4r (2.5.8)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    nio4r (2.6.1)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
-    pry (0.14.1)
+      racc
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.0)
-    puma (5.6.5)
+    public_suffix (5.0.4)
+    puma (6.4.0)
       nio4r (~> 2.0)
-    rack (2.2.4)
-    rack-protection (2.2.2)
-      rack
+    racc (1.7.3)
+    rack (2.2.8)
+    rack-protection (3.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rbnacl (7.1.1)
       ffi
-    redis (5.0.2)
-      redis-client (~> 0.7)
-    redis-client (0.7.1)
+    redis (5.0.8)
+      redis-client (>= 0.17.0)
+    redis-client (0.18.0)
       connection_pool
-    redis-namespace (1.9.0)
+    redis-namespace (1.11.0)
       redis (>= 4)
-    regexp_parser (2.5.0)
-    resque (2.3.0)
+    regexp_parser (2.8.2)
+    resque (2.6.0)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.6)
       sinatra (>= 0.9.2)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.35.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.57.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.19.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.24.0)
+      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.12.1)
-      rubocop (~> 1.31)
-    ruby-progressbar (1.11.0)
+    rubocop-rspec (2.25.0)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sinatra (2.2.2)
-      mustermann (~> 2.0)
-      rack (~> 2.2)
-      rack-protection (= 2.2.2)
+    sinatra (3.1.0)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.1.0)
       tilt (~> 2.0)
-    tilt (2.0.11)
-    unicode-display_width (2.2.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    tilt (2.3.0)
+    unicode-display_width (2.5.0)
+    yard (0.9.34)
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-23
+  ruby
   x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 2.3)
+  bundler (~> 2.4)
   pry (~> 0.14)
-  rake (~> 13.0)
-  rspec (~> 3.10)
-  rubocop (~> 1.23)
+  rake (~> 13.1)
+  rspec (~> 3.12)
+  rubocop (~> 1.57)
   rubocop-rake (~> 0.6)
-  rubocop-rspec (~> 2.6)
-  simplecov (~> 0.21)
+  rubocop-rspec (~> 2.25)
+  simplecov (~> 0.22)
   waylon-core!
   yard (~> 0.9, >= 0.9.27)
 
 BUNDLED WITH
-   2.3.10
+   2.4.19

data/Rakefile

@@ -18,9 +18,11 @@ end
 
 task default: %i[spec rubocop yard]
 
+# Allows a REPL to be started with a demo chat
+desc "Start a REPL with a demo chat"
 task :demo do
   require "pry"
-  Waylon::Logger.logger = ::Logger.new("/dev/null")
+  Waylon::Logger.logger = Logger.new("/dev/null")
   Waylon::Cache.storage = Moneta.new(:Cookie)
   Waylon::Storage.storage = Moneta.new(:Cookie)
   require "waylon/rspec/test_server"

data/lib/waylon/base_component.rb

@@ -30,11 +30,11 @@ module Waylon
         cache_key = config_key_for(key)
         if !Waylon::Cache.key?(cache_key) && block_given?
           result = yield
-          Waylon::Cache.store(cache_key, result, expires: expires)
+          Waylon::Cache.store(cache_key, result, expires:)
         elsif !Waylon::Cache.key?(cache_key)
           return nil
         end
-        Waylon::Cache.load(cache_key, expires: expires)
+        Waylon::Cache.load(cache_key, expires:)
       end
 
       # The namespace used for this component's storage
@@ -51,7 +51,7 @@ module Waylon
       def config(key, default: nil, required: false, type: String)
         conf = Config.instance
         config_key = config_key_for(key)
-        conf.add_schema(config_key, default: default, required: required, type: type)
+        conf.add_schema(config_key, default:, required:, type:)
       end
 
       # Provides the full Config key given a relative key
@@ -112,11 +112,11 @@ module Waylon
         cache_key = self.class.config_key_for(key)
         if !Waylon::Cache.key?(cache_key) && block_given?
           result = yield
-          Waylon::Cache.store(cache_key, result, expires: expires)
+          Waylon::Cache.store(cache_key, result, expires:)
         elsif !Waylon::Cache.key?(cache_key)
           return nil
         end
-        Waylon::Cache.load(cache_key, expires: expires)
+        Waylon::Cache.load(cache_key, expires:)
       end
 
       # A wrapper for access to a namespaced Config key

data/lib/waylon/cache.rb

@@ -25,12 +25,12 @@ module Waylon
     end
 
     def self.load(key, expires: nil)
-      expires ? storage.load(key, expires: expires) : storage.load(key)
+      expires ? storage.load(key, expires:) : storage.load(key)
     end
 
     def self.store(key, value, expires: nil)
       if expires
-        storage.store(key, value, expires: expires)
+        storage.store(key, value, expires:)
       else
         storage.store(key, value)
       end

data/lib/waylon/config.rb

@@ -19,7 +19,7 @@ module Waylon
     # @return [Boolean] Was the schema update successful?
     def add_schema(key, default: nil, required: false, type: String)
       @schema ||= {}
-      @schema[key] = { default: default, required: required, type: type }
+      @schema[key] = { default:, required:, type: }
       true
     end
 

data/lib/waylon/core.rb

@@ -13,7 +13,6 @@ require "singleton"
 require "ostruct"
 require "timeout"
 require "resolv"
-require "set"
 
 # External dependencies
 require "addressable/uri"

data/lib/waylon/logger.rb

@@ -22,6 +22,7 @@ module Waylon
       @logger ||= json_logger
     end
 
+    # @param logger [Logger] The Logger instance to use
     def self.logger=(logger)
       @logger = logger
     end
@@ -34,7 +35,7 @@ module Waylon
         json_data = JSON.dump(
           ts: datetime,
           severity: severity.ljust(5).to_s,
-          progname: progname,
+          progname:,
           pid: Process.pid,
           message: msg,
           v: Waylon::Core::VERSION

data/lib/waylon/message.rb

@@ -21,7 +21,7 @@ module Waylon
 
     # Does the Message mention the bot (meant to be overwritten by mixing classes)
     def mentions_bot?
-      nil
+      false
     end
 
     # Is the Message a private/direct Message?

data/lib/waylon/rspec/test_channel.rb

@@ -19,7 +19,7 @@ module Waylon
         if existing_channel
           existing_channel
         else
-          channel_details = { name: name, created_at: Time.now }
+          channel_details = { name:, created_at: Time.now }
           TestSense.channel_list << channel_details
           new(TestSense.channel_list.size - 1)
         end

data/lib/waylon/rspec/test_server.rb

@@ -4,7 +4,7 @@ require "rspec"
 require "rspec/expectations"
 require "rspec/mocks"
 
-major, *_unused = RSpec::Core::Version::STRING.split(/\./)
+major, *_unused = RSpec::Core::Version::STRING.split(".")
 abort "RSpec 3 or greater required" if major.to_i < 3
 
 require "waylon/core"
@@ -101,7 +101,7 @@ def handle_input(body, from: this_user, privately: true)
     puts 'Admin enabled! Use "exit" to go back to a normal user.'
     @admin_enabled = true
   elsif @admin_enabled && %w[irb pry].include?(body)
-    pry
+    pry # rubocop:disable Link/Debugger
   else
     message_count = Waylon::RSpec::TestSense.sent_messages.size
 

data/lib/waylon/rspec.rb

@@ -4,11 +4,10 @@ require "rspec"
 require "rspec/expectations"
 require "rspec/mocks"
 
-major, *_unused = RSpec::Core::Version::STRING.split(/\./)
+major, *_unused = RSpec::Core::Version::STRING.split(".")
 abort "RSpec 3 or greater required" if major.to_i < 3
 
 require "moneta"
-require "set"
 
 require "waylon/core"
 require "waylon/skills/default"

data/lib/waylon/skill_registry.rb

@@ -69,7 +69,7 @@ module Waylon
       raise Exceptions::ValidationError, "Must be a kind of Skill" unless skill_class.ancestors.include?(Skill)
 
       @routes ||= []
-      @routes << Route.new(name: name.to_s, destination: skill_class, condition: condition)
+      @routes << Route.new(name: name.to_s, destination: skill_class, condition:)
     end
 
     # Given a message, find a suitable skill Route for it (sorted by priority, highest first)

data/lib/waylon/skills/help.rb

@@ -126,7 +126,7 @@ module Waylon
                else
                  "Help for #{skill}:"
                end
-        { type: "header", text: { type: "plain_text", text: text, emoji: true } }
+        { type: "header", text: { type: "plain_text", text:, emoji: true } }
       end
 
       def build_help_block(this_route)

data/lib/waylon/storage.rb

@@ -25,8 +25,8 @@ module Waylon
       storage.delete(key)
     end
 
-    def self.each_key(&block)
-      storage.each_key(&block)
+    def self.each_key(&)
+      storage.each_key(&)
     end
 
     def self.encryption_key

data/lib/waylon/version.rb

@@ -5,8 +5,8 @@ module Waylon
     # The Waylon::Core version
     VERSION = [
       0, # Major
-      2, # Minor
-      6  # Patch
+      3, # Minor
+      0  # Patch
     ].join(".")
   end
 end

data/waylon-core.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "The core components of the Waylon bot framework for Ruby"
   spec.homepage      = "https://github.com/jgnagy/waylon-core"
   spec.license       = "MIT"
-  spec.required_ruby_version = "~> 3.0"
+  spec.required_ruby_version = "~> 3.2"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/jgnagy/waylon-core"
@@ -28,22 +28,22 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "addressable", "~> 2.8"
-  spec.add_dependency "faraday", "~> 1.8"
+  spec.add_dependency "faraday", "~> 1.10"
   spec.add_dependency "i18n", "~> 1.8"
   spec.add_dependency "json", "~> 2.6"
   spec.add_dependency "moneta", "~> 1.4"
-  spec.add_dependency "puma", "~> 5.5"
+  spec.add_dependency "puma", "~> 6.4"
   spec.add_dependency "rbnacl", "~> 7.1"
   spec.add_dependency "resque", "~> 2.2"
 
-  spec.add_development_dependency "bundler", "~> 2.3"
+  spec.add_development_dependency "bundler", "~> 2.4"
   spec.add_development_dependency "pry", "~> 0.14"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.10"
-  spec.add_development_dependency "rubocop", "~> 1.23"
+  spec.add_development_dependency "rake", "~> 13.1"
+  spec.add_development_dependency "rspec", "~> 3.12"
+  spec.add_development_dependency "rubocop", "~> 1.57"
   spec.add_development_dependency "rubocop-rake", "~> 0.6"
-  spec.add_development_dependency "rubocop-rspec", "~> 2.6"
-  spec.add_development_dependency "simplecov", "~> 0.21"
+  spec.add_development_dependency "rubocop-rspec", "~> 2.25"
+  spec.add_development_dependency "simplecov", "~> 0.22"
   spec.add_development_dependency "yard", "~> 0.9", ">= 0.9.27"
 
   # For more information and examples about making a new gem, checkout our

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waylon-core
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2023-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '6.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '6.4'
 - !ruby/object:Gem::Dependency
   name: rbnacl
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -156,42 +156,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.57'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.57'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -212,28 +212,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.25'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -335,14 +335,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Core library for the Waylon bot framework