slacky 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c41bbb7f8e9ad2598d6036ad9a1c67166a449328036242723a2faaec2b49aff6
-  data.tar.gz: 51a726c0a6535d4fe1b6ca838497ef20fa9fc8c7629116989ce80f3547f9e452
+  metadata.gz: e608d8b4af8ddfadf4c45aa64a4dc4bcd5d03dd8c1b78fb5e362ea16c4bf602e
+  data.tar.gz: dfee525f94af1a3aca6aa048e9c714a377750bc34980d1e033f9387d6cc50ecf
 SHA512:
-  metadata.gz: 7af303486e41000bd32c184c1cb699a513b105c40a743b4b55549b07905ee5d188663d129c0cd1b47ee8c3f1dafe8ccfbfa36111311c989f08746a2c851b38a5
-  data.tar.gz: 33163cd7a246f666046684b89c0ef07dffcf5d1f25890798238dd1c957ce526c0c2ffebb7020b10859cfa098f08c9fef431c179dfd8ab7ad432c65ca8c7ed934
+  metadata.gz: 4ab7bccbff9e0aa4b0a1a6873ec4e21db25321714a38d3b85c0a01c469267d7caf1c470a521e62a5475080dbdfe5735cd8fa080e96fdf2930ec4388e9e25758c
+  data.tar.gz: f53e5ae04d5674352bc2f9915340acf8228a164bf67254add03348359b3b8294351f11172d28f2f06ca7617263c713c989ea8b99fdce8652b55d2a487b05a80d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slacky (0.3.0)
+    slacky (0.3.1)
       dotenv
       em-cron
       eventmachine

data/lib/slacky.rb

@@ -2,7 +2,6 @@ module Slacky
   require 'slacky/version'
   require 'slacky/cli'
   require 'slacky/config'
-  require 'slacky/daemon'
   require 'slacky/service'
   require 'slacky/bot'
   require 'slacky/bookkeeper'

data/lib/slacky/bot.rb

@@ -8,9 +8,6 @@ module Slacky
     attr_reader :client, :config, :slack_id
 
     def initialize(config)
-      config.log "#{config.name} is starting up..."
-      puts "#{config.name} is starting up..."
-
       @config = config
       @command_handlers = []
       @channel_handlers = []
@@ -19,8 +16,7 @@ module Slacky
       @cron_handlers = []
 
       unless @config.slack_api_token
-        @config.log "No Slack API token found.  Use environment variable SLACK_API_TOKEN."
-        return
+        raise "No Slack API token found.  Use environment variable SLACK_API_TOKEN."
       end
 
       Slack.configure do |slack_cfg|
@@ -30,13 +26,8 @@ module Slacky
       @client = Slack::RealTime::Client.new
 
       auth = web_client.auth_test
-      if auth.ok
-        @slack_id = auth.user_id
-        @config.log "Slackbot is active!"
-      else
-        @config.log "Slackbot is doomed :-("
-        return
-      end
+      @slack_id = auth.user_id
+      puts "Slackbot is active!"
 
       @bookkeeper = Bookkeeper.new @client
 
@@ -47,6 +38,7 @@ module Slacky
       populate_channels
       stay_alive
 
+      on_command 'blowup', &(method :blowup)
     end
 
     def web_client
@@ -159,27 +151,28 @@ 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|
-              handler.call
-            end
+      puts "#{@config.name} is listening to: #{@config.slack_accept_channels}"
+
+      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
+
+        @cron_handlers.each do |h|
+          cron, handler = h.values_at :cron, :handler
+          EM::Cron.schedule cron do |time|
+            handler.call
           end
         end
       end
-
-      puts "#{@config.name} is listening to: #{@config.slack_accept_channels}"
-
-      @client.start!
     end
 
     def populate_users
       print "Getting users from Slack..."
       resp = web_client.users_list
-      throw resp unless resp.ok
       User.invalidate_all_users
       whitelist = @config.whitelist_users || []
       resp.members.map do |member|
@@ -201,13 +194,11 @@ module Slacky
     def populate_channels
       print "Getting channels from Slack..."
       resp = web_client.channels_list
-      throw resp unless resp.ok
       resp.channels.map do |channel|
         Channel.channel channel
       end
 
       resp = web_client.groups_list
-      throw resp unless resp.ok
       resp.groups.map do |group|
         Channel.group group
       end
@@ -226,14 +217,14 @@ module Slacky
         now = Time.now.to_f
         stamp = data.stamp
         delta = now - stamp
-        @config.log "Slow ping pong response: #{delta}s" if delta > 5
+        raise Exception.new("Slow ping pong response: #{delta}s") if delta > 5
       end
     end
 
-    def blowup(user, data, args, &respond)
-      respond.call "Tick... tick... tick... BOOM!   Goodbye."
+    def blowup(message)
+      message.reply "Tick... tick... tick... BOOM!   Goodbye."
       EM.next_tick do
-        raise "kablammo!"
+        raise Exception.new("kablammo!")
       end
     end
   end

data/lib/slacky/channel.rb

@@ -58,7 +58,7 @@ module Slacky
       when :channel ; @member
       when :group   ; @members[@@bot.slack_id]
       when :im      ; true
-      else            throw "Unknown channel type: #{@type}"
+      else            raise "Unknown channel type: #{@type}"
       end
     end
 

data/lib/slacky/cli.rb

@@ -3,32 +3,13 @@ module Slacky
     attr_reader :bot
 
     def initialize(name, bot_class, opts)
-      throw "CLI must be passed a name" unless name
-      @options = { :verbose => false }.merge opts
+      raise "CLI must be passed a name" unless name
       config = Config.new name
