travel_leisure 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccd6af8353bc118f82009b9b6446e05b394a8fa4d325e1e6571e708e5fc37d21
-  data.tar.gz: f09ab6b42946663954a8ba263f21f9896b54e6637d76c3ab8321ad1b77ef2c2c
+  metadata.gz: c25c2164b452ebc6fb6efd5032c1ab7c3fc180314f38b1939ca4c6e2ceaa01cd
+  data.tar.gz: f71dcf59ce796cbb2221f6972f4a6806c43094c247077fa65ee53b6a05bff983
 SHA512:
-  metadata.gz: d36915fd5bf9fad9c8181012118c1756bf8e7bd3439c6ad44cb182493e551b6cf642372c513a8040ecf34f034c053622b90da1f6917012b4c768b0702f6fff06
-  data.tar.gz: 9fdf05d6048dd080dbbbdc078ddd17cb524fce80c795c25861357df8ca24fb51ec81be2ea9e9184d7c66fd8019b3754b473590b4d70e70c34e34db23451cf06c
+  metadata.gz: e32c52412687676d664774fd9b2bc3b997bc9f2219a3ae8727336ed7ab4b20f846d5ad7c4b0fb7581fdfc508c0bf64e70fb3b081d23e325a5aba37e20d8ad8a8
+  data.tar.gz: 34428a4e5000f97b7413fde44a10ab47d7f7b664fcdfd5d3887a736ca0a4f3b6605569d31beea1e7ab98a015bcf2aa292575dc1933f45f9c318912fe52ee3dec

data/bin/travel_leisure

@@ -3,4 +3,4 @@
 require "bundler/setup"
 require "travel_leisure"
 
-TravelLeisure::CLI.new.call
+TravelLeisure::CLI.new.start

data/lib/travel_leisure/cli.rb

@@ -1,67 +1,58 @@
 # code handling CLI display logic and user input
-class TravelLeisure::CLI #:: name space
-    def call
-      TravelLeisure::Scraper.new.make_destinations
-      puts ""
-      puts ""
-      puts " ------------------------------------------------ ".blue
-      puts "|                                                |".blue
-      puts "|    Welcome to Command Line Travel Guides       |".blue.bold
-      puts "|                                                |".blue
-      puts " ------------------------------------------------ ".blue
-      puts ""
-      puts ""
+class TravelLeisure::CLI
 
+    def start
+      greeting
+      TravelLeisure::Scraper.new.make_destinations
       menu
     end
 
-    def menu
+    def greeting
+      puts "\nWelcome to Command Line Travel Guides!".blue.bold
+      puts "Would you like to see our list of destinations?".yellow
+      puts "If so, please type 'Yes' or 'Y'!".yellow
+    end
 
-        puts "To view the destinations that we have travel guides for, enter 'travel'.".yellow.bold
-        puts "or enter 'q' to exit".yellow.bold
+    def good_bye
+      puts "Thank you for checking out Command Line Travel Guides!".yellow.bold
+      exit!
+    end
 
+    def menu 
         input = gets.strip.downcase
-
-        if input == 'travel'
-          puts ""
-          puts "Here is a list of destinations that we have travel guides for:".yellow.bold
-          puts ""
-
-          list_destinations
-
-        elsif input == "q"
-          exit
+        if input == "yes" || input == "y"
+          menu_helper
+        elsif input == "exit" || input == "e"
+          good_bye         
         else
-          puts ""
-          puts "I don't understand that answer, please try again:".red.bold
-          puts ""
-          menu
+          puts "Sorry! I didn't understand that input, please try again".red.bold
+          puts "Would you like to see our list?".yellow
+          puts "If so, please type 'Yes' or 'Y' or exit.".yellow
+          menu 
         end
+    end
 
-        puts "\nPlease enter the number of the travel guide you would like to access\nor enter 'q' to exit:".yellow.bold
+    def menu_helper
+      list_destinations
+      select_destination
+    end
+
+    def list_destinations
+      TravelLeisure::Destination.all.each.with_index(1) do |destination, index|
+            puts "#{index}. #{destination.city}, #{destination.country}"
+    end
+
+    def select_destination
+      puts "\nPlease enter the number of the travel guide you would like to access:".yellow.bold
         input = gets.strip
-        if input == 'q'
-          exit
-        elsif
-          destination = TravelLeisure::Destination.find(input.to_i)
+        destination = TravelLeisure::Destination.find(input.to_i)
+        if input == "exit" || input == "e"
+          good_bye
+        elsif input.to_i.between?(1,TravelLeisure::Destination.all.length)
           print_destination(destination)
-        
-        end
-      
-        puts ""
-        puts "Would you like to see another travel guide? Enter Y or N".yellow.bold
-
-        input = gets.strip.downcase
-        if input == "y"
-          menu
-        elsif input == "n"
-          puts ""
-          puts "Thank you! Have a great day!".yellow.bold
-          exit
         else
-          puts ""
-          puts "I don't understand that answer.".red.bold
-          menu
+          puts "Sorry! I didn't understand that input, please try again".red.bold
+          select_destination
         end
     end
 
@@ -75,29 +66,40 @@ class TravelLeisure::CLI #:: name space
       puts "\nKnow Before Visiting: #{destination.know_before_visiting}".green.bold
       puts "\nLanguage: #{destination.language}".green.bold
       puts "\nCurrency: #{destination.currency}".green.bold
-      puts ""
-      puts "Would you like to read more on #{destination.city}? Enter Y or N".yellow.bold
-
+      puts "\nWould you like to read more on #{destination.city}? Please enter 'Y' or 'N'".yellow.bold
         input = gets.strip.downcase
-        if input == "y"
+        case input
+        when 'y' || 'yes'
           puts ""
-          puts "More info:"
+          puts "More info:".yellow
           puts ""
           puts destination.description
-        elsif input == "n"
-          menu
-        elsif input == "q"
-          exit
+          alt_menu
+        when 'n' || 'no'
+          alt_menu
+        when 'exit'
+          good_bye
         else
           puts ""
-          puts "I don't understand that answer."
-          menu
+          puts "Sorry, I didn't understand that input.".red.bold
+          alt_menu
         end
     end
 
-    def list_destinations
-      TravelLeisure::Destination.all.each.with_index(1) do |destination, index|
-        puts "#{index}. #{destination.city}, #{destination.country}"
+    def alt_menu
+      puts "\nWould you like to see another travel guide? Type 'Yes' or 'Y' ".yellow.bold
+      puts "\nWould you like to exit? Type 'E' or 'Exit' ".yellow.bold
+      input = gets.strip.downcase
+      if input == 'yes' || input == 'y'
+        menu_helper
+      elsif input == 'exit' || input == 'e'
+        good_bye
+      else
+        puts "Sorry, I didn't understand that input.".red.bold
+        alt_menu
       end
     end
+
+    
+  end
 end

data/lib/travel_leisure/version.rb

@@ -1,3 +1,3 @@
 module TravelLeisure
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/travel_leisure.gemspec

@@ -28,4 +28,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry", "~> 0.10.4"
   spec.add_dependency "nokogiri", "~> 1.8"
   spec.add_dependency "colorize", "~> 0.8.1"
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travel_leisure
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - corbinarnett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,8 +120,6 @@ files:
 - lib/travel_leisure/scraper.rb
 - lib/travel_leisure/version.rb
 - notes.md
-- travel_leisure-0.1.0.gem
-- travel_leisure-0.1.1.gem
 - travel_leisure.gemspec
 homepage: https://github.com/corbinarnett/travel-leisure-cli
 licenses: