evertils 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40ea220d69b7b5db784276e1f73c8f4b1a20c1d8
-  data.tar.gz: a6f7643cbfa69044f127df963c824c7f6c01bdc5
+  metadata.gz: 831cd9afe4aacb4705e8671c810a86a75a457995
+  data.tar.gz: 854c215462444912c7a921e3ad96c419091455d9
 SHA512:
-  metadata.gz: f2b0e059335d2c8290c9ee63cf823758fc8b307b9b6faf4b1d7a4b66f3e3b7240af0b7bf564543ca4751c43f5450f854a17a007a34142048ceccd0ec2f1a1fc9
-  data.tar.gz: c58541d8ea0879d621556d8e84c25b2f88c7b26c7dc5fcaf45163c07c60a39286ca249159e4618ee749b69a233425e9555c84b6f9501812ad9ff803d08c88785
+  metadata.gz: 53dad8596ca329e245b131ee9d96b2eb7dd5e186b72a3a04659e1784fa713e349f8ffd2c6956d41b75ec9e352c8b16a70739480448c8cd3537d15646f04599f4
+  data.tar.gz: d6a3bed7465363d47d0b26668ddf7e52709b58feeff9d4902ec0064dc2aa4a0aaf4d76ca7fab99922b1d835f34e5dee82b03580a30001a071fcb6b4cdde1891e

data/bin/evertils

@@ -14,6 +14,7 @@ require "notifaction"
 require 'digest/md5'
 require 'mime/types'
 require 'evertils/common'
+require 'yaml'
 
 # include required files
 require_relative "../lib/kernel.rb"

data/evertils.gemspec

@@ -1,3 +1,6 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require './lib/version'
 
 Gem::Specification.new do |s|

data/lib/config.rb

@@ -11,6 +11,8 @@ module Evertils
   DEBUG = false
 
   class Cfg
+    attr_accessor :custom_sections, :custom_templates
+
     def bootstrap!
       begin
         # configure Notifaction gem
@@ -20,6 +22,8 @@ module Evertils
       rescue => e
         Notify.error("#{e.to_s}\n#{e.backtrace.join("\n")}")
       end
+
+      load_user_customizations
     end
 
     def constant?(name)
@@ -37,5 +41,32 @@ module Evertils
       end
       hash
     end
+
+    #
+    # @since 0.3.1
+    def load_user_customizations
+      conf = recursive_symbolize_keys(YAML::load_file(Dir.home + '/.evertils/config.yml'))
+
+      @custom_sections = conf[:sections] if conf[:sections]
+      @custom_templates = conf[:templates] if conf[:templates]
+    end
+
+    #
+    # @since 0.3.1
+    def recursive_symbolize_keys(hash)
+      hash.inject({}){|result, (key, value)|
+        new_key = case key
+                  when String then key.to_sym
+                  else key
+                  end
+        new_value = case value
+                    when Hash then recursive_symbolize_keys(value)
+                    else value
+                    end
+        result[new_key] = new_value
+        result
+      }
+    end
+
   end
 end

data/lib/controllers/generate.rb

@@ -24,7 +24,7 @@ module Evertils
             @start = DateTime.parse(date)
           end
 
-          opt.on("-n", "--name=NAME", "A name to pass to the script (not all command support this flag)") do |name|
+          opt.on("-n", "--name=NAME", "A name to pass to the script (not all commands support this flag)") do |name|
             @name = name
           end
         end.parse!
@@ -36,6 +36,7 @@ module Evertils
       def daily
         title = @format.date_templates[NOTEBOOK_DAILY]
         body = @format.template_contents
+        body += to_enml($config.custom_sections[NOTEBOOK_DAILY]) if $config.custom_sections[NOTEBOOK_DAILY]
         parent_notebook = NOTEBOOK_DAILY
 
         @model.create_note(title, body, parent_notebook)
@@ -45,6 +46,7 @@ module Evertils
       def weekly
         title = @format.date_templates[NOTEBOOK_WEEKLY]
         body = @format.template_contents
+        body += to_enml($config.custom_sections[NOTEBOOK_WEEKLY]) if $config.custom_sections[NOTEBOOK_WEEKLY]
         parent_notebook = NOTEBOOK_WEEKLY
 
         if !@force
@@ -64,6 +66,7 @@ module Evertils
       def monthly
         title = @format.date_templates[NOTEBOOK_MONTHLY]
         body = @format.template_contents
+        body += to_enml($config.custom_sections[NOTEBOOK_MONTHLY]) if $config.custom_sections[NOTEBOOK_MONTHLY]
         parent_notebook = NOTEBOOK_MONTHLY
 
         note = @model.create_note(title, body, parent_notebook)
@@ -79,11 +82,12 @@ module Evertils
 
         title = "#{@name} #{DateTime.now.strftime('%m-%Y')}"
         body = @format.template_contents
+        body += to_enml($config.custom_sections[NOTEBOOK_MTS]) if $config.custom_sections[NOTEBOOK_MTS]
         parent_notebook = NOTEBOOK_MTS
 
         # create the note from template
         mts_note = @model.create_note(title, body, parent_notebook)
-        
+
         # tag it
         # TODO: maybe move this out of controller?
         tag_manager = Evertils::Common::Manager::Tag.new
@@ -94,6 +98,15 @@ module Evertils
         # client_tag = tag_manager.find_or_create(@name)
         # mts_note.tag(client_tag.prop(:name))
       end
+
+      private
+
+      #
+      # @since 0.3.1
+      def to_enml(hash)
+        enml = Evertils::Helper::EvernoteENML::with_list(hash)
+      end
+
     end
   end
 end

data/lib/controllers/get.rb

@@ -38,15 +38,15 @@ module Evertils
               puts note.title
             end
           else
-            Notify.error("Could not pull data for notebook #{$request.custom[0]}")
+            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")
+          Notify.error("Notebook name is a required argument, i.e.\n#{Evertils::PACKAGE_NAME} get notebook agendas", {})
         end
       end
 
       def info
-        @model.info.each_pair do |key, value|
+        $config.options.each_pair do |key, value|
           Notify.spit("#{key}: #{value}")
         end
       end

data/lib/helpers/evernote-enml.rb

@@ -3,6 +3,7 @@ module Evertils
     class EvernoteENML
       attr_reader :element, :embeddable_element
 
+      # TODO: refactor this whole class so you can create ENML elements with it
       def initialize(file = nil)
         @file = file
         @element = enml_element
@@ -12,22 +13,44 @@ module Evertils
         end
       end
 
-      private
-        def enml_element
-          if @file
-            read_file = File.open(@file, 'rb') { |io| io.read }
-
-            el = ::Evernote::EDAM::Type::Resource.new()
-            el.mime = MIME::Types.type_for(@file)[0].content_type
-            el.data = ::Evernote::EDAM::Type::Data.new()
-            el.data.size = read_file.size
-            el.data.bodyHash = Digest::MD5.hexdigest(read_file)
-            el.data.body = read_file
-            el.attributes = ::Evernote::EDAM::Type::ResourceAttributes.new()
-            el.attributes.fileName = @file # temporary for now, the actual file name
-            el
+      def self.with_list(arr)
+        enml_bucket = []
+
+        if arr.respond_to? :each_pair
+          arr.each_pair do |title, data|
+            enml_bucket.push("<br /><div><span style=\"font-size: 18px;\">#{title}</span></div>")
+
+            enml_bucket.push('<ul>')
+
+            data.each do |item|
+              enml_bucket.push("<li>#{item}</li>")
+            end
+
+            enml_bucket.push('</ul>')
           end
+
+          enml_bucket.join
+        end
+      end
+
+      private
+
+      def enml_element
+        if @file
+          read_file = File.open(@file, 'rb') { |io| io.read }
+
+          el = ::Evernote::EDAM::Type::Resource.new()
+          el.mime = MIME::Types.type_for(@file)[0].content_type
+          el.data = ::Evernote::EDAM::Type::Data.new()
+          el.data.size = read_file.size
+          el.data.bodyHash = Digest::MD5.hexdigest(read_file)
+          el.data.body = read_file
+          el.attributes = ::Evernote::EDAM::Type::ResourceAttributes.new()
+          el.attributes.fileName = @file # temporary for now, the actual file name
+          el
         end
+      end
+
     end
   end
 end

data/lib/helpers/formatting.rb

@@ -33,8 +33,8 @@ module Evertils
           :default => "#{Evertils::TEMPLATE_DIR}#{command.downcase}.enml"
         }
 
-        template = tmpls[:default]
-        
+        template = local_template_override?(tmpls[:default])
+
         if command == :Daily
           if Date.today.friday? && File.exist?(tmpls[:friday])
             template = tmpls[:friday]
@@ -50,7 +50,7 @@ module Evertils
       def date_templates(arg_date = DateTime.now)
         dow = day_of_week(arg_date.strftime('%a'))
         end_of_week = arg_date + 4 # days
-        
+
         {
           :Daily => "Daily Log [#{arg_date.strftime('%B %-d')} - #{dow}]",
           :Weekly => "Weekly Log [#{arg_date.strftime('%B %-d')} - #{end_of_week.strftime('%B %-d')}]",
@@ -63,6 +63,21 @@ module Evertils
       def command
         $request.command.capitalize
       end
+
+      private
+
+      #
+      # @since 0.3.1
+      def local_template_override?(default)
+        tmpl = $config.custom_templates[command]
+
+        if tmpl.nil?
+          default
+        else
+          tmpl.gsub!(/~/, Dir.home) if tmpl.include?('~')
+        end
+      end
+
     end
   end
 end

data/lib/router.rb

@@ -7,7 +7,7 @@ module Evertils
       begin
         if !$request.controller.nil?
           controller = Evertils::Controller.const_get $request.controller.capitalize rescue false
-          
+
           if !controller
             raise "Controller not found: #{$request.controller.capitalize}"
           end
@@ -28,7 +28,7 @@ module Evertils
             if context.model.nil?
               context.model = Model::Base.new
             end
-            
+
             # If the method exists, set model data accordingly
             # If it doesn't exist then just fail silently, the model may not
             # be required by some controllers
@@ -44,7 +44,7 @@ module Evertils
 
             # Run the controller
             # Call a default action for controllers which do not require a third
-            # argument, i.e. evertils status 
+            # argument, i.e. evertils status
             if context.respond_to? :default
               context.default
             else
@@ -56,9 +56,9 @@ module Evertils
           end
         end
       rescue RuntimeError => e
-        Notify.error("#{e.to_s}")
+        Notify.error("#{e.to_s}", {})
       rescue NameError => e
-        Notify.error("#{e.to_s}\n#{e.backtrace.join("\n")}")
+        Notify.error("#{e.to_s}\n#{e.backtrace.join("\n")}", {})
       end
     end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ryan Priebe
@@ -14,70 +14,70 @@ dependencies:
   name: notifaction
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: evertils-common
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Evernote utilities for your CLI workflow
@@ -87,7 +87,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - README.md
 - Rakefile
@@ -135,17 +135,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: EN (heart) CLI