-      daemon = Daemon.new config, bot_class
-      @service = Service.new config, daemon
+      @service = Service.new config, bot_class
     end
 
     def run(params)
       @service.run
     end
-
-    def start(params)
-      @service.start
-    end
-
-    def stop(params)
-      @service.stop
-    end
-
-    def restart(params)
-      @service.restart
-    end
-
-    def status(params)
-      @service.status
-    end
-
   end
 end

data/lib/slacky/config.rb

@@ -5,14 +5,12 @@ require 'dotenv'
 
 module Slacky
   class Config
-    attr_reader :pid_file, :name, :db
+    attr_reader :name, :db
 
     def initialize(name, opts = {})
       @name = name
       Dotenv.load ".env", "#{config_dir}/.env"
       FileUtils.mkdir config_dir unless File.directory? config_dir
-      @pid_file = "#{config_dir}/pid"
-      @timestamps = {}
       User.config = self
     end
 
@@ -55,26 +53,10 @@ module Slacky
       ENV['WHITELIST_USERS'].split(',').map {|u| u.strip}
     end
 
-    def log(msg, ex = nil)
-      log = File.new(log_file, 'a')
-      timestamp = Time.now.strftime('%Y-%m-%d %H:%M:%S')
-      type = ex ? 'ERROR' : ' INFO'
-      log.puts "#{type}  #{timestamp}  #{msg}"
-      if ex
-        log.puts ex.message
-        log.puts("Stacktrace:\n" + ex.backtrace.join("\n"))
-      end
-      log.flush
-    end
-
     private
 
     def db_connect_params
       ENV['DATABASE_URL'] || { dbname: "slacky_#{down_name}" }
     end
-
-    def log_file
-      "#{config_dir}/#{down_name}.log"
-    end
   end
 end

data/lib/slacky/service.rb

@@ -1,73 +1,15 @@
-require 'fileutils'
-
-class Slacky::Service
-  def initialize(config, daemon)
-    @config = config
-    @daemon = daemon
-  end
-
-  def run
-    @daemon.start false
-  end
-
-  def start(persist = false)
-    pid = get_pid
-    if pid
-      puts "#{@config.name} is already running with PID #{pid}"
-      return
+module Slacky
+  class Service
+    def initialize(config, bot_class)
+      @config = config
+      @bot_class = bot_class
     end
 
-    print "Starting #{@config.name}... "
-    new_pid = Process.fork { @daemon.start }
-    Process.detach new_pid
-    puts "started"
-  end
-
-  def stop(persist = false)
-    pid = get_pid
-    unless pid
-      puts "#{@config.name} is not running"
-      return
-    end
-
-    print "Stopping #{@config.name}..."
-
-    begin
-      Process.kill 'HUP', pid
-    rescue
-      @daemon.cleanup
-    end
-
-    ticks = 0
-    while pid = get_pid && ticks < 40
-      sleep 0.5
-      ticks += 1
-      print '.' if ticks % 4 == 0
-    end
-    puts " #{pid.nil? ? 'stopped' : 'failed'}"
-  end
-
-  def restart
-    stop
-    start
-  end
-
-  def status
-    pid = get_pid
-    if pid
-      puts "#{@config.name} is running with PID #{pid}"
-      true
-    else
-      puts "#{@config.name} is not running"
-      false
+    def run
+      puts "#{@config.name} is running"
+      bot = Bot.new @config
+      @bot_class.new bot
+      bot.run
     end
   end
-
-  private
-
-  def get_pid
-    return nil unless File.exists? @config.pid_file
-    IO.read(@config.pid_file).to_i
-  end
-
 end

data/lib/slacky/version.rb

@@ -1,3 +1,3 @@
 module Slacky
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slacky
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Michael Wynholds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
@@ -183,7 +183,6 @@ files:
 - lib/slacky/channel.rb
 - lib/slacky/cli.rb
 - lib/slacky/config.rb
-- lib/slacky/daemon.rb
 - lib/slacky/message.rb
 - lib/slacky/service.rb
 - lib/slacky/user.rb

data/lib/slacky/daemon.rb

@@ -1,70 +0,0 @@
-module Slacky
-  class Daemon
-
-    def initialize(config, bot_class)
-      @config = config
-      @bot_class = bot_class
-      @active = true
-      @running = false
-    end
-
-    def start(daemonize = true)
-      Process.daemon if daemonize
-      write_pid
-
-      [ 'HUP', 'INT', 'QUIT', 'TERM' ].each do |sig|
-        Signal.trap(sig) do
-          @config.log "Interrupted with signal: #{sig}"
-          kill
-        end
-      end
-
-      begin
-        Thread.abort_on_exception = true
-        @slackthread = Thread.new do
-          bot = Bot.new @config
-          @bot_class.new bot
-          bot.run
-        end
-        run
-      rescue => e
-        @config.log "Unexpected error", e
-      ensure
-        cleanup
-      end
-    end
-
-    def cleanup
-      delete_pid
-    end
-
-    private
-
-    def run
-      @config.log "#{@config.name} is running."
-      while active? do
-        sleep 0.5
-      end
-      @config.log "#{@config.name} got killed"
-      @slackthread.kill
-    end
-
-    def active?
-      @active
-    end
-
-    def kill
-      @active = false
-    end
-
-    def write_pid
-      File.open @config.pid_file, 'w' do |f|
-        f.write Process.pid.to_s
-      end
-    end
-
-    def delete_pid
-      File.delete @config.pid_file if File.exists? @config.pid_file
-    end
-  end
-end