evertils 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b85d5ef121dddd8068453eb0465746f307dda09d90a31adf7f1b4752f7c4186
-  data.tar.gz: 658320f1ddd796f117c041d2aebbcfce76ba92fd8a7a2e1218e746c5ee666577
+  metadata.gz: 206974c6d6d876faed379c1f8d174c8e02f1af89410960b5a0759a2ba988c0ee
+  data.tar.gz: 2a56984a7e1757992e811652c9ba989060943a2d99bf943dd318dfdfcf58a628
 SHA512:
-  metadata.gz: 62e03f276e1971f70b64efc234a6f0af28f9d5fc4daabd563809cabac19c0ae3bd49137ac4276b8da5ee8a18fcd41e2610683272c78be98a1f630d3997bbf528
-  data.tar.gz: 2461a7d80f901d925a2292c666fd71c41f16c2dd77917215bfc4211dc191f77249207956d1607ebf8e343f545d4d790fd8f1d6febdda89d0aae352e2a72c3564
+  metadata.gz: 1cb7bf54cf9a60deb6959c37a053a031f4d406950a619fd784d987d5866a2208827ffdc451f1191d2c043734ce9847255786940754a1abfbcfc6d2df33647982
+  data.tar.gz: c85ea5dab302bbdd7c0f6abd3d6c7eccbaccb9360cea96e517b7190a9fe052ace959a0ebbd2ceb9714668110221ca5009dd3b098ddd0b652d0c29f9728c2a12e

data/bin/evertils

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # fix load path
-lib = File.expand_path('../../lib', __FILE__)
+lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'evertils'

data/lib/evertils/controllers/log.rb

@@ -5,14 +5,24 @@ module Evertils
         super
 
         @note_helper = Evertils::Helper.load('Note')
+        @search_grammar = Evertils::Helper.load('SearchGrammar')
         @api_helper = Evertils::Helper.load('ApiEnmlHandler', @config)
       end
 
       # Send arbitrary text to the daily log
       def message(text = nil)
-        return Notify.error('A message is required', {}) if text.nil?
-
-        note = @note_helper.wait_for_by_notebook(:Daily)
+        return Notify.error('A message is required') if text.nil?
+
+        # TODO: should be an object instead of arbitrary hash
+        criteria = {
+          notebook: :Daily,
+          tags: {
+            day: Date.today.yday
+          },
+          created: Date.new(Date.today.year, 1, 1).strftime('%Y%m%d')
+        }
+
+        note = @note_helper.wait_for_with_grammar(criteria)
 
         return Notify.error('Note not found') if note.entity.nil?
 

data/lib/evertils/helpers/note.rb

@@ -7,10 +7,34 @@ module Evertils
       def initialize
         @model = Evertils::Common::Query::Simple.new
         @format = Evertils::Helper.load('Formatting')
+        @search_grammar = Evertils::Helper.load('SearchGrammar')
         @user = @model.user_info[:user]
         @shard = @model.user_info[:shard]
       end
 
+      def wait_for_with_grammar(conf, iterations = Evertils::Type::Base::MAX_SEARCH_SIZE)
+        grammar = @search_grammar.from(conf)
+        Notify.info("Searching with grammar #{grammar}")
+        note = find_note_by_grammar(grammar)
+
+        begin
+          if note.entity.nil?
+            (1..iterations).each do |iter|
+              conf[:tags][:day] -= 1
+              grammar = @search_grammar.from(conf)
+              Notify.info(" (#{iter}) Looking for #{grammar}")
+              note = find_note_by_grammar(grammar, true)
+
+              break unless note.entity.nil? || iter == Evertils::Type::Base::MAX_SEARCH_SIZE
+            end
+          end
+        rescue Interrupt
+          Notify.error('Cancelled wait')
+        end
+
+        note
+      end
+
       # Wait for a note to exist
       def wait_for_by_notebook(notebook, iterations = Evertils::Type::Base::MAX_SEARCH_SIZE)
         Notify.info("Waiting for #{notebook}...")
@@ -68,6 +92,11 @@ module Evertils
       end
       # alias find_by_notebook
 
+      def find_note_by_grammar(grammar, sleep = false)
+        sleep(5) if sleep
+        @model.find_note_contents_using_grammar(grammar)
+      end
+
       #
       # @since 0.3.15
       def internal_url_for(note)

data/lib/evertils/helpers/search-grammar.rb

@@ -0,0 +1,29 @@
+module Evertils
+  module Helper
+    class SearchGrammar
+      def from(conf)
+        @configuration = conf
+        @grammar = []
+
+        fix_standard_grammar
+        fix_tags if @configuration.include?(:tags)
+
+        @grammar.join(' ')
+      end
+
+      private
+
+      def fix_tags
+        @configuration[:tags].each_pair do |k, v|
+          @grammar.push("tag:#{k}-#{v}")
+        end
+      end
+
+      def fix_standard_grammar
+        @configuration.each_pair do |k, v|
+          @grammar.push("#{k}:#{v}") unless k == :tags
+        end
+      end
+    end
+  end
+end

data/lib/evertils/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '1.0.10'.freeze
+  VERSION = '1.0.11'.freeze
 end

data/lib/evertils.rb

@@ -28,6 +28,7 @@ require 'evertils/actions/duplicate_previous'
 require 'evertils/helpers/time'
 require 'evertils/helpers/results'
 require 'evertils/helpers/api-enml-handler'
+require 'evertils/helpers/search-grammar'
 require 'evertils/gpg_exception'
 require 'evertils/yubikey_exception'
 require 'evertils/required_check_exception'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Ryan Priebe
@@ -138,6 +138,7 @@ files:
 - lib/evertils/helpers/formatting.rb
 - lib/evertils/helpers/note.rb
 - lib/evertils/helpers/results.rb
+- lib/evertils/helpers/search-grammar.rb
 - lib/evertils/helpers/time.rb
 - lib/evertils/helpers/xml.rb
 - lib/evertils/kernel.rb
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: EN (heart) CLI