rslack 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed64057e1a6a7e9a5c3541d6ec477c551b480ce6
-  data.tar.gz: 9b0f306e0a6a311e4c862b58b48c92eee20e7f09
+  metadata.gz: 8feb48a7730fc536e14a81b525a755af73c9d8fb
+  data.tar.gz: 35fb641427ea9320d0258224cf105966156013d5
 SHA512:
-  metadata.gz: e3951ed8d9a74f734bdf9294009a24a88d8d1a4ed2c5e471ece1da4028623e6d93522f76bf820f0aee9ebbe92ddeefedf9d21d6119068577ae831225aaddd063
-  data.tar.gz: e904de9637818adf05ad7cf9593d106a5631ba1e88dcea2e98b8687e59745ff3fd91f8306df114c5071859b0d9fbce36a323001e410e812739560ddf12d3972b
+  metadata.gz: 68a0a9e94ac80dcb4338e8b67c109b6e9c3c614f3c432361159b58bfb15f64564716778aa8cfb6f9daee07e04687b8d6267e2f38fe617eda2c2cf0b458300643
+  data.tar.gz: a45bd0b20d33d29a32345bb299decaccb0b0b282d02bb281f556e9356af19737fb8df35b06723d92e78b3706e4fb2da2b7a7ebd4716261644d28d9a20414b66a

data/lib/rslack.rb

@@ -11,8 +11,7 @@ module RSlack
       bot = build(args)
 
       Signal.trap(:INT) do
-        bot.force_stop
-        exit 0
+        bot.stop(force: true)
       end
 
       bot.start

data/lib/rslack/actions/cron.rb

@@ -17,13 +17,10 @@ module RSlack
       helptext: 'List cron schedules.',
       callback: 'list'
 
-    class << self
-      attr_accessor :timer
-    end
-
     def initialize(bot)
-      super(bot)
+      @timer = nil
       @channel = {}
+      super(bot)
     end
 
     def add(msg)
@@ -64,16 +61,16 @@ module RSlack
       parser = CronParser.new(msg.var.syntax)
       sleep  = parser.next(Time.now) - Time.now
 
-      CronAction.timer = EM::Timer.new(sleep) do
+      @timer = EM::Timer.new(sleep) do
         item = OpenStruct.new(msg.to_h.merge(text: msg.var.command))
         item.delete_field(:var)
         bot.react(item)
-        CronAction.timer = start(msg)
+        start(msg)
       end
     end
 
     def stop
-      CronAction.timer.cancel
+      @timer.cancel if @timer
     end
 
     private

data/lib/rslack/api.rb

@@ -1,3 +1,4 @@
+require 'faye/websocket'
 require 'http'
 require 'json'
 
@@ -7,17 +8,20 @@ module RSlack
 
     BASEURL = "https://slack.com/api/"
 
-    attr_accessor :token
+    attr_reader :url
+    attr_reader :token
 
-    def initialize(token)
+    def initialize(url: BASEURL, token:)
+      @url   = url
       @token = token
     end
 
-    def rtm
-      call('rtm.start')
+    def websocket
+      rtm = call('rtm.start')
+      Faye::WebSocket::Client.new(rtm['url'], {}, { ping: 60 })
     end
 
-    def auth
+    def me
       call('auth.test')
     end
 

data/lib/rslack/bot.rb

@@ -1,5 +1,4 @@
 require 'eventmachine'
-require 'faye/websocket'
 require 'rslack/api'
 
 require 'json'
@@ -15,12 +14,8 @@ module RSlack
     class << self
 
       def register(route)
-        routes.push(route)
-      end
-
-      private
-      def routes
         @routes ||= []
+        @routes.push(route)
       end
 
     end
@@ -34,26 +29,29 @@ module RSlack
     STORAGE_INTERVAL = 5
 
     def initialize(token, log: nil)
-      @client  = APIClient.new(token)
+      @client  = APIClient.new(token: token)
       @logger  = Logger.new(log || STDOUT)
       @memory  = {}
