terminal-app 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4965f7409feaca88efec50013feb8b6dd25a35c4b937eca994172c23b5e32fdc
-  data.tar.gz: c733bb5894f0946f54a45dc70d46f8f952c5058c0f619fbe1f091cd7f7d1c5f5
+  metadata.gz: 27c4752b331bd2eea46392771bf6a214539eecf0df7642f8a32ded3a6251a67a
+  data.tar.gz: 54d7258ac1ee9411bef49ffefd86b63e69bad5cd1515e1db4c88b11dc7b99f69
 SHA512:
-  metadata.gz: b2a871c4f0195e4fa9cd18b8efe6f5984ea4333e70515c1bfb73721c490664b80a177bcb20bc818bd7738063991920b0bce4978f71d83a920d55b3e82f75de9a
-  data.tar.gz: fd8d3318218d7a478313b2938f1da62ca348bf3b567421236489596261a3c0fe4c05459a16d4193966fc66e6af2b95d2abf68ad8dc9933cb6537f8e3f03d3f84
+  metadata.gz: 12685863f2cb6c5d61ad66323117b6e571fab731d2789405e489f00c63a8bab081ce4f32fb5c13df9ecd4cc8a94370c1964da41f743bb066755529f3e4d7d6fd
+  data.tar.gz: a3f40df981cf82df2dd78aabcf8044289a1bbc891dc6629afc1d7ab6716bf18dd10665406f06550f461468f918dc67542b99423d73f339066b8a0e099a437abd

data/Gemfile

@@ -2,6 +2,11 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in terminal-app.gemspec
 gemspec
-
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
+gem 'terminal-table', '~> 1.8'
+gem 'tty-prompt'
+gem 'tty-font'
+gem 'colorize', '~> 0.8.1'
+
+

data/README.md

@@ -1,40 +1,196 @@
-# Terminal::App
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/terminal/app`. To experiment with that code, run `bin/console` for an interactive prompt.
+Application Source Code
+---
+https://github.com/tessssssssy/terminal-app
 
-TODO: Delete this and the text above, and describe your gem
+Purpose of the application
+---
+My application is an exercise planning and recording app. The application has multiple features. Users can schedule future workouts and log past workouts, recording workout type, distance, duration and date. They can also check off workouts as completed and view workout stats
 
-## Installation
+What problem is this app trying to solve
+---
 
-Add this line to your application's Gemfile:
+This application aims to be a motivational tool to encourage people to get more exercise. It builds users accountability to an exercise plan by allowing them to plan future workouts and check them off as they are completed. 
+
+Target Audience
+---
+The app is intended for anyone who is interested in starting an exercise plan and want to record their workouts. The app is focused on exercises with the ability to record time and distance, including running, cycling, swimming, walking and hiking so would be particularly suited to people who are interested in those activities. 
+
+How the audience will use the application
+---
+Users will use the application to create their own exercise plan, log and check off completed workouts and to calculate and monitor their monthly activity totals. 
+
+Application Features
+---
+1. Users can log completed workouts and record details icluding:
+
+- workout type: run, ride, swim or walk/hike
+- distance
+- duration
+- date completed
+
+2. Users can schedule future workouts in the same way they log past ones. Recording the planned workout type, distance, duration and the date they want to complete it.
+
+3. View a table of all workouts and their details. These are colour coded, with different colours for completed, incomplete past workouts and future planned workouts.
+
+4. Users can check off completed activities. This will change the colour of the activity in the view table. When a past activity is logged, it is checked completed automatically.
+
+5. Get workout stats. Users can view the total distance and duration for each workout type, and see their longest workouts by distance and duration. Users can choose to see totals and personal records for a specific months or view all.
+
+User Interaction
+---
+1. Users will type their name/username as a command line argument when they run the application
+
+2. The user will choose an option from a main menu: 
+- add activity
+- show activities
+- check completed activity
+- get stats
+- quit: quits the application
+
+3. The user will then be directed to one of the sub menus:
+- add activity: asked to input activity type, distance, duration and date
+- show activities: displays a table listing all the users activities
+- check-completed-activities: asks the user for a date, then shows a list of activities on that date for the user to check off
+- get stats: asks user to enter activity type and month, then shown a table of activity totals/personal records
+
+4. If the user ever enters an invalid input, the application will detect it and ask them to try again
+
+User Interaction Diagram
+---
+![User Interaction Diagram](images/Terminal-app.png)
+
+Implementation Plan
+---
+Develop an implementation plan which:
+- outlines how each feature will be implemented and a checklist of tasks for each feature
+- prioritise the implementation of different features, or checklist items within a feature
+- provide a deadline, duration or other time indicator for each feature or checklist/checklist-item
+
+Utilise a suitable project management platform to track this implementation plan
+
+> Your checklists for each feature should have at least 5 items.
+
+Structure
+---
+The application will be written using a Model, View, Controller (MVC) type structure
+
+-  The model will interact with and manipulate user data taken from user input and stored in 
+a csv file. It will also send data to the display class to display to the user
+
+-  The controller is responsible for taking user input and controlling the flow of the application. It
+sends user input to the model where it is processed and stored on a csv file
+
+-  The display class will take user data from the model and display it in a visually appealing way to the user
+
+- An Activity class will be used to create a blueprint for activity objects
+
+- A csv file will be allocated to each user to store their activities
+
+Features
+---
+1. Main Menu
+- create a menu method in controller class
+- direct user to various sub menus/features
+- use a loop to continue showing user menu options until they quit app
+- install tty prompt gem to create more user friendly menu
+- handle user input errors
+ 
+
+2. Add Activity
+- Create an activity class with type, distance, duration, date parameters
+- Create a method in controller that takes user input
+- Create method in model that processes user input and creates activity object
+- Append new activity to csv file
+
+3. Show Activities
+- need a method to get activities from csv file and add to an array
+- method in display class to display data in a presentable way
+- use terminal-table gem to display the activities as a table
+- sort data to show newest activities first
+
+4. Check off completed activities
+- create a method to search for activities by date
+- method to handle user input 
+- method to take selected activity and set completed
+- change color of completed activity in display class
+- auto set complete if a user logs a past activity
+
+5. Delete Activity
+- method to search for activity to delete
+- handle user input
+- remove activity from activities array
+- method to update the csv file
+- redirect to main menu if no activities to delete
+
+6. Get Stats
+- method to calculate total distance/time
+- Display method to show totals
+- method to find longest activities
+- Display method to show longest activities
+- method to handle user input - sub menu to enter activity 
+type, month
+
+Project Management
+---
+I will be utilizing trello for project management
+
+Documentation
+---
+
+Installation
+
+```bash
+
+gem install terminal-app
+
+```
+
+Gemfile
 
 ```ruby
-gem 'terminal-app'
+
+gem 'terminal-app', '~> 0.1.0'
+
+```
+
+Install Dependencies
+
+```bash
+bundle install
+```
+
+Running the application
+
+```bash
+ruby terminal-app <username>
 ```
+Instructions 
 
-And then execute:
+1. Enter a username as a command line argument
 
-    $ bundle install
+2. If it is a new user, a file will be created to store the users activities, otherwise, the username will be matched to their corresponding csv file with their stored data.
 
-Or install it yourself as:
+Command Line Interface
+---
 
-    $ gem install terminal-app
+Main Menu
 
-## Usage
+![Main Menu](images/main-menu.png)
 
-TODO: Write usage instructions here
+Show Activities
 
-## Development
+![Show Activities](images/show.png)
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+Check Completed sub-menu
 
-## Contributing
+![Check Completed](images/check-completed.png)
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/terminal-app.
+Delete Activity sub-menu
 
+![Delete](images/delete.png)
 
-## License
+Get Stats
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+![Get Stats](images/get-stats.png)

data/activities.txt

@@ -0,0 +1,2 @@
+
+ride, 11.0, 40, 2020-03-11["run", "10"]["run", "10"]

data/lib/Activity.rb

@@ -0,0 +1,23 @@
+require 'date'
+
+class Activity
+    attr_reader :type, :distance, :duration, :date
+    attr_accessor :completed
+    def initialize(type, distance, duration, date)
+        @type = type
+        @distance = distance
+        @duration = duration
+        @date = date
+        @completed = false
+    end
+
+    def complete_activity
+        @completed = true
+    end
+end
+
+
+
+
+
+

data/lib/AppController.rb

@@ -0,0 +1,178 @@
+require_relative 'Model.rb'
+require_relative 'Display.rb'
+require_relative 'helpers.rb'
+require_relative 'Activity.rb'
+require 'date'
+require "tty-prompt"
+
+
+class AppController
+
+    # run at start of program to check if new user
+    # either create a file for new user or get activities for returning user
+    def self.check_user(user_name)  
+        if File.exist?("users/#{user_name}.csv")
+            Model.get_activities(user_name) 
+            self.menu(user_name)
+        else 
+            Model.add_user(user_name)
+            self.menu(user_name)
+        end
+    end
+
+    # main menu - run straight after user check
+    def self.menu(user)
+      while true
+        prompt = TTY::Prompt.new
+        answer = prompt.select("Choose an option: ", %w(add-activity show-activities check-completed-activity delete-activity get-stats quit))
+        if answer == 'add-activity'
+            self.add_activity(user)
+        elsif answer == 'show-activities'
+            Display.show_activities(user)
+        elsif answer == 'check-completed-activity'
+            # self.find_activities(user) 
+            self.check_completed(user)
+        elsif answer == 'get-stats'      
+            self.get_stats(user)    
+        elsif answer == 'delete-activity' 
+            self.delete_activity(user)    
+        elsif answer == 'quit'
+            exit
+        else 
+            puts "Invalid Input"
+        end
+      end
+    end
+
+    def self.get_activities_by_date(user)
+        begin
+            puts "Activity date: (today or yyyy-mm-dd): "
+            date = gets.chomp
+            if date == "today"
+                date = Date.today.to_s
+            else
+                Date.parse(date)
+            end
+            activities = Model.search_activities(user, date) #an array of activities
+        raise "No activities on that date" if activities.length == 0
+        rescue Date::Error, RuntimeError
+            puts "Invalid date"
+            self.menu(user)
+        end 
+        return activities   
+    end
+
+    def self.select_activity(user, activities)
+        #activities = self.get_activities_by_date(user)
+        prompt = TTY::Prompt.new
+            options = %w(go-back)
+            activities.each do |activity|
+                options << "#{activity.type}-#{activity.distance}-#{activity.duration}-#{activity.date}"
+            end
+            selected_activity = prompt.select("Select Activity: ", options)
+            # p selected_activity
+            if selected_activity == 'go-back'
+                self.menu(user)
+            end
+            activities.each do |activity|
+                activity_string = "#{activity.type}-#{activity.distance}-#{activity.duration}-#{activity.date}"
+                if activity_string == selected_activity
+                    return activity
+                end
+            end
+    end
+    
+    def self.find_activities(user)
+        begin
+            puts "Activity date: (today or yyyy-mm-dd): "
+            date = gets.chomp
+            if date == "today"
+                date = Date.today.to_s
+            end
+            Date.parse(date)
+            activities = Model.search_activities(user, date) #an array of activities
+        raise "No activities on that date" if activities.length == 0
+        rescue Date::Error, RuntimeError
+            puts "Invalid date"
+            retry
+        end           
+            prompt = TTY::Prompt.new
+            options = %w(go-back)
+            activities.each do |activity|
+                options << "#{activity.type}-#{activity.distance}-#{activity.duration}-#{activity.date}"
+            end
+            selected_activity = prompt.select("Select Activity: ", options)
+            if selected_activity == 'go-back'
+                self.menu(user)
+            end
+            activities.each do |activity|
+                activity_string = "#{activity.type}-#{activity.distance}-#{activity.duration}-#{activity.date}"
+                if activity_string == selected_activity
+                    activity.completed = true
+                end
+            end
+    end
+
+    def self.check_completed(user)
+        activities = self.get_activities_by_date(user)
+        activity = self.select_activity(user, activities)
+        activity.completed = true 
+        Model.update_activities(user, activities)
+    end
+
+    def self.delete_activity(user)
+        activities = self.get_activities_by_date(user)
+        activity = self.select_activity(user, activities)
+        Model.delete_activity(user, activity)
+    end
+    def self.add_activity(user)
+        prompt = TTY::Prompt.new
+        type = prompt.select("Select Activity: ", %w(run bike swim walk/hike))
+    begin
+        puts "Distance(kms): "
+        distance = gets.chomp.to_f
+        raise "Invalid Input" if distance == 0.0
+    rescue RuntimeError
+        puts "Please enter a number"
+        retry
+    end
+    begin
+        puts "Duration(mins): "
+        duration = gets.chomp.to_i
+        raise "Invalid Input" if duration == 0
+    rescue RuntimeError
+        puts "Please enter a number"
+        retry
+    end
+    # need to handle wrong user input
+    begin
+        puts "Date: (today or yyyy-mm-dd)"     
+        date = gets.chomp
+        if date != "today"
+            Date.parse(date)
+        end
+    rescue Date::Error
+        puts "Invalid date"
+        retry
+    end
+        if date.downcase == "today"
+            date = Date.today.to_s
+        end        
+        Model.add_activity(user, type, distance, duration, date)
+    end
+
+    def self.get_stats(user)
+        prompt = TTY::Prompt.new
+        month = prompt.select("Choose an month: ", %w(All January February March April May June July August September October November December))
+        prompt = TTY::Prompt.new
+        type = prompt.select("Select Activity: ", %w(run bike swim walk/hike))
+        totals = Model.calculate_totals(user, type, month)
+        records = Model.find_longest(user, type, month)
+        Display.display_records(records[0], records[1])
+        Display.display_totals(totals[0], totals[1])
+    end
+end
+
+
+
+

data/lib/Display.rb

@@ -0,0 +1,52 @@
+require 'terminal-table'
+require_relative 'Model.rb'
+require_relative 'helpers.rb'
+require 'tty-font'
+require 'colorize'
+
+# The display class interacts with data for the model and presents it 
+# in a visually appealing way to the user using colors and tables
+
+class Display
+
+    # shows list of completed activities
+    def self.show_activities(user)
+        activities = Model.get_activities(user)
+        rows = []
+        activities.each do |a|
+            row = [a.type, a.distance, a.duration, a.date]
+
+            # if an activity is completed it will display green
+            if a.completed == 'true'
+                row = row.map do |cell|
+                    cell.to_s.colorize(:green)
+                end
+            end
+            
+            # if the activity is incomplete, it will turn red if the date has passed
+            if a.completed == false && is_in_past?(a.date)
+                row = row.map do |cell|
+                    cell.to_s.colorize(:red)
+                end
+            end
+            rows << row
+        end
+        table = Terminal::Table.new :title => "Activity Log", :headings => ['Activity', 'Distance', 'Duration', 'Date'], :rows => rows
+    end
+
+    def self.display_totals(distance, duration)
+        font = TTY::Font.new(:straight)
+        rows = [["#{distance}kms", "#{duration}"]]
+        table = Terminal::Table.new :title => font.write("Activity Totals").colorize(:cyan), :headings => ['Total Distance', 'Total Time'], :rows => rows
+        puts table
+    end
+
+    def self.display_records(distance, duration)
+        font = TTY::Font.new(:straight)
+        rows = [["#{distance}kms", "#{duration}"]]
+        table = Terminal::Table.new :title => font.write("Personal Records").colorize(:magenta), :headings => ['Longest Distance', 'Longest Time'], :rows => rows
+        puts table
+    end
+end
+
+

data/lib/Model.rb

@@ -0,0 +1,136 @@
+require_relative 'Activity.rb'
+require_relative 'helpers.rb'
+require 'date'
+require 'csv'
+
+# The model class processes data from user input and csv files and interacts with the controller
+
+class Model
+    @@activities = []
+
+    # create a file for a new user
+    def self.add_user(user)
+        csv = CSV.open("users/#{user}.csv", 'wb') do |csv|
+        end
+    end
+
+    # parses activity data from users file 
+    # uses to create new activity objects and add to activities array
+    def self.get_activities(user)
+        activities = File.open("users/#{user}.csv", "r").read.split("\n")
+        activities = activities.map do |activity|
+            activity.split(",")
+        end
+
+        @@activities = []
+        activities.each do |activity|
+            new_activity = Activity.new(activity[0], activity[1], activity[2], activity[3])
+            new_activity.completed = activity[4]
+            @@activities << new_activity
+        end
+
+        # sort activities by date
+        @@activities = @@activities.sort_by {|obj| obj.date.to_s.split('-').join('').to_i }
+        return @@activities.reverse # sort from newest to oldest
+    end
+    
+    # iterates over activities array
+    # overwrites file with updated activities
+    def self.update_activities(user, activities)
+        CSV.open("users/#{user}.csv", "wb") do |file|
+            activities.each do |activity|
+              file << [activity.type, activity.distance, activity.duration, activity.date, activity.completed] 
+            end   
+          end
+    end
+
+    # adds a new activity 
+    # append it to the users file
+    def self.add_activity(user, type, distance, duration, date)
+        activity = Activity.new(type, distance, duration, date)
+        if is_in_past?(activity.date)
+            activity.completed = true #checks activity completed if in the past
+        end
+        @@activities << activity
+        #appends to file
+        CSV.open("users/#{user}.csv", "a") do |file|
+            file << [activity.type, activity.distance, activity.duration, activity.date, activity.completed]    
+          end
+        return @@activities
+    end
+
+    # search for activities by date
+    #returns array of activities that match date input
+    def self.search_activities(user, date)
+        matched = []
+        @@activities.each do |activity|
+            if activity.date == date && activity.completed == 'false'
+                matched << activity
+            end
+        end
+        return matched  
+    end
+
+    # deletes an activity based on user selection
+    # updates the csv file to remove the deleted activity
+    def self.delete_activity(user, activity) 
+        activities = self.get_activities(user)
+        activities = activities.select do |a|
+            a.type != activity.type || a.distance != activity.distance || a.duration != activity.duration
+        end
+        self.update_activities(user, activities)      
+    end
+
+    # finds the users longest activities by time and distance
+    # returns an array with longest distance and longest time to send to display
+    def self.find_longest(user, type, month)
+        longest_distance = 0
+        longest_duration = 0
+        activities = self.get_activities(user)
+        activities.each do |activity|
+            month_num = activity.date.to_s.split('-')[1].to_i
+            if month == 'All' || month == Date::MONTHNAMES[month_num]
+                if activity.distance.to_f > longest_distance
+                    longest_distance = activity.distance.to_f
+                end
+                if activity.duration.to_i > longest_duration
+                    longest_duration = activity.duration.to_i
+                end 
+            end
+        end
+        minutes = longest_duration % 60
+        hours = (longest_duration - minutes) / 60
+        return [longest_distance, "#{hours} hours #{minutes} mins"]
+    end
+
+    # calculates users total distance and time for a particular activity for a month (or all months)
+    # returns an array to send to display class
+    def self.calculate_totals(user, type, month)
+        distance = 0
+        duration = 0
+        activities = self.get_activities(user)        
+        activities.each do |activity|
+            month_num = activity.date.to_s.split('-')[1].to_i
+            if activity.type == type && ( month == 'All' || month == Date::MONTHNAMES[month_num] )
+                distance += activity.distance.to_f
+                duration += activity.duration.to_i
+            end
+        end
+        minutes = duration % 60
+        hours = (duration - minutes) / 60
+        return [distance, "#{hours} hours #{minutes} mins"]
+    end
+end
+
+
+
+
+
+
+
+
+
+
+
+
+ 

data/lib/app.rb

@@ -0,0 +1,21 @@
+require_relative "terminal/app/version"
+require_relative 'AppController.rb'
+
+module Terminal
+  module App
+    class Error < StandardError; end
+    # Your code goes here...
+  end
+end
+
+if ARGV.length != 1
+  puts "One argument required"
+  exit
+end
+# pass the user name into the terminal
+user_name = ARGV[0]
+ARGV.clear
+# Entry point to the app
+AppController.check_user(user_name)
+# AppController.check_user
+

data/lib/helpers.rb

@@ -0,0 +1,24 @@
+
+#compares two date strings
+def is_in_past?(date)
+    date_num = date.split('-').join('').to_i
+    today = Date.today.to_s.split('-').join('').to_i
+    if date_num < today
+        return true
+    else
+        return false
+    end
+end
+
+#compares two date strings
+def is_in_future?(date)
+    date_num = date.split('-').join('').to_i
+    today = Date.today.to_s.split('-').join('').to_i
+    if date_num > today
+        return true
+    else
+        return false
+    end
+end
+
+

data/lib/terminal/app/version.rb

@@ -1,5 +1,5 @@
 module Terminal
   module App
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/testing.rb

@@ -0,0 +1,140 @@
+# require 'date'
+
+# puts Date::MONTHNAMES[3]
+
+# require 'terminal-table'
+
+# # activities = Model.get_activities
+# rows = []
+# (1..5).each do |num|
+#     rows << [1,2,3,4,5,6,7]
+# end
+#         table = Terminal::Table.new :title => "March", 
+#                                     :headings => ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'], 
+#                                     :rows => rows
+#         puts table
+
+# require 'csv'   
+
+# # csv_text = File.read('activities.csv')
+# # csv = CSV.parse(csv_text, :headers => false)
+# # activities = []
+# # csv.each do |row|
+# #     row_data = row.to_hash
+# #     if (row_data['country'] == 'Australia') && (row_data['subcountry'] == 'Victoria')
+# #     puts row_data
+# #     cities << row_data
+# #     end 
+# # end
+# # puts cities.length
+
+
+# # CSV.open("activities.csv", "wb") do |csv|
+# #     csv << ["row", "of", "CSV", "data"]
+# #     csv << ["another", "row"]
+# #     # ...
+# #   end
+
+# # File.open("activities.txt", "a") do |file|
+# #     file << ["run", "10"]
+# # end 
+
+# CSV.open('test.csv', 'wb') do |csv|
+#     csv << ['test file']
+# end
+
+# Date::MONTHNAMES[month_num]
+
+# require "tty-prompt"
+
+# prompt = TTY::Prompt.new
+
+# answer = prompt.select("Choose your destiny?", %w(Scorpion Kano Jax))
+# puts answer
+# # =>
+# duration = 320
+# minutes = duration % 60
+# hours = (duration - minutes) / 60
+
+# puts "#{hours} hours #{minutes} mins"
+
+# # Select drinks? (Use ↑/↓ arrow keys, press Space to select and Enter to finish)"
+# # ‣ ⬡ vodka
+# #   ⬡ beer
+# #   ⬡ wine
+# #   ⬡ whisky
+# #   ⬡ bourbon
+
+str = "fhdnajknfk"
+puts str.to_f
+
+require 'date'
+date = Date.today.to_s
+# date_num = date.split('-').join('').to_i
+# p date
+# p date_num
+
+#takes in string checks if right format
+# def valid_date?(date)
+#     return false if date.class != String
+#     return false if date.length != 10
+#     date_arr = date.split("-")
+#     return false if date.split("-") != 3
+#     return false if date_arr[1].to_i > 12
+#     date_arr.each do |str|
+#         if str.to_i == 0
+#             return false
+#         end
+# end
+#  valid_date ="2020-03-10"
+ #length == 10
+ #.split('-') == 3
+
+# p valid_date?(12424)
+
+#compares two date strings
+def compare_dates(d1, d2)
+    num_1 = d1.split('-').join('').to_i
+    num_2 = d2.split('-').join('').to_i
+    if num_1 > num_2
+        return num_1
+    else
+        return num_2
+    end
+end
+
+
+
+require "tty-prompt"
+require_relative 'Model.rb'
+
+activities = Model.search_activities('tess', '2020-03-11') #an array of activities
+p activities
+prompt = TTY::Prompt.new
+activity_strings = []
+activities.each do |activity|
+    activity_strings << "#{activity.type}-#{activity.distance}-#{activity.duration}-#{activity.date}"
+end
+
+p activity_strings
+# choices = %w()
+# activities.each do |activity|
+#     choices << "activity" #"#{activity.type}-#{activity.distance}-#{activity.duration}-#{activity.date}"
+# end
+# selected_activity = prompt.select("Select Activity: ", choices)
+# prompt.select("Choose your destiny?") do |menu|
+#     menu.choice activity_strings[0] , 1
+#     menu.choice 'Kano', 2
+#     menu.choice 'Jax', -> { 'Nice choice captain!' }
+#   end
+# # =>
+#
+# Select drinks? (Use ↑/↓ arrow keys, press Space to select and Enter to finish)"
+# ‣ ⬡ vodka
+#   ⬡ beer
+#   ⬡ wine
+#   ⬡ whisky
+#   ⬡ bourbon
+
+puts Date.parse('2020-43-10')
+puts Date.parse(Date.today)

data/lib/users/a.csv

@@ -0,0 +1 @@
+run,8.0,30,2020-03-12,false

data/lib/users/hdjsafk.csv

@@ -0,0 +1 @@
+ride,40.0,120,2020-03-11

data/lib/users/tess.csv

@@ -0,0 +1,6 @@
+run,4.0,20,2020-03-12,false
+bike,50.0,120,2020-02-20,true
+bike,40.0,90,2020-01-01,true
+swim,2.5,60,2020-02-03,true
+run,10.0,50,2020-03-15,false
+run,5.0,25,2020-03-12,false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal-app
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - tessssssssy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies: []
 description: my gem
 email:
@@ -20,19 +20,33 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Activity.rb
-- ActivityController.rb
-- ActivityModel.rb
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- activities.csv
+- activities.txt
 - bin/console
 - bin/setup
-- lib/terminal/app.rb
+- images/Terminal-app.png
+- images/check-completed.png
+- images/delete.png
+- images/get-stats.png
+- images/main-menu.png
+- images/show.png
+- lib/Activity.rb
+- lib/AppController.rb
+- lib/Display.rb
+- lib/Model.rb
+- lib/app.rb
+- lib/helpers.rb
 - lib/terminal/app/version.rb
+- lib/testing.rb
+- lib/users/a.csv
+- lib/users/hdjsafk.csv
+- lib/users/hfrhfuaerhfu.csv
+- lib/users/hjfakj.csv
+- lib/users/tess.csv
 - terminal-app.gemspec
 homepage: https://github.com/tessssssssy/terminal-app
 licenses:

data/Activity.rb

@@ -1,11 +0,0 @@
-
-class Activity
-    attr_reader :type, :distance, :duration, :date
-    def initialize(type, distance, duration)
-        @type = @type
-        @distance = distance
-        @duration = duration
-        @date = Date.now()
-    end
-end
-

data/ActivityController.rb

@@ -1,20 +0,0 @@
-require_relative 'ActivityModel'
-
-class ActivityController
-    def choose_option
-        puts "Choose an option:"
-        puts "1 to add an activity"
-        puts "2 to view activities"
-        return gets.chomp.to_i
-    end
-
-    def add_activity
-        puts "Activity type: "
-        type = gets.chomp
-        puts "Distance(kms): "
-        distance = gets.chomp.to_f
-        puts "Duration(mins): "
-        duration = gets.chomp.to_i
-        ActivityModel.add_activity(type, distance, duration)
-    end
-end

data/ActivityModel.rb

@@ -1,10 +0,0 @@
-require_relative 'Activity.rb'
-
-class ActivityModel
-    def initialize(activities)
-        @activities = []
-    end
-    def self.add_activity(type, distance, duration)
-        @activities << Activity.new(type, distance, duration)
-    end
-end

data/lib/terminal/app.rb

@@ -1,8 +0,0 @@
-require "terminal/app/version"
-
-module Terminal
-  module App
-    class Error < StandardError; end
-    # Your code goes here...
-  end
-end