evertils 0.3.27 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 720ca09dc9d7d89afa4d74339198a311f227d76b
-  data.tar.gz: 9cd601199146d6c4eca7e5ae88f55824d2dfb468
+  metadata.gz: 63960e7260e09b841d48009ae22eb7a5fd61171e
+  data.tar.gz: 596c479a8841329ab8ddb7186f7c8a2a6f2f7d96
 SHA512:
-  metadata.gz: 9159ebab49b3e62737224e13c9bf16a43271551f7242f9b38b643d5698b8b858becf2ca3db4a15c34e01c6c4f6ec1b77b26f7f5fa741307dd104cae76cf02247
-  data.tar.gz: 3ef0e54ced274549b7d29a5ec03e3c9acbaf55f04fa3caedcbfbfc1f3996e3043450ee9247642a8bd2756e2c946445927b00d1d5fadda028a4cc9ffee7bea508
+  metadata.gz: 0bd824fcdadc08541ecaf17fad468b6c9bff456564da6464f6a2c695149c74835f2be78ea8ee454623248d0368b957a345742a82a3df90d4bcbb7fb4d296154b
+  data.tar.gz: 83d02e678a531b7cac51102f9330283632830fc7e0a3b4d1b5b5e29f078ee0e5b0ce304d32037ad255c1df686362f461dd57004d8d62c20dcc9996a5f237dcd4

data/README.md

@@ -20,7 +20,6 @@ See [this document](https://github.com/aapis/evertils/wiki/Logging-Specification
 |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)|
-|status|View script information and other data|`evertils status`|
 
 ## Automation
 

data/lib/evertils/config.rb

@@ -42,10 +42,19 @@ module Evertils
     # Get a specific value from the config file data
     # Params:
     # +name+:: String/symbol key value
-    def get(name)
+    def get(name, child = nil)
+      return @yml[name.to_sym][child.to_sym] unless child.nil?
       @yml[name.to_sym]
     end
 
+    # Checks if a key exists
+    # Params:
+    # +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
+
     private
 
     # Check if configuration data exists

data/lib/evertils/gpg_exception.rb

@@ -0,0 +1,2 @@
+class GpgException < StandardError
+end

data/lib/evertils/required_check_exception.rb

@@ -0,0 +1,2 @@
+class RequiredCheckException < StandardError
+end

data/lib/evertils/router.rb

@@ -16,6 +16,20 @@ module Evertils
         require "evertils/controllers/#{@request.controller}"
         # include helpers
         require "evertils/helpers/#{@request.controller}" if File.exist? "evertils/helpers/#{@request.controller}"
+
+        # perform all required checks
+        must_pass = Helper::Results.new
+        @config.get(:required).each do |key, value|
+          must_pass.add(send("verify_#{key}"))
+        end
+
+        raise RequiredCheckException unless must_pass.should_eval_to(true)
+      rescue YubikeyException
+        Notify.error('Check failed: Yubikey is not inserted')
+      rescue GpgException
+        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}")
       end
@@ -52,5 +66,23 @@ module Evertils
         Notify.error("#{e}\n#{e.backtrace.join("\n")}", show_time: false)
       end
     end
+
+    # checks output of gpg --list-keys for the presence of a specific GPG key
+    def verify_gpgKey
+      # TODO: replace with Open3
+      res = system("gpg --list-keys  #{@config.get(:required, :gpgKey)} 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
+      # TODO: replace with Open3
+      res = system("ykman list | grep #{@config.get(:required, :yubikeySerial)} 2>/dev/null >/dev/null")
+
+      raise YubikeyException unless res
+      res
+    end
   end
 end

data/lib/evertils/version.rb

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

data/lib/evertils/yubikey_exception.rb

@@ -0,0 +1,2 @@
+class YubikeyException < StandardError
+end

data/lib/evertils.rb

@@ -14,6 +14,7 @@ require 'mime/types'
 require 'evertils/common'
 require 'yaml'
 require 'nokogiri'
+# require 'open3'
 
 # include required files
 require 'evertils/kernel'
@@ -23,6 +24,9 @@ require 'evertils/type'
 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/config'
 require 'evertils/request'
 require 'evertils/controller'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.3.27
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryan Priebe
@@ -124,7 +124,7 @@ files:
 - lib/evertils/controllers/get.rb
 - lib/evertils/controllers/log.rb
 - lib/evertils/controllers/new.rb
-- lib/evertils/controllers/status.rb
+- lib/evertils/gpg_exception.rb
 - lib/evertils/helper.rb
 - lib/evertils/helpers/api-enml-handler.rb
 - lib/evertils/helpers/evernote-enml.rb
@@ -136,6 +136,7 @@ files:
 - 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
@@ -145,6 +146,7 @@ files:
 - 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/controllers/status.rb

@@ -1,13 +0,0 @@
-module Evertils
-  module Controller
-    class Status < Controller::Base
-
-      def default
-        @config.options.each_pair do |key, value|
-          Notify.spit "#{key}: #{value}"
-        end
-      end
-
-    end
-  end
-end