+      @running = true
 
       @routes  = self.class.instance_variable_get(:@routes)
+      @actions = @routes.reduce({}) { |a, e| a[e.action] ||= e.action.new(self); a }
+      @actions.keys.each { |e, _| @logger.info("#{self.class} loads #{e}.") }
       @storage = LevelDB::DB.new(File.join(Dir.pwd, "#{STORAGE_KEYNAME}.db"))
+      @botuser = @client.me
 
-      @auth = @client.auth
-      unless @auth['ok']
+      unless @botuser['ok']
         @logger.fatal("#{self.class} Failed to access slack web api.")
         exit 1
       end
     end
 
     def name
-      "@#{@auth['user']}"
+      "@#{@botuser['user']}"
     end
 
     def linked_name
-      "<@#{@auth['user_id']}>"
+      "<@#{@botuser['user_id']}>"
     end
 
     def reply(msg, **opts)
@@ -70,38 +68,41 @@ module RSlack
         count += 1
         message = msg.dup
         message.var = OpenStruct.new(matched.named_captures)
-        logger.info("#{self.class} passed msg to: '#{route.action}'.")
+        logger.info("#{self.class} passed the msg to: '#{route.action}'.")
 
-        th = Thread.start do
+        Thread.start do
           begin
-            action = route.action.new(self)
+            action = @actions[route.action]
             action.instance_exec(message.freeze, &route.callback)
           rescue => e
-            reply(msg, text: "_#{e}._")
+            reply(msg, text: "#{route.action} encountered an error: _#{e}._")
           end
         end
-        th.abort_on_exception = true
       end
 
-      reply(msg, text: 'I have no idea what to do...') if msg.prefix == linked_name && count.zero?
+      reply(msg, text: 'Sorry, I have no idea what to do...') if msg.prefix == linked_name && count.zero?
     end
 
     def start
       load_storage
       EM.run { wait_for_message }
+      logger.info("#{self.class} started.")
     end
 
-    def stop
-      EM.stop
-      dump_storage
-    end
+    def stop(force: false)
+      @running = !force
 
-    def force_stop
       EM.stop
+      exit 0 unless @running
+
+      dump_storage
+      logger.info("#{self.class} stopped.")
     end
 
     def restart
       stop
+
+      sleep 5
       start
     end
 
@@ -109,22 +110,25 @@ module RSlack
     def wait_for_message
       EM.add_periodic_timer(STORAGE_INTERVAL) { dump_storage }
 
-      url = @client.rtm['url']
-      rtm = Faye::WebSocket::Client.new(url)
+      ws = @client.websocket
+
+      ws.on(:open) do |event|
+        logger.info("#{self.class} slack rtm api connection has opened.")
+      end
 
-      rtm.on(:open) do |event|
-        logger.info("#{self.class} slack realtime api connection has opened.")
+      ws.on(:close) do |event|
+        logger.info("#{self.class} slack rtm api connection has closed.")
+        restart if EM.reactor_running? && @running
       end
 
-      rtm.on(:close) do |event|
-        logger.info("#{self.class} slack realtime api connection has closed.")
-        restart if EM.reactor_running?
+      ws.on(:error) do |event|
+        logger.info("#{self.class} slack rtm api error has occured: #{event.message}")
       end
 
-      rtm.on(:message) do |event|
+      ws.on(:message) do |event|
         msg = OpenStruct.new(JSON.parse(event.data))
         if msg.type == 'message' && msg.subtype.nil?
-          logger.info("#{self.class} recieved msg: '#{msg.text}'.")
+          logger.info("#{self.class} recieved a msg: '#{msg.text}'.")
 
           if msg.text =~ /^\s*(#{linked_name})\s*(.*)$/
             msg.prefix = $1.to_s

data/lib/rslack/version.rb

@@ -1,3 +1,3 @@
 module RSlack
-  VERSION = "0.2.5"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rslack
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler