pokemoves-cli 1.0.4 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff9fe16835af117f9ead6aea422f04cdb04ba14a92c5fbc0a3d6b2c8dd4b7d0
-  data.tar.gz: 4741d1944d3542ab9318bbd82feed7f694a793c30401faf6b61d3cab926c580d
+  metadata.gz: 239ff9f15288592cb8c55da88f16519de762bb58d617a23ca509f8192fe47971
+  data.tar.gz: '0961d2218db011607223d91db4c59436086533d9983d2c6b9539569b62cc433b'
 SHA512:
-  metadata.gz: 577cc0cb94d5accf01f8644d3deac01aa62b4831469be09b11079202fc41f33870a82a5646fdeb1798c2067c89bb8f24dbe8f183d643d523b60ab1503d835d94
-  data.tar.gz: a2492b11125bb33a62e11cb5711844749dfe6ee8fed0fa7b4ab022acf65b39281857c5ddd77a792af6591da4d550c2bf3afe23c45178edf3cbf23ef260ecd6f4
+  metadata.gz: 256aaef1df8f5a1be89cb88ac582910c13d51d7daf67f449a7e0e353dacdcfbd9e80e68e81c28c0ce281905cf72a61ecd68bb5a2a62cdadc48ab6a527a68cf44
+  data.tar.gz: 4ec41649d6d3a5c0d317b19193e890a81f3ddd493d1261f174a90a30ed88006ab14d155d698bc14441867f1e9d1a4161c30de097b0bcdf58957703b71fd18f5f

data/Gemfile

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
 gem "httparty"
-gem "pry"
 
 # Specify your gem's dependencies in pokemoves-cli.gemspec
 gemspec

data/Gemfile.lock

@@ -1,23 +1,19 @@
 PATH
   remote: .
   specs:
-    pokemoves-cli (1.0.4)
+    pokemoves-cli (1.0.9)
+      httparty
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.3)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
     multi_xml (0.6.0)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
     rake (12.3.3)
 
 PLATFORMS
@@ -27,7 +23,6 @@ DEPENDENCIES
   bundler (~> 2.0)
   httparty
   pokemoves-cli!
-  pry
   rake (~> 12.3.3)
 
 BUNDLED WITH

data/README.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Pokemoves-cli
 
 Pokemoves allows you to easily check which moves pokemon can learn, as well as which pokemon can learn a specific move. You can also check a move's given type.
@@ -21,7 +20,11 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Simply enter the command: 
+
+    $ pokemoves 
+
+Into the terminal to start up the CLI. From there, instructions are provided by the CLI itself. 
 
 ## Development
 

data/bin/pokemoves

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require "pokemoves"
+require_relative "../lib/pokemoves.rb"
 
-cli = Pokemoves::CLI.new
+Pokemoves::CLI.new.run
 

data/lib/move.rb

@@ -2,15 +2,23 @@ require_relative "scraper.rb"
 require_relative "pokemon.rb"
 
 class Move
-  attr_reader :name, :type
+  attr_reader :name, :pretty_name
   @@all = []
   
   def initialize(name)
     @name = name
-    @type = Scraper.get_move_by_name(name)["type"]["name"]
+    @pretty_name = name.split("-").collect{|word| word.capitalize}.join(" ")
+    
     @@all << self
   end
   
+  def type
+    if @type == nil
+      @type = Scraper.get_move_by_name(name)["type"]["name"]
+    end
+    @type
+  end
+  
   def self.all
     @@all
   end
@@ -22,4 +30,8 @@ class Move
     end
     return nil
   end
+  
+  def self.find_or_create_by_pretty_name(pretty_name)
+    self.find_or_create_by_name(pretty_name.split(" ").collect{|word| word.downcase}.join("-"))
+  end
 end

data/lib/pokemon.rb

@@ -11,11 +11,11 @@ class Pokemon
   end
   
   def get_moves
-    moves = Scraper.get_pokemon_by_name(@name)["moves"].collect{|move_hash| move_hash["move"]["name"]}
+    Scraper.get_pokemon_by_name(@name)["moves"].collect{|move_hash| Move.new(move_hash["move"]["name"])}
   end
   
