evertils 0.3.1.1 → 0.3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05122815f6b5d6da37cead7cb46c3a5e1fbd9cf6
-  data.tar.gz: 42fcdf313a91bae68c3798e64c685e60b53560a3
+  metadata.gz: 9bfbec7f3599e451794675eba97e020e1a2c478a
+  data.tar.gz: 79c2d40edeeb68ff45eb1053aed8a518f39be78b
 SHA512:
-  metadata.gz: fc7fb2cea73e2f8d5796ac73d920f49637a347ba616f4693b2cd65a456ab2715e21ef87881fb0904dd3dafe95ae846d6ec3ce14cc64492dfe6e4aedb058a2886
-  data.tar.gz: 98e07f683a6400fe0179a7a38c06613f1e361103248fa3a2c36b185dc6b80641afba379ba08f7ae6f91c758c19fbe979fe27e96c636503ac4e8791aca65fa198
+  metadata.gz: 62553e2671eb2a96110ee10e706392a7a48ea825853e07daa33a93d926025b898bbb87948a137e73d86bf802e4b727e55fcf2bcbf67414cdf557447776039485
+  data.tar.gz: 46d7dcc874f6ad43aa4141f7ea34116aa313638774a11e0da2743351b6b156435304bebc643a467ffc6d3124e09f7c15553e2e470b4294651b3e02afece7caa8

data/lib/config.rb

@@ -11,7 +11,7 @@ module Evertils
   DEBUG = false
 
   class Cfg
-    attr_accessor :custom_sections, :custom_templates
+    attr_accessor :custom_sections, :custom_templates, :custom_path
 
     def bootstrap!
       begin
@@ -45,8 +45,10 @@ module Evertils
     #
     # @since 0.3.1
     def load_user_customizations
-      conf = recursive_symbolize_keys(YAML::load_file(Dir.home + '/.evertils/config.yml'))
+      conf_path = Dir.home + '/.evertils/'
+      conf = recursive_symbolize_keys(YAML::load_file(conf_path + 'config.yml'))
 
+      @custom_path = conf_path
       @custom_sections = conf[:sections] if conf[:sections]
       @custom_templates = conf[:templates] if conf[:templates]
     end

data/lib/controllers/generate.rb

@@ -51,7 +51,7 @@ module Evertils
 
         if !@force
           if !Date.today.monday?
-            Notify.error("Sorry, you can only create new weekly logs on Mondays")
+            Notify.error("Sorry, you can only create new weekly logs on Mondays", {})
           end
         end
 
@@ -78,7 +78,7 @@ module Evertils
 
       # generate monthly task summary templates
       def mts
-        Notify.error("Name argument is required") if @name.nil?
+        Notify.error("Name argument is required", {}) if @name.nil?
 
         title = "#{@name} #{DateTime.now.strftime('%m-%Y')}"
         body = @format.template_contents

data/lib/helpers/formatting.rb

@@ -71,13 +71,20 @@ module Evertils
       def local_template_override?(default)
         return default if $config.custom_templates.nil?
 
+        rval = default
         tmpl = $config.custom_templates[command]
 
-        if tmpl.nil?
-          default
-        else
-          tmpl.gsub!(/~/, Dir.home) if tmpl.include?('~')
+        if !tmpl.nil?
+          rval = $config.custom_path
+
+          if tmpl.include?('~')
+            rval += tmpl.gsub!(/~/, Dir.home)
+          else
+            rval += tmpl
+          end
         end
+
+        rval
       end
 
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '0.3.1.1'
+  VERSION = '0.3.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.3.1.1
+  version: 0.3.1.2
 platform: ruby
 authors:
 - Ryan Priebe