botemon 0.4.1 → 0.4.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjQzYmM4Yzk4MmVmN2FiNjA1MzdhZmQ0NzU2MWQzN2MwNmI3YTAyNg==
-  data.tar.gz: !binary |-
-    M2JjNmU0NmQ5ZjVhMzQyNzk4ZWQyMjI3YmUzYmU2MzZhMTdlZDQ5ZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Y2U3ZTliZjRmMzdlYWU1NDk2NTg4NGVhNTMzMTEwOWI4ZGNjMDU3NDYyMjk5
-    ZThjNWI3MTFjNWM3MWJlNmRhMWYyZjMwNDE3YWNmYTgxNTczNDA1ZDM5MDQz
-    ZDBhOTliMWZmNzRjNjYzZTkzYjFhMTVhMmZhOWYyMjJiZWIxYzQ=
-  data.tar.gz: !binary |-
-    YjI2YWQ0MGM3YzZhNjEyNzI5YjcxMDY0MDVhMmMwNDI1ZDAzNDM0ZDJhMTQ5
-    OWQ0ZmQ1ZGVhNTNjMzBiOGZiMmE5NjgxNGFmMjA1YzFjNjg3OTU0ZTAwZDZi
-    ODk1ZDJhMTUwYTJkNTQyNWNjNDFiMjdhNDZiNzg5ZjY0MzNlMjA=
+SHA1:
+  metadata.gz: 8719a656f8d54deafe96a02776081f6a78b716da
+  data.tar.gz: 94fb5c19c2b5b9466f9744eae7a373e9359e3949
+SHA512:
+  metadata.gz: 1a72a494758509d1f3e815813ea00a213210d7f9f507e8aa702dfa18d41c18391759cee95c1f08eeffa908c863c6f4114ae161a885898d08865c2b90498314d0
+  data.tar.gz: 91e42103058216708a654968d402e91a796ad3ade9ecc169ce4aa170a19f8875f0e93e055b40458bfa7d6d9f9e81318e3e18f0a46d6b03f16b9a6b10add73b11

data/bin/botemon

@@ -45,7 +45,7 @@ Cinch::Bot.new {
   on :message, /^pkmn (.+)/ do |m, name|
     @storage = Storage.new('./cache.db') unless @storage
     
-    name = Pokedex.id2name(name) if name.numeric?
+    name = Smogon::Pokemon.id2name(name) if name.numeric?
 
     pokemon = Pokedex.get name, @storage
     m.reply pokemon ? "#{pokemon.to_s}\n#{pokemon.url}".split("\n").map { |l| Format(:red, l) }.join("\n") : Format(:red, 'Pokémon not found.')
@@ -53,18 +53,23 @@ Cinch::Bot.new {
 
   on :message, /^ability (.+)/ do |m, name|   
     ability = Abilitydex.get name
+    
     m.reply ability ? "#{ability.to_s}\n#{ability.url}".split("\n").map { |l| Format(:red, l) }.join("\n") : Format(:red, 'Ability not found.')
   end
 
   on :message, /^move (.+)/ do |m, name|
-    name = Pokedex.id2name(name) if name.numeric?    
+    name = Smogon::Pokemon.id2name(name) if name.numeric?    
 
-    move = Movedex.get name
-    m.reply move ? "#{move.to_s}\n#{move.url}".split("\n").map { |l| Format(:red, l) }.join("\n") : Format(:red, 'Move not found.')
+    if name
+      move = Movedex.get name
+      m.reply move ? "#{move.to_s}\n#{move.url}".split("\n").map { |l| Format(:red, l) }.join("\n") : Format(:red, 'Move not found.')
+    else
+      m.reply Format(:red, 'An error is occurred searching the Pokémon.')
+    end
   end
 
   on :message, /^moveset (.+) (.+)/ do |m, name, tier|
-    name = Pokedex.id2name(name) if name.numeric?
+    name = Smogon::Pokemon.id2name(name) if name.numeric?
 
     movesets = Movesetdex.get name, tier
     if movesets != nil || movesets.any?
@@ -82,16 +87,20 @@ Cinch::Bot.new {
       m.reply Format(:red, 'Other players are playing, wait until they finish.')
       m.reply Format(:red, @pokemon_trivia.clues)
     else
-      @pokemon_trivia = Pokedex.get Pokedex.id2name(Random.new.rand(1..649)), @storage
+      @pokemon_trivia = Pokedex.get Smogon::Pokemon.id2name(Random.new.rand(1..649)), @storage
       @trivia_owner   = m.user.nick
       @trivia_wrong   = 0
       
-      m.reply @pokemon_trivia.clues.split("\n").map { |l| Format(:red, l) }.join("\n")
-      m.reply Format(:red, "You have 3 chances to try to say which Pokémon is this!")
+      if @pokemon_trivia
+        m.reply @pokemon_trivia.clues.split("\n").map { |l| Format(:red, l) }.join("\n")
+        m.reply Format(:red, 'You have 3 chances to try to say which Pokémon is this!')
+      else
+        m.reply Format(:red, 'An error is occurred searching the Pokémon.')
+      end
     end
   end
 
-  on :message, /^pktrivia (.+)$/ do |m, pokemon|
+  on :message, /^pktrivia (.+)/ do |m, pokemon|
     if @pokemon_trivia == nil
       m.reply Format(:red, 'You have to start the game before to play.')
     elsif pokemon.downcase == @pokemon_trivia.name.downcase
@@ -115,6 +124,8 @@ Cinch::Bot.new {
       @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.')
     else
       m.reply Format(:red, "Only ops and the game luncher can stop the game. #{m.user.nick} GTFO.")
     end
@@ -126,11 +137,28 @@ Cinch::Bot.new {
     elsif m.user.nick == 'mirkosp' || m.user.nick == 'RoxasShadowRS'
       m.reply Format(:red, @pokemon_trivia.name)
     else
-      m.reply Format(:red, 'VAI A ZAPPARE LA TERRA')
+      m.reply Format(:red, "GO TO DIG THE EARTH #{m.user.nick} ヽ(`Д´)ﾉ ┻━┻")
+    end
+  end
+  
+  on :message, /^pkcache$/ do |m|
+    if m.user.nick.oper? c
+      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 Format(:red, 'Cache created.')
+    else
+      m.reply Format(:red, "Only ops can create the cache. #{m.user.nick} GTFO.")
     end
   end
 
   on :message, /^pkversion$/ do |m|
-    m.reply Format(:red, Botemon::version)
+    m.reply Format(:red, "Botémon:    #{Botemon::version}")
+    m.reply Format(:red, "Smogon-API: #{Smogon::version}")
   end
 }.start

data/lib/botemon/abilitydex.rb

@@ -19,7 +19,6 @@
 
 class Abilitydex    
   def self.get(name)
-    return nil if name == nil
-    return Smogon::Abilitydex.get name
+    return name ? Smogon::Abilitydex.get(name) : nil
   end
 end

data/lib/botemon/movesetdex.rb

@@ -17,17 +17,8 @@
 # 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
-   
+class Movesetdex    
   def self.get(name, tier)
-    return nil if name == nil || tier == nil
-    return Smogon::Movesetdex.get name, tier
+    return name && tier ? Smogon::Movesetdex.get(name, tier) : nil
   end
 end

data/lib/botemon/pokedex.rb

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

data/lib/botemon/string.rb

@@ -18,7 +18,13 @@
 #++
 
 class String
+
   def numeric?
     self.to_i.to_s == self || self.to_f.to_s == self
   end
+  
+  def oper?(c)
+    bot.channels.each { |c| return true if c.ops.include? self }
+  end
+  
 end

data/lib/botemon/version.rb

@@ -19,6 +19,6 @@
 
 module Botemon
   def self.version
-    '0.4.1'
+    '0.4.2'
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: botemon
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-18 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
     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-login
   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: smogon
   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'
 description: IRC bot for pokéfag with (Poké|Ability|Move|Moveset)dex and a trivia
@@ -109,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: IRC bot for pokéfag.