socrates 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e648a9ac94de0a6fd27a051b478618c505f7027541eaa38e40677e555c22fc1a
-  data.tar.gz: '094d6680aefa6c2c5b64a667775c29069c9f95e9aaf953ebfcaefed5bbafef39'
+  metadata.gz: e53d6a963e0727b1bd7ad8d42b330177aed491cf30445ec04258672d97e5f468
+  data.tar.gz: d316fc17f82718d619484e372dd2a81b8945c07a2018108cf3348842f815c93f
 SHA512:
-  metadata.gz: 2e7e0ee90d0486f5a325fce2889b99f9739b76fd45696577ca3e999f18250d2f4155bc46fb8d324eadeff0d986e65a6809c6baa31d0a2bd07fbe9938a0a148dc
-  data.tar.gz: f8b3c910975023e89e05216eea0b05eb24d17f2af4de933d736ab40f3662ed841e3fef53224076edac5f6e5f2a1c8d160290781e96890a620f1632e0ebb90f5d
+  metadata.gz: ef55cc21dfb0d23284622656e73da3f2c6c808084324e1a7646d6ea6847a1c29bde36a0e9cd5b0b531a19e9fa6269400f614950017340c7dda431e1593d0e69f
+  data.tar.gz: 4513826a263c419af60c5b48a5f38204f28b17ce0ad3b937183f346c2d8431792a112035dc487c15885ea9960c2093f02ef06a4955fd17d749eab5ef4bab3f90

data/.circleci/config.yml

@@ -0,0 +1,36 @@
+version: 2
+jobs:
+  build:
+    parallelism: 1
+    working_directory: ~/socrates
+    docker:
+      - image: circleci/ruby:2.5.1
+    steps:
+      - checkout
+
+      # Restore bundle cache, with fallbacks to increase the likeliness of a cache hit
+      - restore_cache:
+          keys:
+            - gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+            - gem-cache-{{ arch }}-{{ .Branch }}
+            - gem-cache
+
+      # Bundle install dependencies and remove any unused gems
+      - run: bundle install --path vendor/bundle --jobs=4 && bundle clean --force
+
+      # Store bundle cache
+      - save_cache:
+          key: gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+
+      # Rubocop compliance
+      - run: bundle exec rubocop
+
+      # Run RSpec in parallel, when parallelism > 1
+      - run: bundle exec rspec
+
+      # Save the test logs for debugging
+      - store_artifacts:
+          path: ./log/test.log
+          destination: test.log

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.5.1

data/lib/socrates/bots/slack/ping.rb

@@ -0,0 +1,28 @@
+module Socrates
+  module Bots
+    class Slack
+      class Ping
+        def initialize
+          logger = Logger.new(STDOUT)
+          # The ping is going to run every minute, so don't be too chatty
+          logger.level = Logger::WARN
+
+          @client = ::Slack::Web::Client.new(
+            token: ENV.fetch("SLACK_API_TOKEN"),
+            logger: logger
+          )
+        end
+
+        def alive?
+          auth = client.auth_test
+          presence = client.users_getPresence(user: auth["user_id"])
+          presence.online?
+        end
+
+        private
+
+        attr_reader :client
+      end
+    end
+  end
+end

data/lib/socrates/bots/slack.rb

@@ -30,7 +30,25 @@ module Socrates
           @dispatcher.dispatch(data.text, context: data)
         end
 
-        @slack_client.start!
+        @slack_client.start_async
+
+        ping = Ping.new
+        loop do
+          sleep 60
+          next if ping.alive?
+
+          alert "Slack RTC has gone offline; restarting it"
+          @slack_client.stop! if @slack_client.started?
+          sleep 1 # give the websocket a chance to completely disconnect
+          @slack_client.start_async
+        end
+      end
+
+      private
+
+      def alert(message)
+        Socrates.config.logger.warn(message)
+        Socrates.config.warn_handler.call(message)
       end
     end
   end

data/lib/socrates/configuration.rb

@@ -17,7 +17,8 @@ module Socrates
     attr_accessor :error_message
     attr_accessor :expired_timeout # seconds
     attr_accessor :logger
-    attr_accessor :error_handler   # a callable proc
+    attr_accessor :error_handler   # a callable like ->(String, Exception) { ... }
+    attr_accessor :warn_handler    # a callable like ->(String) { ... }
 
     def initialize
       @storage         = Storage::Memory.new
@@ -25,6 +26,7 @@ module Socrates
       @expired_timeout = 30.minutes
       @logger          = Socrates::Logger.default
       @error_handler   = proc { |_message, _error| }
+      @warn_handler    = proc { |_message| }
     end
   end
 end

data/lib/socrates/sample_states.rb

@@ -141,11 +141,10 @@ module Socrates
       def calculate_age
         today = Time.current.to_date
 
-        if today.month < birth_date.month || (today.month == birth_date.month && birth_date.day > today.day)
-          today.year - birth_date.year - 1
-        else
-          today.year - birth_date.year
-        end
+        age = today.year - birth_date.year
+        age -= 1 if today.month < birth_date.month || (today.month == birth_date.month && birth_date.day > today.day)
+
+        age
       end
     end
 

data/lib/socrates/version.rb

@@ -1,3 +1,3 @@
 module Socrates
-  VERSION = "0.1.19"
+  VERSION = "0.1.20"
 end

data/lib/socrates.rb

@@ -14,6 +14,7 @@ require "socrates/core/state"
 require "socrates/core/dispatcher"
 require "socrates/bots/cli"
 require "socrates/bots/slack"
+require "socrates/bots/slack/ping"
 
 module Socrates
 end

data/socrates.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rspec", "~> 3.7"
-  spec.add_development_dependency "rubocop", "~> 0.52"
+  spec.add_development_dependency "rubocop", "0.54"
+  spec.add_development_dependency "simplecov", "~> 0.16.1"
   spec.add_development_dependency "timecop", "~> 0.9"
 
   spec.add_dependency "activesupport", ">= 5.1.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socrates
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Christian Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,18 +54,32 @@ dependencies:
         version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.54'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.54'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +172,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -167,7 +182,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- circle.yml
 - exe/socrates
 - lib/socrates.rb
 - lib/socrates/adapters/adapter.rb
@@ -177,6 +191,7 @@ files:
 - lib/socrates/adapters/stubs.rb
 - lib/socrates/bots/cli.rb
 - lib/socrates/bots/slack.rb
+- lib/socrates/bots/slack/ping.rb
 - lib/socrates/configuration.rb
 - lib/socrates/core/dispatcher.rb
 - lib/socrates/core/session.rb
@@ -211,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A micro-framework for building stateful conversational bots.

data/circle.yml

@@ -1,7 +0,0 @@
-dependencies:
-  pre:
-    - gem update --system
-
-test:
-  post:
-    - bundle exec rubocop