evertils 0.3.7 → 0.3.8

data/lib/{type.rb → evertils/type.rb}

@@ -1,11 +1,14 @@
 module Evertils
   module Type
     class Base
+      attr_reader :title, :content, :notebook
+
       #
       # @since 0.3.7
-      def initialize(*args)
+      def initialize(config, *args)
         @model = Evertils::Common::Query::Simple.new
         @format = Evertils::Helper.load('Formatting')
+        @config = config if config
         @args = args unless args.size.zero?
       end
 
@@ -28,7 +31,10 @@ module Evertils
       #
       # @since 0.3.7
       def should_create?
-        raise 'Should be overwritten in sub classes'
+        note_title = @format.date_templates[NOTEBOOK]
+        found = @model.find_note_contents(note_title)
+
+        found.entity.nil?
       end
     end
   end

data/lib/{types → evertils/types}/daily.rb

@@ -1,18 +1,15 @@
 module Evertils
   module Type
     class Daily < Type::Base
-      attr_reader :title, :content, :notebook
-
       NOTEBOOK = :Daily
 
       #
       # @since 0.3.7
-      def initialize
-        super
+      def initialize(config, *args)
+        super(config, *args)
 
         @title = @format.date_templates[NOTEBOOK]
         @content = @format.template_contents(NOTEBOOK)
-        @content += to_enml($config.custom_sections[NOTEBOOK]) unless $config.custom_sections.nil?
       end
     end
   end

data/lib/{types → evertils/types}/monthly-task-summary.rb

@@ -1,19 +1,16 @@
 module Evertils
   module Type
     class MonthlyTaskSummary < Type::Base
-      attr_reader :title, :content, :notebook
-
       NOTEBOOK = :'Monthly Task Summaries'
 
       #
       # @since 0.3.7
-      def initialize(*args)
-        super(*args)
+      def initialize(config, *args)
+        super(config, *args)
 
         @name = @args.first
         @title = "#{@name} #{DateTime.now.strftime('%m-%Y')}"
         @content = @format.template_contents(NOTEBOOK)
-        @content += to_enml($config.custom_sections[NOTEBOOK]) unless $config.custom_sections.nil?
 
         # BUG: inability to tag notes lies somewhere in evertils-common,
         # specifically in how note.tag works
@@ -26,12 +23,6 @@ module Evertils
         # client_tag = tag_manager.find_or_create(@name)
         # mts_note.tag(client_tag.prop(:name))
       end
-
-      #
-      # @since 0.3.7
-      def notebook
-        NOTEBOOK
-      end
     end
   end
 end

data/lib/{types → evertils/types}/monthly.rb

@@ -1,18 +1,15 @@
 module Evertils
   module Type
     class Monthly < Type::Base
-      attr_reader :title, :content, :notebook
-
       NOTEBOOK = :Monthly
 
       #
       # @since 0.3.7
-      def initialize
-        super
+      def initialize(config, *args)
+        super(config, *args)
 
         @title = @format.date_templates[NOTEBOOK]
         @content = @format.template_contents(NOTEBOOK)
-        @content += to_enml($config.custom_sections[NOTEBOOK]) unless $config.custom_sections.nil?
 
         # BUG: inability to tag notes lies somewhere in evertils-common,
         # specifically in how note.tag works
@@ -30,7 +27,7 @@ module Evertils
         monthly_note_title = @format.date_templates[NOTEBOOK]
         found = @model.find_note_contents(monthly_note_title)
 
-        !found.entity.nil? && today_is_first_of_month
+        found.entity.nil? && today_is_first_of_month
       end
     end
   end

data/lib/{types → evertils/types}/priority-queue.rb

@@ -1,16 +1,14 @@
 module Evertils
   module Type
     class PriorityQueue < Type::Base
-      attr_reader :title, :content, :notebook
-
       NOTEBOOK = :'Priority Queue'
 
       #
       # @since 0.3.7
-      def initialize
-        super
+      def initialize(config, *args)
+        super(config, *args)
 