-  def can_learn_move?(move_name)
-    self.get_moves.include?(move_name)
+  def can_learn_move?(move)
+    self.get_moves.collect{|m| m.name}.include?(move.name)
   end
   
   def self.all

data/lib/pokemoves.rb

@@ -1,85 +1,97 @@
 require_relative "pokemon.rb"
 require_relative "move.rb"
-require "pokemoves/cli/version"
+#require "pokemoves/cli/version"
 
   module Pokemoves
     class CLI
-      puts "Welcome to Pokemoves!"
-      input = 0
-      until input == 3
-        puts "Enter 1 to see a list of a pokemon's given moves."
-        puts "Enter 2 to see if a certain move is learnable by a pokemon."
-        puts "Enter 3 to exit."
-        input = gets.to_i
-        if input == 1
-          puts "Enter the name of a pokemon."
+      
+      def run
+        puts "Welcome to Pokemoves!"
+        input = 0
+        until input == 3
+          puts "Enter 1 to see a list of a pokemon's given moves."
+          puts "Enter 2 to see if a certain move is learnable by a pokemon."
+          puts "Enter 3 to exit."
+          input = gets.to_i
+          if input == 1
+            get_pokemon_move_list
+
+          elsif input == 2
+            check_learnability_of_move
+          else
+            puts "That isn't a vailid choice." unless input == 3
+          end
+
+        end
+        
+      end
+      
+      def get_pokemon_move_list
+        puts "Enter the name of a pokemon."
+        pokemon_name = gets.chomp
+        until Pokemon.find_or_create_by_name(pokemon_name.downcase) != nil
+          puts "It doesn't look like we have that pokemon stored."
+          puts "Try a different one."
           pokemon_name = gets.chomp
-          until Pokemon.find_or_create_by_name(pokemon_name.downcase) != nil
-            puts "It doesn't look like we have that pokemon stored."
-            puts "Try a different one."
-            pokemon_name = gets.chomp
+        end
+        current_pokemon = Pokemon.find_or_create_by_name(pokemon_name.downcase)
+        puts "Press enter to see a list of #{pokemon_name.capitalize}'s moves."
+        gets
+        counter = 1
+        current_pokemon.get_moves.each{|move|
+          puts "#{counter}. #{move.pretty_name}"
+        counter += 1
+        }
+        puts "Enter the number of the move you'd like to know the type of."
+        puts "To continue to the main menu, enter -1"
+        num = gets.to_i
+        until num <= 0
+          if(num <= current_pokemon.get_moves.size)
+            current_move = Move.find_or_create_by_name(current_pokemon.get_moves[num - 1].name)
+            puts "The move #{current_move.pretty_name} is a #{current_move.type} type move."
+          else
+            puts "That number is not in the list of moves."
           end
-          current_pokemon = Pokemon.find_or_create_by_name(pokemon_name.downcase)
-          puts "Press enter to see a list of #{pokemon_name.capitalize}'s moves."
-          gets
-          counter = 1
-          current_pokemon.get_moves.each{|move|
-            puts "#{counter}. #{move.split("-").collect{|word| word.capitalize}.join(" ")}"
-          counter += 1
-          }
           puts "Enter the number of the move you'd like to know the type of."
-          puts "To continue to the main menu, enter -1"
+          puts "Enter -1 to continue to the main menu."
           num = gets.to_i
-          until num <= 0
-            if(num <= current_pokemon.get_moves.size)
-              current_move = Move.find_or_create_by_name(current_pokemon.get_moves[num - 1])
-              puts "The move #{current_move.name.capitalize} is a #{current_move.type} type move."
-            else
-              puts "That number is not in the list of moves."
-            end
-            puts "Enter the number of the move you'd like to know the type of."
-            puts "Enter -1 to continue to the main menu."
-            num = gets.to_i
-          end
+        end
+      end
       
-        elsif input == 2
-          puts "Enter the name of a move!"
+      def check_learnability_of_move
+        puts "Enter the name of a move!"
+        move_name = gets.chomp
+        until Move.find_or_create_by_pretty_name(move_name) != nil
+          puts "It doesn't look like we have that move stored."
+          puts "Try a different one."
           move_name = gets.chomp
