evertils 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 613756ce620cb2f255b005b86da5e14357c2851c
-  data.tar.gz: 4e1ced19ef5f23579fec39be7d0e939792c00195
+  metadata.gz: 6bf3d2b3c26ba0ece79f8aa12e697f5cd7edae75
+  data.tar.gz: 2fe5780fb6e21b93c3afb34f8dbd6f934f812f1c
 SHA512:
-  metadata.gz: 16c384c2f9baa1580f9142126be48529e386afb0cb955bb6661876535b3bfb0c24eadbc50adf8ab8afe9d4e84118de56e9ee7d622559f9766467d648898f8bc1
-  data.tar.gz: 0712a55cab72c0d843d9d69808aaaee89de92960814a1a73d798320941bbc47f1abd0b2a4a48b3102b7d56a6c7a836d8bd806cb3399f4c54891e6be4247c0efe
+  metadata.gz: 57861f7047caa63344d7a55f0f0a0f99a9d67d4d2f84463034a68ddf0633c09f4ec9b8aa7478ea0c28fb0057cdca6ee9fd38b581045e525bdc91c992bce83b36
+  data.tar.gz: c7ffdb0d40287f62da1ad3291b882e29af084b4276de62a8c1200e56a3e28e12b6b0b408d96d7dfdaa164becbc828895cd48a134d30123b1cdf7ba0e2b6b5465

data/bin/evertils

@@ -18,23 +18,23 @@ require 'yaml'
 require 'nokogiri'
 
 # 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'
+require_relative '../lib/version'
+require_relative '../lib/type'
+require_relative '../lib/helpers/time'
+require_relative '../lib/helpers/results'
+require_relative '../lib/helpers/api-enml-handler'
+require_relative '../lib/log'
+require_relative '../lib/config'
+require_relative '../lib/request'
+require_relative '../lib/utils'
+require_relative '../lib/logs'
+require_relative '../lib/command'
+require_relative '../lib/controller'
+require_relative '../lib/router'
+require_relative '../lib/helpers/formatting'
+require_relative '../lib/helpers/evernote-enml'
+require_relative '../lib/helper'
 
 # Modify configuration options here
 $config = Evertils::Cfg.new

data/lib/controller.rb

@@ -7,11 +7,6 @@ module Evertils
 
       # Perform pre-run tasks
       def pre_exec
-        # interface with the Evernote API so we can use it later
-        @model = Evertils::Common::Query::Simple.new
-
-        @format = Evertils::Helper.load('formatting')
-
         OptionParser.new do |opt|
           opt.banner = "#{Evertils::PACKAGE_NAME} controller command [...-flags]"
 
@@ -38,7 +33,6 @@ module Evertils
 
       # Determines if the command can execute
       def can_exec?(command = nil, name = nil)
-        @model = Evertils::Model.const_get(command.capitalize).new rescue nil
         @helper = Evertils::Helper.const_get(command.capitalize).new rescue nil
         @methods_require_internet = []
 

data/lib/controllers/generate.rb

@@ -1,16 +1,14 @@
+require_relative '../types/priority-queue'
+require_relative '../types/monthly-task-summary'
+require_relative '../types/daily'
+require_relative '../types/weekly'
+require_relative '../types/monthly'
+
 module Evertils
   module Controller
     class Generate < Controller::Base
       attr_accessor :force, :start, :name
 
-      # required user-created notebooks
-      NOTEBOOK_DAILY = :Daily
-      NOTEBOOK_WEEKLY = :Weekly
-      NOTEBOOK_MONTHLY = :Monthly
-      NOTEBOOK_DEPLOYMENT = :Deployments
-      NOTEBOOK_MTS = :'Monthly Task Summaries'
-      NOTEBOOK_PRIORITY_QUEUE = :'Priority Queue'
-
       def pre_exec
         @methods_require_internet.push(:daily, :weekly, :monthly, :mts)
 
@@ -27,160 +25,53 @@ module Evertils
 
       # generate daily notes
       def daily
-        title = @format.date_templates[NOTEBOOK_DAILY]
-        body = @format.template_contents(NOTEBOOK_DAILY)
-        body += to_enml($config.custom_sections[NOTEBOOK_DAILY]) unless $config.custom_sections.nil?
-        parent_notebook = NOTEBOOK_DAILY
-
-        @model.create_note(title: title, body: body, parent_notebook: parent_notebook)
+        note = Type::Daily.new
+        note.create
       end
 
       # generate weekly notes
       def weekly
