unibanner 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06aeafd65b7d37f8d4d877e873f3ef4e3b7e6306c548f0fe6d06b9d1d3d1e1f9
-  data.tar.gz: 044b1b1350c24bde180a1cb1823f305b7bf401f7dde4ca83c318bb3b51ea92d1
+  metadata.gz: b0d2fa1f0fc6a51a65ac480ba854d363e1b688a1e759372a26ef7c02cc5a564d
+  data.tar.gz: 308ef4cc9198fdf369adad4c6fa48045ff19b93c2c0a0904bb8d9c0d771d5831
 SHA512:
-  metadata.gz: 57246e064918f488910ce308ed971cec0526f0b47aa924dbd5165c3a88849c478bef8e2ead217bc6015fee97a3ff62349c6e11f3c7526cb5374eca52d0730463
-  data.tar.gz: cf8d2ceeb62e6539cbbd137f4233d0cf8911e74691dfe571a525a9b17da194bc6cfeeeceded939efef13c02c823411da5e84851502160f1f4f763a283d7226fa
+  metadata.gz: 8fd3e6e3d84c63f00247da57b773aac261ff46c32bdaf8924d4c600392e2cdf6982b6e6d7eb6c1121fcb90c5ce350fc7aade065614c9f74dd13b598ccd8789e3
+  data.tar.gz: abddcd4143da5c76e13b71321049ddaa3c65ebcb79351e05143d2c25c2e7a00b3796bb12d9f2a425ea14c270e62a81ce1d540d36f079f76a362b12bfd2c2ee5f

data/Gemfile.lock

@@ -1,44 +1,31 @@
 PATH
   remote: .
   specs:
-    unibanner (0.0.3)
+    unibanner (0.0.4)
       irc_socket (~> 1.0, >= 1)
       logging (~> 2.2.2)
       paint (~> 2.0.1)
       parseconfig (~> 1.0.8)
-      pry
+      thor (~> 0.20)
       unirest (~> 1.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.8)
-    ansi (1.5.0)
-    builder (3.2.3)
-    coderay (1.1.2)
     irc_socket (1.0.7)
     json (1.8.6)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    method_source (0.9.1)
     mime-types (1.25.1)
-    minitest (5.11.3)
-    minitest-reporters (1.3.5)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
     multi_json (1.13.1)
     paint (2.0.1)
     parseconfig (1.0.8)
-    pry (0.12.0)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
     rest-client (1.6.9)
       mime-types (~> 1.16)
-    ruby-progressbar (1.10.0)
+    thor (0.20.3)
     unirest (1.1.2)
       addressable (~> 2.3.5)
       json (~> 1.8.1)
@@ -48,9 +35,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
-  minitest (~> 5)
-  minitest-reporters (~> 1.1)
   unibanner!
 
 BUNDLED WITH

data/bin/unibanner

@@ -1,5 +1,5 @@
-#! /usr/bin/env ruby
+#! /usr/bin/ruby
 
 require 'unibanner'
-Unibanner::Bots.find_bots
-Unibanner::Bots.start
+
+Unibanner::CLI.start

data/lib/unibanner/bot_class.rb

@@ -1,4 +1,3 @@
-require "logging"
 require "irc_socket"
 require "yaml"
 require "unibanner/logger"
@@ -43,7 +42,7 @@ module Unibanner
     def self.start
       @@bots.each do |network, bot|
         thr = Thread.new do
-          Thread.current.name = "#{bot.nick}@#{network}[#{bot.server}:#{bot.ssl == true ? '+' : ''}#{bot.port}]"
+          Thread.current.name = "#{bot.nick}@#{network}[#{bot.server}:#{bot.ssl == true ? "+" : ""}#{bot.port}]"
           bot.start
         end
         @@threads << thr
@@ -137,7 +136,7 @@ module Unibanner
             @log.debug "send2BL(#{user_ip}) returned '#{reply}'"
             #ircZLine(user_ip)
           end
-          if line.split[1] == '433'
+          if line.split[1] == "433"
             @log.error "#{self.network}: 433, Nickname in use, can't connect"
             ::Unibanner::Bots.die("Nickname in use, Can't connect")
           end

data/lib/unibanner/functions.rb

@@ -1,3 +1,5 @@
+require 'unirest'
+
 module Unibanner
   # A group of functions to help with unibanner
   # @attr [String] key DNSBL.im key file contents

data/lib/unibanner/version.rb

@@ -1,3 +1,3 @@
 module Unibanner
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/unibanner.rb

@@ -1,3 +1,35 @@
-require 'unibanner/bot_class'
+require "unibanner/bot_class"
+require "thor"
+
+module Unibanner
+  class ConfigClass < Thor
+    desc "init [options]", "Initialize the gem"
+
+    def init
+    end
+
+    desc "gen [options]", "Generate a config based on options or questions"
+
+    def gen
+    end
+  end
+
+  class BotClass < Thor
+    desc "start [options]", "Start the bot"
+
+    def start
+      Unibanner::Bots.find_bots
+      Unibanner::Bots.start
+    end
+  end
+
+  class CLI < Thor
+    desc "config SUBCOMMAND [options]", "Configure unibanner"
+    subcommand "config", ConfigClass
+
+    desc "bot SUBCOMMAND [options]", "Start up the unibanner bot"
+    subcommand "bot", BotClass
+  end
+end
 
 # vim: ts=2 sw=2

data/unibanner.gemspec

@@ -13,20 +13,14 @@ Gem::Specification.new do |s|
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if s.respond_to?(:metadata)
-    s.metadata = {
-        'github_repo'       => 'https://git.lasershark.army/IotaSpencer/unibanner',
-        'bug_tracker_uri'   => 'https://git.lasershark.army/IotaSpencer/unibanner/issues',
-#        'documentation_uri' => 'https://rubydoc.info/gems/unibanner',
-        'homepage_uri'      => 'https://iotaspencer.me/projects/unibanner',
-        'source_code_uri'   => 'https://git.lasershark.army/IotaSpencer/unibanner',
-        'wiki_uri'          => 'https://git.lasershark.army/IotaSpencer/unibanner/wiki'
-    }
-  else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-          'public gem pushes.'
-  end
-
+  s.metadata = {
+      'github_repo'       => 'https://git.lasershark.army/IotaSpencer/unibanner',
+      'bug_tracker_uri'   => 'https://git.lasershark.army/IotaSpencer/unibanner/issues',
+      'documentation_uri' => 'https://rubydoc.info/gems/unibanner',
+      'homepage_uri'      => 'https://iotaspencer.me/projects/unibanner',
+      'source_code_uri'   => 'https://git.lasershark.army/IotaSpencer/unibanner',
+      'wiki_uri'          => 'https://git.lasershark.army/IotaSpencer/unibanner/wiki'
+  }
   s.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test)/})
   end
@@ -39,10 +33,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'logging', '~> 2.2.2'
   s.add_runtime_dependency 'paint', '~> 2.0.1'
   s.add_runtime_dependency 'parseconfig', '~> 1.0.8'
-  s.add_runtime_dependency 'pry'
+  s.add_runtime_dependency 'thor', '~> 0.20'
   s.add_runtime_dependency 'unirest', '~> 1.1.2'
-  s.add_development_dependency 'bundler', '~> 1.16'
-  s.add_development_dependency 'minitest', '~> 5'
-  s.add_development_dependency 'minitest-reporters', '~> 1.1'
+  #s.add_development_dependency 'bundler', '~> 1.16'
+  #s.add_development_dependency 'minitest', '~> 5'
+  #s.add_development_dependency 'minitest-reporters', '~> 1.1'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unibanner
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ken Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irc_socket
@@ -73,19 +73,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.8
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: unirest
   requirement: !ruby/object:Gem::Requirement
@@ -100,48 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 description: A simple bot made to ban and blacklist unicode spamming bots on IRC.
   Use only in channels where such unicode is not commonplace.
 email: me@iotaspencer.me
@@ -167,6 +125,7 @@ licenses:
 metadata:
   github_repo: https://git.lasershark.army/IotaSpencer/unibanner
   bug_tracker_uri: https://git.lasershark.army/IotaSpencer/unibanner/issues
+  documentation_uri: https://rubydoc.info/gems/unibanner
   homepage_uri: https://iotaspencer.me/projects/unibanner
   source_code_uri: https://git.lasershark.army/IotaSpencer/unibanner
   wiki_uri: https://git.lasershark.army/IotaSpencer/unibanner/wiki