evertils 1.0.12 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99e8ad314c474633e6107fb99dd66364cab9d8a2f38ae36e461c07cae6a2a842
-  data.tar.gz: 94cff8759a0cac2568fc06f59205870225d7b9f9e76c8f5c37ad3bccfa299f62
+  metadata.gz: 04b57db19e88587c1b226d8b457f2366be8abaa9d9ac11167d08c704d828a008
+  data.tar.gz: 2dc9c21a462bdd8404f116bdd45a3ffd32e91e4191133e4ee0d1bc363936a721
 SHA512:
-  metadata.gz: d0a4d0c5ccb9461475e0c975515c0cdaddd13250ba10631504ac861f3729acf218361a86e5d6daeb037f779cd53a3bf8bd6d131a41a6dec4bc9ce503f882dcd0
-  data.tar.gz: 29e50ce9b59a4be5a41fe9288b4d465d13abb20422094487e7df9bdecccbd6f25fb22a8dda22cef551ec1c40239b53177b464ec3104d4b134ad184aacedd08ee
+  metadata.gz: be6ea98ad31e762358da2188e145f987367e1c2e1e976470e1ec575c2c9ec687c639bf838a90c090a0c426dbff9a4d4783fe9b248bf75ede31bb9ef0619a183f
+  data.tar.gz: 3d7d6aeae4d8676cee6f5619407719ef364bc426f398c4c39fc29178106290daeea7b746c11e4a2b69cd5b3797c973f0a2b9fa3e241efc7f02b9402ba805de2f

data/README.md

@@ -17,9 +17,7 @@ See [this document](https://github.com/aapis/evertils/wiki/Logging-Specification
 |Command|Description|Usage|
 |:--------------|:-----------|:-------------|
 |generate|Create notes from templates|`evertils generate daily`, `evertils generate morning`, `evertils generate monthly`|
-|new|Manually create notes|`evertils new note "STUFF"`, `evertils new share_note "STUFF"`, `other task $PIPE_CHAR$ evertils new share_note --title="Piped data note"`|
-|get|Get data from Evernote|`evertils get notebook` (coming soon)|
-|convert|Convert your notes to Markdown, then back to ENML|(coming soon)|
+|log|Write a line to a note|`evertils log message "I am a message"`|
 
 ## Automation
 

data/evertils.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.executables           = 'evertils'
   s.required_ruby_version = '>= 2.4.0'
 
-  s.add_runtime_dependency 'notifaction'
-  s.add_runtime_dependency 'mime-types'
+  s.add_runtime_dependency 'notifaction', '~> 0.4.4'
+  s.add_runtime_dependency 'mime-types', '~> 3.3.1'
   s.add_runtime_dependency 'evertils-common', '~> 0.3.7'
   s.add_runtime_dependency 'nokogiri'
 
   s.add_development_dependency "bundler", "~> 1.10"
-  s.add_development_dependency "rake", "~> 10.0"
+  s.add_development_dependency "rake", "~> 12.3.3"
 end

data/lib/evertils/action.rb

@@ -5,8 +5,8 @@ module Evertils
     class Base
       def initialize(args)
         @args = args
-        @note_helper = Evertils::Helper.load('Note')
-        @api = Evertils::Helper.load('ApiEnmlHandler', {})
+        @note_helper = Evertils::Helper::Note.instance
+        @api = Evertils::Helper::ApiEnmlHandler.new
       end
     end
   end

data/lib/evertils/actions/duplicate_previous.rb

@@ -20,7 +20,7 @@ module Evertils
 
         Notify.info("Searching for last #{@args[:notebook]}...")
 
-        (1..Evertils::Type::Base::MAX_SEARCH_SIZE).each do |iter|
+        (1..Evertils::Base::MAX_SEARCH_SIZE).each do |iter|
           day -= 1
           dow = day.strftime('%a')
 

data/lib/evertils/base.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
+
 module Evertils
   class Base
-    def initialize
-      @format = Evertils::Helper.load('Formatting')
-    end
+    MAX_SEARCH_SIZE = 11
   end
 end

data/lib/evertils/config.rb

@@ -47,9 +47,7 @@ module Evertils
     # Populates the internal hash which stores any values set in the config file
     def populate_config
       file = File.expand_path("~/.evertils/config.yml")
-      fmt = Evertils::Helper.load('Formatting')
-
-      @yml = fmt.symbolize(::YAML.load_file(file))
+      @yml = symbolize_keys(::YAML.load_file(file))
 
       set_evertils_token
 

data/lib/evertils/controller.rb

@@ -31,7 +31,6 @@ module Evertils
 
       # Perform pre-run tasks
       def pre_exec
-        @format = Evertils::Helper.load('Formatting')
       end
 
       # Handle the request

data/lib/evertils/controllers/log.rb

@@ -4,8 +4,8 @@ module Evertils
       def pre_exec
         super
 
-        @note_helper = Evertils::Helper.load('Note')
-        @api_helper = Evertils::Helper.load('ApiEnmlHandler', @config)
+        @note_helper = Evertils::Helper::Note.instance
+        @api_helper = Evertils::Helper::ApiEnmlHandler.new(@config)
       end
 
       # Send arbitrary text to the daily log

data/lib/evertils/controllers/render.rb

@@ -14,8 +14,9 @@ module Evertils
       end
 
       def note_exists?
-        helper = Evertils::Helper.load('Note')
-        note = helper.wait_for_by_title(@allowed_fields[:title], @allowed_fields[:notebook], 3)
+        helper = Evertils::Helper::Note.instance
+        note = helper.wait_for_with_grammar(grammar)
+
         @link = helper.external_url_for(note.entity) unless note.entity.nil?
 
         note.exists?
@@ -24,7 +25,7 @@ module Evertils
       def execute_action(action)
         case action
         when nil
-          Notify.info 'Action not provided, creation new note...'
+          Notify.info 'Action not provided, creating new note...'
           Action::Create.new(@allowed_fields)
         when 'create'
           Action::Create.new(@allowed_fields)
@@ -47,6 +48,17 @@ module Evertils
           :tags
         )
       end
