waylon-core 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f5c64d272b9360761b3c7d77b9930cc0d04e23e6fd5e87ab28540be57d283f1
-  data.tar.gz: d6bcd56f391f3d842b082975bf1c2d7ffb2263a413a3be9ff943be9d0d54e2a8
+  metadata.gz: 57bed2ca4c2e97caf912ff316be213e191605c61d2934a1a2cd590013a28cfa2
+  data.tar.gz: 6e32bf09330d75603b7340f18a58bc9a16d373097d91c2a082ff5fea8a4cb5b8
 SHA512:
-  metadata.gz: ac0179b9880f4f0a30ff2d0f4bc39c4e2d991b87fc643c8ce323f707319dfdd56de2114d91b028e2f658480276f909dad89c2e17fdb82e4c05c58eb4b63dc144
-  data.tar.gz: 35e0eba674ddc78a8b49fcf4e47d35c529a0e4ab102afe955965ce64ca74d1cf4dfdda24126e25cf9bc277e64c2eed74b5d2c3f145e02ad240c5043dcac866ea
+  metadata.gz: 05bc6522ee2cda61c80dbabeb52a624d3301e6be562ebc575f4508e7537cfa212ba8f8b0f0d14ce4607852dd30162c93d5494325eac4bffe1c0e6f923492c31f
+  data.tar.gz: 8537c32ded411934c548b4aa47ca8a03dcf3ed502a927357f25932166f555d0224948776d1226865bea5b01d94deb300081ede84075a64a073eb535175059817

data/.roxanne.yml

@@ -2,3 +2,7 @@ version: 1.0
 stages:
   test:
     image: ruby:3.1
+  release:
+    image: ruby:3.1
+    only:
+    - main

data/.ruby-version

@@ -1 +1 @@
-3.1.0
+3.1.2

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    waylon-core (0.1.3)
+    waylon-core (0.1.6)
       addressable (~> 2.8)
       faraday (~> 1.8)
       i18n (~> 1.8)
       json (~> 2.6)
       moneta (~> 1.4)
       puma (~> 5.5)
+      rbnacl (~> 7.1)
       resque (~> 2.2)
 
 GEM
@@ -16,10 +17,10 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    faraday (1.9.3)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -35,72 +36,74 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    i18n (1.9.1)
+    ffi (1.15.5)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.1)
-    moneta (1.4.2)
+    json (2.6.2)
+    moneta (1.5.1)
     mono_logger (1.1.1)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.8)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
-    puma (5.6.1)
+    public_suffix (4.0.7)
+    puma (5.6.4)
       nio4r (~> 2.0)
-    rack (2.2.3)
-    rack-protection (2.1.0)
+    rack (2.2.3.1)
+    rack-protection (2.2.0)
       rack
     rainbow (3.1.1)
     rake (13.0.6)
-    redis (4.5.1)
-    redis-namespace (1.8.1)
+    rbnacl (7.1.1)
+      ffi
+    redis (4.6.0)
+    redis-namespace (1.8.2)
       redis (>= 3.0.4)
-    regexp_parser (2.2.0)
-    resque (2.2.0)
+    regexp_parser (2.5.0)
+    resque (2.2.1)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.6)
       sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.25.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.8.0)
+    rubocop-rspec (2.11.1)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -109,22 +112,21 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    sinatra (2.1.0)
+    simplecov_json_formatter (0.1.4)
+    sinatra (2.2.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
-      rack-protection (= 2.1.0)
+      rack-protection (= 2.2.0)
       tilt (~> 2.0)
     tilt (2.0.10)
     unicode-display_width (2.1.0)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
     webrick (1.7.0)
-    yard (0.9.27)
+    yard (0.9.28)
       webrick (~> 1.7.0)
 
 PLATFORMS
   arm64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
   bundler (~> 2.3)
@@ -138,4 +140,4 @@ DEPENDENCIES
   yard (~> 0.9, >= 0.9.27)
 
 BUNDLED WITH
-   2.3.4
+   2.3.10

data/README.md

@@ -44,7 +44,7 @@ Alone, this library isn't super useful for running a bot, but it does include a
 
 ## Development
 
-Waylon's development pipeline makes heavy use of [RSpec](https://rspec.info/) for testing (and [SimpleCov](https://github.com/simplecov-ruby/simplecov) for reporting on coverage), [Rubocop](https://rubocop.org/) for linting/format checking, [YARD](https://yardoc.org/) for documentation, and [Travis CI](https://www.travis-ci.com/) for CI. Most of this is built-in and will work out-of-the-box for GitHub PRs.
+Waylon's development pipeline makes heavy use of [RSpec](https://rspec.info/) for testing (and [SimpleCov](https://github.com/simplecov-ruby/simplecov) for reporting on coverage), [Rubocop](https://rubocop.org/) for linting/format checking, [YARD](https://yardoc.org/) for documentation, and [RoxanneCI](https://github.com/apps/roxanneci) for CI. Most of this is built-in and will work out-of-the-box for GitHub PRs.
 
 To get started locally, after checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rake` to run the tests and linting. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 

data/bin/console

@@ -2,7 +2,12 @@
 # frozen_string_literal: true
 
 require "bundler/setup"
-require "waylon"
+require "waylon/core"
+require "waylon/skills/default"
+require "waylon/skills/diagnostics"
+require "waylon/skills/fun"
+require "waylon/skills/groups"
+require "waylon/skills/help"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/waylon/base_component.rb

@@ -46,7 +46,7 @@ module Waylon
         @namespace || name.to_s.split("::").last.downcase
       end
 
-      # Creates namespaced configuration keys for Webhook subclasses
+      # Creates namespaced configuration keys for BaseComponent subclasses
       # @param (see Config#add_schema)
       def config(key, default: nil, required: false, type: String)
         conf = Config.instance
@@ -127,7 +127,7 @@ module Waylon
       end
 
       # A wrapper for accessing the persistent storage
-      # @return [Waylon::Storage] The Storage wrapper class
+      # @return [Waylon::Storage] The Storage wrapper module
       def storage
         Waylon::Storage
       end

data/lib/waylon/condition.rb

@@ -66,7 +66,10 @@ module Waylon
     # @param message [Waylon::Message] The received message
     # @return [Boolean]
     def properly_mentions?(message)
-      (mention_only? && message.to_bot?) || (!mention_only? && !message.to_bot?)
+      return true unless mention_only?
+
+      message.to_bot?
+      # (mention_only? && message.to_bot?) || (!mention_only? && !message.to_bot?)
     end
 
     # Tokens is used to provide details about the message input to the action

data/lib/waylon/conditions/regex.rb

@@ -18,6 +18,9 @@ module Waylon
         @mechanism.match(input).to_a[1..]
       end
 
+      # Provides the _named_ regular expression match groups as a hash
+      # @param input [String] The message text
+      # @return [Hash<Symbol,String>] The named regular expression match groups
       def named_tokens(input)
         match_data = @mechanism.match(input)
         match_data.names.to_h { |n| [n.to_sym, match_data[n]] }

data/lib/waylon/config.rb

@@ -41,7 +41,7 @@ module Waylon
       ENV.keys.grep(/CONF_/).each do |env_key|
         conf_key = env_key.downcase.split("_")[1..].join(".")
         ::Waylon::Logger.log("Attempting to set #{conf_key} from #{env_key}", :debug)
-        self[conf_key] = ENV[env_key]
+        self[conf_key] = ENV.fetch(env_key, nil)
       end
       true
     end

data/lib/waylon/core.rb

@@ -21,6 +21,7 @@ require "faraday"
 require "i18n"
 require "json"
 require "moneta"
+require "rbnacl"
 require "resque"
 require "sinatra"
 
@@ -32,6 +33,7 @@ require "waylon/exceptions/not_implemented_error"
 require "waylon/exceptions/validation_error"
 require "waylon/group"
 require "waylon/logger"
+require "waylon/storage"
 require "waylon/base_component"
 require "waylon/condition"
 require "waylon/message"

data/lib/waylon/logger.rb

@@ -19,12 +19,18 @@ module Waylon
     # Provides an easy way to access the underlying logger
     # @return [Logger] The Logger instance
     def self.logger
-      return @logger if @logger
+      @logger ||= json_logger
+    end
+
+    def self.logger=(logger)
+      @logger = logger
+    end
 
-      @logger = ::Logger.new($stderr)
-      @logger.level = level
-      @logger.progname = "Waylon"
-      @logger.formatter = proc do |severity, datetime, progname, msg|
+    def self.json_logger
+      a_logger = ::Logger.new($stderr)
+      a_logger.level = level
+      a_logger.progname = "Waylon"
+      a_logger.formatter = proc do |severity, datetime, progname, msg|
         json_data = JSON.dump(
           ts: datetime,
           severity: severity.ljust(5).to_s,
@@ -35,7 +41,8 @@ module Waylon
         )
         "#{json_data}\n"
       end
-      @logger
+
+      a_logger
     end
   end
 end

data/lib/waylon/message.rb

@@ -30,6 +30,7 @@ module Waylon
     end
 
     def to_bot?
+      # private? || mentions_bot?
       true
     end
   end

data/lib/waylon/rspec/test_server.rb

@@ -20,7 +20,7 @@ config = Waylon::Config.instance
 config.load_env
 
 Waylon::Cache = Moneta.new(:Cookie)
-Waylon::Storage = Moneta.new(:LRUHash)
+p Waylon::Storage
 Waylon::Logger.log("Found Global Admins: #{config.admins}")
 
 Waylon::RSpec::TestUser.find_or_create(
@@ -41,7 +41,10 @@ end
 Waylon::RSpec::TestChannel.find_or_create("random")
 
 # Load demo skills here
+require "waylon/skills/diagnostics"
 require "waylon/skills/fun"
+require "waylon/skills/groups"
+require "waylon/skills/help"
 
 # Handle demo chat REPL
 def adminuser
@@ -101,7 +104,7 @@ def handle_input(body, from: this_user, privately: true)
   else
     message_count = Waylon::RSpec::TestSense.sent_messages.size
 
-    Waylon::RSpec::TestSense.process(msg_details(body, from, privately))
+    Waylon::RSpec::TestSense.perform(msg_details(body, from, privately))
     Waylon::RSpec::TestWorker.handle(Waylon::RSpec::TestSense.fake_queue)
     result = Waylon::RSpec::TestSense.sent_messages[message_count..].join("\n")
     puts("(@#{Waylon::RSpec::TestUser.whoami.handle}) >> #{result}")

data/lib/waylon/rspec/test_user.rb

@@ -147,8 +147,8 @@ module Waylon
       # @api private
       # @return [String] A generated email address
       def self.email_from_name(name)
-        if ENV["USER_EMAIL"] && name == "homer.simpson"
-          ENV["USER_EMAIL"]
+        if ENV.fetch("USER_EMAIL", nil) && name == "homer.simpson"
+          ENV.fetch("USER_EMAIL", nil)
         else
           "#{name.downcase.gsub(/[\s_-]/, ".")}@example.com"
         end

data/lib/waylon/rspec.rb

@@ -47,4 +47,4 @@ module Waylon
 end
 
 Waylon::Cache = Moneta.new(:Cookie)
-Waylon::Storage = Moneta.new(:Cookie)
+Waylon::Storage::Store = Moneta.new(:Cookie)

data/lib/waylon/skills/diagnostics.rb

@@ -27,8 +27,10 @@ module Waylon
         response << "  - *Test Result:* #{state ? "Success" : "Error"}"
         response << "  - *Read time:* #{read_time}s"
         response << "  - *Write time:* #{write_time}s"
-        response << "*Queue Monitoring:*"
-        response << "  - Failed jobs: #{Resque::Failure.count}"
+        if Resque.redis.connected?
+          response << "*Queue Monitoring:*"
+          response << "  - Failed jobs: #{Resque::Failure.count}"
+        end
 
         reply response.join("\n")
       end

data/lib/waylon/skills/groups.rb

@@ -146,7 +146,13 @@ module Waylon
       private
 
       def all_group_keys
-        db.adapter.backend.keys("groups.*")
+        if db.adapter.instance_of?(Moneta::Adapters::Redis)
+          db.adapter.backend.keys("groups.*")
+        else
+          groups = []
+          db.each_key { |key| groups << key if key.start_with?("groups.") }
+          groups
+        end
       end
 
       def found_user(user_string)

data/lib/waylon/storage.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Waylon
+  # Used for working with the Moneta store
+  module Storage
+    Store = Moneta.new(
+      :Redis,
+      url: "redis://#{ENV.fetch("REDIS", "localhost:6379")}/1"
+    )
+
+    def self.cipher
+      key_bytes = RbNaCl::Hash.sha256(ENV.fetch("ENCRYPTION_KEY", "thisisVeryUnsafe4U"))[0..31]
+      RbNaCl::SimpleBox.from_secret_key(key_bytes)
+    end
+
+    def self.clear
+      Store.clear
+    end
+
+    def self.key?(name)
+      Store.key?(name)
+    end
+
+    def self.load(key)
+      this_cipher = cipher
+      raw = Store.load(key)
+      return nil unless raw
+
+      decoded = Base64.decode64(raw)
+      plain = this_cipher.decrypt(decoded)
+      JSON.parse(plain)
+    end
+
+    def self.store(key, value)
+      this_cipher = cipher
+      encrypted = this_cipher.encrypt(value.to_json)
+      encoded = Base64.encode64(encrypted)
+      Store.store(key, encoded)
+    end
+  end
+end

data/lib/waylon/version.rb

@@ -6,7 +6,7 @@ module Waylon
     VERSION = [
       0, # Major
       1, # Minor
-      3  # Patch
+      6  # Patch
     ].join(".")
   end
 end

data/scripts/release.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+apt-get update && apt-get install -y libsodium-dev
+
+gem install bundler -v '~> 2.3'
+bundle install
+rm -rf pkg/*.gem
+bundle exec rake build
+bundle exec gem push pkg/*.gem

data/scripts/test.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
-gem install bundler -v '~> 2.2'
+apt-get update && apt-get install -y libsodium-dev
+
+gem install bundler -v '~> 2.3'
 bundle install
 bundle exec rake

data/waylon-core.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json", "~> 2.6"
   spec.add_dependency "moneta", "~> 1.4"
   spec.add_dependency "puma", "~> 5.5"
+  spec.add_dependency "rbnacl", "~> 7.1"
   spec.add_dependency "resque", "~> 2.2"
 
   spec.add_development_dependency "bundler", "~> 2.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waylon-core
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Jonathan Gnagy
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
+- !ruby/object:Gem::Dependency
+  name: rbnacl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +260,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/waylon.rb
 - lib/waylon/base_component.rb
 - lib/waylon/condition.rb
 - lib/waylon/conditions/black_hole.rb
@@ -284,10 +297,12 @@ files:
 - lib/waylon/skills/fun.rb
 - lib/waylon/skills/groups.rb
 - lib/waylon/skills/help.rb
+- lib/waylon/storage.rb
 - lib/waylon/user.rb
 - lib/waylon/version.rb
 - lib/waylon/webhook.rb
 - lib/waylon/webhook_registry.rb
+- scripts/release.sh
 - scripts/test.sh
 - waylon-core.gemspec
 homepage: https://github.com/jgnagy/waylon-core
@@ -297,7 +312,7 @@ metadata:
   homepage_uri: https://github.com/jgnagy/waylon-core
   source_code_uri: https://github.com/jgnagy/waylon-core
   changelog_uri: https://github.com/jgnagy/waylon-core/blob/main/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -312,8 +327,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: Core library for the Waylon bot framework
 test_files: []

data/lib/waylon.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require "waylon/core"
-require "waylon/skills/default"
-require "waylon/skills/diagnostics"
-require "waylon/skills/fun"
-require "waylon/skills/groups"
-require "waylon/skills/help"