botemon 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3df70fe78c7cdd0135358fd8c09c20b436ed76ff
-  data.tar.gz: 3524bccd5236fc147fcfef51a708be301b486e88
+  metadata.gz: f4158ad88bf1ebd27007e04363e0a1faf01fb20a
+  data.tar.gz: 29cf92dd9c4039c5324e57ffd5f9be12355026f5
 SHA512:
-  metadata.gz: 64120d70649dc92f119c50fdc22244e8f54076ec5af6ff4bfbc9ccc80dcddb68217e0c9fb5874b9ad03d0cdcbc63ca657d798b8defc10a596af4030f87b63679
-  data.tar.gz: 78c531ef41dabda70f93b6caaec73bfa83e008172880eff7301e58b9acbf38fdfee97f83e1e544c7c1a0e2eb46e34c9c68b7c895bd14f5303f8258534401663e
+  metadata.gz: 8acbaa22fb276e507976653f9b40f678722213b31b24126273dd0bd3359a658119871c3124f2aadf97dfc0cbad7115c05c16a465a2942c326047f35ef43fa994
+  data.tar.gz: 1d9af056be096b2d1357b982edb7aa91561c85eb44ef086793b711dba32e4ffbe1ec9fcc6c5f68fffce8791bbf981b022e8b11b70785f6b8045fca930b9915ce

data/bin/botemon

@@ -46,7 +46,7 @@ Cinch::Bot.new {
   on :message, /^pkmn (.+)/ do |m, name|
     @storage = Storage.new('./cache.db') unless @storage
 
-    name = Smogon::Pokemon.id2name(name) if name.numeric?
+    name = Smogon::Type::Pokemon.id2name(name) if name.numeric?
 
     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
@@ -71,7 +71,7 @@ Cinch::Bot.new {
   end
 
   on :message, /^moveset (.+) (.+) (.+)/ do |m, name, tier, metagame|
-    name = Smogon::Pokemon.id2name(name) if name.numeric?
+    name = Smogon::Type::Pokemon.id2name(name) if name.numeric?
 
     tier     = nil if tier.empty?
     metagame = nil if metagame.empty?
@@ -91,7 +91,7 @@ Cinch::Bot.new {
   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?
+    name    = Smogon::Type::Pokemon.id2name(name) if name.numeric?
     pokemon = Pokedex.get name, @storage
 
     hidden_values = evs.strip.split
@@ -109,7 +109,7 @@ Cinch::Bot.new {
   on :message, /^pkrandom$/ do |m|
     @storage = Storage.new('./cache.db') unless @storage
 
-    pokemon = Pokedex.get Smogon::Pokemon.id2name(Random.new.rand(1..649)), @storage
+    pokemon = Pokedex.get Smogon::Type::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
 
@@ -120,7 +120,7 @@ Cinch::Bot.new {
       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)), @storage
+      @pokemon_trivia = Pokedex.get Smogon::Type::Pokemon.id2name(Random.new.rand(1..649)), @storage
       @trivia_owner   = m.user.nick
       @trivia_wrong   = 0
 
@@ -198,15 +198,15 @@ Cinch::Bot.new {
   end
 
   on :message, /^pkhelp$/ do |m|
-    m.reply "- pkmn     Bulbasaur                                          ".colorize
-    m.reply "- pkmn     1                                                  ".colorize
-    m.reply "- ability  Synchronize                                        ".colorize
-    m.reply "- item     Leftovers                                          ".colorize
-    m.reply "- move     Reflect                                            ".colorize
-    m.reply "- moveset  Bulbasaur LC                                       ".colorize
-    m.reply "- moveset  Bulbasaur LC DP                                    ".colorize
-    m.reply "- pstats   Scizor 70 Adamant 0/252/0/0/6/252 15/31/30/2/31/31 ".colorize
-    m.reply "- pstats   Scizor 70 Adamant 0/252/0/0/6/252                  ".colorize
-    m.reply "- pkrandom, pktrivia, pkdebug, pkstop, pkcache, pkversion     ".colorize
+    m.reply "- pkmn Bulbasaur                                             ".colorize
+    m.reply "- pkmn 1                                                     ".colorize
+    m.reply "- ability Synchronize                                        ".colorize
+    m.reply "- item Leftovers                                             ".colorize
+    m.reply "- move Reflect                                               ".colorize
+    m.reply "- moveset Bulbasaur LC                                       ".colorize
+    m.reply "- moveset Bulbasaur LC DP                                    ".colorize
+    m.reply "- pstats Scizor 70 Adamant 0/252/0/0/6/252 15/31/30/2/31/31  ".colorize
+    m.reply "- pstats Scizor 70 Adamant 0/252/0/0/6/252                   ".colorize
+    m.reply "- pkrandom, pktrivia, pkdebug, pkstop, pkcache, pkversion    ".colorize
   end
 }.start

data/lib/botemon/abilitydex.rb

@@ -17,8 +17,8 @@
 # along with Botémon.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-class Abilitydex    
+class Abilitydex
   def self.get(name)
     name ? Smogon::Abilitydex.get(name) : nil
   end
-end
+end

data/lib/botemon/smogon/moveset.rb

@@ -1,35 +1,35 @@
-#--
-# 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.d
-#
-# 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/>.
-#++
-
-module Smogon
-  class Moveset
-    attr_accessor :pokemon, :name, :tier, :item, :ability, :nature, :moves, :evs
-
-    def initialize
-      @item    = []
-      @ability = []
-      @nature  = []
-      @moves   = []
-    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
+#--
+# Copyright(C) 2017 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/>.
+#++
+
+module Smogon
+  class Moveset
+    attr_accessor :pokemon, :name, :tier, :items, :abilities, :natures, :moves, :ivs, :evs
+
+    def initialize
+      @items     = []
+      @abilities = []
+      @natures   = []
+      @moves     = []
+    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

data/lib/botemon/smogon/pokemon.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2017 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Botémon.
 #
@@ -18,90 +18,90 @@
 #++
 
 module Smogon
-  class Pokemon
-    attr_accessor :name, :_name, :types, :tier, :abilities, :base_stats, :moves
+  module Type
+    class Pokemon
+      attr_accessor :name, :types, :tier, :abilities, :base_stats, :moves
 
-    def clues
-      "Ability: #{@abilities.join(', ')}\nType: #{@types.join(?/)}\nTier: #{@tier}\nBase stats: #{@base_stats.join(?/)}"
-    end
+      def clues
+        "Ability: #{abilities.join(', ')}\nType: #{types.join(?/)}\nBase stats: #{base_stats.join(?/)}"
+      end
 
-    def self.to_pokemon(ary)
-      Pokemon.new.tap { |pokemon|
-        pokemon.name       = ary['name'      ]
-        pokemon._name      = ary['_name'     ]
-        pokemon.types      = ary['types'     ]
-        pokemon.tier       = ary['tier'      ]
-        pokemon.abilities  = ary['abilities' ]
-        pokemon.base_stats = ary['base_stats']
-        pokemon.moves      = ary['moves'     ]
-      }
-    end
+      def self.to_pokemon(ary)
+        Pokemon.new.tap do |pokemon|
+          pokemon.name       = ary['name'      ]
+          pokemon.types      = ary['types'     ]
+          pokemon.tier       = ary['tier'      ]
+          pokemon.abilities  = ary['abilities' ]
+          pokemon.base_stats = ary['base_stats']
+          pokemon.moves      = ary['moves'     ]
+        end
+      end
 
-    def to_ary
-      {
-        'name'       => @name,
-        '_name'      => @_name,
-        'types'      => @types,
-        'tier'       => @tier,
-        'abilities'  => @abilities,
-        'base_stats' => @base_stats,
-        'moves'      => @moves
-      }
-    end
+      def to_ary
+        {
+          'name'       => @name,
+          'types'      => @types,
+          'tier'       => @tier,
+          'abilities'  => @abilities,
+          'base_stats' => @base_stats,
+          'moves'      => @moves
+        }
+      end
 
-    def stats(level, nature, evs, ivs)
-      natures = {
-        :jolly   => { :plus => :spe,   :minus => :atksp },
-        :rash    => { :plus => :atksp, :minus => :defsp },
-        :hardy   => { :plus => :none,  :minus => :none  },
-        :brave   => { :plus => :atk,   :minus => :spe   },
-        :naughty => { :plus => :atk,   :minus => :defsp },
-        :calm    => { :plus => :defsp, :minus => :atk   },
-        :careful => { :plus => :defsp, :minus => :atksp },
-        :adamant => { :plus => :atk,   :minus => :atksp },
-        :docile  => { :plus => :none,  :minus => :none  },
-        :lax     => { :plus => :def,   :minus => :defsp },
-        :quirky  => { :plus => :none,  :minus => :none  },
-        :gentle  => { :plus => :defsp, :minus => :def   },
-        :naive   => { :plus => :spe,   :minus => :defsp },
-        :hasty   => { :plus => :spe,   :minus => :def   },
-        :mild    => { :plus => :atksp, :minus => :def   },
-        :modest  => { :plus => :atksp, :minus => :atk   },
-        :relaxed => { :plus => :def,   :minus => :spe   },
-        :quiet   => { :plus => :atksp, :minus => :spe   },
-        :bashful => { :plus => :none,  :minus => :none  },
-        :impish  => { :plus => :def,   :minus => :atksp },
-        :lonely  => { :plus => :atk,   :minus => :def   },
-        :serious => { :plus => :none,  :minus => :none  },
-        :bold    => { :plus => :def,   :minus => :atk   },
-        :timid   => { :plus => :spe,   :minus => :atk   },
-        :sassy   => { :plus => :defsp, :minus => :spe   },
-      }
+      def stats(level, nature, evs, ivs)
+        natures = {
+          :jolly   => { :plus => :spe,   :minus => :atksp },
+          :rash    => { :plus => :atksp, :minus => :defsp },
+          :hardy   => { :plus => :none,  :minus => :none  },
+          :brave   => { :plus => :atk,   :minus => :spe   },
+          :naughty => { :plus => :atk,   :minus => :defsp },
+          :calm    => { :plus => :defsp, :minus => :atk   },
+          :careful => { :plus => :defsp, :minus => :atksp },
+          :adamant => { :plus => :atk,   :minus => :atksp },
+          :docile  => { :plus => :none,  :minus => :none  },
+          :lax     => { :plus => :def,   :minus => :defsp },
+          :quirky  => { :plus => :none,  :minus => :none  },
+          :gentle  => { :plus => :defsp, :minus => :def   },
+          :naive   => { :plus => :spe,   :minus => :defsp },
+          :hasty   => { :plus => :spe,   :minus => :def   },
+          :mild    => { :plus => :atksp, :minus => :def   },
+          :modest  => { :plus => :atksp, :minus => :atk   },
+          :relaxed => { :plus => :def,   :minus => :spe   },
+          :quiet   => { :plus => :atksp, :minus => :spe   },
+          :bashful => { :plus => :none,  :minus => :none  },
+          :impish  => { :plus => :def,   :minus => :atksp },
+          :lonely  => { :plus => :atk,   :minus => :def   },
+          :serious => { :plus => :none,  :minus => :none  },
+          :bold    => { :plus => :def,   :minus => :atk   },
+          :timid   => { :plus => :spe,   :minus => :atk   },
+          :sassy   => { :plus => :defsp, :minus => :spe   },
+        }
 
-      fields     = [ :hp, :atk, :def, :atksp, :defsp, :spe ]
-      evs        = Hash[fields.zip evs]
-      ivs        = Hash[fields.zip ivs]
-      base_stats = Hash[fields.zip @base_stats]
-      nature     = natures[nature.downcase.to_sym]
+        fields     = [ :hp, :atk, :def, :atksp, :defsp, :spe ]
+        evs        = Hash[fields.zip evs]
+        ivs        = Hash[fields.zip ivs]
+        base_stats = Hash[fields.zip @base_stats]
+        nature     = natures[nature.downcase.to_sym]
 
-      [].tap { |stats|
-        fields.each_with_index { |field|
-          iv        = ivs[field].to_i
-          ev        = evs[field].to_i
-          base_stat = base_stats[field].to_i
-          multipler = case field
-            when nature[:plus]  then 1.1
-            when nature[:minus] then 0.9
-            else                     1
-          end
+        [].tap { |stats|
+          fields.each_with_index { |field|
+            iv        = ivs[field].to_i
+            ev        = evs[field].to_i
+            base_stat = base_stats[field].to_i
+            multipler = case field
+              when nature[:plus]  then 1.1
+              when nature[:minus] then 0.9
+              else                     1
+            end
 
-          if field == :hp
-            stats << (((iv + 2 * base_stat + ev / 4) * level / 100) + 10 + level).floor
-          else
-            stats << ((((iv + 2 * base_stat + ev / 4) * level / 100) + 5) * multipler).floor
-          end
+            if field == :hp
+              stats << (((iv + 2 * base_stat + ev / 4) * level / 100) + 10 + level).floor
+            else
+              stats << ((((iv + 2 * base_stat + ev / 4) * level / 100) + 5) * multipler).floor
+            end
+          }
         }
-      }
+      end
     end
   end
 end

data/lib/botemon/storage.rb

@@ -19,34 +19,36 @@
 
 class Storage
   attr_accessor :file, :db
-  
+
   def initialize(file)
     @file = file
     @db = [].tap { |db|
-      (File.exists?(file) ? JSON.load(File.read(file)) : []).each { |p| db << Smogon::Pokemon.to_pokemon(p) }
+      (File.exists?(file) ? JSON.load(File.read(file)) : []).each { |p| db << Smogon::Type::Pokemon.to_pokemon(p) }
     }
   end
-  
+
   def is_cached?(name)
-    @db.select { |p| p._name == name.downcase }.any?
+    name = name.downcase
+    @db.select { |p| p.name == name }.any?
   end
   alias :include? :is_cached?
-  
+
   def get(name)
-    @db.select { |p| p._name == name.downcase }.first
+    name = name.downcase
+    @db.select { |p| p.name == name }.first
   end
-  
+
   def get_all
     @db
   end
   alias :dump :get_all
-  
+
   def add(pokemon)
     return unless pokemon
     @db << pokemon unless is_cached?(pokemon.name)
   end
   alias :put :add
-  
+
   def save
     [].tap { |ary|
       @db.each { |p| ary << p.to_ary }
@@ -55,4 +57,4 @@ class Storage
       }
     }
   end
-end
+end

data/lib/botemon/version.rb

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

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: botemon
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: cinch-login
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: cinch-colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: smogon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 description: IRC bot for Pokéfags with (Poké|Ability|Item|Move|Moveset)dex and a trivia
   game.
 email: webmaster@giovannicapuano.net
@@ -88,7 +88,7 @@ files:
 - lib/botemon/version.rb
 homepage: http://www.giovannicapuano.net
 licenses:
-- GPL-3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: IRC bot for Pokéfags.