-        title = @format.date_templates[NOTEBOOK_WEEKLY]
-        body = @format.template_contents(NOTEBOOK_WEEKLY)
-        body += to_enml($config.custom_sections[NOTEBOOK_WEEKLY]) unless $config.custom_sections.nil?
-        parent_notebook = NOTEBOOK_WEEKLY
-
-        note = @model.create_note(title: title, body: body, parent_notebook: parent_notebook)
-
-        # 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))
+        note = Type::Weekly.new
+        note.create
       end
 
       # generate monthly notes
       def monthly
-        title = @format.date_templates[NOTEBOOK_MONTHLY]
-        body = @format.template_contents(NOTEBOOK_MONTHLY)
-        body += to_enml($config.custom_sections[NOTEBOOK_MONTHLY]) unless $config.custom_sections.nil?
-        parent_notebook = NOTEBOOK_MONTHLY
-
-        note = @model.create_note(title: title, body: body, parent_notebook: parent_notebook)
-
-        # 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))
+        note = Type::Monthly.new
+        note.create
       end
 
       # 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(NOTEBOOK_MTS)
-        body += to_enml($config.custom_sections[NOTEBOOK_MTS]) unless $config.custom_sections.nil?
-        parent_notebook = NOTEBOOK_MTS
-
-        # create the note from template
-        mts_note = @model.create_note(title: title, body: body, parent_notebook: parent_notebook)
-
-        # 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)
-        # mts_note.tag(client_tag.prop(:name))
+        note = Type::MonthlyTaskSummary.new(@name)
+        note.create
       end
 
       # generate priority queue notes
       def pq
-        if Date.today.monday?
-          # get friday's note
-          friday = (Date.today - 3)
-          dow = @format.day_of_week(friday.strftime('%a'))
-          note_title = "Queue For [#{friday.strftime('%B %-d')} - #{dow}]"
-          found = @model.find_note_contents(note_title)
-
-          raise "Queue was not found - #{friday.strftime('%B %-d')}" unless found
-
-          title = @format.date_templates[NOTEBOOK_PRIORITY_QUEUE]
-          content = prepare_enml(found.entity.content)
-
-          @model.create_note(title: title, body: content, parent_notebook: NOTEBOOK_PRIORITY_QUEUE)
-        elsif Date.today.tuesday?
-          # find monday's note
-          monday = (Date.today - 1)
-          dow = @format.day_of_week(monday.strftime('%a'))
-          monday_note_title = "Queue For [#{monday.strftime('%B %-d')} - #{dow}]"
-          monday_note = @model.find_note_contents(monday_note_title)
-
-          if !monday_note.entity.nil?
-            note = monday_note.entity
-            note.title = @format.date_templates[NOTEBOOK_PRIORITY_QUEUE]
-          else
-            # if it does not exist, get friday's note
-            friday = (Date.today - 4)
-            dow = @format.day_of_week(friday.strftime('%a'))
-            note_title = "Queue For [#{friday.strftime('%B %-d')} - #{dow}]"
-            note = @model.find_note_contents(note_title)
-          end
-
-          raise 'Queue was not found' unless note
-
-          content = prepare_enml(note.content)
-
-          @model.create_note(title: note.title, body: content, parent_notebook: NOTEBOOK_PRIORITY_QUEUE)
-        else
-          yest = (Date.today - 1)
-          dow = @format.day_of_week(yest.strftime('%a'))
-          yest_note_title = "Queue For [#{yest.strftime('%B %-d')} - #{dow}]"
-          found = @model.find_note_contents(yest_note_title).entity
-
-          raise "Queue was not found - #{yest.strftime('%B %-d')}" unless found
-
-          title = @format.date_templates[NOTEBOOK_PRIORITY_QUEUE]
-          content = prepare_enml(found.content)
-          content += to_enml($config.custom_sections[NOTEBOOK_PRIORITY_QUEUE]) unless $config.custom_sections.nil?
-
-          @model.create_note(title: title, body: content, parent_notebook: NOTEBOOK_PRIORITY_QUEUE)
-        end
+        note = Type::PriorityQueue.new
+        note.create
       end
 
       # creates the notes required to start the day
       #  - priority queue
       #  - daily
-      #  - weekly (if today is Monday)
+      #  - weekly (if today is Monday and there isn't a weekly log already)
+      #  - monthly (if today is the 1st and there isn't a monthly log already)
       def morning
