bobby-b 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e847c1c23498f8ffd05cbb5cd5c20f04c4ee4ddf2bf49737e6efdddb62609a41
-  data.tar.gz: e5b49a9e89b29552f2ed3618fe55993b143d6b4058a79aeeee00254b4965aca3
+  metadata.gz: 49d79d669ad319f68c66c67e0f25f996813f22fa7e30b1b3e5c55636b32dc1be
+  data.tar.gz: 877a6014b3b04f7a139bcf3f68fb33c46e4ccc90fecfb95d43c4ed8a359b2ebc
 SHA512:
-  metadata.gz: 4e74fb2cf15421e31b103d6fc6a4b51af6bd7e1f2231c68338191e3c21586cc798be37c1c92b4ea5283c501a08ac3030bbe70a493c24cfd2e401c13f463c2d2a
-  data.tar.gz: 32b06547932753cbc17c80a35dd889c396deb4f7e8c9258870d284efcc47b18f3e2d813d04a5605cedc6bfa023fa6b20da3184773b539ce488d2f94c5c2b7efc
+  metadata.gz: 9b073214711e018c5fa53f3552f7e15da1b7a74ece07002de1b74ffa5d99b990a1bb7ae43221a4a9070ba116e29602315acec2d6b720008bb1abc20459d5d712
+  data.tar.gz: '04385341ecbec08b6b20638c0229e85204d2ab41203749fe3f9603fc446bd5bd7c82f4597a1c3766a9bc39e6f0bb13ef69eabd542b036bebbf136e863c6cf0fd'

data/bin/bobby-b

@@ -5,11 +5,31 @@ require 'optparse'
 require 'ostruct'
 require 'bobby-b/bobby'
 
-options = OpenStruct.new
-OptionParser.new do |parser|
+def validate_command_line_arguments(arguments)
+  has_api_key = arguments.key? :key
+  has_responses_file = arguments.key? :responses
+
+  has_api_key && has_responses_file
+end
+
+def extract_command_line_arguments
+  options = {}
+  parser = OptionParser.new
   parser.banner = 'Usage: bobby-b [options]'
-  parser.on('-k', '--discord-key=DISCORDKEY', 'Discord API bot key') { |k| options[:api_key] = k }
-  parser.on('-f', '--responses-file=RESPONSES_FILE', 'List of responses') { |k| options[:responses_file] = k }
-end.parse!
+  parser.on('-k KEY', '--key=KEY', 'Discord API key', String)
+  parser.on('-f FILE', '--responses=FILE', 'List of responses file', String)
+  parser.parse!(into: options)
+  options
+end
+
+def main
+  arguments = extract_command_line_arguments
+  puts arguments
+  arguments_are_valid = validate_command_line_arguments(arguments)
+
+  raise 'Invalid arguments' unless arguments_are_valid
+
+  Bobby.new(arguments).start
+end
 
-Bobby.new(options).start
+main

data/lib/bobby-b/bobby.rb

@@ -1,53 +1,57 @@
-# frozen_string_literal: true
-
-require 'discordrb'
-
-class Bobby
-  def initialize(options)
-    @queue = []
-    @last_message_time = 0
-    @cooldown = 0.5
-    @discord_token = options.api_key
-    @responses = File.readlines(options.responses_file)
-  end
-
-  def start
-    start_queue
-    start_bot
-  end
-
-  def start_bot
-    bot = Discordrb::Bot.new token: @discord_token
-
-    bot.message do |event|
-      @queue.unshift(event) if event.message.to_s.include? bot.bot_user.id.to_s
-    end
-
-    bot.run
-  end
-
-  def send_newest_message
-    response = @responses.sample
-    event = @queue.pop
-    event.respond(response)
-    puts "Responded with #{response}"
-  end
-
-  def process_queue
-    now = Time.now.to_f
-    return if @queue.empty? || now - @last_message_time < @cooldown
-
-    send_newest_message
-    @last_message_time = now
-  end
-
-  def start_queue
-    Thread.new do
-      puts 'Message queue started'
-      loop do
-        sleep 0.1
-        process_queue
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'discordrb'
+
+# Bobby B discord bot instance.
+class Bobby
+  def initialize(options)
+    @queue = []
+    @last_message_time = 0
+    @cooldown = 0.5
+    @discord_token = options[:key]
+    @responses = File.readlines(options[:responses])
+  end
+
+  def start
+    start_queue
+    start_bot
+  end
+
+  def start_bot
+    bot = Discordrb::Bot.new token: @discord_token
+
+    bot.message do |event|
+      @queue.unshift(event) if event.message.to_s.include? bot.bot_user.id.to_s
+    end
+
+    bot.run
+  end
+
+  def send_newest_message
+    response = @responses.sample
+    event = @queue.pop
+    event.respond(response)
+  end
+  
+  def is_on_cooldown
+    now = Time.now.to_f
+    bot_is_on_cooldown = now - @last_message_time < @cooldown
+    return bot_is_on_cooldown
+  end
+
+  def process_queue_item
+    return if @queue.empty? || is_on_cooldown
+
+    send_newest_message
+    @last_message_time = Time.now.to_f
+  end
+
+  def start_queue
+    Thread.new do
+      loop do
+        sleep 0.1
+        process_queue_item
+      end
+    end
+  end
+end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: bobby-b
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Andreas Kruhlmann
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2020-07-21 00:00:00.000000000 Z
@@ -23,23 +23,23 @@ homepage: https://github.com/Kruhlmann/bobby-b
 licenses:
 - GPL-3.0-or-later
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Bobby B bot replacement
 test_files: []