botemon 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4b33f9b3680eba8a49a93540c02b5069d4e947f
-  data.tar.gz: 514881bafa725f4be10fb02fd1885bde69bbfa58
+  metadata.gz: 3df70fe78c7cdd0135358fd8c09c20b436ed76ff
+  data.tar.gz: 3524bccd5236fc147fcfef51a708be301b486e88
 SHA512:
-  metadata.gz: 593b18b57aece77d20fe50216eeacd4af3d686b4b9c603e8a3f78694af3efc51f6c8e66001f8f412fbfb3631325032cc796cb3d8fd7908de31991f40cac1f8e1
-  data.tar.gz: ef8279e8f0bede5678db236b1ca4781f77b701a7298a34b0affb3b365b5d323696d6de10ac10e1d2ca2f04b161abefbc3899038136de6fd8e28a0d7050645c5f
+  metadata.gz: 64120d70649dc92f119c50fdc22244e8f54076ec5af6ff4bfbc9ccc80dcddb68217e0c9fb5874b9ad03d0cdcbc63ca657d798b8defc10a596af4030f87b63679
+  data.tar.gz: 78c531ef41dabda70f93b6caaec73bfa83e008172880eff7301e58b9acbf38fdfee97f83e1e544c7c1a0e2eb46e34c9c68b7c895bd14f5303f8258534401663e

data/bin/botemon

@@ -32,10 +32,10 @@ Cinch::Bot.new {
     c.password = ARGV[1]
     c.server   = ARGV[2]
     c.channels = ARGV.drop(3).map { |c| "\##{c}" }
-    
+
     c.plugins.plugins = [Cinch::Plugins::Login]
     c.plugins.options[Cinch::Plugins::Login] = { :password => ARGV[1] }
-    
+
     @storage        = Storage.new './cache.db'
     @pokemon_trivia = nil
     @players        = []
@@ -45,22 +45,22 @@ Cinch::Bot.new {
 
   on :message, /^pkmn (.+)/ do |m, name|
     @storage = Storage.new('./cache.db') unless @storage
-    
+
     name = Smogon::Pokemon.id2name(name) if name.numeric?
 
-    pokemon = Pokedex.get name.delete(?'), @storage
+    pokemon = Pokedex.get name, @storage
     m.reply pokemon ? "#{pokemon.to_s}\n#{pokemon.url}".split("\n").map(&:colorize).join("\n") : 'Pokémon not found.'.colorize
   end
 
-  on :message, /^ability (.+)/ do |m, name|   
+  on :message, /^ability (.+)/ do |m, name|
     ability = Abilitydex.get name
-    
+
     m.reply ability ? "#{ability.to_s}\n#{ability.url}".split("\n").map(&:colorize).join("\n") : 'Ability not found.'.colorize
   end
 
-  on :message, /^item (.+)/ do |m, name|   
+  on :message, /^item (.+)/ do |m, name|
     item = Itemdex.get name
-    
+
     m.reply item ? "#{item.to_s}\n#{item.url}".split("\n").map(&:colorize).join("\n") : 'Item not found.'.colorize
   end
 
@@ -73,10 +73,16 @@ Cinch::Bot.new {
   on :message, /^moveset (.+) (.+) (.+)/ do |m, name, tier, metagame|
     name = Smogon::Pokemon.id2name(name) if name.numeric?
 
-    movesets = Movesetdex.get name.delete(?'), tier, (metagame.empty? ? 'bw' : metagame)
-    if movesets != nil || movesets.any?
-      m.reply "--- #{movesets.first.pokemon} (#{movesets.first.tier}) ---".colorize
-      movesets.each { |moveset| m.reply " -- #{moveset.name} --\n#{moveset.to_s.split("\n").map(&:colorize).join("\n")}\n".colorize }
+    tier     = nil if tier.empty?
+    metagame = nil if metagame.empty?
+
+    movesets = Movesetdex.get name, tier, metagame
+    if movesets && movesets.any?
+      m.reply "--- #{movesets.first.pokemon} ---".colorize
+
+      movesets.each do |moveset|
+        m.reply " -- #{moveset.name} (#{moveset.tier}) --\n#{moveset.to_s.split("\n").map(&:colorize).join("\n")}\n"
+      end
     else
       m.reply 'Moveset not found.'.colorize
     end
@@ -86,7 +92,7 @@ Cinch::Bot.new {
     @storage = Storage.new('./cache.db') unless @storage
 
     name    = Smogon::Pokemon.id2name(name) if name.numeric?
-    pokemon = Pokedex.get name.delete(?'), @storage
+    pokemon = Pokedex.get name, @storage
 
     hidden_values = evs.strip.split
     if hidden_values.length == 2
@@ -96,28 +102,28 @@ Cinch::Bot.new {
       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
 
   on :message, /^pkrandom$/ do |m|
     @storage = Storage.new('./cache.db') unless @storage
-    
-    pokemon = Pokedex.get Smogon::Pokemon.id2name(Random.new.rand(1..649)).delete(?'), @storage
+
+    pokemon = Pokedex.get Smogon::Pokemon.id2name(Random.new.rand(1..649)), @storage
     m.reply pokemon ? "#{pokemon.to_s}\n#{pokemon.url}".split("\n").map(&:colorize).join("\n") : 'Pokémon not found.'.colorize
   end
 
   on :message, /^pktrivia$/ do |m|
     @storage = Storage.new('./cache.db') unless @storage
-    
+
     if @pokemon_trivia != nil
       m.reply 'Other players are playing, please wait until they finish.'.colorize
       m.reply @pokemon_trivia.clues.colorize
     else
-      @pokemon_trivia = Pokedex.get Smogon::Pokemon.id2name(Random.new.rand(1..649)).delete(?'), @storage
+      @pokemon_trivia = Pokedex.get Smogon::Pokemon.id2name(Random.new.rand(1..649)), @storage
       @trivia_owner   = m.user.nick
       @trivia_wrong   = 0
-      
+
       if @pokemon_trivia
         m.reply @pokemon_trivia.clues.split("\n").map(&:colorize).join("\n")
         m.reply 'You have 3 chances to try to say which Pokémon is this!'.colorize
@@ -168,17 +174,17 @@ Cinch::Bot.new {
       m.reply proverbs.colorize
     end
   end
-  
+
   on :message, /^pkcache$/ do |m|
     if m.user.nick.to_s.oper? bot
       File.delete('./cache.db') if File.exists? './cache.db'
-      
+
       @storage        = Storage.new './cache.db'
       @pokemon_trivia = nil
       @players        = []
       @trivia_owner   = ''
       @trivia_wrong   = 0
-      
+
       m.reply 'Cache created.'.colorize
     else
       proverbs = open('http://pastebin.com/raw.php?i=qWF65TcP').read.each_line.to_a.sample.strip
@@ -187,8 +193,8 @@ Cinch::Bot.new {
   end
 
   on :message, /^pkversion$/ do |m|
-    m.reply "Botémon:    #{Botemon::version}".colorize
-    m.reply "Smogon-API: #{Smogon::version}".colorize
+    m.reply "Botémon:    #{Botemon::VERSION}".colorize
+    m.reply "Smogon-API: #{Smogon::VERSION}".colorize
   end
 
   on :message, /^pkhelp$/ do |m|

data/lib/botemon.rb

@@ -18,8 +18,6 @@
 #++
 
 require 'open-uri'
-require 'nokogiri'
-require 'sanitize'
 require 'json'
 
 require 'cinch'

data/lib/botemon/movesetdex.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Botémon.
 #
@@ -17,8 +17,8 @@
 # along with Botémon.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-class Movesetdex    
+class Movesetdex
   def self.get(name, tier, metagame)
-    name && tier ? Smogon::Movesetdex.get(name, tier, metagame) : nil
+    name ? Smogon::Movesetdex.get(name, tier, metagame) : nil
   end
-end
+end

data/lib/botemon/smogon/moveset.rb

@@ -1,12 +1,12 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 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.
+# (at your option) any later version.d
 #
 # Botémon is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,10 +27,9 @@ module Smogon
       @nature  = []
       @moves   = []
     end
-    
-    def to_s
-      "Item: #{item.join(' / ')}\nAbility: #{ability.join(' / ')}\nNature: #{nature.join(' / ')}\nMoves: #{''.tap { |s| moves.each { |move| s << move.join(' / ') + ', '}}[0..-3]}\nEVs: #{evs}"
-    end
-    
+
+    # def to_s
+    #   "Set: #{@name}\nItem: #{@item.join(' / ')}\nAbility: #{@ability.join(' / ')}\nNature: #{@nature.join(' / ')}\nMoves: #{''.tap { |s| @moves.each { |move| s << move.join(' / ') + ', '}}[0..-3]}\nEVs: #{@evs}"
+    # end
   end
-end
+end

data/lib/botemon/smogon/pokemon.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Botémon.
 #
@@ -20,11 +20,11 @@
 module Smogon
   class Pokemon
     attr_accessor :name, :_name, :types, :tier, :abilities, :base_stats, :moves
-    
+
     def clues
       "Ability: #{@abilities.join(', ')}\nType: #{@types.join(?/)}\nTier: #{@tier}\nBase stats: #{@base_stats.join(?/)}"
     end
-    
+
     def self.to_pokemon(ary)
       Pokemon.new.tap { |pokemon|
         pokemon.name       = ary['name'      ]
@@ -36,7 +36,7 @@ module Smogon
         pokemon.moves      = ary['moves'     ]
       }
     end
-    
+
     def to_ary
       {
         'name'       => @name,
@@ -104,4 +104,4 @@ module Smogon
       }
     end
   end
-end
+end

data/lib/botemon/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Botémon.
 #
@@ -18,7 +18,5 @@
 #++
 
 module Botemon
-  def self.version
-    '0.6'
-  end
+  VERSION = '0.7'
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: botemon
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sanitize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +74,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/botemon
+- lib/botemon.rb
 - lib/botemon/abilitydex.rb
 - lib/botemon/itemdex.rb
 - lib/botemon/movedex.rb
@@ -112,8 +86,6 @@ files:
 - lib/botemon/storage.rb
 - lib/botemon/string.rb
 - lib/botemon/version.rb
-- lib/botemon.rb
-- bin/botemon
 homepage: http://www.giovannicapuano.net
 licenses:
 - GPL-3
@@ -134,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: IRC bot for Pokéfags.