evertils 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 63960e7260e09b841d48009ae22eb7a5fd61171e
-  data.tar.gz: 596c479a8841329ab8ddb7186f7c8a2a6f2f7d96
+SHA256:
+  metadata.gz: '090e7c596124e90b0ef20118f78f1609906eac814fc70f5c68b8c10f8509d867'
+  data.tar.gz: fdeda657569494c3fba6a650820f15dae663be3624d7f6650549bc3e240f4847
 SHA512:
-  metadata.gz: 0bd824fcdadc08541ecaf17fad468b6c9bff456564da6464f6a2c695149c74835f2be78ea8ee454623248d0368b957a345742a82a3df90d4bcbb7fb4d296154b
-  data.tar.gz: 83d02e678a531b7cac51102f9330283632830fc7e0a3b4d1b5b5e29f078ee0e5b0ce304d32037ad255c1df686362f461dd57004d8d62c20dcc9996a5f237dcd4
+  metadata.gz: 0c98eedc392dfac24e4e23f28a59cbac12667df4aeb250c4db768bc0ad19890446788329021a19fdb2578ed26338076b0c7f1a3d8caff0aeebde3189dbf7baa5
+  data.tar.gz: 12dea2af67a4415d7deaa52d7ccb23e6b96ea0cb047100a4fec638cdf76c11c0a57e9278fa3c47ca0e91e83e99c5cc2275531d393c56bbd3443cb5b8925271d9

data/lib/evertils/config.rb

@@ -44,6 +44,7 @@ module Evertils
     # +name+:: String/symbol key value
     def get(name, child = nil)
       return @yml[name.to_sym][child.to_sym] unless child.nil?
+
       @yml[name.to_sym]
     end
 
@@ -52,9 +53,26 @@ module Evertils
     # +name+:: String/symbol key value
     def exist?(name, child = nil)
       return @yml[name].key?(child.to_sym) unless child.nil?
+
       @yml.key?(name.to_sym)
     end
 
+    # Merge a hash into config data
+    # Params:
+    # +hash+:: Any arbitrary hash
+    def merge(hash)
+      @yml.merge!(hash)
+      self
+    end
+
+    def symbolize!
+      @yml = @yml.inject({}) { |h, (k, v)| h[k.to_sym] = v; h}
+    end
+
+    def pluck(*args)
+      @yml.slice(*args)
+    end
+
     private
 
     # Check if configuration data exists

data/lib/evertils/controller.rb

@@ -48,13 +48,17 @@ module Evertils
       # Determines if the command can execute
       # Params:
       # +command+:: Symbol containing the command we want to execute
-      def can_exec?(command)
+      # +config+:: Configuration data
+      def can_exec?(command, config)
         # no command was passed, check if controller has a default method
         if command.nil? && respond_to?(:default)
           @method = :default
         elsif respond_to? command
           # check the controller for the requested method
           @method = command
+        elsif is_a? Evertils::Controller::Render
+          @method = :from_file
+          @request.param = config.pluck(:path, :notebook)
         else
           raise NoMethodError, "Invalid method: #{command}"
         end

data/lib/evertils/controllers/log.rb

@@ -18,7 +18,7 @@ module Evertils
           append: text
         }
 
-        return Notify.error("Note not found") if note.entity.nil?
+        return Notify.error('Note not found') if note.entity.nil?
 
         modify(note, edit_conf)
       end
@@ -31,9 +31,9 @@ module Evertils
         xml_helper = Evertils::Helper.load('Xml', xml)
 
         time = Time.now.strftime('%I:%M')
-        target = xml.search("div:contains('#{conf[:search]}')").first.next_element
+        target = xml.search("h2:contains('#{conf[:search]}')").first
 
-        return Notify.error('Unable to log message') if target.nil?
+        return Notify.error('Unable to log message, triage section not found') if target.nil?
 
         log_message_txt = xml_helper.span("#{time} - #{conf[:append]}")
         log_message_el = xml_helper.li(log_message_txt)

data/lib/evertils/controllers/render.rb

@@ -0,0 +1,25 @@
+require 'evertils/common/query/simple'
+
+module Evertils
+  module Controller
+    class Render < Controller::Base
+      def from_file(config)
+        @config = config
+        return Notify.warning("Note already exists\n- #{@link}") if note_exists?
+
+        Notify.info 'Note not found, creating a new one'
+
+        query = Evertils::Common::Query::Simple.new
+        query.create_note_from_yml(@config[:path])
+      end
+
+      def note_exists?
+        helper = Evertils::Helper.load('Note')
+        note = helper.wait_for(@config[:notebook].to_sym, 3)
+        @link = helper.external_url_for(note.entity) unless note.entity.nil?
+
+        note.exists?
+      end
+    end
+  end
+end