-        @handler = Evertils::Helper.load('ApiEnmlHandler')
+        @handler = Evertils::Helper.load('ApiEnmlHandler', @config)
 
         if Date.today.monday?
           @title, @content = condition_monday

data/lib/{types → evertils/types}/weekly.rb

@@ -1,18 +1,15 @@
 module Evertils
   module Type
     class Weekly < Type::Base
-      attr_reader :title, :content, :notebook
-
       NOTEBOOK = :Weekly
 
       #
       # @since 0.3.7
-      def initialize
-        super
+      def initialize(config, *args)
+        super(config, *args)
 
         @title = @format.date_templates[NOTEBOOK]
         @content = @format.template_contents(NOTEBOOK)
-        @content += to_enml($config.custom_sections[NOTEBOOK]) unless $config.custom_sections.nil?
 
         # BUG: inability to tag notes lies somewhere in evertils-common,
         # specifically in how note.tag works
@@ -25,13 +22,12 @@ module Evertils
       #
       # @since 0.3.7
       def should_create?
-        today = Date.today
-        is_monday = today.monday?
+        is_monday = Date.today.monday?
 
         weekly_note_title = @format.date_templates[NOTEBOOK]
         found = @model.find_note_contents(weekly_note_title)
 
-        !found.entity.nil? && is_monday
+        found.entity.nil? && is_monday
       end
     end
   end

data/lib/{utils.rb → evertils/utils.rb}

@@ -1,7 +1,7 @@
 module Evertils
   class Utils
     @cache = Hash.new
-    
+
     # Gets a list of files from the current directory with a specific extension
     def self.get_files(ext)
       @cache[:files] ||= Hash.new
@@ -48,7 +48,7 @@ module Evertils
           @cache[:files][ext].push file.strip.match(/[A-Z ]+(.*)/)[1]
         end
       end
-      
+
       @cache[:files][ext]
     end
 
@@ -94,8 +94,8 @@ module Evertils
             raise TypeError, "unknown os: #{host_os.inspect}"
           end
         )
-      rescue err
-        Notify.error(err.message)
+      rescue e
+        Notify.error("#{e}\n#{e.backtrace.join("\n")}", show_time: false)
       end
     end
 

data/lib/evertils/version.rb

@@ -0,0 +1,3 @@
+module Evertils
+  VERSION = '0.3.8'.freeze
+end

data/lib/evertils.rb

@@ -0,0 +1,39 @@
+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'
+require 'nokogiri'
+
+# include required files
+require 'evertils/kernel'
+require 'evertils/version'
+require 'evertils/type'
+require 'evertils/helpers/time'
+require 'evertils/helpers/results'
+require 'evertils/helpers/api-enml-handler'
+require 'evertils/config'
+require 'evertils/request'
+require 'evertils/utils'
+require 'evertils/controller'
+require 'evertils/router'
+require 'evertils/helper'
+require 'evertils/helpers/formatting'
+require 'evertils/helpers/evernote-enml'
+
+module Evertils
+  # Flag to determine if module is running in test mode
+  def self.test?
+    false
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Ryan Priebe
@@ -108,39 +108,38 @@ files:
 - bin/evertils
 - bin/setup
 - evertils.gemspec