+
+      def grammar
+        terms = Grammar.new
+        terms.notebook = @allowed_fields[:notebook]
+        terms.tags = {
+          day: Date.today.yday,
+          week: Date.today.cweek
+        }
+        terms.created = Date.new(Date.today.year, 1, 1).strftime('%Y%m%d')
+        terms
+      end
     end
   end
 end

data/lib/evertils/grammar.rb

@@ -2,7 +2,7 @@
 
 module Evertils
   class Grammar
-    attr_accessor :tags, :notebook, :created
+    attr_accessor :tags, :notebook, :created, :intitle
 
     # Available grammars
     # https://dev.evernote.com/doc/articles/search_grammar.php
@@ -11,6 +11,7 @@ module Evertils
       @tags = []
       @grammar = []
       @notebook = nil
+      @intitle = nil
       @created = Date.today.strftime('%Y%m%d')
     end
 
@@ -42,7 +43,8 @@ module Evertils
       grammars_used.reject! { |k, _| k.to_s.end_with?('=') || k == :tags }
 
       grammars_used.each do |grammar|
-        @grammar.push("#{grammar}:#{send(grammar)}")
+        value = send(grammar)
+        @grammar.push("#{grammar}:#{value}") unless value.nil?
       end
     end
   end

data/lib/evertils/helpers/api-enml-handler.rb

@@ -5,8 +5,8 @@ module Evertils
 
       #
       # @since 0.3.7
-      def initialize(args = [])
-        @config = args.first
+      def initialize(conf)
+        @config = conf
         self
       end
 

data/lib/evertils/helpers/formatting.rb

@@ -3,42 +3,8 @@
 module Evertils
   module Helper
     class Formatting
-      # Legacy notes will have single/double character denotations for day of
-      # week, this maps them.
-      def day_of_week(arg_date = Date.today.strftime('%a'))
-        case arg_date
-        when 'Mon'
-          :M
-        when 'Tue'
-          :Tu
-        when 'Wed'
-          :W
-        when 'Thu'
-          :Th
-        when 'Fri'
-          :F
-        when 'Sat'
-          :Sa
-        when 'Sun'
-          :Su
-        end
-      end
-
-      # Template file for note body
-      def template_contents(type = nil)
-        begin
-          raise ArgumentError, "Type is required" if type.nil?
-
-          IO.readlines(load_template(type), :encoding => 'UTF-8').join("").delete!("\n")
-        rescue Errno::ENOENT => e
-          Notify.error("#{e}\n#{e.backtrace.join("\n")}", show_time: false)
-        rescue ArgumentError => e
-          Notify.error("#{e}\n#{e.backtrace.join("\n")}", show_time: false)
-        end
-      end
-
       # Template string for note title
-      def date_templates
+      def self.date_templates
         current_date = Date.today
         week_stub = current_date.strftime('%a')
         start_of_week = Date.commercial(current_date.year, current_date.cweek, 1)
@@ -52,47 +18,6 @@ module Evertils
           :'Priority Queue' => "Queue For [#{current_date.strftime('%B %-d')} - #{week_stub}]"
         }
       end
