bullit 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc4e4773d0af202048720a7c8a50182d79acc2f1
-  data.tar.gz: d65f57afd736a8684a342005381e754987183dad
+  metadata.gz: '0960865172d22bc2dc9a29a9d01c5be340b54386'
+  data.tar.gz: 5d96f08fa3c2c1d14a4346793a1ab561c0ead5c8
 SHA512:
-  metadata.gz: 9294e578acf3543ca5a3f393a6a7b0f590d275024fef5a82b5bfae0342ed09501854f94fe0af5287b46c8da2cdf1c53db1c557708edab52f4eda11dc7dc398a7
-  data.tar.gz: 198b1aa7cd779b467d3e0b1e01b71a65686abdea6a5747e65feb2cdeed34b6d98cfbd928023f949da54a715f486db90c2cd0a2c2b4bf3b6ca7da7994330079ec
+  metadata.gz: 89f38b733d016cc5704c9afd3567de8373230b9b27ac9cf6a67c8e0f529a92149473fab6b48b72f01c1b98cd097daa179b5689812fb8066c4d0b1ab656aa2b28
+  data.tar.gz: f5f68803ff523ad17621ca39d403845bacf59b51d96895e44cb3d0e1ddeea05d6dc40dc81821831da6522533f90943f78996443d3ecf8e9cfd11e8545a50e638

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullit (0.1.0)
+    bullit (0.1.1)
       clamp
       tty-prompt
       tty-table

data/lib/bullit/file.rb

@@ -1,5 +1,6 @@
 require 'pathname'
 require 'yaml'
+require 'tty-prompt'
 require 'pry'
 
 require 'bullit/task'
@@ -7,7 +8,7 @@ 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
@@ -16,7 +17,7 @@ module BulletJournal
 
         file_contents = {
           title: title,
-          tasks: incomplete_tasks_from_yesterday
+          tasks: incomplete_tasks_from_yesterday(loud)
         }
 
         today_file.write(YAML.dump(file_contents))
@@ -25,11 +26,32 @@ module BulletJournal
       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
 
@@ -67,7 +89,7 @@ module BulletJournal
       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
@@ -79,9 +101,9 @@ module BulletJournal
 
       # 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

data/lib/bullit/version.rb

@@ -1,3 +1,3 @@
 module BulletJournal
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/bullit.rb

@@ -32,6 +32,7 @@ module BulletJournal
           prompt = TTY::Prompt.new
           text = prompt.ask('what do you need to do?') if text.nil?
           BulletJournal::File.add_task(text)
+          show_tasks
         end
       end
 
@@ -39,14 +40,19 @@ module BulletJournal
         parameter "TASK_NUMBER", "what the task is", required: true
         def execute
           BulletJournal::File.complete_task(task_number.to_i)
+          show_tasks
         end
       end
     end
 
     def show_tasks
-      tasks = BulletJournal::File.today_tasks.each_with_index.map{ |t,i| [i,t[:text], t[:complete] == true ? ' ✅' : ' ❌']}
+      if tasks = BulletJournal::File.today_tasks
+        tasks = tasks.each_with_index.map{ |t,i| [i,t[:text], t[:complete] == true ? ' ✅' : ' ❌']}
 
-      puts TTY::Table.new(['#', 'Task', ''], tasks).render(:ascii)
+        puts TTY::Table.new(['#', 'Task', ''], tasks).render(:unicode)
+      elsif tasks == {}
+        puts "There's no tasks for today"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tomek Nadolny
@@ -134,7 +134,6 @@ files:
 - lib/bullit/file.rb
 - lib/bullit/task.rb
 - lib/bullit/version.rb
-- tasks/2019/05/6.yaml
 homepage: https://github.com/tomekn/bullit
 licenses:
 - MIT

data/tasks/2019/05/6.yaml

@@ -1,15 +0,0 @@
----
-:title: Journal for 02/09/19
-:tasks:
-- :text: Get cat food
-  :complete: true
-  :created_at: '2019-02-09 16:46:24 +0000'
-- :text: Finish this app
-  :complete: true
-  :created_at: '2019-02-09 17:03:43 +0000'
-- :text: Add colours to the terminal.
-  :complete: true
-  :created_at: '2019-02-09 19:20:57 +0000'
-- :text: Make sure the rename worked
-  :complete: true
-  :created_at: '2019-02-09 20:00:26 +0000'