botemon 0.5.4.2 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c41d91421cfba1635a7477401852786c04c25a2f
-  data.tar.gz: e5dd127b10dbf8983bcd1b26be612f8b2f0777f6
+  metadata.gz: f2d667948ffa1014e3e6571c89908931a248e566
+  data.tar.gz: 957e69a5bbd5138e4bd68f8a3bfa8ec07016c00f
 SHA512:
-  metadata.gz: 4255fb64868d7a4c6c13d06a1b39a55cf99b1b6c77618675b40ad68025c39438f91a59d5014afd47f350e2d5c460e4a8caf966de972bcf610cf52cf036c503b3
-  data.tar.gz: 14d8bcf0cee5330d5c53b0743990e1d332e3e2708af540a56d43af00743e5907c3e4c968acfeeecc7e3c40f55ae9e28236beb5ff524cd225dee9ab27ba508539
+  metadata.gz: 58e65bab3c4d97d3e548a2ced8f26afb600d8cff53758273cc76060ec7d583aafb98e02a9b4537e0e8a3b81c95f488459eb9b07510d50089948a8dbb033594fe
+  data.tar.gz: bfff0fb5e3c046e203abdbc31a198c9bed3ba5617f6ed70a00f1bb2939a2de7d0c922fb8a2aed3659e05686289f601341bd6ae744722f587ea70ad15ae731059

data/bin/botemon

@@ -20,26 +20,28 @@
 #++
 
 require 'botemon'
+require 'open-uri'
 
