slackbot_frd 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5c6be64e04fc7a8be46b5dacab72fee1612e5b5
-  data.tar.gz: 9180a45cb3f7acbe6db6fb9cd74c4ca0f85c85e4
+  metadata.gz: 13a08ffadb9cd54f73c63639c08a1ea18ec13433
+  data.tar.gz: cc02227f5e2563e12055fa7acbdab07d36b68921
 SHA512:
-  metadata.gz: 395ab58d08a47f062b529998bd0fe4a515930d3013176b0e60a58ffba5d587fc18e51c5b4c5629cb2c03c027d464dd867637c4041b012d4c629a509221eaeffe
-  data.tar.gz: e767617e733d4c580d08fb04a82e944f46d0cfb388f5e4265e5fd7c933cbb4684d3476befc95210bff29c85d56c81d41fe6464e399d5abce550ab1abce169242
+  metadata.gz: f7c931ec908432fd850989608a8009842daa1dec90bcd4bc82bb240efa84fe32c9904a99e2bd2825b46e0e391e533e25577a3cef15d99a3bbd64695dbfc250fa
+  data.tar.gz: 646772e155bff7d015d64df6a78524a46dda856ccf05fd68b3031afdbc2c1f44d5efa74b5ced7a61ea4715e92b14da38a85ac5cace09346aecc9c814ccee7e84

data/bin/slackbot-frd

@@ -17,7 +17,7 @@ DEBUG = true
 PID_FILE_WATCHER = "/tmp/slackbot-frd-watcher.pid"
 PID_FILE_CONNECTION = "/tmp/slackbot-frd-connection.pid"
 BOT_LIST_FILE = "/tmp/slackbot-frd-bot-list.pid"
-ERROR_FILE = "/tmp/slackbot-frd-error-file.pid"
+ERROR_FILE = "/tmp/slackbot-frd.errors"
 DEFAULT_CONFIG_FILE = "slackbot-frd.conf"
 LOG_FILE = "slackbot-frd.log"
 
@@ -32,6 +32,22 @@ class SlackbotFrdBin < Thor
     # TODO
   end
 
+  desc "genconfig", "Generate a skeleton config file"
+  long_desc <<-LONGDESC
+    genconfig will generate a skeleton config file that
+    can be customized
+  LONGDESC
+  def genconfig
+    File.write(config_file_location, <<-CONFIG_FILE_SKELETON)
+      {
+          "token" : "<put-token-here>",
+          "botdir" : ".",
+          "daemonize" : false,
+          "bots" : []
+      }
+    CONFIG_FILE_SKELETON
+  end
+
   desc "start [bot1] [bot2] [botx...]", "Start all specified bots, or all bots"
   long_desc <<-LONGDESC
     start [bot1] [bot2] [botx...] will start the specified bots.
@@ -47,8 +63,16 @@ class SlackbotFrdBin < Thor
   option 'config-file'.to_sym, type: :string, aliases: 'c'
   option :token, type: :string, aliases: 't'
   def start(*bots)
+    if running?(watcher_pid)
+      SlackbotFrd::Log.warn("Already running.  Not starting again")
+      return
+    end
+
+    delete_pid_files
+    delfile(ERROR_FILE)
+
     config_file = options['config-file'.to_sym]
-    config_file = "#{Dir.pwd}/#{DEFAULT_CONFIG_FILE}" unless config_file
+    config_file = config_file_location unless config_file
     json = config_file_json(config_file) if config_file
     json ||= {}
 
@@ -92,6 +116,9 @@ class SlackbotFrdBin < Thor
     # first kill the watcher, then kill the connection
     kill_pid(watcher_pid)
     kill_pid(connection_pid)
+
+    delete_pid_files
+    delfile(ERROR_FILE)
   end
 
   desc "restart", "Stop all bots and restart them"
@@ -104,6 +131,10 @@ class SlackbotFrdBin < Thor
     stop
     start(set_bots)
   end
+  private
+  def config_file_location
+    "#{Dir.pwd}/#{DEFAULT_CONFIG_FILE}"
+  end
 
   private
   def config_file_json(config_file)
@@ -137,27 +168,33 @@ class SlackbotFrdBin < Thor
 
   private
   def watch_connection(bots, token, botdir, daemonize = false)
+    Process.daemon if daemonize
     until errors
-      pid = Process.fork do
-        Process.daemon if daemonize
-        loop { BotStarter.start_bots(ERROR_FILE, token, botdir, bots) }
-      end
+      pid = Process.fork { BotStarter.start_bots(ERROR_FILE, token, botdir, bots) }
       set_connection_pid(pid)
       Process.wait(pid)
     end
     if errors
-      puts "Could not start connection: #{errors}"
+      SlackbotFrd::Log.error("Slack connection encountered errors: #{errors}")
+      delfile(ERROR_FILE)
     end
+    delete_pid_files
+  end
+
+  private
+  def delfile(file)
+    File.delete(file) if File.exists?(file)
   end
 
   private
   def errors
-    return File.read(ERROR_FILE).split if File.exists?(ERROR_FILE)
+    return File.read(ERROR_FILE).split("\n") if File.exists?(ERROR_FILE)
     nil
   end
 
   private
   def running?(pid)
+    return false unless pid
     begin
       Process.getpgid(pid.to_i)
       return true
@@ -168,12 +205,14 @@ class SlackbotFrdBin < Thor
 
   private
   def watcher_pid
-    File.read(PID_FILE_WATCHER).to_i
+    File.read(PID_FILE_WATCHER).to_i if File.exists?(PID_FILE_WATCHER)
+    nil
   end
 
   private
   def connection_pid
-    File.read(PID_FILE_CONNECTION).to_i
+    File.read(PID_FILE_CONNECTION).to_i if File.exists?(PID_FILE_CONNECTION)
+    nil
   end
 
   private
@@ -188,8 +227,8 @@ class SlackbotFrdBin < Thor
 
   private
   def delete_pid_files
-    File.delete(PID_FILE_WATCHER)
-    File.delete(PID_FILE_CONNECTION)
+    delfile(PID_FILE_WATCHER)
+    delfile(PID_FILE_CONNECTION)
   end
 end
 

data/lib/slackbot_frd/initializer/bot_starter.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'file-append'
 require 'thor'
 
 require 'slackbot_frd/lib/slack_connection'
@@ -15,7 +16,7 @@ class BotStarter
     bot_enabled = ->(bot) { bots.empty? || bots.include?(bot) }
 
     # Create a new Connection to pass to the bot classes
-    slack_connection = SlackbotFrd::SlackConnection.new(token)
+    slack_connection = SlackbotFrd::SlackConnection.new(token, errors_file)
 
     load_bot_files(botdir)
 
@@ -32,9 +33,8 @@ class BotStarter
     end
 
     if bots.count == 0
-      @error ||= []
-      @error.push("No bots loaded")
       SlackbotFrd::Log.error("Not starting: no bots found")
+      File.append(errors_file, "Not starting: no bots found")
     else
       SlackbotFrd::Log.debug("Starting SlackConnection")
       slack_connection.start

data/lib/slackbot_frd/lib/slack_connection.rb

@@ -1,5 +1,6 @@
 require 'faye/websocket'
 require 'eventmachine'
+require 'file-append'
 require 'json'
 
 require 'slackbot_frd/lib/errors'
@@ -22,13 +23,14 @@ module SlackbotFrd
 
     attr_accessor :token
 
-    def initialize(token)
+    def initialize(token, errors_file)
       unless token
         SlackbotFrd::Log::error("No token passed to #{self.class}")
         raise NoTokenError.new
       end
 
       @token = token
+      @errors_file = errors_file
       @event_id = 0
       @on_connected_callbacks = []
       @on_disconnected_callbacks = []
@@ -57,7 +59,7 @@ module SlackbotFrd
         unless wss_url
           str = "No Real Time stream opened by slack.  Check for correct authentication token"
           SlackbotFrd::Log.error(str)
-          File.append(@errors_file, str)
+          File.append(@errors_file, "#{str}\n") if @errors_file
           return
         end
         @ws = Faye::WebSocket::Client.new(wss_url)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slackbot_frd
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ben Porter
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: file-append
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +177,7 @@ files:
 - lib/slackbot_frd/slack_methods/im_channels_list.rb
 - lib/slackbot_frd/slack_methods/rtm_start.rb
 - lib/slackbot_frd/slack_methods/users_list.rb
-homepage: http://rubygems.org/gems/slackbot_frd
+homepage: https://github.com/FreedomBen/slackbot_frd
 licenses:
 - MIT
 metadata: {}