-- lib/command.rb
-- lib/config.rb
-- lib/configs/templates/daily.enml
-- lib/configs/templates/monthly.enml
-- lib/configs/templates/mts.enml
-- lib/configs/templates/pq.enml
-- lib/configs/templates/weekly.enml
-- lib/controller.rb
-- lib/controllers/convert.rb
-- lib/controllers/generate.rb
-- lib/controllers/get.rb
-- lib/controllers/new.rb
-- lib/controllers/status.rb
-- lib/helper.rb
-- lib/helpers/api-enml-handler.rb
-- lib/helpers/evernote-enml.rb
-- lib/helpers/evernote-markdown.rb
-- lib/helpers/formatting.rb
-- lib/helpers/results.rb
-- lib/helpers/time.rb
-- lib/kernel.rb
-- lib/log.rb
-- lib/logs.rb
-- lib/request.rb
-- lib/router.rb
-- lib/type.rb
-- lib/types/daily.rb
-- lib/types/monthly-task-summary.rb
-- lib/types/monthly.rb
-- lib/types/priority-queue.rb
-- lib/types/weekly.rb
-- lib/utils.rb
-- lib/version.rb
+- lib/evertils.rb
+- lib/evertils/config.rb
+- lib/evertils/configs/templates/daily.enml
+- lib/evertils/configs/templates/monthly-task-summaries.enml
+- lib/evertils/configs/templates/monthly.enml
+- lib/evertils/configs/templates/pq.enml
+- lib/evertils/configs/templates/weekly.enml
+- lib/evertils/controller.rb
+- lib/evertils/controllers/convert.rb
+- lib/evertils/controllers/firstrun.rb
+- lib/evertils/controllers/generate.rb
+- lib/evertils/controllers/get.rb
+- lib/evertils/controllers/new.rb
+- lib/evertils/controllers/status.rb
+- lib/evertils/helper.rb
+- lib/evertils/helpers/api-enml-handler.rb
+- lib/evertils/helpers/evernote-enml.rb
+- lib/evertils/helpers/evernote-markdown.rb
+- lib/evertils/helpers/formatting.rb
+- lib/evertils/helpers/results.rb
+- lib/evertils/helpers/time.rb
+- lib/evertils/kernel.rb
+- lib/evertils/request.rb
+- lib/evertils/router.rb
+- lib/evertils/type.rb
+- lib/evertils/types/daily.rb
+- lib/evertils/types/monthly-task-summary.rb
+- lib/evertils/types/monthly.rb
+- lib/evertils/types/priority-queue.rb
+- lib/evertils/types/weekly.rb
+- lib/evertils/utils.rb
+- lib/evertils/version.rb
 - logs/.gitignore
 homepage: http://rubygems.org/gems/evertils
 licenses:

data/lib/command.rb

