terminal-app 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27c4752b331bd2eea46392771bf6a214539eecf0df7642f8a32ded3a6251a67a
-  data.tar.gz: 54d7258ac1ee9411bef49ffefd86b63e69bad5cd1515e1db4c88b11dc7b99f69
+  metadata.gz: 25d9fd6e26259c32d6ceff88ba633a9b594cba0a9d785aa0eaa4d2073d7ceb83
+  data.tar.gz: 682fc9d9675a83c67c6facf8a670dbfed64e83d8f53bc0f1cd7c51e9918b92be
 SHA512:
-  metadata.gz: 12685863f2cb6c5d61ad66323117b6e571fab731d2789405e489f00c63a8bab081ce4f32fb5c13df9ecd4cc8a94370c1964da41f743bb066755529f3e4d7d6fd
-  data.tar.gz: a3f40df981cf82df2dd78aabcf8044289a1bbc891dc6629afc1d7ab6716bf18dd10665406f06550f461468f918dc67542b99423d73f339066b8a0e099a437abd
+  metadata.gz: d10480c82ef474edd0c9720ff14d05380578e6e2208cd12df29250d711d40430b1cb962c149ff551fb4a81db1beba1debd6199049a75403487e138da575f04f8
+  data.tar.gz: 70a464124a4a73800ebde9538b8cd504861ec050ab1f9f95057db1a3fa8ee1ea92483a1c28841c13b6c8c4c76fd3e7c1460e7f3536a5e4fc9f6e566b9946c2c2

data/README.md

@@ -135,9 +135,16 @@ Project Management
 ---
 I will be utilizing trello for project management
 
-Documentation
+![trello](images/trello.png)
+
+
+Testing
 ---
 
+Manual Testing documentation
+
+https://docs.google.com/spreadsheets/d/1gCTDmCn7aAHaRTZWpWSsw2kVUnW_tdpHwY4TgpYB4J0/edit?usp=sharing
+
 Installation
 
 ```bash
@@ -150,7 +157,7 @@ Gemfile
 
 ```ruby
 
-gem 'terminal-app', '~> 0.1.0'
+gem 'terminal-app', '~> 0.1.1'
 
 ```
 

data/lib/AppController.rb

@@ -7,7 +7,6 @@ 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)  
@@ -30,7 +29,6 @@ class AppController
         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)    
@@ -44,6 +42,8 @@ class AppController
       end
     end
 
+    # looks up activities based on user input date
+    # returns an array of activities that match date
     def self.get_activities_by_date(user)
         begin
             puts "Activity date: (today or yyyy-mm-dd): "
@@ -51,29 +51,33 @@ class AppController
             if date == "today"
                 date = Date.today.to_s
             else
-                Date.parse(date)
+                # run to test for invalid dates
+                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
+            activities = Model.search_activities(user, date)
+        raise "No activities on that date" if activities.length == 0 || is_in_future?(date)
+        rescue Date::Error, RuntimeError 
             puts "Invalid date"
             self.menu(user)
         end 
         return activities   
     end
 
+    # takes array of activities and generates a drop down menu
+    # used for selecting activities to check completed or to delete
+    # returns users chosen activity
     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
+            
+            # iterates over array of activities, converts to string for comparison with user selection
             activities.each do |activity|
                 activity_string = "#{activity.type}-#{activity.distance}-#{activity.duration}-#{activity.date}"
                 if activity_string == selected_activity
@@ -82,42 +86,11 @@ class AppController
             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)
+        Model.update_activities(user)
     end
 
     def self.delete_activity(user)
@@ -125,6 +98,7 @@ class AppController
         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))
@@ -144,7 +118,6 @@ class AppController
         puts "Please enter a number"
         retry
     end
-    # need to handle wrong user input
     begin
         puts "Date: (today or yyyy-mm-dd)"     
         date = gets.chomp
@@ -173,6 +146,3 @@ class AppController
     end
 end
 
-
-
-

data/lib/Display.rb

@@ -24,7 +24,7 @@ class Display
             end
             
             # if the activity is incomplete, it will turn red if the date has passed
-            if a.completed == false && is_in_past?(a.date)
+            if a.completed == 'false' && is_in_past?(a.date)
                 row = row.map do |cell|
                     cell.to_s.colorize(:red)
                 end
@@ -32,6 +32,7 @@ class Display
             rows << row
         end
         table = Terminal::Table.new :title => "Activity Log", :headings => ['Activity', 'Distance', 'Duration', 'Date'], :rows => rows
+        puts table
     end
 
     def self.display_totals(distance, duration)

data/lib/Model.rb

@@ -36,9 +36,9 @@ class Model
     
     # iterates over activities array
     # overwrites file with updated activities
-    def self.update_activities(user, activities)
+    def self.update_activities(user)
         CSV.open("users/#{user}.csv", "wb") do |file|
-            activities.each do |activity|
+            @@activities.each do |activity|
               file << [activity.type, activity.distance, activity.duration, activity.date, activity.completed] 
             end   
           end
@@ -75,10 +75,10 @@ class Model
     # 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|
+        @@activities = activities.select do |a|
             a.type != activity.type || a.distance != activity.distance || a.duration != activity.duration
         end
-        self.update_activities(user, activities)      
+        self.update_activities(user)      
     end
 
     # finds the users longest activities by time and distance

data/lib/app.rb

@@ -5,17 +5,21 @@ module Terminal
   module App
     class Error < StandardError; end
     # Your code goes here...
+    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)
   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/terminal/app/version.rb

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

data/lib/users/tess.csv

@@ -1,6 +1,10 @@
-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
+run,10.0,50,2020-04-01,false
+run,10.0,50,2020-03-13,false
+bike,20.0,50,2020-03-13,false
+run,30.0,300,2020-03-13,true
+run,5.0,25,2020-03-12,true
+run,4.0,20,2020-03-12,true
+run,2.0,10,2020-03-09,true
+swim,2.0,45,2020-02-22,true
+run,8.0,25,2020-02-12,false
+bike,23.0,56,2020-02-12,true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal-app
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - tessssssssy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies: []
 description: my gem
 email:
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -34,6 +35,7 @@ files:
 - images/get-stats.png
 - images/main-menu.png
 - images/show.png
+- images/trello.png
 - lib/Activity.rb
 - lib/AppController.rb
 - lib/Display.rb
@@ -43,10 +45,13 @@ files:
 - lib/terminal/app/version.rb
 - lib/testing.rb
 - lib/users/a.csv
+- lib/users/b.csv
 - lib/users/hdjsafk.csv
 - lib/users/hfrhfuaerhfu.csv
 - lib/users/hjfakj.csv
 - lib/users/tess.csv
+- lib/users/test.csv
+- terminal-app-0.1.1.gem
 - terminal-app.gemspec
 homepage: https://github.com/tessssssssy/terminal-app
 licenses: