pokemoves-cli 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb8cb7108327718cdb80a49954b547282c2590b999398e33d22767a76aab9956
-  data.tar.gz: 03077af2c10f6cb231417002d5d9c9dc514f35327cc66b7878893e06351bc28b
+  metadata.gz: 239ff9f15288592cb8c55da88f16519de762bb58d617a23ca509f8192fe47971
+  data.tar.gz: '0961d2218db011607223d91db4c59436086533d9983d2c6b9539569b62cc433b'
 SHA512:
-  metadata.gz: 83475f7b57df6097d9616451b67d44a9a019c1306ffa804a62a0ca56282eb10dcd7c16e4ddfc51481f9348dfd5a8915f335bc764e9e83b21b806db634ec878d3
-  data.tar.gz: 44624204c1f2c53f05f812d97790949175f0a3456cb97e4aa5a90a5c68c02520b98a69ad8bbd45bc21d4f24ea3d2006cde46c56012b0f624c8a1250d851dd3a7
+  metadata.gz: 256aaef1df8f5a1be89cb88ac582910c13d51d7daf67f449a7e0e353dacdcfbd9e80e68e81c28c0ce281905cf72a61ecd68bb5a2a62cdadc48ab6a527a68cf44
+  data.tar.gz: 4ec41649d6d3a5c0d317b19193e890a81f3ddd493d1261f174a90a30ed88006ab14d155d698bc14441867f1e9d1a4161c30de097b0bcdf58957703b71fd18f5f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pokemoves-cli (1.0.8)
+    pokemoves-cli (1.0.9)
       httparty
 
 GEM

data/README.md

@@ -20,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/pokemon.rb

@@ -11,7 +11,7 @@ class Pokemon
   end
   
   def get_moves
-    moves = Scraper.get_pokemon_by_name(@name)["moves"].collect{|move_hash| Move.new(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)

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.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"
+          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].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
-            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_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
+        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_pretty_name(move_name)
-          puts "Enter the name of a pokemon to see if they can learn #{current_move.pretty_name}"
+          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)
-              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
-            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 || 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.8"
+    VERSION = "1.0.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pokemoves-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - "'Andrew Ribas'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler