evertils 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dd3665b2b457314b37dab1ba7758e34ecce2785
-  data.tar.gz: 9f703b41beb6ad89d2cae27e94e1b2de91e5bf8f
+  metadata.gz: d4ffe43d82d5401de2e7e132b9ca9328c0713ed7
+  data.tar.gz: dcd8f113b8cd4443a3d08a35faaf3ed3518a9fb2
 SHA512:
-  metadata.gz: 087b3e62dcc315a87a247926ccf6f9e9de6a7d49b4a0a88e2564dbdaee64cf490288a7c53658679789b1889bf837716a75227b52d4f68348b65e57ed0d98d019
-  data.tar.gz: 4d561b8df58874305aab10a16d40a9388833da3782f753a77a67778e4081bedf11628b2646282cd790f80995d68351f87e2b57f2c0dae8ef3b49b5b96517b377
+  metadata.gz: 1f1469fbc3cf5b6a523116e3566c4a8c9f528d934c8652c4c02390750a4ce64480b8dfa88adf68dbca31e416a423a690948da116ab0b820d52087d90c8feac41
+  data.tar.gz: 660a9653dfcacca6892e3ea90a0f66a170f77513246d126094f332c2db00fadc19c7f5e73b0f0ff4ba240c2f43d71fff8674b295cb725ec388ccb743ac155b69

data/bin/evertils

@@ -1,39 +1,39 @@
 #!/usr/bin/env ruby
 
-require "date"
-require "time"
-require "json"
-require "optparse"
-require "rbconfig"
-require "evernote-thrift"
-require "net/http"
-require "uri"
-require "fileutils"
-require "cgi"
-require "notifaction"
+require 'date'
+require 'time'
+require 'json'
+require 'optparse'
+require 'rbconfig'
+require 'evernote-thrift'
+require 'net/http'
+require 'uri'
+require 'fileutils'
+require 'cgi'
+require 'notifaction'
 require 'digest/md5'
 require 'mime/types'
 require 'evertils/common'
 require 'yaml'
 
 # include required files
-require_relative "../lib/kernel.rb"
-require_relative "../lib/version.rb"
-require_relative "../lib/helpers/time.rb"
-require_relative "../lib/helpers/results.rb"
-require_relative "../lib/log.rb"
-require_relative "../lib/config.rb"
-require_relative "../lib/request.rb"
-require_relative "../lib/utils.rb"
-require_relative "../lib/logs.rb"
-require_relative "../lib/command.rb"
-require_relative "../lib/model_data.rb"
-require_relative "../lib/controller.rb"
-require_relative "../lib/router.rb"
-require_relative "../lib/model.rb"
-require_relative "../lib/helpers/formatting.rb"
-require_relative "../lib/helpers/evernote-enml.rb"
-require_relative "../lib/helper.rb"
+require_relative '../lib/kernel.rb'
+require_relative '../lib/version.rb'
+require_relative '../lib/helpers/time.rb'
+require_relative '../lib/helpers/results.rb'
+require_relative '../lib/log.rb'
+require_relative '../lib/config.rb'
+require_relative '../lib/request.rb'
+require_relative '../lib/utils.rb'
+require_relative '../lib/logs.rb'
+require_relative '../lib/command.rb'
+require_relative '../lib/model_data.rb'
+require_relative '../lib/controller.rb'
+require_relative '../lib/router.rb'
+require_relative '../lib/model.rb'
+require_relative '../lib/helpers/formatting.rb'
+require_relative '../lib/helpers/evernote-enml.rb'
+require_relative '../lib/helper.rb'
 
 # Modify configuration options here
 $config = Evertils::Cfg.new

data/evertils.gemspec

@@ -4,17 +4,18 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require './lib/version'
 
 Gem::Specification.new do |s|
-  s.name          = 'evertils'
-  s.version       = Evertils::VERSION
-  s.date          = '2015-07-03'
-  s.summary       = 'EN (heart) CLI'
-  s.description   = 'Evernote utilities for your CLI workflow'
-  s.authors       = ['Ryan Priebe']
-  s.email         = 'hello@ryanpriebe.com'
-  s.files         = `git ls-files`.split($\)
-  s.homepage      = 'http://rubygems.org/gems/evertils'
-  s.license       = 'MIT'
-  s.executables   = 'evertils'
+  s.name                  = 'evertils'
+  s.version               = Evertils::VERSION
+  s.date                  = '2017-10-10'
+  s.summary               = 'EN (heart) CLI'
+  s.description           = 'Evernote utilities for your CLI workflow'
+  s.authors               = ['Ryan Priebe']
+  s.email                 = 'hello@ryanpriebe.com'
+  s.files                 = `git ls-files`.split($\)
+  s.homepage              = 'http://rubygems.org/gems/evertils'
+  s.license               = 'MIT'
+  s.executables           = 'evertils'
+  s.required_ruby_version = '>= 2.4.0'
 
   s.add_runtime_dependency 'notifaction'
   s.add_runtime_dependency 'mime-types'

data/lib/controllers/generate.rb

@@ -17,14 +17,6 @@ module Evertils
         OptionParser.new do |opt|
           opt.banner = "#{Evertils::PACKAGE_NAME} generate timeframe [...-flags]"
 
-          opt.on("-f", "--force", "Force execution") do
-            @force = true
-          end
-
-          opt.on("-s", "--start=START", "Specify a date for the note") do |date|
-            @start = DateTime.parse(date)
-          end
-
           opt.on("-n", "--name=NAME", "A name to pass to the script (not all commands support this flag)") do |name|
             @name = name
           end
@@ -50,17 +42,14 @@ module Evertils
         body += to_enml($config.custom_sections[NOTEBOOK_WEEKLY]) unless $config.custom_sections.nil?
         parent_notebook = NOTEBOOK_WEEKLY
 
-        if !@force
-          if !Date.today.monday?
-            Notify.error("Sorry, you can only create new weekly logs on Mondays", {})
-          end
-        end
-
         note = @model.create_note(title: title, body: body, parent_notebook: parent_notebook)
 
-        tag_manager = Evertils::Common::Manager::Tag.instance
-        week_tag = tag_manager.find("week-#{DateTime.now.cweek + 1}")
-        note.tag(week_tag.prop(:name))
+        # BUG: inability to tag notes lies somewhere in evertils-common,
+        # specifically in how note.tag works
+        # As this is non-functional, lets not run it - commented out for now
+        # tag_manager = Evertils::Common::Manager::Tag.instance
+        # week_tag = tag_manager.find_or_create("week-#{Date.today.cweek}")
+        # note.tag(week_tag.prop(:name))
       end
 
       # generate monthly notes
@@ -72,9 +61,12 @@ module Evertils
 
         note = @model.create_note(title: title, body: body, parent_notebook: parent_notebook)
 
-        tag_manager = Evertils::Common::Manager::Tag.instance
-        month_tag = tag_manager.find("month-#{DateTime.now.strftime('%-m')}")
-        note.tag(month_tag.prop(:name))
+        # BUG: inability to tag notes lies somewhere in evertils-common,
+        # specifically in how note.tag works
+        # As this is non-functional, lets not run it - commented out for now
+        # tag_manager = Evertils::Common::Manager::Tag.instance
+        # month_tag = tag_manager.find_or_create("month-#{Date.today.month}")
+        # note.tag(month_tag.prop(:name))
       end
 
       # generate monthly task summary templates
@@ -89,11 +81,12 @@ module Evertils
         # create the note from template
         mts_note = @model.create_note(title: title, body: body, parent_notebook: parent_notebook)
 
-        # tag it
-        # TODO: maybe move this out of controller?
-        tag_manager = Evertils::Common::Manager::Tag.instance
-        month_tag = tag_manager.find("month-#{DateTime.now.strftime('%-m')}")
-        mts_note.tag(month_tag.prop(:name))
+        # BUG: inability to tag notes lies somewhere in evertils-common,
+        # specifically in how note.tag works
+        # As this is non-functional, lets not run it - commented out for now
+        # tag_manager = Evertils::Common::Manager::Tag.instance
+        # month_tag = tag_manager.find_or_create("month-#{Date.today.month}")
+        # mts_note.tag(month_tag.prop(:name))
 
         # TODO: commented out until support for multiple tags is added
         # client_tag = tag_manager.find_or_create(@name)
@@ -113,9 +106,11 @@ module Evertils
       # creates the notes required to start the day
       #  - priority queue
       #  - daily
+      #  - weekly (if today is Monday)
       def morning
         pq
         daily
+        weekly if Date.today.monday?
       end
 
       private

data/lib/helpers/formatting.rb

@@ -36,16 +36,18 @@ module Evertils
       end
 
       # Template string for note title
-      def date_templates(arg_date = DateTime.now)
-        dow = day_of_week(arg_date.strftime('%a'))
-        end_of_week = arg_date + 4 # days
+      def date_templates
+        current_date = Date.today
+        week_stub = day_of_week(current_date.strftime('%a'))
+        start_of_week = Date.commercial(current_date.year, current_date.cweek, 1)
+        end_of_week = Date.commercial(current_date.year, current_date.cweek, 5)
 
         {
-          :Daily => "Daily Log [#{arg_date.strftime('%B %-d')} - #{dow}]",
-          :Weekly => "Weekly Log [#{arg_date.strftime('%B %-d')} - #{end_of_week.strftime('%B %-d')}]",
-          :Monthly => "Monthly Log [#{arg_date.strftime('%B %Y')}]",
-          :Deployments => "#{arg_date.strftime('%B %-d')} - #{dow}",
-          :'Priority Queue' => "Queue For [#{arg_date.strftime('%B %-d')} - #{dow}]"
+          :Daily => "Daily Log [#{current_date.strftime('%B %-d')} - #{week_stub}]",
+          :Weekly => "Weekly Log [#{start_of_week.strftime('%B %-d')} - #{end_of_week.strftime('%B %-d')}]",
+          :Monthly => "Monthly Log [#{current_date.strftime('%B %Y')}]",
+          :Deployments => "#{current_date.strftime('%B %-d')} - #{week_stub}",
+          :'Priority Queue' => "Queue For [#{current_date.strftime('%B %-d')} - #{week_stub}]"
         }
       end
 

data/lib/kernel.rb

@@ -6,14 +6,6 @@ class String
   end
 end
 
-class Fixnum
-  def to_bool
-    return true if self == 1
-    return false if self == 0
-    raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
-  end
-end
-
 class TrueClass
   def to_i; 1; end
   def to_bool; self; end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = "0.3.4".freeze
+  VERSION = '0.3.5'.freeze
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Ryan Priebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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
@@ -134,17 +134,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: EN (heart) CLI