data/lib/evertils/helpers/formatting.rb

@@ -38,7 +38,7 @@ module Evertils
       # Template string for note title
       def date_templates
         current_date = Date.today
-        week_stub = day_of_week(current_date.strftime('%a'))
+        week_stub = current_date.strftime('%a')
         start_of_week = Date.commercial(current_date.year, current_date.cweek, 1)
         end_of_week = Date.commercial(current_date.year, current_date.cweek, 5)
 

data/lib/evertils/helpers/note.rb

@@ -12,15 +12,15 @@ module Evertils
       end
 
       # Wait for a note to exist
-      def wait_for(notebook)
+      def wait_for(notebook, iterations = Evertils::Type::Base::MAX_SEARCH_SIZE)
         Notify.info("Waiting for #{notebook}...")
         note = find_note(notebook)
 
         begin
           # didn't find it the first time?  wait and try again
           if note.entity.nil?
-            (1..Evertils::Type::Base::MAX_SEARCH_SIZE).each do |iter|
-              Notify.info(" (#{iter}) #{notebook}")
+            (1..iterations).each do |iter|
+              Notify.info(" (#{iter}) Looking for #{notebook.downcase}")
               note = find_note(notebook, true)
               break unless note.entity.nil? || iter == Evertils::Type::Base::MAX_SEARCH_SIZE
             end
@@ -46,6 +46,12 @@ module Evertils
         "evernote:///view/#{@user[:id]}/#{@shard}/#{note.guid}/#{note.guid}/"
       end
 
+      #
+      # @since 1.0.0
+      def external_url_for(note)
+        "https://www.evernote.com/Home.action#n=#{note.guid}&s=#{@shard}&ses=4&sh=2&sds=5"
+      end
+
       # Create a note
       def create(data)
         @model.create_note(data)

data/lib/evertils/request.rb

@@ -1,7 +1,7 @@
 module Evertils
   class Request
     # Access controller variable property externally
-    attr_reader :controller
+    attr_accessor :controller
     # Access command variable property externally
     attr_reader :command
     # Access custom variable property externally
@@ -11,7 +11,7 @@ module Evertils
     # Access raw_flags variable property externally
     attr_reader :raw_flags
     # Access param variable property externally
-    attr_reader :param
+    attr_accessor :param
 
     # Create the request object, parse ARGV for values
     def initialize

data/lib/evertils/router.rb

@@ -17,9 +17,11 @@ module Evertils
         # include helpers
         require "evertils/helpers/#{@request.controller}" if File.exist? "evertils/helpers/#{@request.controller}"
 
+        update_config if uses_config_file?
+
         # perform all required checks
         must_pass = Helper::Results.new
-        @config.get(:required).each do |key, value|
+        @config.get(:required).each do |key, _|
           must_pass.add(send("verify_#{key}"))
         end
 
@@ -30,8 +32,8 @@ module Evertils
         Notify.error('Check failed: GPG key not found or not imported into your keychain')
       rescue RequiredCheckException
         Notify.error('One or more required checks failed')
-      rescue LoadError
-        Notify.error("Controller not found: #{@request.controller}")
+      rescue LoadError => e
+        Notify.error(e || "Controller not found: #{@request.controller}")
       end
     end
 
@@ -43,11 +45,12 @@ 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)
 
-          if context.can_exec? @request.command
+          if context.can_exec? @request.command, @config
             # Set things up
             context.pre_exec
 
@@ -67,6 +70,21 @@ module Evertils
       end
     end
 
+    def uses_config_file?
+      @config_file_path = File.expand_path("~/.evertils/templates/type/#{@request.command}.yml")
+      File.exist? @config_file_path
+    end
+
+    def update_config
+      additional_config = { path: @config_file_path }.merge(YAML.safe_load(File.read(@config_file_path)))
+      @config.merge(additional_config).symbolize!
+      overwrite_controller_with :render
+    end
+
+    def overwrite_controller_with(new_controller)
+      @request.controller = new_controller
+    end
+
     # checks output of gpg --list-keys for the presence of a specific GPG key
     def verify_gpgKey
       # TODO: replace with Open3

data/lib/evertils/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '0.4.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/evertils.rb

@@ -30,6 +30,7 @@ require 'evertils/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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ryan Priebe
@@ -124,6 +124,7 @@ files:
 - 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/helper.rb
 - lib/evertils/helpers/api-enml-handler.rb
@@ -166,8 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: EN (heart) CLI