evertils 2.2.4 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4287407ac08195fc3753b86840165a6a17e5fd76e52e8a93a72d3e46dd091ba7
-  data.tar.gz: 4c3d9d3d8047f2b584d90bffbb370f25c391253095e88df6eeba703c579c30fe
+  metadata.gz: 0524e47cfd8ebc7a6a23a96aedc8a51db105d5c8069861e5d0b93210d422436b
+  data.tar.gz: b7e5b4f6ae11ffc9927a6aa8400296bcd7526e33050cb6f15b01ca28d4e681e3
 SHA512:
-  metadata.gz: da81538d25a7b6818d834085d4f104e0f31ba10f77a5eb5eb378794cc625dfbd352a3e83f9b2de67809e15b6dc90364d1da99be35da3dbb689734e859ba22c5d
-  data.tar.gz: a27b4b9fd3acef87ac8e5a976c03ee476115e46e439669e66a0e093b2b3f3bf0cda44d5a1f9c69cb22853292130f307715e5be5a20ecd677182f13d7c0b1c486
+  metadata.gz: 55b1e6260cae3ac702a597ffd3525baef12025ad4a9ae9eaef1931480aa93124cf85f684fd25cf491a400d07674d42d84cdd95bbce9402f9d0aee20fabcf4a8d
+  data.tar.gz: f456baacfcf127453673234a562adc42f413502100723c5d2697a27cedd9ebca46dddb862e9e3af1c0d068087f51bed30b7a48d52a1f18265b1db2ed26ba1664

data/README.md

@@ -20,6 +20,7 @@ See [this document](https://github.com/aapis/evertils/wiki/Logging-Specification
 |generate|Create notes from templates|`evertils generate daily`, `evertils generate morning`, `evertils generate monthly`|
 |log|Interact with a note's content|`evertils log message "I am a message"`, `evertils log grep 2223`, `evertils log group`|
 |change|Change the configured Evernote API token `evertils` is using|`evertils change token`|
+|config|Send your configuration to a secret gist, great for portability|`evertils config push`, `evertils config pull`|
 
 ## Automation
 

data/evertils.gemspec

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

data/lib/evertils.rb

@@ -14,6 +14,7 @@ require 'mime/types'
 require 'evertils/common'
 require 'yaml'
 require 'nokogiri'
+require 'egist'
 # require 'open3'
 
 # include required files

data/lib/evertils/actions/duplicate_previous.rb

@@ -26,11 +26,19 @@ module Evertils
         terms.notebook = @args[:notebook]
         terms.tags = {
           day: (Date.today.yday - 1),
-          week: Date.today.cweek
+          week: week
         }
         terms.created = Date.new(Date.today.year, 1, 1).strftime('%Y%m%d')
         terms
       end
+
+      def week
+        this_week = Date.today.cweek
+
+        return this_week - 1 if Date.today.monday?
+
+        this_week
+      end
     end
   end
 end

data/lib/evertils/controller.rb

@@ -25,8 +25,6 @@ module Evertils
       def initialize(config, request)
         @config = config
         @request = request
-
-        pre_exec
       end
 
       # Perform pre-run tasks

data/lib/evertils/controllers/change.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Evertils
   module Controller
     class Change < Controller::Base

data/lib/evertils/controllers/config.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require 'yaml/store'
+require 'fileutils'
+
+module Evertils
+  module Controller
+    class Config < Controller::Base
+      def pre_exec
+        conf = contents_of('~/.evertils/config.yml')
+        @token = conf['gist_token'] unless conf['gist_token'].nil?
+        @updating = Gist.gist_exists?(@token)
+        # if the requested gist doesn't exist, ignore it and generate a new one
+        @token = nil unless @updating
+
+        Gist.login! unless has_auth_already?
+      end
+
+      def push
+        options = {
+          public: false
+        }
+
+        options.merge!(update: @token) unless @token.nil?
+
+        resp = Gist.multi_gist(payload, options)
+        @token = resp['id'] if resp.key?('id')
+
+        Notify.success(message(resp['html_url'])) if store_token?
+      end
+
+      def pull
+        # TODO: refactor this crap
+        files = Gist.download(@token)
+
+        FileUtils.mv(File.expand_path('~/.evertils'), File.expand_path('~/.evertils.old'))
+        FileUtils.mkdir_p(File.expand_path('~/.evertils/templates/type'))
+
+        dir = {}
+        t_pfx = '~/.evertils/templates/type'
+        c_pfx = '~/.evertils'
+        root_files = ['config.yml']
+
+        files.each_pair do |_, file|
+          dir["#{t_pfx}/#{file['filename']}"] = file['content'] unless file['filename'] == 'config.yml'
+          dir["#{c_pfx}/#{file['filename']}"] = file['content'] if root_files.include?(file['filename'])
+        end
+
+        dir.each_pair do |path, contents|
+          File.open(File.expand_path(path), 'w') { |f| f.write(contents) }
+        end
+      end
+
+      private
+
+      def message(url)
+        return "Gist updated - #{url}" if @updating
+
+        "Gist created - #{url}"
+      end
+
+      def payload
+        {
+          'config.yml' => contents_of('~/.evertils/config.yml').to_yaml,
+        }.merge(types)
+      end
+
+      def contents_of(file)
+        YAML.load_file(File.expand_path(file))
+      end
+
+      def types
+        types = {}
+
+        Dir[File.expand_path('~/.evertils/templates/type/*.yml')].each do |dir|
+          types["templates/type/#{dir.split('/').last}"] = contents_of(dir).to_yaml
+        end
+
+        types
+      end
+
+      def gist_authenticate
+        Gist.login!
+      end
+
+      def has_auth_already?
+        File.exist?(File.expand_path('~/.gist'))
+      end
+
+      def store_token?
+        store = YAML::Store.new(File.expand_path('~/.evertils/config.yml'))
+        yaml = contents_of('~/.evertils/config.yml')
+
+        store.transaction do
+          yaml.each_pair { |key, value| store[key] = value }
+          store['gist_token'] = @token
+        end
+
+        true
+      end
+    end
+  end
+end

data/lib/evertils/controllers/log.rb

@@ -1,6 +1,13 @@
+# frozen_string_literal: true
+
 module Evertils
   module Controller
+    # Used to format output
     Formatting = Evertils::Helper::Formatting
+    # Data structure for grep action options
+    GrepParams = Struct.new(:term, :action, :notebook)
+    # Data structure for group action options
+    GroupParams = Struct.new(:action, :notebook)
 
     class Log < Controller::Base
       WORDS_PER_LINE = 20
@@ -22,7 +29,7 @@ module Evertils
           w.join(' ')
         end
 
-        return Notify.error('Note not found') if @note.entity.nil?
+        return Notify.error("Note not found for grammar '#{grammar}'") if @note.entity.nil?
 
         modify_with(text_groups)
       end
@@ -30,20 +37,16 @@ module Evertils
       #
       # @since 2.2.0
       def grep(text = nil)
-        params = OpenStruct.new(term: text, action: 'search', notebook: 'Daily')
-
         runner = ActionRunner.new
-        runner.params = params
+        runner.params = GrepParams.new(text, 'search', 'Daily')
         runner.execute
       end
 
       #
       # @since 2.2.0
       def group
-        params = OpenStruct.new(action: 'group', notebook: 'Daily')
-
         runner = ActionRunner.new
-        runner.params = params
+        runner.params = GroupParams.new('group', 'Daily')
         runner.execute
       end
 
@@ -79,9 +82,16 @@ module Evertils
       def update_note_content_with(text)
         xml = @api_helper.from_str(@note.entity.content)
         target = xml.search('en-note').first
+        job_id = 0
+        job_id = text.first.split(' -').first.to_i unless text.first.scan('-').empty?
+
+        text.map! { |l| l.gsub("#{job_id} - ", '')}
 
         text.each do |line|
-          target.add_child("<div>* #{Formatting.current_time} - #{Formatting.clean(line)}</div>")
+          child = "<div>* #{Formatting.current_time} -".dup
+          child.concat " #{job_id} -" unless job_id.zero?
+          child.concat " #{Formatting.clean(line)}</div>"
+          target.add_child(child)
         end
 
         xml

data/lib/evertils/router.rb

@@ -82,18 +82,18 @@ module Evertils
     end
 
     # checks output of gpg --list-keys for the presence of a specific GPG key
-    def verify_gpgKey
+    def verify_gpg_key
       # TODO: replace with Open3
-      res = system("gpg --list-keys  #{@config.get(:required, :gpgKey)} 2>/dev/null >/dev/null")
+      res = system("gpg --list-keys  #{@config.get(:required, :gpg_key)} 2>/dev/null >/dev/null")
 
       raise GpgException unless res
       res
     end
 
     # checks output of ykman list to determine if the correct key is inserted
-    def verify_yubikeySerial
+    def verify_yubikey_serial
       # TODO: replace with Open3
-      res = system("ykman list | grep #{@config.get(:required, :yubikeySerial)} 2>/dev/null >/dev/null")
+      res = system("ykman list | grep #{@config.get(:required, :yubikey_serial)} 2>/dev/null >/dev/null")
 
       raise YubikeyException unless res
       res

data/lib/evertils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Evertils
-  VERSION = '2.2.4'
+  VERSION = '2.3.4'
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.4
 platform: ruby
 authors:
 - Ryan Priebe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: notifaction
+  name: evertils-gist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 5.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: evertils-common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
-  name: evertils-common
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.10.9
+- !ruby/object:Gem::Dependency
+  name: notifaction
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,7 @@ files:
 - lib/evertils/config.rb
 - lib/evertils/controller.rb
 - lib/evertils/controllers/change.rb
+- lib/evertils/controllers/config.rb
 - lib/evertils/controllers/log.rb
 - lib/evertils/controllers/render.rb
 - lib/evertils/exceptions/gpg_exception.rb
@@ -145,7 +160,7 @@ homepage: http://rubygems.org/gems/evertils
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -161,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: EN (heart) CLI
 test_files: []