lib/bullit/file.rb in bullit-0.1.0 vs lib/bullit/file.rb in bullit-0.1.1

@@ -1,37 +1,59 @@
 require 'pathname'
 require 'yaml'
+require 'tty-prompt'
 require 'pry'
 
 require 'bullit/task'
 
 module BulletJournal
   class File
     def self.generate_today_file(loud)
-      today_file.dirname.mkpath
+      today_file.dirname.mkpath unless today_file.dirname.exist?
 
       unless today_file.exist?
         t = Time.now
 
         title = "Journal for #{t.strftime('%m/%d/%y')}"
 
         file_contents = {
           title: title,
-          tasks: incomplete_tasks_from_yesterday
+          tasks: incomplete_tasks_from_yesterday(loud)
         }
 
         today_file.write(YAML.dump(file_contents))
         
         puts "#{today_file.to_s} created." if loud
       end
     end
 
-    def self.incomplete_tasks_from_yesterday
+    def self.incomplete_tasks_from_yesterday(loud)
       if yesterday_file.exist?
         file = YAML.load(yesterday_file.read)
+        
         return {} if file[:tasks].empty?
-        file[:tasks].reject{ |t| t.complete == true }
+        
+        file[:tasks].each do |t|
+          unless t[:complete] == true
+            action = TTY::Prompt.new.select("\nWould you like to complete\n\n\t'#{t[:text]}'\n\nor migrate it to today's entry?\n", %w(complete migrate))
+            if action == 'complete'
+              t[:complete] = true
+            end
+          end
+        end
+
+        file[:tasks] = file[:tasks].reject{ |t| t[:complete] == true }
+
+        yesterday_file.write(YAML.dump(file))
+
+        binding.pry
+        
+        if file[:tasks] == {}
+          return nil
+        else
+          return file[:tasks]
+        end
       end
     end
 
     def self.today_tasks
       YAML.load(today_file.read)[:tasks]
@@ -65,11 +87,11 @@
 
       year    = t.strftime "%Y"
       week    = t.strftime "%W" 
       weekday = t.strftime "%u"
 
-      Pathname("tasks/#{year}/#{week}/#{weekday}.yaml")
+      Pathname("#{Dir.home}/.bullit/journal/#{year}/#{week}/#{weekday}.yaml")
     end
 
     def self.yesterday_file
       t = Time.now
 
@@ -77,12 +99,12 @@
       week    = t.strftime "%W" 
       weekday = t.strftime("%u").to_i
 
       # TODO: the logic here is a bit dodgy... it should look for the latest file in case you don't use your machine for more than one day.
       if weekday > 1
-        Pathname("tasks/#{year}/#{week}/#{(weekday - 1).to_s}.md")
+        Pathname("#{Dir.home}/.bullit/journal/#{year}/#{week}/#{(weekday - 1).to_s}.yaml")
       else
-        Pathname("tasks/#{year}/#{week-1}/7.md")
+        Pathname("#{Dir.home}/.bullit/journal/#{year}/#{week-1}/7.yaml")
       end
     end
   end
 end
\ No newline at end of file