rodbot 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac36ded2dc61a62f3a5e9c236987ff66f0aadf65f216b96932375af2cec3241
-  data.tar.gz: '099b12406aa01b8ec165efb25a3faef9fd1efeed3a8c9a7c0c0bb05febadf2e8'
+  metadata.gz: cfce379a5c8a1fa2b8ba390b25c5a3db58406aa2442edc9bb4c5b022bfabe40a
+  data.tar.gz: 4b5ca31f1697ae81d9374b5ab9e0173ea37c391d4cd9e936c7a733b91b14439b
 SHA512:
-  metadata.gz: 06d6953cd85005effd3a54da59564e52a27d27cb42f61ccc2aeb0dfa32627a38d96f9e07fd9ba7d533fdf4210180d228582e5b39672a4124eba9831abb443016
-  data.tar.gz: cec0a4d433b447c34fa91ff7a7fd9df416648851ef5b8156fb3d01579ac2d1abb26e7738ee000b1bdb322575dc99c5f8ac635843e1ecfc07d439b3b3403fddb9
+  metadata.gz: 7d8c5faff81fd9fc2f2552155fe1f29909d444c4b8321bbb8faf4b3889ab363a56991d68de88fc418b9418d3dbc587851cb0bd9134009ad0a9ee8321927ef668
+  data.tar.gz: b668cbe4c688399f2d4f8bedd355268b4c24d05bfd74dfe50643c3ec93970ebc42c0e87a882135c580587e8badda7f5b9bb0d3a6fe51b478a9e40fa73c0f2124

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 Nothing so far
 
+## 0.4.1
+
+#### Fixes
+* Fix init of memoization cache
+
+## 0.4.0
+
+#### Breaking Changes
+* Rename `timezone` config to `time_zone` and properly implement and document
+  time zone handling
+
 ## 0.3.4
 
 #### Additions

data/README.md

@@ -60,6 +60,13 @@ bundle config set --local with matrix
 bundle install
 ```
 
+You can use more than one plugin of course. Please note that you have to list them separated with a space:
+
+```
+bundle config set --local with matrix slack
+bundle install
+```
+
 Please refer to the [Matrix plugin README](https://rubydoc.info/github/svoop/rodbot/file/lib/rodbot/plugins/matrix/README.matrix.md) for more on how to configure and authorise this relay service.
 
 Time to add Git to the mix. Both `gems.locked` and `.bundle` are included in order to use the same gems and versions both for local development and deployment to production:
@@ -128,7 +135,7 @@ It loads the following Roda plugins:
 * [run_append_slash](http://roda.jeremyevans.net/rdoc/classes/Roda/RodaPlugins/RunAppendSlash.html)
 * [halt](http://roda.jeremyevans.net/rdoc/classes/Roda/RodaPlugins/Halt.html)
 * [unescape_path](http://roda.jeremyevans.net/rdoc/classes/Roda/RodaPlugins/UnescapePath.html)
-* [render](http://roda.jeremyevans.net/rdoc/classes/Roda/RodaPlugins/Render.html).
+* [render](http://roda.jeremyevans.net/rdoc/classes/Roda/RodaPlugins/Render.html)
 
 It loads the following Roda extensions provided by Rodbot:
 
@@ -204,6 +211,8 @@ The **schedule service** is a [Clockwork process](https://github.com/Rykian/cloc
 
 It's a good idea to have the **app service** do the heavy lifting while the schedule simply fires the corresponding HTTP request.
 
+A word on time zones since they are particularly important for schedules: Automatic discovery of the local time zone and DST status is rather unreliable. Therefore, Rodbot expects you to set the time zone in `config/rodbot.rb` using `time_zone`. See `ls /usr/share/zoneinfo` for valid values. To correctly handle DST, you should use geographical zones like `Europe/Paris` rather than technical zones like `CET`. If `time_zone` is not defined, the environment variable `TZ` is read instead. And if `TZ` isn't set neither, Rodbot falls back to `Etc/UTC`.
+
 ## CLI
 
 The `rodbot` CLI is the main tool to manage your bot. For a full list of functions:

data/checksums/rodbot-0.4.0.gem.sha512

@@ -0,0 +1 @@
+86c927787dfd98933bc894182d2757c8b3667863e989a2b86ea67491dcc712bb294a726e118f619bf02b721e22aff5f879bc7ce700949293e65f21c757915a20

data/checksums/rodbot-0.4.1.gem.sha512

@@ -0,0 +1 @@
+d2acbdcc527c4306534fdca3853d97566c395601178f723d7fce60032df5581d1ebbfc720bae1ec219441d66c8779ac41cf345748427d497f4052a31f21b642f

data/lib/rodbot/config.rb

@@ -66,7 +66,7 @@ module Rodbot
     DEFAULTS = <<~END
       name 'Rodbot'
       port 7200
-      timezone 'Etc/UTC'
+      time_zone ENV['TZ'] || 'Etc/UTC'
       db 'hash'
       app do
         threads Rodbot.env.development? ? (1..1) : (2..4)

data/lib/rodbot/generator.rb

@@ -93,8 +93,8 @@ module Rodbot
     end
 
     class Helpers
-      def timezone
-        Rodbot.config(:timezone)
+      def time_zone
+        Rodbot.config(:time_zone)
       end
 
       def relay_extensions

data/lib/rodbot/memoize.rb

@@ -53,12 +53,12 @@ module Rodbot
           if Rodbot::Memoize.suspend? || block
             send(unmemoized_method, *args, **kargs, &block)
           else
-            id = method.hash ^ args.hash ^ kargs.hash
-            @_memoize_cache ||= {}
-            if !Rodbot::Memoize.revisit? && @_memoize_cache.has_key?(id)
-              @_memoize_cache[id]
+            cache = Rodbot::Memoize.cache
+            id = object_id.hash ^ method.hash ^ args.hash ^ kargs.hash
+            if !Rodbot::Memoize.revisit? && cache.has_key?(id)
+              cache[id]
             else
-              @_memoize_cache[id] = send(unmemoized_method, *args, **kargs)
+              cache[id] = send(unmemoized_method, *args, **kargs)
             end
           end
         end
@@ -67,6 +67,13 @@ module Rodbot
     end
 
     class << self
+      attr_reader :cache
+
+      def included(base)
+        base.extend(ClassMethods)
+        @cache ||= {}
+      end
+
       %i(suspend revisit).each do |switch|
         ivar = "@#{switch}"
         define_method switch do |&block|
@@ -84,10 +91,6 @@ module Rodbot
           end
         end
       end
-
-      def included(base)
-        base.extend(ClassMethods)
-      end
     end
   end
 

data/lib/rodbot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rodbot
-  VERSION = "0.3.4"
+  VERSION = "0.4.1"
 end

data/lib/rodbot.rb

@@ -51,6 +51,7 @@ module Rodbot
         dir ENV['RODBOT_CREDENTIALS_DIR'] || Rodbot.env.root.join('config', 'credentials')
       end
       @config = Rodbot::Config.new(Rodbot.env.root.join('config', 'rodbot.rb'))
+      ENV['TZ'] = @config.config(:time_zone)
       @plugins = Rodbot::Plugins.new
       @db = (db = @config.config(:db)) && Rodbot::Db.new(db)
       @log = Rodbot::Log.new

data/lib/templates/deploy/docker/compose.yaml.gerb

@@ -9,7 +9,7 @@ x-defaults: &defaults
       ENV RODBOT_ENV="production"
       ENV RACK_ENV="production"
       ENV RACK_ROOT="/var/www"
-      ENV TZ="[%= timezone %]"
+      ENV TZ="[%= time_zone %]"
       RUN mkdir -p /var/www
       WORKDIR /var/www
       COPY . .

data/lib/templates/deploy/docker-split/compose.yaml.gerb

@@ -9,7 +9,7 @@ x-defaults: &defaults
       ENV RODBOT_ENV="production"
       ENV RACK_ENV="production"
       ENV RACK_ROOT="/var/www"
-      ENV TZ="[%= timezone %]"
+      ENV TZ="[%= time_zone %]"
       RUN mkdir -p /var/www
       WORKDIR /var/www
       COPY . .

data/lib/templates/new/config/rodbot.rb

@@ -1,5 +1,5 @@
 name 'Rodbot'
-timezone 'Etc/UTC'
+time_zone 'Etc/UTC'
 
 plugin :hal
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rodbot
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.1
 platform: ruby
 authors:
 - Sven Schwyn
@@ -10,26 +10,24 @@ bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDODCCAiCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhydWJ5
-  L0RDPWJpdGNldGVyYS9EQz1jb20wHhcNMjIxMTA2MTIzNjUwWhcNMjMxMTA2MTIz
-  NjUwWjAjMSEwHwYDVQQDDBhydWJ5L0RDPWJpdGNldGVyYS9EQz1jb20wggEiMA0G
+  MIIC+jCCAeKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhydWJ5
+  L0RDPWJpdGNldGVyYS9EQz1jb20wHhcNMjMxMTEwMTgyMzM2WhcNMjQxMTA5MTgy
+  MzM2WjAjMSEwHwYDVQQDDBhydWJ5L0RDPWJpdGNldGVyYS9EQz1jb20wggEiMA0G
   CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcLg+IHjXYaUlTSU7R235lQKD8ZhEe
   KMhoGlSUonZ/zo1OT3KXcqTCP1iMX743xYs6upEGALCWWwq+nxvlDdnWRjF3AAv7
   ikC+Z2BEowjyeCCT/0gvn4ohKcR0JOzzRaIlFUVInlGSAHx2QHZ2N8ntf54lu7nd
   L8CiDK8rClsY4JBNGOgH9UC81f+m61UUQuTLxyM2CXfAYkj/sGNTvFRJcNX+nfdC
   hM9r2kH1+7wsa8yG7wJ2IkrzNACD8v84oE6qVusN8OLEMUI/NaEPVPbw2LUM149H
   PVa0i729A4IhroNnFNmw4wOC93ARNbM1+LW36PLMmKjKudf5Exg8VmDVAgMBAAGj
-  dzB1MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSfK8MtR62mQ6oN
-  yoX/VKJzFjLSVDAdBgNVHREEFjAUgRJydWJ5QGJpdGNldGVyYS5jb20wHQYDVR0S
-  BBYwFIEScnVieUBiaXRjZXRlcmEuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAYG2na
-  ye8OE2DANQIFM/xDos/E4DaPWCJjX5xvFKNKHMCeQYPeZvLICCwyw2paE7Otwk6p
-  uvbg2Ks5ykXsbk5i6vxDoeeOLvmxCqI6m+tHb8v7VZtmwRJm8so0eSX0WvTaKnIf
-  CAn1bVUggczVdNoBXw9WAILKyw9bvh3Ft740XZrR74sd+m2pGwjCaM8hzLvrVbGP
-  DyYhlBeRWyQKQ0WDIsiTSRhzK8HwSTUWjvPwx7SEdIU/HZgyrk0ETObKPakVu6bH
-  kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
-  fwIwU1MKlFBdsjkd
+  OTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSfK8MtR62mQ6oN
+  yoX/VKJzFjLSVDANBgkqhkiG9w0BAQsFAAOCAQEAXhT/LpMArF3JRcZSRkJDY+dU
+  GKCRqOefi2iydqh1yIqXyTA9PGR1w5O6O+WS1FvF+sHCwh8fFjCuStg2L8V2RSeo
+  aDtfZ5s80sL8wRFxg3kek69cBuI6ozU+rf9DaXlMES4i8+zASsdv9Y4a2BsbhEdE
+  9AtuMcWn5a45TOO0S4Q8OuV0v705V38Ow15J2RDRvkFRySt+//8/Vd57XAJxPXU0
+  k/QvZU05f6HMYBrPogJgIzHC/C5N/yeE4BVEuBDn+10Zb1iu3aDk8sd0uMgukCY8
+  TUmlP5A6NeGdeDJIoLgromAKs+nvI7TWzhQq9ODs51XhxgUFRCvBqUTpjTQigw==
   -----END CERTIFICATE-----
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2023-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -454,6 +452,8 @@ files:
 - checksums/rodbot-0.3.2.gem.sha512
 - checksums/rodbot-0.3.3.gem.sha512
 - checksums/rodbot-0.3.4.gem.sha512
+- checksums/rodbot-0.4.0.gem.sha512
+- checksums/rodbot-0.4.1.gem.sha512
 - doc/rodbot.afphoto
 - doc/rodbot.avif
 - exe/rodbot
@@ -573,7 +573,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Minimalistic framework to build chat bots on top of a Roda backend