evertils 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43ad7a896a71c0d795fc1055a1978fe3986704b9
-  data.tar.gz: 17ad2c9211937a80a6412496e675773aff61acd6
+  metadata.gz: 1fd3248143eff7e8b781638d5099de4e5c05535a
+  data.tar.gz: 5b2f2eef86e3159a1039a23bac1c1f5825cd1828
 SHA512:
-  metadata.gz: 558b29635656f446dbda191c5ab8df1b20351db0c05e3c9a9b10b5a4e0361c3f5f8b74639f00f897c11ee758556cea56fadf45ffba7598e0711b631785e7c643
-  data.tar.gz: 1b85ed113a17f793c9d8eabc363a1d83bde975aa2ac404ba70ce27b34e00d7dac1a97dae31a1f51b690c9b959e350e347c7a4924d59f3381e02835f29003a500
+  metadata.gz: 4aca086dff5f7374d585f7311be1c506be32e6df2f1557e84c8728f548d8ed2930555c8991e5483af051361ce3c3b77697422e3514b5e6b62cd2858ca274d164
+  data.tar.gz: 059af51da8b902f6a751ac41b56483d5e349cdf1fb0f848da0a84d729ad8f74a1a6cc29016beae3b33755a852e3904f7cbae58f7617aaf25fc45a4762fc7c33e

data/lib/configs/templates/pq.enml

@@ -0,0 +1,3 @@
+<ul>
+<ol>...</ol>
+</ul>

data/lib/controller.rb

@@ -4,7 +4,7 @@ module Evertils
       attr_accessor :model, :helper, :methods_require_internet, :default_method
 
       @@options = Hash.new
-      
+
       # Perform pre-run tasks
       def pre_exec
         # interface with the Evernote API so we can use it later
@@ -34,7 +34,6 @@ module Evertils
 
       # Perform post-run cleanup tasks, such as deleting old logs
       def post_exec(total_errors = 0, total_warnings = 0, total_files = 0)
-        
       end
 
       # Determines if the command can execute
@@ -54,7 +53,7 @@ module Evertils
 
         @default_method = name || user_defined_methods.first || :sample
 
-        if !respond_to? default_method.to_sym, true
+        unless respond_to? @default_method.to_sym, true
           Notify.error("Command not found: #{name}")
         end
 
@@ -84,12 +83,12 @@ module Evertils
       # autoload and instantiate required libraries, models and helpers
       def auto_load_required(modules = [])
         loaded = {:controller => {}, :helper => {}, :model => {}}
-        
+
         begin
           modules.each do |mod|
             if File.exists? "#{Evertils::INSTALLED_DIR}/lib/controllers/#{mod}.rb"
               require "#{Evertils::INSTALLED_DIR}/lib/controllers/#{mod}.rb"
-              
+
               loaded[:controller][mod] = Evertils::Controller.const_get(mod.capitalize).new
             else
               raise StandardError, "Controller not found: #{mod}"

data/lib/controllers/generate.rb

@@ -9,6 +9,7 @@ module Evertils
       NOTEBOOK_MONTHLY = :Monthly
       NOTEBOOK_DEPLOYMENT = :Deployments
       NOTEBOOK_MTS = :'Monthly Task Summaries'
+      NOTEBOOK_PRIORITY_QUEUE = :'Priority Queue'
 
       def pre_exec
         @methods_require_internet.push(:daily, :weekly, :monthly, :mts)
@@ -36,7 +37,7 @@ module Evertils
       def daily
         title = @format.date_templates[NOTEBOOK_DAILY]
         body = @format.template_contents
-        body += to_enml($config.custom_sections[NOTEBOOK_DAILY]) if $config.custom_sections[NOTEBOOK_DAILY]
+        body += to_enml($config.custom_sections[NOTEBOOK_DAILY]) unless $config.custom_sections.nil?
         parent_notebook = NOTEBOOK_DAILY
 
         @model.create_note(title: title, body: body, parent_notebook: parent_notebook)
@@ -46,7 +47,7 @@ module Evertils
       def weekly
         title = @format.date_templates[NOTEBOOK_WEEKLY]
         body = @format.template_contents
-        body += to_enml($config.custom_sections[NOTEBOOK_WEEKLY]) if $config.custom_sections[NOTEBOOK_WEEKLY]
+        body += to_enml($config.custom_sections[NOTEBOOK_WEEKLY]) unless $config.custom_sections.nil?
         parent_notebook = NOTEBOOK_WEEKLY
 
         if !@force
@@ -57,7 +58,7 @@ module Evertils
 
         note = @model.create_note(title: title, body: body, parent_notebook: parent_notebook)
 
-        tag_manager = Evertils::Common::Manager::Tag.new
+        tag_manager = Evertils::Common::Manager::Tag.instance
         week_tag = tag_manager.find("week-#{DateTime.now.cweek + 1}")
         note.tag(week_tag.prop(:name))
       end
@@ -66,12 +67,12 @@ module Evertils
       def monthly
         title = @format.date_templates[NOTEBOOK_MONTHLY]
         body = @format.template_contents
-        body += to_enml($config.custom_sections[NOTEBOOK_MONTHLY]) if $config.custom_sections[NOTEBOOK_MONTHLY]
+        body += to_enml($config.custom_sections[NOTEBOOK_MONTHLY]) unless $config.custom_sections.nil?
         parent_notebook = NOTEBOOK_MONTHLY
 
         note = @model.create_note(title: title, body: body, parent_notebook: parent_notebook)
 
-        tag_manager = Evertils::Common::Manager::Tag.new
+        tag_manager = Evertils::Common::Manager::Tag.instance
         month_tag = tag_manager.find("month-#{DateTime.now.strftime('%-m')}")
         note.tag(month_tag.prop(:name))
       end
@@ -82,7 +83,7 @@ module Evertils
 
         title = "#{@name} #{DateTime.now.strftime('%m-%Y')}"
         body = @format.template_contents
-        body += to_enml($config.custom_sections[NOTEBOOK_MTS]) if $config.custom_sections[NOTEBOOK_MTS]
+        body += to_enml($config.custom_sections[NOTEBOOK_MTS]) unless $config.custom_sections.nil?
         parent_notebook = NOTEBOOK_MTS
 
         # create the note from template
@@ -90,7 +91,7 @@ module Evertils
 
         # tag it
         # TODO: maybe move this out of controller?
-        tag_manager = Evertils::Common::Manager::Tag.new
+        tag_manager = Evertils::Common::Manager::Tag.instance
         month_tag = tag_manager.find("month-#{DateTime.now.strftime('%-m')}")
         mts_note.tag(month_tag.prop(:name))
 
@@ -99,12 +100,22 @@ module Evertils
         # mts_note.tag(client_tag.prop(:name))
       end
 
+      # generate priority queue notes
+      def pq
+        title = @format.date_templates[NOTEBOOK_PRIORITY_QUEUE]
+        body = @format.template_contents
+        body += to_enml($config.custom_sections[NOTEBOOK_PRIORITY_QUEUE]) unless $config.custom_sections.nil?
+        parent_notebook = NOTEBOOK_PRIORITY_QUEUE
+
+        note = @model.create_note(title: title, body: body, parent_notebook: parent_notebook)
+      end
+
       private
 
       #
       # @since 0.3.1
       def to_enml(hash)
-        enml = Evertils::Helper::EvernoteENML::with_list(hash)
+        Evertils::Helper::EvernoteENML.with_list(hash)
       end
 
     end

data/lib/helpers/formatting.rb

@@ -24,26 +24,7 @@ module Evertils
 
       # Template file for note body
       def template_contents
-        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 = local_template_override?(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", '')
+        IO.readlines(load_template, :encoding => 'UTF-8').join("").delete!("\n")
       end
 
       # Template string for note title
@@ -55,7 +36,8 @@ module Evertils
           :Daily => "Daily Log [#{arg_date.strftime('%B %-d')} - #{dow}]",
           :Weekly => "Weekly Log [#{arg_date.strftime('%B %-d')} - #{end_of_week.strftime('%B %-d')}]",
           :Monthly => "Monthly Log [#{arg_date.strftime('%B %Y')}]",
-          :Deployments => "#{arg_date.strftime('%B %-d')} - #{dow}"
+          :Deployments => "#{arg_date.strftime('%B %-d')} - #{dow}",
+          :'Priority Queue' => "Queue For [#{arg_date.strftime('%B %-d')} - #{dow}]"
         }
       end
 
@@ -68,7 +50,9 @@ module Evertils
 
       #
       # @since 0.3.1
-      def local_template_override?(default)
+      def load_template
+        default = "#{Evertils::TEMPLATE_DIR}#{command.downcase}.enml"
+
         return default if $config.custom_templates.nil?
 
         rval = default

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '0.3.2'.freeze
+  VERSION = "0.3.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ryan Priebe
@@ -96,11 +96,10 @@ files:
 - evertils.gemspec
 - 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
+- lib/configs/templates/pq.enml
 - lib/configs/templates/weekly.enml
 - lib/controller.rb
 - lib/controllers/convert.rb

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

@@ -1,12 +0,0 @@
-<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>
-<div><en-todo checked="false"/>Ensure timecard is up to date</div>

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

@@ -1,15 +0,0 @@
-<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>