-        pq
-        daily
-        weekly if Date.today.monday?
-      end
-
-      private
-
-      #
-      # @since 0.3.1
-      def to_enml(hash)
-        Evertils::Helper::EvernoteENML.with_list(hash)
-      end
-
-      #
-      # @since 0.3.5
-      def prepare_enml(content)
-        # remove the xml declaration and DTD
-        content = content.split("\n")
-        content.shift(2)
+        pq = Type::PriorityQueue.new
+        pq.create
 
-        xml = Nokogiri::XML::DocumentFragment.parse(content.join)
-        note_xml = xml.search('en-note')
+        daily = Type::Daily.new
+        daily.create
 
-        # remove <br> tags
-        note_xml.search('br').each do |br|
-          br.remove
-        end
+        weekly = Type::Weekly.new
+        weekly.create if weekly.should_create?
 
-        note_xml.inner_html().to_s
+        monthly = Type::Monthly.new
+        monthly.create if monthly.should_create?
       end
     end
   end

data/lib/helper.rb

@@ -2,8 +2,8 @@ module Evertils
   module Helper
     def self.load(klass, args = nil)
       begin
-        klass_instance = Evertils::Helper.const_get(klass.capitalize)
-        
+        klass_instance = Evertils::Helper.const_get(klass)
+
         if klass_instance
           if args.nil?
             klass_instance.new

data/lib/helpers/api-enml-handler.rb

@@ -0,0 +1,46 @@
+module Evertils
+  module Helper
+    class ApiEnmlHandler
+      #
+      # @since 0.3.7
+      def initialize(enml = nil)
+        convert_to_xml(enml) if enml
+        self
+      end
+
+      #
+      # @since 0.3.7
+      def convert_to_xml(enml)
+        # remove the xml declaration and DTD
+        enml = enml.split("\n")
+        enml.shift(2)
+
+        @xml = Nokogiri::XML::DocumentFragment.parse(enml.join)
+        self
+      end
+
+      #
+      # @since 0.3.5
+      def prepare
+        note_xml = @xml.search('en-note')
+
+        # remove <br> tags
+        note_xml.search('br').each(&:remove)
+
+        enml = note_xml.inner_html.to_s
+
+        # append custom sections to the end of the content if they exist
+        return enml if $config.custom_sections.nil?
+
+        enml += to_enml($config.custom_sections[NOTEBOOK_PRIORITY_QUEUE])
+        enml
+      end
+
+      #
+      # @since 0.3.1
+      def to_enml(hash)
+        Evertils::Helper::EvernoteENML.with_list(hash)
+      end
+    end
+  end
+end

data/lib/router.rb

@@ -17,24 +17,6 @@ module Evertils
           if context.can_exec? $request.controller, $request.command
             context.pre_exec
 
-            # no command sent?  Use default to populate model data
-            model_method = ($request.command ? $request.command : context.default_method).to_s + "_data"
-
-            # populate model data
-            method = context.model.public_method(model_method) rescue false
-
-            # model is not set, use Base model instead so the controller still has
-            # access to model methods
-            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
-            if method.respond_to? :call
-              context.model.data = method.call($request.custom || [])
-            end
 
             if context.methods_require_internet.include? $request.command
               if !Utils.has_internet_connection?

data/lib/type.rb

@@ -0,0 +1,35 @@
+module Evertils
+  module Type
+    class Base
+      #
+      # @since 0.3.7
+      def initialize(*args)
+        @model = Evertils::Common::Query::Simple.new
+        @format = Evertils::Helper.load('Formatting')
+        @args = args unless args.size.zero?
+      end
+
+      #
+      # @since 0.3.7
+      def create
+        data = {
+          title: @title,
+          body: @content,
+          parent_notebook: self.class::NOTEBOOK
+        }
+
+        raise 'Invalid title' if @title.nil?
+        raise 'Invalid note content' if @content.nil?
+        raise 'Invalid notebook' if self.class::NOTEBOOK.nil?
+
+        @model.create_note(data)
+      end
+
+      #
+      # @since 0.3.7
+      def should_create?
+        raise 'Should be overwritten in sub classes'
+      end
+    end
+  end
+end

data/lib/types/daily.rb

@@ -0,0 +1,19 @@
+module Evertils
+  module Type
+    class Daily < Type::Base
+      attr_reader :title, :content, :notebook
+
+      NOTEBOOK = :Daily
+
+      #
+      # @since 0.3.7
+      def initialize
+        super
+
+        @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
+end

data/lib/types/monthly-task-summary.rb

@@ -0,0 +1,37 @@
+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)
+
+        @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
+        # 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)
+        # mts_note.tag(client_tag.prop(:name))
+      end
+
+      #
+      # @since 0.3.7
+      def notebook
+        NOTEBOOK
+      end
+    end
+  end
+end

data/lib/types/monthly.rb

@@ -0,0 +1,37 @@
+module Evertils
+  module Type
+    class Monthly < Type::Base
+      attr_reader :title, :content, :notebook
+
+      NOTEBOOK = :Monthly
+
+      #
+      # @since 0.3.7
+      def initialize
+        super
+
+        @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
+        # 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
+
+      #
+      # @since 0.3.7
+      def should_create?
+        today_is_first_of_month = Date.today.day == 1
+
+        monthly_note_title = @format.date_templates[NOTEBOOK]
+        found = @model.find_note_contents(monthly_note_title)
+
+        !found.entity.nil? && today_is_first_of_month
+      end
+    end
+  end
+end

data/lib/types/priority-queue.rb

@@ -0,0 +1,86 @@
+module Evertils
+  module Type
+    class PriorityQueue < Type::Base
+      attr_reader :title, :content, :notebook
+
+      NOTEBOOK = :'Priority Queue'
+
+      #
+      # @since 0.3.7
+      def initialize
+        super
+
+        @handler = Evertils::Helper.load('ApiEnmlHandler')
+
+        if Date.today.monday?
+          @title, @content = condition_monday
+        elsif Date.today.tuesday?
+          @title, @content = condition_tuesday
+        else
+          @title, @content = condition_default
+        end
+      end
+
+      private
+
+      # Get friday's note
+      # @since 0.3.7
+      def condition_monday
+        friday = (Date.today - 3)
+        dow = @format.day_of_week(friday.strftime('%a'))
+        note_title = "Queue For [#{friday.strftime('%B %-d')} - #{dow}]"
+        found = @model.find_note_contents(note_title)
+
+        raise "Queue was not found - #{friday.strftime('%B %-d')}" unless found
+
+        [
+          @format.date_templates[NOTEBOOK],
+          @handler.convert_to_xml(found.entity.content).prepare
+        ]
+      end
+
+      # Find monday's note
+      # @since 0.3.7
+      def condition_tuesday
+        monday = (Date.today - 1)
+        dow = @format.day_of_week(monday.strftime('%a'))
+        monday_note_title = "Queue For [#{monday.strftime('%B %-d')} - #{dow}]"
+        monday_note = @model.find_note_contents(monday_note_title)
+
+        if !monday_note.entity.nil?
+          note = monday_note.entity
+          note.title = @format.date_templates[NOTEBOOK]
+        else
+          # if it does not exist, get friday's note
+          friday = (Date.today - 4)
+          dow = @format.day_of_week(friday.strftime('%a'))
+          note_title = "Queue For [#{friday.strftime('%B %-d')} - #{dow}]"
+          note = @model.find_note_contents(note_title)
+        end
+
+        raise 'Queue was not found' unless note
+
+        [
+          note.title,
+          @handler.convert_to_xml(note.content).prepare
+        ]
+      end
+
+      # Default action for not-Monday/Tuesday
+      # @since 0.3.7
+      def condition_default
+        yest = (Date.today - 1)
+        dow = @format.day_of_week(yest.strftime('%a'))
+        yest_note_title = "Queue For [#{yest.strftime('%B %-d')} - #{dow}]"
+        found = @model.find_note_contents(yest_note_title).entity
+
+        raise "Queue was not found - #{yest.strftime('%B %-d')}" unless found
+
+        [
+          @format.date_templates[NOTEBOOK],
+          @handler.convert_to_xml(found.content).prepare
+        ]
+      end
+    end
+  end
+end

data/lib/types/weekly.rb

@@ -0,0 +1,38 @@
+module Evertils
+  module Type
+    class Weekly < Type::Base
+      attr_reader :title, :content, :notebook
+
+      NOTEBOOK = :Weekly
+
+      #
+      # @since 0.3.7
+      def initialize
+        super
+
+        @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
+        # 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
+
+      #
+      # @since 0.3.7
+      def should_create?
+        today = Date.today
+        is_monday = today.monday?
+
+        weekly_note_title = @format.date_templates[NOTEBOOK]
+        found = @model.find_note_contents(weekly_note_title)
+
+        !found.entity.nil? && is_monday
+      end
+    end
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '0.3.6'.freeze
+  VERSION = '0.3.7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Ryan Priebe
@@ -122,19 +122,23 @@ files:
 - 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/generate.rb
 - lib/helpers/results.rb
 - lib/helpers/time.rb
 - lib/kernel.rb
 - lib/log.rb
 - lib/logs.rb
