just-the-recipe 0.1.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd7b63f04dd0ef8e6536a0a1ec23db9e26491a2e778d4033615ea7630338a527
-  data.tar.gz: 27de77e4c6e546a51ed51ef226abd1c85351af531725d093724e0f33c0af0028
+  metadata.gz: 9f762feff2c616419e85ce6ddf071c889643531c3f90b3934d06b5356f9e4282
+  data.tar.gz: e3ecdd69fc59b935137748d66afec24371466c6bc336c166ff917c45daab569d
 SHA512:
-  metadata.gz: 2e91e8971c95aada57382c7c799d887c0257fb03d43f81f0b3a2c84704e9a9070033b567416c88212cf8b6e47a79da04316fbf69d595c9e6fff513d2e81f05ef
-  data.tar.gz: f267754a184f11536aa1f4c96933cdd1d70c333720e66088d66b51bbda2bcad10968e46a62cd26d0c3742c044dfeed1d7ba93f8c32bf8741921e4e63951f6cc5
+  metadata.gz: 9dcc649793cdac6c6a99e4e04243954c9869da5c809f85ccc8f2e71c0e204fd43e72a8e052db17ca51f719d9d0c6229af239c1436b23d219e74212c36eba3431
+  data.tar.gz: 3a87384a00dbfc2742d37323f1f1cd745a09bd53440cf0dfd34c408775cb28a8991148513d703caef5da5f67e9298ab58dc288b2824476cf724b62fd5b0f2549

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    just-the-recipe (0.1.0)
+    just-the-recipe (0.6.0)
       dotenv
       nokogiri
       open-uri
+      tty-prompt
 
 GEM
   remote: https://rubygems.org/
@@ -13,8 +14,21 @@ GEM
     nokogiri (1.11.2-x86_64-darwin)
       racc (~> 1.4)
     open-uri (0.1.0)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     racc (1.5.2)
     rake (13.0.3)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.0)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    wisper (2.0.1)
 
 PLATFORMS
   x86_64-darwin-20

data/README.md

@@ -4,8 +4,7 @@
 
 Add this line to your application's Gemfile:
 
-```ruby
-gem 'just-the-recipe'
+```ruby gem 'just-the-recipe'
 ```
 
 And then execute:

data/bin/console

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require "bundler/setup"
-require "./lib/environment.rb"
+require './lib/just-the-recipe.rb'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/bin/just-the-recipe

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 require "bundler/setup"
-require "./lib/environment.rb"
+require './lib/just-the-recipe.rb'
 
 JustTheRecipe::CLI.new.call

data/just-the-recipe.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "./lib/environment.rb"
+require "./lib/just-the-recipe.rb"
 
 Gem::Specification.new do |spec|
   spec.name          = "just-the-recipe"
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org/"
 
-  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["homepage_uri"] = "https://github.com/george-dilthey/just-the-recipe"
   spec.metadata["source_code_uri"] = "https://github.com/george-dilthey/just-the-recipe"
   spec.metadata["changelog_uri"] = "https://github.com/george-dilthey/just-the-recipe"
 
@@ -24,14 +24,15 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.bindir        = "bin"
+  spec.executables   = spec.files.grep(%r{\Abin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "open-uri"
   spec.add_dependency "dotenv"
   spec.add_dependency "nokogiri"
+  spec.add_dependency "tty-prompt"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/{environment.rb → just-the-recipe.rb}

@@ -3,6 +3,7 @@ require 'open-uri'
 require 'nokogiri'
 require 'JSON'
 require 'net/http'
+require 'tty-prompt'
 
 require './lib/just-the-recipe/version.rb'
 require './lib/just-the-recipe/cli.rb'

data/lib/just-the-recipe/authenticate.rb

@@ -0,0 +1,11 @@
+
+class Authenticate
+    
+    def initialize(app_id, app_key)
+        @app_id, @app_key = app_id, app_key
+        File.write(".env", "APP_ID = #{app_id.to_s}\nAPP_KEY = #{app_key.to_s}")
+    end
+
+end
+
+Authenticate.new('6d8b7767', 'e1633ded1da9906633b79ec6c8525ac5')

data/lib/just-the-recipe/cli.rb

@@ -1,69 +1,35 @@
-require_relative '../environment.rb'
+require './lib/just-the-recipe.rb'
 
 class JustTheRecipe::CLI
 
     def call
         JustTheRecipe::Cookbook.create_from_files
         puts "Welcome to Just the Recipe! What would you like to do?"
-        list_options
-        choose_option
-        goodbye
+        main_menu
     end
 
-    def list_options
-        puts  "\n\nEnter a number 1-3 or type exit."
-        puts "1. Search for a new recipe."
-        puts "2. Get a recipe from a url."
-        puts "3. View your cookbooks."
-    end
-
-    def choose_option
-        input = nil
-        while input != "exit"
-            input = gets.chomp
-            if input == "1"
-                search
-            elsif input == "2"
-                scrape_url
-            elsif input == "3"
-                cookbook_menu 
-            elsif input == "exit"
-                break
-            elsif input == "options"
-                list_options
-            else
-                puts "Whoops! Choose a number 1-3, type options to view your options again, or type exit."
-            end
-        end
-    end
-
-    def scrape_url
-        puts "Enter your url:"
-        url = gets.chomp
-        if JustTheRecipe::Scraper.new(url).valid_url?
-            recipe = JustTheRecipe::Scraper.new(url).get_recipe_by_schema
-            recipe.display_recipe
-            add_recipe(recipe)
-            list_options
-        else
-            puts ""
-            puts "Sorry, it doesn't look like we can get the recipe from that URL. Try something else."
-            list_options
+    def main_menu
+        prompt = TTY::Prompt.new
+        puts "\n"
+        menu_choice = prompt.select("Choose an option") do |menu|
+            menu.choice name: "Search for a new recipe.", value: 1
+            menu.choice name: "Get a recipe from a URL.", value: 2
+            menu.choice name: "View your cookbooks.", value: 3
+            menu.choice name: "Create a new recipe manually.", value: 4
+            menu.choice name: "Exit", value: "exit"
         end
-    end
 
-    def add_recipe(recipe)
-        puts "Would you like to add this recipe to a cookbook? (y/n)"
-        input = gets.chomp
-        if input == "y"
-            puts "Ok! Which cookbook would you like to add this recipe to? Type an existing cookbook name, or type anything to create a new one!"
-            cookbook = gets.chomp
-            recipe.add_to_cookbook(cookbook)
-            puts "Great choice. We added this recipe to the cookbook called #{cookbook}"
-        elsif input == "n"
-            puts "No problem. This recipe wasn't added to a cookbook."
-        else 
-            puts "Sorry, you'll have to answer with either 'y' or 'n'."
+        case menu_choice
+        when 1
+            search
+        when 2
+            scrape_url
+        when 3
+            cookbook_menu
+        when 4
+            new_recipe 
+        when "exit"
+            goodbye
         end
     end
 
@@ -74,44 +40,99 @@ class JustTheRecipe::CLI
         if recipe.class == JustTheRecipe::Recipe
             recipe.display_recipe
             add_recipe(recipe)
-            list_options
         else
-            list_options
+            main_menu
         end
     end
 
-    def cookbook_menu
-        if JustTheRecipe::Cookbook.all.length > 0
-            puts "Type the name of the cookbook you'd like to view, type \"create\" to create a new one, type \"delete\" to delete a cookbook, or type \"exit\" to return to the main menu.\n\n"    
-            JustTheRecipe::Cookbook.list_cookbooks
+    def scrape_url
+        puts "Enter your url:"
+        url = gets.chomp
+        if JustTheRecipe::Scraper.new(url).valid_url?
+            recipe = JustTheRecipe::Scraper.new(url).get_recipe_by_schema
+            recipe.display_recipe
+            add_recipe(recipe)
         else
-            puts "It looks like you don't have any cookbooks yet. Type \"create\" to create a new one, or type \"exit\" to return to the main menu."
+            puts "\nSorry, it doesn't look like we can get the recipe from that URL. Try something else."
+            main_menu
         end
-        input = gets.chomp
+    end
 
+    def cookbook_menu
+        prompt = TTY::Prompt.new
+     
+        cookbooks_create = JustTheRecipe::Cookbook.list_cookbooks << "Create a new cookbook." << "Delete a cookbook." << "Main Menu"
+        input = prompt.select("Choose a cookbook to view or create a new one.", cookbooks_create)  
+        JustTheRecipe::Cookbook.list_cookbooks
+       
         if JustTheRecipe::Cookbook.find_by_name(input)
             puts "Here's what's in the cookbook called #{input}:" 
             puts JustTheRecipe::Cookbook.find_by_name(input).return_cookbook
-            list_options
-        elsif input == "create"
-            puts "Ok! What would you like to name your new cookbook?"
-            cookbook = gets.chomp
-            JustTheRecipe::Cookbook.new(cookbook)
-            puts "Great! We created a new cookbook for you. Find some recipes to add to it!"
-            list_options
-        elsif input == "delete"
-            puts "Which cookbook would you like to delete? WARNING: THIS CANNOT BE UNDONE!\n\n"
-            JustTheRecipe::Cookbook.list_cookbooks
-            delete_cookbook = gets.chomp
-            JustTheRecipe::Cookbook.delete(delete_cookbook)
+            main_menu
+        elsif input == "Create a new cookbook"
+            create_cookbook
+            main_menu
+        elsif input == "Delete a cookbook."
+            cookbooks_delete = JustTheRecipe::Cookbook.list_cookbooks << "Exit"
+            delete = prompt.select("Which cookbook would you like to delete? WARNING: THIS CANNOT BE UNDONE!", cookbooks_create)  
+            JustTheRecipe::Cookbook.delete(delete)
             puts "Ok, we deleted that cookbook."
-            list_options
-        elsif input == "exit"
-            list_options
+            main_menu
+        elsif input == "Main Menu"
+            main_menu
+        end
+    end
+
+    def new_recipe
+        puts "Ok, what would you like to call your new recipe?"
+        name = gets.chomp
+
+        puts "Add a short description of your recipe."
+        description = gets.chomp
+
+        puts "Add the recipe's ingredients, seperated by a comma. (Ex: 1/2 cup of flour, 2 tbsp sugar, 1 cup water)"
+        ingredients = gets.chomp.split(", ")
+
+        puts "Add the recipe's instructions, seperated by a comma. (Ex: Mix the ingredients, cook the recipe, enjoy!)"
+        steps = gets.chomp.split(", ")
+
+        puts "\nGreat! Here's your new recipe:"
+        manual_recipe = JustTheRecipe::Recipe.new(name, description, ingredients, steps)
+        manual_recipe.display_recipe
+        add_recipe(manual_recipe)
+    end
+
+    def create_cookbook
+        puts "Ok! What would you like to name your new cookbook?"
+        cookbook = gets.chomp
+        JustTheRecipe::Cookbook.new(cookbook)
+        puts "Great! We created a new cookbook for you."
+        cookbook
+    end
+
+    def add_recipe(recipe)
+        prompt = TTY::Prompt.new
+        puts "Would you like to add this recipe to a cookbook? It won't be saved otherwise. (y/n)"
+        input = gets.chomp
+        if input == "y"
+
+            cookbooks_create = JustTheRecipe::Cookbook.list_cookbooks << "Create a new cookbook."
+            cookbook = prompt.select("Ok! Choose a cookbook to add your recipe to, or create a new one.", cookbooks_create)  
+            if cookbook == "Create a new cookbook."
+                recipe.add_to_cookbook(create_cookbook)
+                puts "We added this recipe to your new cookbook."
+                main_menu
+            else
+                recipe.add_to_cookbook(cookbook)
+                puts "We added this recipe to the cookbook called #{cookbook}"
+                main_menu
+            end
+        elsif input == "n"
+            puts "No problem. This recipe wasn't added to a cookbook."
+            main_menu
         else 
-            puts ""
-            puts "Sorry, thats not a valid cookbook. Type \"create\" to create a new cookbook or type \"exit\" to return to the main menu"
-            list_cookbooks
+            puts "Sorry, you'll have to answer with either 'y' or 'n'."
+            main_menu
         end
     end
 
@@ -119,4 +140,6 @@ class JustTheRecipe::CLI
         puts "\n\nThanks for stopping by! If you created any cookbooks, they'll be saved as text files so that you can continue using them in the future. See you soon!"
     end
 
+    
+
 end

data/lib/just-the-recipe/cookbook.rb

@@ -1,5 +1,5 @@
 require 'pry'
-require './lib/environment.rb'
+require './lib/just-the-recipe.rb'
 
 class JustTheRecipe::Cookbook
 
@@ -42,7 +42,9 @@ class JustTheRecipe::Cookbook
     end
 
     def self.list_cookbooks
-        @@all.each{|i| puts "#{i.name}"}
+        cookbooks = []
+        @@all.each{|i| cookbooks << i.name}
+        cookbooks
     end 
     
     def return_cookbook

data/lib/just-the-recipe/recipe.rb

@@ -1,5 +1,5 @@
 require 'pry'
-require './lib/environment.rb'
+require './lib/just-the-recipe.rb'
 
 class JustTheRecipe::Recipe
 
@@ -7,7 +7,7 @@ class JustTheRecipe::Recipe
 
     @@all = []
 
-    def initialize(title, description, ingredients, steps, url) # ingredients and steps are arrays
+    def initialize(title, description, ingredients, steps, url= "n/a") # ingredients and steps are arrays
         @title = title
         @description = description
         @ingredients = ingredients

data/lib/just-the-recipe/scraper.rb

@@ -1,6 +1,6 @@
 require 'pry'
 
-require './lib/environment.rb'
+require './lib/just-the-recipe.rb'
 
 class JustTheRecipe::Scraper
 

data/lib/just-the-recipe/searcher.rb

@@ -1,6 +1,6 @@
 require 'pry'
 
-require './lib/environment.rb'
+require './lib/just-the-recipe.rb'
 
 class JustTheRecipe::Searcher
 
@@ -34,7 +34,6 @@ class JustTheRecipe::Searcher
             scrape_recipe(good_url)
         rescue
             puts "Sorry we couldn't find a valid recipe with that search term."
-            puts e
         end
         
     end

data/lib/just-the-recipe/version.rb

@@ -1,3 +1,3 @@
 module JustTheRecipe
-    VERSION = "0.1.0"
+    VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: just-the-recipe
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.6.0
 platform: ruby
 authors:
 - George Dilthey
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open-uri
@@ -52,10 +52,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  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: A small CLI application to search for recipes and create simple cookbooks.
 email:
 - george.dilthey@gmail.com
-executables: []
+executables:
+- console
+- just-the-recipe
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -69,7 +86,8 @@ files:
 - bin/just-the-recipe
 - bin/setup
 - just-the-recipe.gemspec
-- lib/environment.rb
+- lib/just-the-recipe.rb
+- lib/just-the-recipe/authenticate.rb
 - lib/just-the-recipe/cli.rb
 - lib/just-the-recipe/cookbook.rb
 - lib/just-the-recipe/recipe.rb