-
-      # Recursively symbolize keys in a hash
-      # Params:
-      # +h+:: The hash you want to symbolize
-      def symbolize(h)
-        case h
-        when Hash
-          Hash[
-            h.map do |k, v|
-              [k.respond_to?(:to_sym) ? k.to_sym : k, symbolize(v)]
-            end
-          ]
-        when Enumerable
-          h.map { |v| symbolize(v) }
-        else
-          h
-        end
-      end
-
-      private
-
-      #
-      # @since 0.3.1
-      def load_template(type)
-        file_name = type.to_s.downcase.gsub(/\s/, '-')
-        installed_dir = Gem::Specification.find_by_name('evertils').gem_dir
-        local_installed_dir = "#{Dir.home}/.evertils/templates/"
-        template_file = "#{installed_dir}/lib/evertils/configs/templates/#{file_name}.enml"
-
-        if Dir.exist? local_installed_dir
-          template_file = "#{local_installed_dir}#{file_name}.enml"
-
-          # local config dir exists but the requested template does not, use
-          # the default template for this type
-          unless File.exist? template_file
-            template_file = "#{installed_dir}/lib/evertils/configs/templates/#{file_name}.enml"
-          end
-        end
-
-        template_file
-      end
     end
   end
 end

data/lib/evertils/helpers/note.rb

@@ -1,17 +1,21 @@
 module Evertils
   module Helper
     class Note
+      include Singleton
+
       attr_reader :model
 
       # Create the Note object
       def initialize
         @model = Evertils::Common::Query::Simple.new
-        @format = Evertils::Helper.load('Formatting')
+        @format = Formatting.new
         @user = @model.user_info[:user]
         @shard = @model.user_info[:shard]
       end
 
-      def wait_for_with_grammar(grammar, iterations = Evertils::Type::Base::MAX_SEARCH_SIZE)
+      #
+      # @since 1.0.12
+      def wait_for_with_grammar(grammar, iterations = Evertils::Base::MAX_SEARCH_SIZE)
         Notify.info("Searching with grammar #{grammar}")
         note = find_note_by_grammar(grammar.to_s)
 
@@ -22,7 +26,7 @@ module Evertils
               Notify.info(" (#{iter}) Looking for #{grammar}")
               note = find_note_by_grammar(grammar.to_s, true)
 
-              break unless note.entity.nil? || iter == Evertils::Type::Base::MAX_SEARCH_SIZE
+              break unless note.entity.nil? || iter == Evertils::Base::MAX_SEARCH_SIZE
             end
           end
         rescue Interrupt
@@ -33,7 +37,7 @@ module Evertils
       end
 
       # Wait for a note to exist
-      def wait_for_by_notebook(notebook, iterations = Evertils::Type::Base::MAX_SEARCH_SIZE)
+      def wait_for_by_notebook(notebook, iterations = Evertils::Base::MAX_SEARCH_SIZE)
         Notify.info("Waiting for #{notebook}...")
         note = find_note_by_notebook(notebook)
 
@@ -43,7 +47,7 @@ module Evertils
             (1..iterations).each do |iter|
               Notify.info(" (#{iter}) Looking for #{notebook.downcase}")
               note = find_note_by_notebook(notebook, true)
-              break unless note.entity.nil? || iter == Evertils::Type::Base::MAX_SEARCH_SIZE
+              break unless note.entity.nil? || iter == Evertils::Base::MAX_SEARCH_SIZE
             end
           end
         rescue Interrupt
@@ -54,7 +58,7 @@ module Evertils
       end
 
       # Wait for a note to exist
-      def wait_for_by_title(title, notebook, iterations = Evertils::Type::Base::MAX_SEARCH_SIZE)
+      def wait_for_by_title(title, notebook, iterations = Evertils::Base::MAX_SEARCH_SIZE)
         Notify.info("Waiting for #{title}...")
         note = find_note_by_title(title)
 
@@ -64,7 +68,7 @@ module Evertils
             (1..iterations).each do |iter|
               Notify.info(" (#{iter}) Looking for #{notebook.downcase}")
               note = find_note_by_title(notebook, true)
-              break unless note.entity.nil? || iter == Evertils::Type::Base::MAX_SEARCH_SIZE
+              break unless note.entity.nil? || iter == Evertils::Base::MAX_SEARCH_SIZE
             end
           end
         rescue Interrupt
@@ -83,7 +87,7 @@ module Evertils
       # Find a note by notebook
       def find_note_by_notebook(notebook, sleep = false)
         sleep(5) if sleep
-        title = @format.date_templates[notebook]
+        title = Formatting.date_templates[notebook]
 
         @model.find_note_contents(title)
       end

data/lib/evertils/router.rb

@@ -12,12 +12,9 @@ module Evertils
       @request = Request.new
 
       begin
-        # include the controller
-        require "evertils/controllers/#{@request.controller}"
-        # include helpers
-        require "evertils/helpers/#{@request.controller}" if File.exist? "evertils/helpers/#{@request.controller}"
+        update_config if uses_local_configuration?
 
-        update_config if uses_config_file?
+        require "evertils/controllers/#{@request.controller}" unless uses_local_configuration?
 
         # perform all required checks
         must_pass = Helper::Results.new
@@ -45,7 +42,6 @@ module Evertils
       begin
         unless @request.controller.nil?
           controller = Evertils::Controller.const_get @request.controller.capitalize
-          controller = Evertils::Controller::Render if @config.exist?(:path)
 
           # create an instance of the requested controller
           context = controller.new(@config, @request)
@@ -70,7 +66,7 @@ module Evertils
       end
     end
 
-    def uses_config_file?
+    def uses_local_configuration?
       @config_file_path = File.expand_path("~/.evertils/templates/type/#{@request.command}.yml")
       File.exist? @config_file_path
     end

data/lib/evertils/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '1.0.12'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/evertils.rb

@@ -20,23 +20,20 @@ require 'nokogiri'
 require 'evertils/kernel'
 require 'evertils/version'
 require 'evertils/base'
-require 'evertils/type'
 require 'evertils/action'
 require 'evertils/actions/default'
 require 'evertils/actions/create'
 require 'evertils/actions/duplicate_previous'
-require 'evertils/helpers/time'
 require 'evertils/helpers/results'
 require 'evertils/helpers/api-enml-handler'
-require 'evertils/gpg_exception'
-require 'evertils/yubikey_exception'
-require 'evertils/required_check_exception'
+require 'evertils/exceptions/gpg_exception'
+require 'evertils/exceptions/yubikey_exception'
+require 'evertils/exceptions/required_check_exception'
 require 'evertils/config'
 require 'evertils/request'
 require 'evertils/controller'
 require 'evertils/controllers/render'
 require 'evertils/router'
-require 'evertils/helper'
 require 'evertils/helpers/formatting'
 require 'evertils/helpers/evernote-enml'
 require 'evertils/helpers/note'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 2.0.0
 platform: ruby
 authors:
 - Ryan Priebe
@@ -14,30 +14,30 @@ dependencies:
   name: notifaction
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: evertils-common
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 description: Evernote utilities for your CLI workflow
 email: hello@ryanpriebe.com
 executables:
@@ -116,44 +116,27 @@ files:
 - lib/evertils/actions/duplicate_previous.rb
 - lib/evertils/base.rb
 - lib/evertils/config.rb
-- lib/evertils/configs/templates/daily.enml
-- lib/evertils/configs/templates/monthly-task-summaries.enml
-- lib/evertils/configs/templates/monthly.enml
-- lib/evertils/configs/templates/pq.enml
-- lib/evertils/configs/templates/weekly.enml
 - lib/evertils/controller.rb
 - lib/evertils/controllers/change.rb
-- lib/evertils/controllers/convert.rb
 - lib/evertils/controllers/firstrun.rb
-- lib/evertils/controllers/generate.rb
-- lib/evertils/controllers/get.rb
 - lib/evertils/controllers/log.rb
-- lib/evertils/controllers/new.rb
 - lib/evertils/controllers/render.rb
-- lib/evertils/gpg_exception.rb
+- lib/evertils/exceptions/gpg_exception.rb
+- lib/evertils/exceptions/required_check_exception.rb
+- lib/evertils/exceptions/yubikey_exception.rb
 - lib/evertils/grammar.rb
-- lib/evertils/helper.rb
 - lib/evertils/helpers/api-enml-handler.rb
 - lib/evertils/helpers/evernote-enml.rb
 - lib/evertils/helpers/evernote-markdown.rb
 - lib/evertils/helpers/formatting.rb
 - lib/evertils/helpers/note.rb
 - lib/evertils/helpers/results.rb
-- lib/evertils/helpers/time.rb
 - lib/evertils/helpers/xml.rb
 - lib/evertils/kernel.rb
 - lib/evertils/request.rb
-- lib/evertils/required_check_exception.rb
 - lib/evertils/router.rb
-- lib/evertils/type.rb
-- lib/evertils/types/daily.rb
-- lib/evertils/types/monthly-task-summary.rb
-- lib/evertils/types/monthly.rb
-- lib/evertils/types/priority-queue.rb
-- lib/evertils/types/weekly.rb
 - lib/evertils/vendor/enml.dtd
 - lib/evertils/version.rb
-- lib/evertils/yubikey_exception.rb
 homepage: http://rubygems.org/gems/evertils
 licenses:
 - MIT

data/lib/evertils/configs/templates/daily.enml

@@ -1,14 +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"/>Timecard is up to date</li>
-</ul>

data/lib/evertils/configs/templates/monthly-task-summaries.enml

@@ -1,9 +0,0 @@
-<div><span style="font-size: 18px;">Completed</span></div>
-<ul>
-<li>...</li>
-</ul>
-<br />
-<div><span style="font-size: 18px;">Logs</span></div>
-<ul>
-<li>...</li>
-</ul>

data/lib/evertils/configs/templates/monthly.enml

@@ -1,13 +0,0 @@
-<ul>
-<li>...</li>
-</ul>
-<br />
-<div><span style="font-size: 18px;">Highlights</span></div>
-<ul>
-<li>...</li>
-</ul>
-<br />
-<div><span style="font-size: 18px;">Summaries</span></div>
-<ul>
-<li>...</li>
-</ul>

data/lib/evertils/configs/templates/pq.enml

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

data/lib/evertils/configs/templates/weekly.enml

@@ -1,13 +0,0 @@
-<div>
-<div><span style="font-size: 18px;">Logs</span></div>
-<ul>
-<li>...</li>
-</ul>
-</div>
-<div>
-<br />
-<div><span style="font-size: 18px;">Highlights</span></div>
-<ul>
-<li>...</li>
-</ul>
-</div>

data/lib/evertils/controllers/convert.rb

@@ -1,48 +0,0 @@
-module Evertils
-  module Controller
-    class Convert < Controller::Base
-      attr_accessor :title, :file, :notebook
-
-      def pre_exec
-        # command flag parser
-        OptionParser.new do |opt|
-          opt.banner = "#{Evertils::PACKAGE_NAME} new note [...-flags]"
-
-          opt.on("-m", "--to-markdown", "Convert to MD format") do |b|
-            @markdown = b
-          end
-
-          opt.on("-e", "--to-enml", "Convert to ENML") do |b|
-            @file = b
-          end
-
-          opt.on("-n", "--notebook=PBOOK", "Attach a file to your custom note") do |notebook|
-            @notebook = notebook.capitalize
-          end
-        end.parse!
-
-        super
-      end
-
-      def notes_in
-        unless @notebook
-          Notify.error("Notebook (--notebook=) is a required argument")
-        end
-
-        metadata = @model.notes_by_notebook(@notebook)
-
-        if metadata.is_a? Hash
-          Notify.info("#{metadata.size} notes in #{@notebook}")
-          Notify.info("Printing list of notes")
-
-          metadata.each_pair do |note_guid, note_content|
-            # convert it here!
-            Notify.spit(note_content)
-          end
-        else
-          Notify.error("Could not pull data for notebook #{@notebook}")
-        end
-      end
-    end
-  end
-end

data/lib/evertils/controllers/generate.rb

@@ -1,57 +0,0 @@
-require_relative '../types/priority-queue'
-require_relative '../types/monthly-task-summary'
-require_relative '../types/daily'
-require_relative '../types/weekly'
-require_relative '../types/monthly'
-
-module Evertils
-  module Controller
-    class Generate < Controller::Base
-      # generate daily notes
-      def daily
-        note = Type::Daily.new(@config)
-        note.create if note.should_create?
-      end
-
-      # generate weekly notes
-      def weekly
-        note = Type::Weekly.new(@config)
-        note.create if note.should_create?
-        note.add_daily_note_link
-      end
-
-      # generate monthly notes
-      def monthly
-        note = Type::Monthly.new(@config)
-        note.create if note.should_create?
-        note.add_weekly_note_link
-      end
-
-      # generate monthly task summary templates
-      def mts(arg)
-        Notify.error('Name argument is required', {}) if arg.nil?
-
-        note = Type::MonthlyTaskSummary.new(@config, arg[1])
-        note.create if note.should_create?
-      end
-
-      # generate priority queue notes
-      def pq
-        note = Type::PriorityQueue.new(@config)
-        note.create if note.should_create?
-      end
-
-      # creates the notes required to start the day
-      #  - priority queue
-      #  - daily
-      #  - weekly (if today is Monday and there isn't a weekly log already)
-      #  - monthly (if today is the 1st and there isn't a monthly log already)
-      def morning
-        pq
-        daily
-        weekly
-        monthly
-      end
-    end
-  end
-end

data/lib/evertils/controllers/get.rb

@@ -1,55 +0,0 @@
-module Evertils
-  module Controller
-    class Get < Controller::Base
-      attr_accessor :title, :file, :notebook
-
-      def pre_exec
-        # command flag parser
-        OptionParser.new do |opt|
-          opt.banner = "evertils new note [...-flags]"
-
-          opt.on("-t", "--title=TITLE", "Set a custom title") do |title|
-            @title = title
-          end
-
-          opt.on("-f", "--file=PATH", "Attach a file to your custom note") do |file|
-            @file = file
-          end
-
-          opt.on("-n", "--notebook=PBOOK", "Attach a file to your custom note") do |notebook|
-            @notebook = notebook
-          end
-        end.parse!
-
-        super
-      end
-
-      # Get data about a notebook, prints titles of each child note
-      def notebook
-        if !$request.custom.nil?
-          book = $request.custom[0]
-          metadata = @model.notes_by_notebook(book)
-
-          if metadata.is_a? ::Evernote::EDAM::NoteStore::NotesMetadataList
-            Notify.info("#{metadata.totalNotes} notes in #{book}")
-            Notify.info("Printing list of notes")
-
-            metadata.notes.each do |note|
-              Notify.spit note.title
-            end
-          else
-            Notify.error("Could not pull data for notebook #{$request.custom[0]}", {})
-          end
-        else
-          Notify.error("Notebook name is a required argument, i.e.\n#{Evertils::PACKAGE_NAME} get notebook agendas", {})
-        end
-      end
-
-      def info
-        @config.options.each_pair do |key, value|
-          Notify.spit("#{key}: #{value}")
-        end
-      end
-    end
-  end
-end

data/lib/evertils/controllers/new.rb

@@ -1,88 +0,0 @@
-module Evertils
-  module Controller
-    class New < Controller::Base
-      attr_accessor :title, :file, :notebook
-
-      def pre_exec
-        # all methods require internet to make API calls
-        @methods_require_internet.push(:daily, :weekly, :monthly)
-
-        @title = "Evertils - Custom Note"
-
-        # command flag parser
-        OptionParser.new do |opt|
-          opt.banner = "#{Evertils::PACKAGE_NAME} new note [...-flags]"
-
-          opt.on("-t", "--title=TITLE", "Set a custom title") do |title|
-            @title = title
-          end
-
-          opt.on("-f", "--file=PATH", "Attach a file to your custom note") do |file|
-            @file = file
-          end
-
-          opt.on("-n", "--notebook=PBOOK", "Choose the notebook to add your note to") do |notebook|
-            @notebook = notebook
-          end
-
-          opt.on("-b", "--body=BODY", "Note body") do |body|
-            @body = body
-          end
-
-          opt.on("-t", "--tags=list", "Assign tags to the new note") do |tags|
-            @tags = tags
-          end
-
-          opt.on("-c", "--created_on=DATE", "Set note created date") do |created_on|
-            # Evernote cuts the last 3 values off of your timestamp because
-            # it "accurate to milliseconds", so we have to add them back or
-            # else the date is all messed up
-            parsed = Date.parse(created_on)
-            @created_on = (parsed.to_time.to_i.to_s + "000").to_i
-          end
-        end.parse!
-
-        super
-      end
-
-      # Create a new Evernote note from data or terminal output
-      def note
-        if @body.nil?
-          message = JSON.parse(STDIN.gets.to_s).join
-          message = message.gsub!("\n", '<br />')
-        else
-          message = @body
-        end
-
-        note = @model.create_note(title: @title, body: message, parent_notebook: @notebook, files: @file, shareable: false, created_on: @created_on)
-
-        if note[:note]
-          Notify.success("Note created")
-        else
-          Notify.error("Unable to create note, are you authenticated?")
-        end
-      end
-
-      # Create a new note and automatically share it
-      def share_note
-        if @body.nil?
-          message = JSON.parse(STDIN.gets).join
-          message = message.gsub!("\n", '<br />')
-        else
-          message = @body
-        end
-
-        # Prefix title to indicate it's shared status
-        @title = "[SHARED] #{@title}"
-
-        note = @model.create_note(title: @title, body: message, parent_notebook: @notebook, files: @file, shareable: true, created_on: @created_on)
-
-        if note[:share_url]
-          Notify.success("Note created and shared:\n#{note[:share_url]}")
-        else
-          Notify.error("Something dreadful happened!")
-        end
-      end
-    end
-  end
-end

data/lib/evertils/helper.rb

@@ -1,19 +0,0 @@
-module Evertils
-  module Helper
-    def self.load(klass, *args)
-      begin
-        klass_instance = Evertils::Helper.const_get(klass)
-
-        if klass_instance
-          if args.empty?
-            klass_instance.new
-          else
-            klass_instance.new(args)
-          end
-        end
-      rescue => e
-        Notify.error("#{e}\n#{e.backtrace.join("\n")}", show_time: false)
-      end
-    end
-  end
-end

data/lib/evertils/helpers/time.rb

@@ -1,28 +0,0 @@
-module Evertils
-  module Helper
-    class Time
-      def self.human_readable(start, finish)
-        seconds = finish.to_f - start.to_f
-
-        if seconds < 60
-          "No time at all!"
-        else
-          minutes = (seconds / 60).round(1)
-          if minutes < 1
-            "#{minutes} minute"
-          else
-            "#{minutes} minutes"
-          end
-        end
-      end
-
-      def self.formatted(time = nil)
-        if time.nil?
-          time = ::Time.now
-        end
-        
-        time.strftime("%e/%-m/%Y @ %I:%M:%S%P")
-      end
-    end
-  end
-end

