botemon 0.3.5 → 0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTIwNDIzNGMyZDdlOGZjMmIyMjc1YzlhM2JhZmI0Njc2MTlkMDI2Ng==
+    MDA1NzA5OGQ4ODYzNDE1MDM1ODE2NjM3OTdmOTc0M2M5NjdkZjFkMQ==
   data.tar.gz: !binary |-
-    YmZhNzYxYmI1ZjM4OGU5OTJmOTk5NWIyNWE1NjlhMTIwYTZiODQ4MQ==
+    OTM4NGZlNWQ1YmFlYzcxZTYzMjE5NmQ2Mjg2ODI2ZWE5OTdmZDZjOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODAyZTVlNWE2NTllNWMzMjQ1N2E0N2QwZWNmZGVhMWI1MGViYzQ2Y2JjNWJj
-    YTViMzQzNTcwNmI1ZmFhM2NkM2JiMDhiNjA5ZDRiNDg2OTY0ZmUyNmYwOWYz
-    YmY1ZGY5YmY5Y2UwOGQ3MzkzOGIwNjQ0Zjc2M2M2Y2MyM2JhYzE=
+    OWRiNTU5N2QwYWZjOTEwM2U5ZDFhYmIzOWIzN2VhMDVhNTdiYWE2N2E0N2Rk
+    Y2QxODQyODU1OTljOTllNTAwZjllYzVmYjc2ZDJlNzZmNTg4NDIyM2QwNDc4
+    YjBhYzU4MjU5NjRhYWFiYjhkYWI0OGY1ZGJhZDJlZWQ3NzliMGU=
   data.tar.gz: !binary |-
-    YzNhMGZlOTAxNjZiNzA1NmZkMjJiNTAyMTExMzcxMDkwMDc5OTI4NWYxYjVh
-    MTU2OGM1ZWRkODEwMzI0MTAzYTgzNzVhMmRlNWY3YTEwODkxYTY5YmM1ZGY1
-    NjAyYzA1YjgxMjliNWNlNTQzMWZlOGNiOGUwNGFkNDE2YjY3YTU=
+    MDM0YTU3NjQ5ZDdjZmRjNDc1OTc3OTM1NzE4Yzk5NjdiMWRlNzBkNWM5OThj
+    NzQ3ZjU1MjhmMjI2ZDllZTE2NmE2MzhjMTc2YTkxODRjYjQ5MTJmNGQ3Yzhl
+    ZDZmZGRlZWM3ZTA1OWZhOThhM2U2MzU3ZjYwNjc2M2Q3OWRjMTQ=

data/bin/botemon

@@ -51,11 +51,32 @@ Cinch::Bot.new {
     m.reply pokemon ? "#{pokemon.to_s}\n#{pokemon.url}".split("\n").map { |l| Format(:red, l) }.join("\n") : 'Pokémon not found.'
   end
 
+  on :message, /^ability (.+)/ do |m, name|   
+    ability = Abilitydex.get name
+    if ability != nil
+      m.reply Format(:red, "#{ability.to_s.split("\n").map { |l| Format(:red, l) }.join("\n")}")
+    else
+      m.reply Format(:red, 'Ability not found.')
+    end
+  end
+
+  on :message, /^move (.+)/ do |m, name|
+    name = Pokedex.id2name(name) if name.numeric?
+    
+
+    move = Movedex.get name
+    if move != nil
+      m.reply Format(:red, move.to_s.split("\n").map { |l| Format(:red, l) }.join("\n"))
+    else
+      m.reply Format(:red, 'Move not found.')
+    end
+  end
+
   on :message, /^moveset (.+) (.+)/ do |m, name, tier|
     name = Pokedex.id2name(name) if name.numeric?
     
 
-    movesets = Movedex.get name, tier
+    movesets = Movesetdex.get name, tier
     if movesets != nil || movesets.any?
       m.reply Format(:red, "--- #{movesets.first.pokemon} (#{movesets.first.tier}) ---")
       movesets.each { |moveset| m.reply Format(:red, " -- #{moveset.name} --\n#{moveset.to_s.split("\n").map { |l| Format(:red, l) }.join("\n")}\n") }
@@ -64,15 +85,6 @@ Cinch::Bot.new {
     end
   end
 
-  on :message, /^ability (.+)/ do |m, name|   
-    ability = Abilitydex.get name
-    if ability != nil
-      m.reply Format(:red, "#{ability.to_s.split("\n").map { |l| Format(:red, l) }.join("\n")}")
-    else
-      m.reply Format(:red, 'Ability not found.')
-    end
-  end
-
   on :message, /^pktrivia$/ do |m|
     @storage = Storage.new('./cache.db') unless @storage
     
@@ -100,7 +112,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, "Time expired. The secret Pokémon is #{@pokemon_trivia.name}!")
+        m.reply Format(:red, "No more chances. The secret Pokémon is #{@pokemon_trivia.name}!")
         @pokemon_trivia = nil
         @trivia_wrong   = 0
       end

data/lib/botemon/movedex.rb

@@ -17,17 +17,9 @@
 # along with Botémon.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-class Movedex 
-  def self.id2name(id)
-    return begin
-      Nokogiri::HTML(open("http://pokemondb.net/pokedex/#{id}")).xpath('//div[@class="navbar"]/h1')[0].text
-    rescue
-      nil
-    end
-  end
-   
-  def self.get(name, tier)
-    return nil if name == nil || tier == nil
-    return Smogon::Movedex.get name, tier
+class Movedex    
+  def self.get(name)
+    return nil if name == nil
+    return Smogon::Movedex.get name
   end
 end

data/lib/botemon/movesetdex.rb

@@ -0,0 +1,33 @@
+#--
+# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+#
+# This file is part of Botémon.
+#
+# Botémon is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Botémon is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Botémon.  If not, see <http://www.gnu.org/licenses/>.
+#++
+
+class Movesetdex 
+  def self.id2name(id)
+    return begin
+      Nokogiri::HTML(open("http://pokemondb.net/pokedex/#{id}")).xpath('//div[@class="navbar"]/h1')[0].text
+    rescue
+      nil
+    end
+  end
+   
+  def self.get(name, tier)
+    return nil if name == nil || tier == nil
+    return Smogon::Movesetdex.get name, tier
+  end
+end

data/lib/botemon/version.rb

@@ -19,6 +19,6 @@
 
 module Botemon
   def self.version
-    '0.3.5'
+    '0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: botemon
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: '0.4'
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -80,7 +80,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: IRC bot for Pokéfag with (Poké|Move|Ability)dex and a trivia game.
+description: IRC bot for Pokéfag with (Poké|Ability|Move|Moveset)dex and a trivia
+  game.
 email: webmaster@giovannicapuano.net
 executables:
 - botemon
@@ -89,6 +90,7 @@ extra_rdoc_files: []
 files:
 - lib/botemon/abilitydex.rb
 - lib/botemon/movedex.rb
+- lib/botemon/movesetdex.rb
 - lib/botemon/pokedex.rb
 - lib/botemon/smogon/moveset.rb
 - lib/botemon/smogon/pokemon.rb