bullit 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27cbd77f4722a299c4e7d0a5df2ee1be91874bd2
-  data.tar.gz: 6fa8250c7ec7d913847a59e0933067c83a9526b1
+  metadata.gz: c7a71f4040b479e1f18de182e7a384e469743d3d
+  data.tar.gz: 1cf730d51f9f467833dc822a69dd339c94e505e1
 SHA512:
-  metadata.gz: 77d8fe890c2fb4a534c937a121e5d8a841b504ad5e1330ef66172138f6dd9832402ff77f77e35e5d97b05b6ea0d63931b4f05f8a7b20087e46a457999dc13b4a
-  data.tar.gz: 5a845c86abdbc2c1c199108faa56310d2fd029ab47af879b7733262e206d4d22feb6da0e39333817886beef468a714fd2483b553d3bdeca014633dde7dc8e02c
+  metadata.gz: 8d7aa84e83f64da9737cd9a1848b5e937ee707e59a1b923484da9d8342b94e2ca7e3aaad8ebe2606c576e9059aaa2c965908f552c9f0b062d85daabe3c034533
+  data.tar.gz: 706eb52dea58b2cb39b3845f22c241ecc2730c6dc9a60cdaa4f12fbc4ec1a75eec67bd74d65bb22185639153bd30cee3cbb57ddea5468a8309e6d50ff795d9ff

data/Gemfile.lock

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

data/bullit.gemspec

@@ -5,7 +5,7 @@ require "bullit/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "bullit"
-  spec.version       = BulletJournal::VERSION
+  spec.version       = Bullit::VERSION
   spec.authors       = ["Tomek Nadolny"]
   spec.email         = ["tomek.nad@gmail.com"]
 

data/lib/bullit.rb

@@ -5,7 +5,7 @@ require 'tty-prompt'
 require "bullit/version"
 require "bullit/file"
 
-module BulletJournal
+module Bullit
   class Error < StandardError; end
   
   Clamp do
@@ -14,7 +14,7 @@ module BulletJournal
     subcommand "generate", "generator functions" do
       subcommand "today", "creates task file for today" do
         def execute
-          BulletJournal::File.generate_today_file(loud?)
+          Bullit::File.generate_today_file(loud?)
         end
       end
     end
@@ -31,7 +31,15 @@ module BulletJournal
         def execute
           prompt = TTY::Prompt.new
           text = prompt.ask('what do you need to do?') if text.nil?
-          BulletJournal::File.add_task(text)
+          Bullit::File.add_task(text)
+          show_tasks
+        end
+      end
+      
+      subcommand "delete", "delete a task" do
+        parameter "TASK_NUMBER", "what the task is", required: true
+        def execute
+          Bullit::File.delete_task(task_number.to_i)
           show_tasks
         end
       end
@@ -39,14 +47,14 @@ module BulletJournal
       subcommand "complete", "complete a task" do
         parameter "TASK_NUMBER", "what the task is", required: true
         def execute
-          BulletJournal::File.complete_task(task_number.to_i)
+          Bullit::File.complete_task(task_number.to_i)
           show_tasks
         end
       end
     end
 
     def show_tasks
-      if tasks = BulletJournal::File.today_tasks
+      if tasks = Bullit::File.today_tasks
         tasks = tasks.each_with_index.map{ |t,i| [i,t[:text], t[:complete] == true ? ' ✅' : ' ❌']}
 
         puts TTY::Table.new(['#', 'Task', ''], tasks).render(:unicode)

data/lib/bullit/file.rb

@@ -5,7 +5,7 @@ require 'pry'
 
 require 'bullit/task'
 
-module BulletJournal
+module Bullit
   class File
     def self.generate_today_file(loud)
       today_file.dirname.mkpath unless today_file.dirname.exist?
@@ -28,7 +28,7 @@ module BulletJournal
 
     def self.incomplete_tasks_from_yesterday(loud)
       if yesterday_file.exist?
-        file = YAML.load(yesterday_file.read)
+        file = yesterday_file_contents
         
         return {} if file[:tasks].empty?
         
@@ -36,7 +36,7 @@ module BulletJournal
           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
+              t = t.to_task.mark_as_complete
             end
           end
         end
@@ -58,7 +58,7 @@ module BulletJournal
     end
 
     def self.add_task(text)
-      file = YAML.load(today_file.read)
+      file = today_file_contents
 
       if file[:tasks] == {}
         file[:tasks] = [ Task.new(text: text).to_h ]
@@ -69,12 +69,24 @@ module BulletJournal
       today_file.write(YAML.dump(file))
     end
 
+    def self.delete_task(task_number)
+      file = today_file_contents
+
+      unless file[:tasks].nil?
+        unless file[:tasks][task_number].nil?
+          file[:tasks].delete_at(task_number)
+        end
+      end
+      
+      today_file.write(YAML.dump(file))
+    end
+
     def self.complete_task(task_number)
-      file = YAML.load(today_file.read)
+      file = today_file_contents
 
       unless file[:tasks].nil?
         unless file[:tasks][task_number].nil?
-          file[:tasks][task_number] = Task.new(file[:tasks][task_number].to_h).mark_as_complete
+          file[:tasks][task_number] = file[:tasks][task_number].to_task.mark_as_complete
           today_file.write(YAML.dump(file))
         end
       end
@@ -90,6 +102,10 @@ module BulletJournal
       Pathname("#{Dir.home}/.bullit/journal/#{year}/#{week}/#{weekday}.yaml")
     end
 
+    def self.today_file_contents
+      YAML.load(today_file.read)
+    end
+
     def self.yesterday_file
       t = Time.now
 
@@ -104,5 +120,9 @@ module BulletJournal
         Pathname("#{Dir.home}/.bullit/journal/#{year}/#{week-1}/7.yaml")
       end
     end
+
+    def self.yesterday_file_contents
+      YAML.load(yesterday_file.read)
+    end
   end
 end

data/lib/bullit/task.rb

@@ -1,4 +1,4 @@
-module BulletJournal
+module Bullit
   class Task
     attr_accessor :text, :complete
 
@@ -21,4 +21,10 @@ module BulletJournal
       to_h
     end
   end
+end
+
+class Hash
+  def to_task
+    Bullit::Task.new(self)
+  end
 end

data/lib/bullit/version.rb

@@ -1,3 +1,3 @@
-module BulletJournal
-  VERSION = "0.1.2"
+module Bullit
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tomek Nadolny