-          until Move.find_or_create_by_name(move_name.split(" ").collect{|word| word.downcase}.join("-")) != nil
-            puts "It doesn't look like we have that move stored."
-            puts "Try a different one."
-            move_name = gets.chomp
+        end
+        current_move = Move.find_or_create_by_pretty_name(move_name)
+        puts "Enter the name of a pokemon to see if they can learn #{current_move.pretty_name}"
+        pokemon_name = gets.chomp
+        until Pokemon.find_or_create_by_name(pokemon_name.downcase) != nil
+          puts "It doesn't look like we have that pokemon stored."
+          puts "Try a different one."
+          pokemon_name = gets.chomp
+        end
+        until pokemon_name == "exit"
+          current_pokemon = Pokemon.find_or_create_by_name(pokemon_name.downcase)
+          if current_pokemon.can_learn_move?(current_move)
+            puts "It looks like #{current_pokemon.name.capitalize} can learn #{current_move.pretty_name}."
+          else
+            puts "It looks like #{current_pokemon.name.capitalize} can't learn #{current_move.pretty_name}."
           end
-          current_move = Move.find_or_create_by_name(move_name.split(" ").collect{|word| word.downcase}.join("-"))
-          puts "Enter the name of a pokemon to see if they can learn #{current_move.name.split("-").collect{|word|  word.capitalize}.join(" ")}"
+          puts "Enter the name of another pokemon to see if they can learn #{current_move.pretty_name}."
+          puts "Enter \"exit\" to continue to the main menu."
           pokemon_name = gets.chomp
-          until Pokemon.find_or_create_by_name(pokemon_name.downcase) != nil
+          until Pokemon.find_or_create_by_name(pokemon_name.downcase) != nil || pokemon_name == "exit"
             puts "It doesn't look like we have that pokemon stored."
-            puts "Try a different one."
+            puts "Try a different one, or enter \"exit\" to exit."
             pokemon_name = gets.chomp
           end
-          until pokemon_name == "exit"
-            current_pokemon = Pokemon.find_or_create_by_name(pokemon_name.downcase)
-            if current_pokemon.can_learn_move?(current_move.name)
-              puts "It looks like #{current_pokemon.name.capitalize} can learn #{current_move.name.split("-").collect{|word| word.capitalize}.join(" ")}."
-            else
-              puts "It looks like #{current_pokemon.name.capitalize} can't learn #{current_move.name.split("-").collect{|word| word.capitalize}.join(" ")}."
-            end
-            puts "Enter the name of another pokemon to see if they can learn #{current_move.name.split("-").collect{|word| word.capitalize}.join(" ")}."
-            puts "Enter \"exit\" to continue to the main menu."
-            pokemon_name = gets.chomp
-            until Pokemon.find_or_create_by_name(pokemon_name.downcase) != nil || pokemon_name == "exit"
-              puts "It doesn't look like we have that pokemon stored."
-              puts "Try a different one, or enter \"exit\" to exit."
-              pokemon_name = gets.chomp
-            end
-          end
-        else
-          puts "That isn't a vailid choice." unless input == 3
         end
-      
       end
-    
-  end
+      
+    end
   
-end
+  end

data/lib/pokemoves/cli/version.rb

@@ -1,5 +1,5 @@
 module Pokemoves
   module Cli
-    VERSION = "1.0.4"
+    VERSION = "1.0.9"
   end
 end

data/lib/scraper.rb

@@ -1,5 +1,4 @@
 require "httparty"
-require "pry"
 
 class Scraper
   

data/pokemoves-cli.gemspec

@@ -38,4 +38,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 12.3.3"
+  spec.add_runtime_dependency "httparty"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pokemoves-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.9
 platform: ruby
 authors:
 - "'Andrew Ribas'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: httparty
+  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: '"Pokemoves allows you to easily check which moves pokemon can learn,
   as well as which pokemon can learn a specific move. You can also check a move''s
   given type."'