slacky 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c355833a298fc5863bdec1d1e532644a4bdf58e6561307cec1f6a40955a241dd
-  data.tar.gz: 565d78bc807f1497605542641bdd903620f913780daf2e9b5b928c557f929c9c
+  metadata.gz: f64d6b38573e8b85b0902c5e8c8445aee9f13a6d9af4228e9710c7b6d0c1f381
+  data.tar.gz: 9b95b176b787e8371a3047d7f10503993d2431f05580e87eadca417ef2e3cc7b
 SHA512:
-  metadata.gz: f86f2d65c23bd7aded4d7e28d660896e23d4cae62372c006434b0ad7edfe5effdc5613298f49e290f3339e7ca7e33909cfe737a064cfc54578cc4f311e0305ed
-  data.tar.gz: d39bcb102bb26ae19494e70dbdc187d20a77aa5c2986105cc0695460695c294f9b536fe294429eb06bbf7052e668b2458373efdc52d2ef63c928ad9419245860
+  metadata.gz: 4f3be5fad70e8f134037fab97543758cfdd051838545d510bae177eff11c26992c45b9a332fc684782a79bad3b5ecc4bd8433cc50084044c5712010ebfb0336c
+  data.tar.gz: b8a76cec99a509b7d46ddfa90ccabe165682b52aa7ecaedb0c6f8e17b9af3b307031deea5c96cabec98f227dd81d9502dfd99f1d397f8f12cef4ea1024aef7b0

data/Gemfile.lock

@@ -1,48 +1,51 @@
 PATH
   remote: .
   specs:
-    slacky (0.3.2)
+    slacky (0.3.3)
+      async-websocket (~> 0.8.0)
       dotenv
-      em-cron
-      eventmachine
-      faye-websocket
+      parse-cron
       pg
-      slack-ruby-client (>= 0.14)
+      slack-ruby-client
       tzinfo
       tzinfo-data
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (5.1.6)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.0.5)
+    async (1.20.0)
+      console (~> 1.0)
+      nio4r (~> 2.3)
+      timers (~> 4.1)
+    async-io (1.23.3)
+      async (~> 1.14)
+    async-websocket (0.8.0)
+      async-io
+      websocket-driver (~> 0.7.0)
+    concurrent-ruby (1.1.5)
+    console (1.4.0)
     dotenv (2.7.4)
-    em-cron (0.2.0)
-      eventmachine
-      parse-cron (~> 0.1)
-    eventmachine (1.2.7)
     factory_girl (4.9.0)
       activesupport (>= 3.0.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    faye-websocket (0.10.9)
-      eventmachine (>= 0.12.0)
-      websocket-driver (>= 0.5.1)
     gli (2.18.1)
     hashie (3.6.0)
-    i18n (1.0.0)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
     multipart-post (2.1.1)
+    nio4r (2.4.0)
     parse-cron (0.1.4)
     pg (1.1.4)
-    rake (12.3.1)
+    rake (12.3.2)
     slack-ruby-client (0.14.2)
       activesupport
       faraday (>= 0.9)
@@ -51,9 +54,10 @@ GEM
       hashie
       websocket-driver
     thread_safe (0.3.6)
+    timers (4.3.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2019.1)
+    tzinfo-data (1.2019.2)
       tzinfo (>= 1.0.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)

data/lib/slacky.rb

@@ -8,4 +8,5 @@ module Slacky
   require 'slacky/user'
   require 'slacky/channel'
   require 'slacky/message'
+  require 'slacky/cronner'
 end

data/lib/slacky/bot.rb

@@ -1,7 +1,6 @@
 require 'slack-ruby-client'
 require 'set'
 require 'tzinfo'
-require 'em/cron'
 
 module Slacky
   class Bot
@@ -24,7 +23,7 @@ module Slacky
       end
 
       Slack::RealTime.configure do |cfg|
-        cfg.concurrency = Slack::RealTime::Concurrency::Eventmachine
+        cfg.concurrency = Slack::RealTime::Concurrency::Async
       end
 
       @client = Slack::RealTime::Client.new
@@ -159,15 +158,10 @@ module Slacky
 
       Thread.report_on_exception = false if defined? Thread.report_on_exception
 
-      @client.start! do
-        # This code must run in the callback / block because it requires EventMachine
-        # be running before it gets executed.  If we can find another way to handle
-        # this cron syntax we can move to using the async-websocket library instead
-        # of EventMachine. -mike
-
+      @client.start! do |driver|
         @cron_handlers.each do |h|
           cron, handler = h.values_at :cron, :handler
-          EM::Cron.schedule cron do |time|
+          Cronner.schedule cron do |time|
             handler.call
           end
         end
@@ -218,10 +212,11 @@ module Slacky
       end
 
       on :pong do |data|
-        now = Time.now.to_f
-        stamp = data.stamp
-        delta = now - stamp
-        raise Exception.new("Slow ping pong response: #{delta}s") if delta > 5
+        if data.stamp
+          now = Time.now.to_f
+          delta = now - data.stamp
+          raise Exception.new("Slow ping pong response: #{delta}s") if delta > 5
+        end
       end
     end
 

data/lib/slacky/cronner.rb

@@ -0,0 +1,16 @@
+require 'async'
+require 'parse-cron'
+
+module Slacky
+  class Cronner
+    def self.schedule(cron_string, &blk)
+      cron_parser = CronParser.new(cron_string)
+      next_time = cron_parser.next(Time.now)
+      Async do |task|
+        task.sleep next_time - Time.now
+        result = yield next_time
+        schedule(cron_string, &blk) unless result == :stop
+      end
+    end
+  end
+end

data/lib/slacky/version.rb

@@ -1,3 +1,3 @@
 module Slacky
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/slacky.gemspec

@@ -16,11 +16,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'slack-ruby-client', ">= 0.14"
+  s.add_runtime_dependency 'slack-ruby-client'
   s.add_runtime_dependency 'pg'
-  s.add_runtime_dependency 'eventmachine'
-  s.add_runtime_dependency 'faye-websocket'
-  s.add_runtime_dependency 'em-cron'
+  s.add_runtime_dependency 'async-websocket', "~> 0.8.0"
+  s.add_runtime_dependency 'parse-cron'
   s.add_runtime_dependency 'tzinfo'
   s.add_runtime_dependency 'tzinfo-data'
   s.add_runtime_dependency 'dotenv'

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: slacky
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Michael Wynholds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faye-websocket
+  name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: em-cron
+  name: parse-cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -183,6 +169,7 @@ files:
 - lib/slacky/channel.rb
 - lib/slacky/cli.rb
 - lib/slacky/config.rb
+- lib/slacky/cronner.rb
 - lib/slacky/message.rb
 - lib/slacky/service.rb
 - lib/slacky/user.rb