slacky 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e1595985ecf5c2d925a14d5c73cb4534849e0ff
-  data.tar.gz: 08a0a936ac58f790fa9bbe326e7d5b2e89fc3f5e
+  metadata.gz: d528ee2f1cfdda695c7f3fe20a6fa6ff7873f122
+  data.tar.gz: e7e22972083c7375817923074d2bd308f665d939
 SHA512:
-  metadata.gz: 1718bf0e9ed4453048fe800ee410a9dc67bd0a3d38c8a4362e7ff995639c4f3e1c36831be54161c287b5f2a91e86a38ab83c6e4ad7e0c5ab89bb9b46514383e8
-  data.tar.gz: b1f90b491fcb60f8bb5276436a86994067f681160fcd9f164690d7fa878354688fc005b750eedbf137e731b0630b482f1878f9779d27a0adaa24e960a3713394
+  metadata.gz: cad4aade9a68c755bbf555d287aa44953ad84ea08053f9e34c1287cccebf8a119174778c9ceae3a056b7079beec8e8b5946cd7e5d089f64d89398e84ef7173e3
+  data.tar.gz: f6284614a30b71c12771508fceeed2ace006dbffad8b241f00dd6ae30d2c227aafc8a89cc849b87873282a11d4290277cda1a0c36b9cf0554e303e3bd3c1f653

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slacky (0.2.6)
+    slacky (0.2.7)
       dotenv
       em-cron
       eventmachine
@@ -27,7 +27,7 @@ GEM
     eventmachine (1.2.1)
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    faraday (0.10.0)
+    faraday (0.10.1)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.1)
       faraday (>= 0.7.4, < 1.0)

data/lib/slacky/bot.rb

@@ -12,7 +12,6 @@ module Slacky
       puts "#{config.name} is starting up..."
 
       @config = config
-      @restarts = []
       @command_handlers = []
       @channel_handlers = []
       @im_handlers = []
@@ -160,16 +159,13 @@ module Slacky
         end
       end
 
+      Thread.abort_on_exception = true
       @cron_thread ||= Thread.new do
         EM.run do
           @cron_handlers.each do |h|
             cron, handler = h.values_at :cron, :handler
             EM::Cron.schedule cron do |time|
-              begin
-                handler.call
-              rescue => e
-                @config.log "An error ocurred inside the Slackbot (in a scheduled block)", e
-              end
+              handler.call
             end
           end
         end
@@ -178,15 +174,6 @@ module Slacky
       puts "#{@config.name} is listening to: #{@config.slack_accept_channels}"
 
       @client.start!
-    rescue => e
-      @config.log "An error ocurred inside the Slackbot", e
-      @restarts << Time.new
-      @restarts.shift while (@restarts.length > 3)
-      if @restarts.length == 3 and ( Time.new - @restarts.first < 30 )
-        @config.log "Too many errors.  Not restarting anymore."
-      else
-        run
-      end
     end
 
     def populate_users
@@ -232,7 +219,7 @@ module Slacky
 
     def stay_alive
       at '* * * * *' do
-        @client.ping stamp: Time.now.to_f
+        @client.pingg stamp: Time.now.to_f
       end
 
       on :pong do |data|

data/lib/slacky/version.rb

@@ -1,3 +1,3 @@
 module Slacky
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slacky
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Michael Wynholds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client