-abort 'Usage: botemon <bot_name> <bot_password> <server> <channels>' if ARGV.length < 4
+abort 'Usage: botemon <bot_name> <server> <channels>' if ARGV.length < 3
 
 Cinch::Bot.new {
   configure do |c|
     c.nick     = ARGV[0]
     c.realname = ARGV[0]
     c.user     = ARGV[0]
-    c.password = ARGV[1]
-    c.server   = ARGV[2]
-    c.channels = ARGV.drop(3).map { |c| "\##{c}" }
+    c.password = 'dat_password'
+    c.server   = ARGV[1]
+    c.channels = ARGV.drop(2).map { |c| "\##{c}" }
     
     c.plugins.plugins = [Cinch::Plugins::Login]
-    c.plugins.options[Cinch::Plugins::Login] = { :password => ARGV[1] }
+    c.plugins.options[Cinch::Plugins::Login] = { :password => 'dat_password' }
     
     @storage        = Storage.new './cache.db'
     @pokemon_trivia = nil
     @players        = []
     @trivia_owner   = ''
     @trivia_wrong   = 0
+    @bot_admin      = [ 'mirkosp', 'RoxasShadowRS' ]
   end
 
   on :message, /^pkmn (.+)/ do |m, name|
@@ -81,7 +83,7 @@ Cinch::Bot.new {
     end
   end
 
-  on :message, /^pstats (.+) (.+) (.+) (.+)/ do |m, name, level, nature, evs|
+  on :message, /^pstats (\S*) (\S*) (\S*) (.*)/ do |m, name, level, nature, evs|
     @storage = Storage.new('./cache.db') unless @storage
 
     name    = Smogon::Pokemon.id2name(name) if name.numeric?
@@ -89,13 +91,13 @@ Cinch::Bot.new {
 
     hidden_values = evs.strip.split
     if hidden_values.length == 2
-      evs = hidden_values[0].strip.split ?/
-      ivs = hidden_values[1].strip.split ?/
+      evs = hidden_values[0].split ?/
+      ivs = hidden_values[1].split ?/
     else
-      evs = evs.strip.split ?/
+      evs = evs.split                 ?/
       ivs = '31/31/31/31/31/31'.split ?/
     end
-
+    
     m.reply "#{pokemon.name}: (#{pokemon.types.join(?-)}) #{pokemon.stats(level.to_i, nature, evs, ivs).join(?/)}"
   end
 
@@ -110,7 +112,7 @@ Cinch::Bot.new {
     @storage = Storage.new('./cache.db') unless @storage
     
     if @pokemon_trivia != nil
-      m.reply Format(:red, 'Other players are playing, wait until they finish.')
+      m.reply Format(:red, 'Other players are playing, please wait until they finish.')
       m.reply Format(:red, @pokemon_trivia.clues)
     else
       @pokemon_trivia = Pokedex.get Smogon::Pokemon.id2name(Random.new.rand(1..649)).delete(?'), @storage
@@ -137,7 +139,7 @@ Cinch::Bot.new {
       m.reply Format(:red, "Nope, #{m.user.nick} was wrong.")
       @trivia_wrong += 1
       if @trivia_wrong >= 3
-        m.reply Format(:red, "No more chances. The secret Pokémon is #{@pokemon_trivia.name}!")
+        m.reply Format(:red, "You have no more chances. The secret Pokémon is #{@pokemon_trivia.name}!")
         @pokemon_trivia = nil
         @trivia_wrong   = 0
       end
@@ -145,25 +147,26 @@ Cinch::Bot.new {
   end
 
   on :message, /^pkstop$/ do |m|
-    if @pokemon_trivia != nil && (m.user.nick == 'mirkosp' || m.user.nick == 'RoxasShadowRS' || m.user.nick == @trivia_owner)
+    if @pokemon_trivia != nil && (@bot_admin.include?(m.user.nick) || m.user.nick == @trivia_owner)
       @pokemon_trivia = nil
       @trivia_owner   = ''
       @trivia_wrong   = 0
       m.reply Format(:red, "Game aborted by #{m.user.nick}.")
     elsif @pokemon_trivia == nil
-      m.reply Format(:red, 'Game not started.')
+      m.reply Format(:red, 'Game not started yet.')
     else
-      m.reply Format(:red, "Only ops and the game luncher can stop the game. #{m.user.nick} GTFO.")
+      m.reply Format(:red, "Only channel operators and the game luncher can stop the game. #{m.user.nick} GTFO.")
     end
   end
 
   on :message, /^pkdebug$/ do |m|
     if @pokemon_trivia == nil
       m.reply Format(:red, 'Game not started.')
-    elsif m.user.nick == 'mirkosp' || m.user.nick == 'RoxasShadowRS'
+    elsif @bot_admin.include?(m.user.nick)
       m.reply Format(:red, @pokemon_trivia.name)
     else
-      m.reply Format(:red, "GO TO DIG THE EARTH #{m.user.nick} ヽ(`Д´)ﾉ ┻━┻")
+      proverbs = open('http://pastebin.com/raw.php?i=qWF65TcP').read.each_line.to_a.sample.strip
+      m.reply Format(:red, proverbs)
     end
   end
   
@@ -179,7 +182,8 @@ Cinch::Bot.new {
       
       m.reply Format(:red, 'Cache created.')
     else
-      m.reply Format(:red, "Only ops can create the cache. #{m.user.nick} GTFO.")
+      proverbs = open('http://pastebin.com/raw.php?i=qWF65TcP').read.each_line.to_a.sample.strip
+      m.reply Format(:red, proverbs)
     end
   end
 
@@ -189,10 +193,15 @@ Cinch::Bot.new {
   end
 
   on :message, /^pkhelp$/ do |m|
-    m.reply Format(:red, "- pkmn    Bulbasaur / 1     ")
-    m.reply Format(:red, "- ability Synchronize       ")
-    m.reply Format(:red, "- move    Reflect           ")
-    m.reply Format(:red, "- moveset Bulbasaur LC (BW) ")
-    m.reply Format(:red, "- pkrandom, pktrivia, pkstop, pkversion ")
+    m.reply Format(:red, "- pkmn     Bulbasaur                                          ")
+    m.reply Format(:red, "- pkmn     1                                                  ")
+    m.reply Format(:red, "- ability  Synchronize                                        ")
+    m.reply Format(:red, "- item     Leftovers                                          ")
+    m.reply Format(:red, "- move     Reflect                                            ")
+    m.reply Format(:red, "- moveset  Bulbasaur LC                                       ")
+    m.reply Format(:red, "- moveset  Bulbasaur LC DP                                    ")
+    m.reply Format(:red, "- pstats   Scizor 70 Adamant 0/252/0/0/6/252 15/31/30/2/31/31 ")
+    m.reply Format(:red, "- pstats   Scizor 70 Adamant 0/252/0/0/6/252                  ")
+    m.reply Format(:red, "- pkrandom, pktrivia, pkdebug, pkstop, pkcache, pkversion     ")
   end
 }.start

data/lib/botemon/storage.rb

@@ -42,6 +42,7 @@ class Storage
   alias :dump :get_all
   
   def add(pokemon)
+    return unless pokemon
     @db << pokemon unless is_cached?(pokemon.name)
   end
   alias :put :add

data/lib/botemon/version.rb

@@ -19,6 +19,6 @@
 
 module Botemon
   def self.version
-    '0.5.4.2'
+    '0.5.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: botemon
 version: !ruby/object:Gem::Version
-  version: 0.5.4.2
+  version: 0.5.5
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri