evertils 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 949afe8d09c701e278050a9b01a70ba8126357c9
-  data.tar.gz: 30756cf65ccd654a7dd3c742b685b6513d9b6d0d
+  metadata.gz: 40ea220d69b7b5db784276e1f73c8f4b1a20c1d8
+  data.tar.gz: a6f7643cbfa69044f127df963c824c7f6c01bdc5
 SHA512:
-  metadata.gz: 18b2aa16bd5473de272b6ac10daac74db7662f35afa472c611612eee3cc38398727c17542475fb0455f488374ad7628ef0532ea08741fdbdec1c2a1b76d70067
-  data.tar.gz: a3e665e1c366f52d82fb5ed7fc6fe14707b9ebb67ad1cf2bf8d0f11a551e16f4115d3e7043a16eabb1fe8527c5bbe00b5129a36966cd95d79ee7870aff4318ea
+  metadata.gz: f2b0e059335d2c8290c9ee63cf823758fc8b307b9b6faf4b1d7a4b66f3e3b7240af0b7bf564543ca4751c43f5450f854a17a007a34142048ceccd0ec2f1a1fc9
+  data.tar.gz: c58541d8ea0879d621556d8e84c25b2f88c7b26c7dc5fcaf45163c07c60a39286ca249159e4618ee749b69a233425e9555c84b6f9501812ad9ff803d08c88785

data/lib/configs/templates/daily-thursday.enml

@@ -0,0 +1,15 @@
+<div><span style="font-size: 18px;">Logs</span></div>
+<ul>
+<li>...</li>
+</ul>
+<br />
+<div><span style="font-size: 18px;">Tasks completed</span></div>
+<ul>
+<li>...</li>
+</ul>
+<br />
+<div><span style="font-size: 18px;">EOD</span></div>
+<ul>
+<li><en-todo checked="false"/>Weekly timecard is up to date</li>
+<li><en-todo checked="false"/>Tasks are filled out</li>
+</ul>

data/lib/configs/templates/daily.enml

@@ -9,4 +9,6 @@
 </ul>
 <br />
 <div><span style="font-size: 18px;">EOD</span></div>
-<div><en-todo checked="false"/>Ensure timecard is up to date</div>
+<ul>
+<li><en-todo checked="false"/>Timecard is up to date</li>
+</ul>

data/lib/controllers/generate.rb

@@ -53,7 +53,11 @@ module Evertils
           end
         end
 
-        @model.create_note(title, body, parent_notebook)
+        note = @model.create_note(title, body, parent_notebook)
+
+        tag_manager = Evertils::Common::Manager::Tag.new
+        week_tag = tag_manager.find("week-#{DateTime.now.cweek + 1}")
+        note.tag(week_tag.prop(:name))
       end
 
       # generate monthly notes
@@ -62,7 +66,11 @@ module Evertils
         body = @format.template_contents
         parent_notebook = NOTEBOOK_MONTHLY
 
-        @model.create_note(title, body, parent_notebook)
+        note = @model.create_note(title, body, parent_notebook)
+
+        tag_manager = Evertils::Common::Manager::Tag.new
+        month_tag = tag_manager.find("month-#{DateTime.now.strftime('%-m')}")
+        note.tag(month_tag.prop(:name))
       end
 
       # generate monthly task summary templates

data/lib/helpers/formatting.rb

@@ -22,15 +22,31 @@ module Evertils
         end
       end
 
+      # Template file for note body
       def template_contents
-        if Date.today.friday? && command == :Daily
-          # Friday uses a slightly different template
-          IO.readlines("#{Evertils::TEMPLATE_DIR}#{command.downcase}-friday.enml").join("").gsub!("\n", '')
-        else
-          IO.readlines("#{Evertils::TEMPLATE_DIR}#{command.downcase}.enml").join("").gsub!("\n", '')
+        tmpls = {
+          :monday => "#{Evertils::TEMPLATE_DIR}#{command.downcase}-monday.enml",
+          :tuesday => "#{Evertils::TEMPLATE_DIR}#{command.downcase}-tuesday.enml",
+          :wednesday => "#{Evertils::TEMPLATE_DIR}#{command.downcase}-wednesday.enml",
+          :thursday => "#{Evertils::TEMPLATE_DIR}#{command.downcase}-thursday.enml",
+          :friday => "#{Evertils::TEMPLATE_DIR}#{command.downcase}-friday.enml",
+          :default => "#{Evertils::TEMPLATE_DIR}#{command.downcase}.enml"
+        }
+
+        template = tmpls[:default]
+        
+        if command == :Daily
+          if Date.today.friday? && File.exist?(tmpls[:friday])
+            template = tmpls[:friday]
+          elsif Date.today.thursday? && File.exist?(tmpls[:thursday])
+            template = tmpls[:thursday]
+          end
         end
+
+        IO.readlines(template, :encoding => 'UTF-8').join("").gsub!("\n", '')
       end
 
+      # Template string for note title
       def date_templates(arg_date = DateTime.now)
         dow = day_of_week(arg_date.strftime('%a'))
         end_of_week = arg_date + 4 # days

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '0.2.9'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Priebe
@@ -97,6 +97,7 @@ files:
 - lib/command.rb
 - lib/config.rb
 - lib/configs/templates/daily-friday.enml
+- lib/configs/templates/daily-thursday.enml
 - lib/configs/templates/daily.enml
 - lib/configs/templates/monthly.enml
 - lib/configs/templates/mts.enml