@@ -1,179 +0,0 @@
-module Evertils
-  module Command
-    class Exec
-      attr_reader :response, :exitcode
-      attr_accessor :enable_logging
-
-      #
-      # class methods
-      #
-      class << self
-        def git_queue_status
-          if global("git log origin/#{git_current_branch}..HEAD --oneline")
-            response = @response.split("\n")
-            response.size > 0
-          end
-        end
-
-        def git_push
-          global("git push -q origin #{git_current_branch}")
-        end
-
-        def git_checkout
-          begin
-            curr_branch = git_current_branch
-            branch = $request.custom.nil? ? curr_branch : $request.custom[0]
-
-            if !git_branch_verify branch
-              raise "Requested branch not found in the working copy: #{branch}"
-            end
-
-            if branch == curr_branch
-              return Notify.warning("Requested branch is already checked out, skipping checkout")
-            else
-              global("git checkout -q #{branch}")
-            end
-
-            # not found locally, checkout from origin
-            if !@response
-              branch = "origin/#{branch}"
-              global("git checkout -q #{branch}")
-            end
-
-            if !@response
-              Notify.error("Unable to locate #{branch} on the remote server or local working copy")
-            end
-
-            branch
-          rescue SystemExit, Interrupt
-            Notify.error("Interrupt caught, exiting")
-          rescue RuntimeError => e
-            Notify.error(e.message)
-          end
-        end
-
-        def git_current_branch
-          global("git rev-parse --abbrev-ref HEAD")
-        end
-
-        def git_branch_verify(branch = nil)
-          if branch.nil?
-            branch = git_current_branch
-          end
-
-          global("git rev-parse --verify #{branch}")
-        end
-
-        def global(command, file = nil)
-          begin
-            # disable logging if user settings prohibit it
-            #file = nil if !@enable_logging
-            # default value for exit code is an error
-            @exitcode = 1
-
-            @response = `#{command}`.chomp
-            @exitcode = $?.exitstatus
-
-            # Log output to a file
-            # This method is better than redirecting output to a file because now
-            # the response is always populated instead of being empty when output
-            # is sent to the log file
-            if file
-              File.open(file.path, 'w+') do |f|
-                f.write(@response)
-              end
-            end
-
-            @response
-          rescue SystemExit, Interrupt
-            Notify.error("Interrupt caught, exiting")
-          end
-        end
-      end
-
-      #
-      # instance methods
-      #
-      def minify(file, destination)
-        begin
-          min_file = "#{destination}#{File.basename(file, File.extname(file))}.min.js"
-
-          @response = `uglifyjs #{file} -cm -o "#{min_file}"`
-
-          Notify.success("Minified #{file}")
-
-          $?.exitstatus == 0
-        rescue SystemExit, Interrupt
-          Notify.error("Interrupt caught, exiting")
-        end
-      end
-
-      def lint(file, log_file)
-        begin
-          command = `coffeelint -f "#{Evertils::INSTALLED_DIR}/lib/configs/coffeelint.json" #{file}`
-
-          @response = command.include?("Ok!")
-
-          # only send errors to the log file
-          if !@response
-            File.open(log_file.path, 'a') do |f|
-              f.write("Logged at #{Time.now}\n============================================================\n\n")
-              f.write(command)
-            end
-          end
-
-          $?.exitstatus == 0
-        rescue SystemExit, Interrupt
-          Notify.error("Interrupt caught, exiting")
-        end
-      end
-
-      def open_editor(file=nil)
-        begin
-          log_file = file || Evertils::DEFAULT_LOG
-
-          # System editor is not set/unavailable, use system default to open the
-          # file
-          if `echo $EDITOR` == ""
-            if Utils.os == :macosx
-              `open #{log_file.path}`
-            else
-              `xdg-open #{log_file.path}`
-            end
-          else
-            `$EDITOR #{log_file.path}`
-          end
-        rescue SystemExit, Interrupt
-          Notify.error("Interrupt caught, exiting")
-        end
-      end
-
-      def arbitrary(command, file = nil)
-        begin
-          # default value for exit code is an error
-          @exitcode = 1
-          @response = `#{command}`.chomp
-          @exitcode = $?.exitstatus
-
-          # Log output to a file
-          # This method is better than redirecting output to a file because now
-          # the response is always populated instead of being empty when output
-          # is sent to the log file
-          if file
-            File.open(file.path, 'w+') do |f|
-              f.write("Logged at #{Time.now}\n============================================================\n\n")
-              f.write(@response)
-            end
-          end
-
-          @exitcode == 0
-
-          # support chaining
-          self
-        rescue SystemExit, Interrupt
-          Notify.error("Interrupt caught, exiting")
-        end
-      end
-    end
-  end
-end

data/lib/config.rb

@@ -1,65 +0,0 @@
-module Evertils
-  PACKAGE_NAME = "evertils"
-  INSTALLED_DIR = Gem::Specification.find_by_name(Evertils::PACKAGE_NAME).gem_dir
-  LOG_DIR = INSTALLED_DIR + "/logs"
-  DEFAULT_LOG = Evertils::Log.new # no args means default log
-  HELPER_DIR = INSTALLED_DIR + "/lib/helpers/"
-  CONTROLLER_DIR = INSTALLED_DIR + "/lib/controllers/"
-  MODEL_DIR = INSTALLED_DIR + "/lib/models/"
-  TEMPLATE_DIR = INSTALLED_DIR + "/lib/configs/templates/"
-  LOG_DIGEST_LENGTH = 20
-  DEBUG = false
-
-  class Cfg
-    attr_accessor :custom_sections, :custom_templates, :custom_path
-
-    def bootstrap!
-      load_user_customizations
-    end
-
-    def constant?(name)
-      name == name.upcase
-    end
-
-    def options
-      keys = Evertils.constants.select do |name|
-        constant? name
-      end
-
-      hash = {}
-      keys.each do |key|
-        hash[key] = Evertils.const_get(key)
-      end
-      hash
-    end
-
-    #
-    # @since 0.3.1
-    def load_user_customizations
-      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
-
-    #
-    # @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/controller.rb

@@ -1,117 +0,0 @@
-module Evertils
-  module Controller
-    class Base
-      attr_accessor :model, :helper, :methods_require_internet, :default_method
-
-      @@options = Hash.new
-
-      # Perform pre-run tasks
-      def pre_exec
-        OptionParser.new do |opt|
-          opt.banner = "#{Evertils::PACKAGE_NAME} controller command [...-flags]"
-
-          opt.on("-v", "--verbose", "Verbose output") do |v|
-            # short output
-            @@options[:verbose] = v
-          end
-
-          opt.on("-V", "--version", "Show app version") do |v|
-            # short output
-            @version = Evertils::PACKAGE_VERSION
-          end
-        end.parse!
-      end
-
-      # Handle the request
-      def exec(args = [])
-        self.send(@default_method.to_sym)
-      end
-
-      # Perform post-run cleanup tasks, such as deleting old logs
-      def post_exec(total_errors = 0, total_warnings = 0, total_files = 0)
-      end
-
-      # Determines if the command can execute
-      def can_exec?(command = nil, name = nil)
-        @helper = Evertils::Helper.const_get(command.capitalize).new rescue nil
-        @methods_require_internet = []
-
-        # get user-defined methods to use as a fallback
-        user_defined_methods = []
-
-        # timeout is the first system defined method after the user defined
-        # ones
-        for i in 0..public_methods.index(:to_json) -1
-          user_defined_methods.push(public_methods[i].to_sym)
-        end
-
-        @default_method = name || user_defined_methods.first || :sample
-
-        unless respond_to? @default_method.to_sym, true
-          Notify.error("Command not found: #{name}")
-        end
-
-        true
-      end
-
-      # default method called by exec if no argument is passed
-      def sample
-        Notify.warning("Method not implemented");
-      end
-
-      def required_modules(*modules)
-        auto_load_required(modules).each do |type, hash|
-          # Make each auto-loaded module available as an instance variable
-          # i.e. [:hound]: @hound_controller, @hound_model, @hound_helper
-          # i.e. [:test]: @test_controller, @test_model, @test_helper
-          # Only files that exist and can be called are loaded
-          hash.each do |key, value|
-            instance_variable_set("@#{key}_#{type}".to_sym, value)
-            @last_model = instance_variable_get("@#{key}_model")
-          end
-        end
-      end
-
-      private
-
-      # autoload and instantiate required libraries, models and helpers
-      def auto_load_required(modules = [])
-        loaded = {:controller => {}, :helper => {}, :model => {}}
-
-        begin
-          modules.each do |mod|
-            if File.exists? "#{Evertils::INSTALLED_DIR}/lib/controllers/#{mod}.rb"
-              require "#{Evertils::INSTALLED_DIR}/lib/controllers/#{mod}.rb"
-
-              loaded[:controller][mod] = Evertils::Controller.const_get(mod.capitalize).new
-            else
-              raise StandardError, "Controller not found: #{mod}"
-            end
-
-            if File.exists? "#{Evertils::INSTALLED_DIR}/lib/helpers/#{mod}.rb"
-              require "#{Evertils::INSTALLED_DIR}/lib/helpers/#{mod}.rb"
-              loaded[:helper][mod] = Evertils::Helper.const_get(mod.capitalize).new
-
-              # auto-instantiate new instance of helper for the new instance of the controller
-              loaded[:controller][mod].helper = loaded[:helper][mod]
-            end
-
-            if File.exists? "#{Evertils::INSTALLED_DIR}/lib/models/#{mod}.rb"
-              require "#{Evertils::INSTALLED_DIR}/lib/models/#{mod}.rb"
-              loaded[:model][mod] = Evertils::Model.const_get(mod.capitalize).new
-
-              # auto-instantiate new instance of model for the new instance of the controller
-              loaded[:controller][mod].model = loaded[:model][mod]
-            else
-              loaded[:controller][mod].model = Model::Base.new
-            end
-          end
-
-          loaded
-        rescue StandardError => e
-          Notify.error(e.message)
-        end
-      end
-    end
-  end
-end