data/lib/evertils/type.rb

@@ -1,58 +0,0 @@
-module Evertils
-  module Type
-    class Base
-      attr_reader :title, :content, :notebook
-
-      COLOUR = 0xffffff
-      MAX_SEARCH_SIZE = 11
-
-      #
-      # @since 0.3.7
-      def initialize(config, *args)
-        # helpers
-        @note_helper = Evertils::Helper.load('Note')
-        @format = Evertils::Helper.load('Formatting')
-
-        @config = config
-        @api = Evertils::Helper.load('ApiEnmlHandler', @config)
-        @args = args unless args.size.zero?
-      end
-
-      #
-      # @since 0.3.7
-      def create
-        data = {
-          title: @title,
-          body: @content.to_s.delete("\n"),
-          parent_notebook: self.class::NOTEBOOK,
-          tags: tags || [],
-          colour: self.class::COLOUR
-        }
-
-        raise 'Invalid title' if @title.nil?
-        raise 'Invalid note content' if @content.nil?
-        raise 'Invalid notebook' if self.class::NOTEBOOK.nil?
-
-        @note_helper.create_note(data)
-      end
-
-      #
-      # @since 0.3.7
-      def should_create?
-        @note = @note_helper.find_note(self.class::NOTEBOOK)
-        @entity = @note.entity
-        result = @entity.nil?
-
-        Notify.warning "#{self.class.name} skipped, note already exists" unless result
-
-        result
-      end
-
-      #
-      # @since 0.3.15
-      def morning_note?
-        !caller.grep(/morning/).empty?
-      end
-    end
-  end
-end

data/lib/evertils/types/daily.rb

@@ -1,54 +0,0 @@
-module Evertils
-  module Type
-    class Daily < Type::Base
-      NOTEBOOK = :Daily
-      COLOUR = 0xffe8b7
-
-      #
-      # @since 0.3.7
-      def initialize(config, *args)
-        super(config, *args)
-
-        @title = @format.date_templates[NOTEBOOK]
-        @content = @format.template_contents(NOTEBOOK)
-
-        attach_pq_note if morning_note?
-      end
-
-      #
-      # @since 0.3.9
-      def tags
-        [
-          "day-#{Date.today.yday}",
-          "week-#{Date.today.cweek}",
-          "month-#{Date.today.month}"
-        ]
-      end
-
-      private
-
-      #
-      # TODO: refactor
-      # @since 0.3.13
-      def attach_pq_note
-        enml = @api.from_str(@format.template_contents(NOTEBOOK))
-        pq = @note_helper.wait_for_by_notebook(:'Priority Queue')
-        xml_conf = {
-          href: @note_helper.internal_url_for(pq.entity),
-          content: @format.date_templates[:'Priority Queue']
-        }
-        xml = Evertils::Helper.load('Xml', enml)
-        a = xml.create(:a, xml_conf)
-
-        enml.at('li:contains("Queue") ul li').children.first.replace(a)
-
-        # remove dtd if it is the first element
-        if enml.children.first.is_a?(Evertils::Helper::DTD)
-          enml.children.first.remove
-        end
-
-        @content = enml
-      end
-    end
-  end
-end

data/lib/evertils/types/monthly-task-summary.rb

@@ -1,24 +0,0 @@
-module Evertils
-  module Type
-    class MonthlyTaskSummary < Type::Base
-      NOTEBOOK = :'Monthly Task Summaries'
-      COLOUR = 0xffe8b7
-
-      #
-      # @since 0.3.7
-      def initialize(config, *args)
-        super(config, *args)
-
-        @name = @args.first
-        @title = "#{@name} #{DateTime.now.strftime('%m-%Y')}"
-        @content = @format.template_contents(NOTEBOOK)
-      end
-
-      #
-      # @since 0.3.9
-      def tags
-        ["day-#{Date.today.yday}", @args.first]
-      end
-    end
-  end
-end

data/lib/evertils/types/monthly.rb

@@ -1,58 +0,0 @@
-module Evertils
-  module Type
-    class Monthly < Type::Base
-      NOTEBOOK = :Monthly
-      COLOUR = 0xffe8b7
-
-      #
-      # @since 0.3.7
-      def initialize(config, *args)
-        super(config, *args)
-
-        @title = @format.date_templates[NOTEBOOK]
-        @content = @format.template_contents(NOTEBOOK)
-      end
-
-      #
-      # @since 0.3.9
-      def tags
-        ["month-#{Date.today.month}"]
-      end
-
-      #
-      # @since 0.3.15
-      def add_weekly_note_link
-        wk_entity = @note_helper.wait_for_by_notebook(:Weekly).entity
-        # parse the ENML note data into something we can work with
-        xml = @api.from_str(@entity.content)
-        # include the XML element builder
-        xml_helper = Evertils::Helper.load('Xml', xml)
-        # internal URL for the linked note
-        note_url = @note_helper.internal_url_for(wk_entity)
-
-        # don't add the note link if it is already there
-        unless xml.search("a[href='#{note_url}']").size.zero?
-          return Notify.warning('Weekly note link already exists here, exiting to avoid duplicate content')
-        end
-
-        a = xml_helper.a(
-          note_url,
-          @format.date_templates[:Weekly]
-        )
-        li = xml_helper.li(a)
-        br = xml_helper.br
-
-        xml.search('ul:first-child li').after(li)
-
-        # add a line break after the UL if one is not there yet
-        if xml.search('ul:first-child').first.next_element.name != 'br'
-          xml.search('ul:first-child').after(br)
-        end
-
-        @entity.content = xml.to_s
-
-        Notify.success("#{self.class.name} updated, added weekly note link") if @note.update
-      end
-    end
-  end
-end

data/lib/evertils/types/priority-queue.rb

@@ -1,55 +0,0 @@
-module Evertils
-  module Type
-    class PriorityQueue < Type::Base
-      NOTEBOOK = :'Priority Queue'
-      COLOUR = 0xffe8b7
-
-      #
-      # @since 0.3.7
-      def initialize(config, *args)
-        super(config, *args)
-
-        @title = @format.date_templates[NOTEBOOK]
-        @content = find_previous
-      end
-
-      #
-      # @since 0.3.9
-      def tags
-        [
-          "day-#{Date.today.yday}",
-          "week-#{Date.today.cweek}",
-          "month-#{Date.today.month}"
-        ]
-      end
-
-      private
-
-      # Find a previous note
-      # @since 0.3.7
-      def find_previous
-        day = Date.today
-        note = nil
-
-        Notify.info('Searching for last PQ...')
-
-        (1..MAX_SEARCH_SIZE).each do |iter|
-          day -= 1
-          dow = @format.day_of_week(day.strftime('%a'))
-
-          # always skip weekends, even if there is a note for those days
-          next if %i[Sa Su].include?(dow)
-
-          note_title = "Queue For [#{day.strftime('%B %-d')} - #{dow}]"
-          note = @note_helper.model.find_note_contents(note_title).entity
-
-          Notify.info(" (#{iter}) #{note_title}")
-
-          break unless note.nil?
-        end
-
-        @api.convert_to_xml(note.content).prepare
-      end
-    end
-  end
-end

data/lib/evertils/types/weekly.rb

@@ -1,66 +0,0 @@
-module Evertils
-  module Type
-    class Weekly < Type::Base
-      NOTEBOOK = :Weekly
-      COLOUR = 0xffe8b7
-
-      #
-      # @since 0.3.7
-      def initialize(config, *args)
-        super(config, *args)
-
-        @title = @format.date_templates[NOTEBOOK]
-        @content = @format.template_contents(NOTEBOOK)
-      end
-
-      #
-      # @since 0.3.9
-      def tags
-        [
-          "week-#{Date.today.cweek}",
-          "month-#{Date.today.month}"
-        ]
-      end
-
-      #
-      # @since 0.3.15
-      def add_daily_note_link
-        da_entity = @note_helper.wait_for_by_notebook(:Daily).entity
-        # parse the ENML note data into something we can work with
-        xml = @api.from_str(@entity.content)
-        # include the XML element builder
-        xml_helper = Evertils::Helper.load('Xml', xml)
-        # internal URL for the linked note
-        note_url = @note_helper.internal_url_for(da_entity)
-
-        # don't add the note link if it is already there
-        unless xml.search("a[href='#{note_url}']").size.zero?
-          return Notify.warning('Daily note link already exists here, exiting to avoid duplicate content')
-        end
-
-        a = xml_helper.a(
-          note_url,
-          @format.date_templates[:Daily]
-        )
-        li = xml_helper.li(a)
-        br = xml_helper.br
-
-        xml.search('en-note>div:first-child>ul li:last-child').after(li)
-
-        # add a line break after the UL if one is not there yet
-        if xml.search('en-note>div:first-child').first.next_element.name != 'br'
-          xml.search('en-note>div:first-child').after(br)
-        end
-
-        # remove XML processing definition if it is the second element
-        if xml.children[1].is_a?(Nokogiri::XML::ProcessingInstruction)
-          xml.children[1].remove
-        end
-
-        @entity.content = xml.to_s
-
-        Notify.success("#{self.class.name} updated, added daily note link") if @note.update
-      end
-    end
-  end
-end