-- lib/model.rb
-- lib/model_data.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
 - logs/.gitignore

data/lib/helpers/generate.rb

@@ -1,39 +0,0 @@
-module Evertils
-  module Helper
-    class Generate
-      def self.format_date(title)
-        if title =~ /Daily/
-          resp = /Daily Log \[([A-Z].*) \- [A-Z]\]/.match(title)
-
-          if resp
-            Time.parse($1)
-          end
-        elsif title =~ /Weekly/
-          resp = /Weekly Log \[([A-Z].*) (\d+) \- (\d+)\]/.match(title)
-          
-          if resp
-            first = Time.parse($1 +" "+ $2)
-            second = Time.parse($1 +" "+ $3)
-
-            [first, second]
-          end
-        elsif title =~ /Monthly/
-          resp = /Monthly Log \[([A-Z].*) (\d+)\]/.match(title)
-
-          if resp
-            Time.parse($1 +" "+ $2)
-          end
-        elsif title =~ /Quarterly/
-          resp = /Quarterly Log \[([A-Z].*) \- ([A-Z].*) (\d+)\]/.match(title)
-
-          if resp
-            first = Time.parse($1 +" "+ $3)
-            second = Time.parse($2 +" "+ $3)
-
-            [first, second]
-          end
-        end
-      end
-    end
-  end
-end

data/lib/model.rb

@@ -1,26 +0,0 @@
-module Evertils
-  module Model
-    class Base
-      attr_accessor :data, :branch, :browser, :command, :start
-
-      def initialize(hash = nil)
-        @data = hash || Evertils::Model::Data.new
-
-        # Current time
-        #@time = @data.start
-        # Time the command was executed
-        @start = Time.now
-        # Current working branch
-        @branch = @data.branch
-        # Browser to execute tests in
-        @browser = @data.browser
-        # Instantiate the command execution class
-        @command = Command::Exec.new
-      end
-
-      def bind(hash)
-        initialize(hash)
-      end
-    end
-  end
-end

data/lib/model_data.rb

@@ -1,97 +0,0 @@
-module Evertils
-  module Model
-    class Data
-      attr_accessor :identifier, :branch, :browser, :files_with_errors
-
-      def initialize()
-        @d = Hash.new([])
-
-        # setup defaults
-        defaults = {
-          :issues => {:errors => 0, :warnings => 0},
-          :status => {:success => 0, :error => 0, :total => 0, :errors_per_file => 0},
-          :success_rate => {:int => 0, :str => "0%"},
-          :log => '',
-          :below_acceptable_limit => false
-        }
-
-        @branch = Command::Exec.git_current_branch
-        @files_with_errors = []
-
-        @d.merge! defaults
-      end
-
-      def unset(key)
-        @d.delete(key.to_sym)
-      end
-
-      def instance_var(key, val = nil)
-        self.class.__send__(:attr_accessor, key)
-        instance_variable_set("@#{key}", val)
-      end
-
-      def serialize
-        @d.to_json
-      end
-
-      def status
-        get(:status)
-      end
-
-      def success_rate
-        get(:success_rate)
-      end
-
-      def increment_issues(key, val)
-        @d[:issues][key.to_sym] += val
-      end
-
-      def increment_status(key, val)
-        @d[:status][key.to_sym] += val
-      end
-
-      def issues
-        get(:issues)
-      end
-
-      def issues=(val)
-        set(:issues, val)
-      end
-
-      def log
-        get(:log, Evertils::DEFAULT_LOG)
-      end
-
-      def add_to_error_list(file)
-        @files_with_errors << file
-      end
-
-      def identifier=(val)
-        @identifier = val
-
-        # create the log file now
-        @d[:log] = Log.new(@branch, Time.now, @identifier)
-      end
-
-      def below_acceptable_limit?
-        get(:below_acceptable_limit) == true
-      end
-
-      def below_acceptable_limit=(val)
-        set(:below_acceptable_limit, val)
-      end
-
-      def bind!(seed_data)
-        @d = seed_data
-      end
-
-      def get(key, default = @d.default)
-        @d[key] || default
-      end
-
-      def set(key, val = nil)
-        @d[key] = val
-      end
-    end
-  end
-end