minder 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fc827a792b9ba35db1c5574bf3531ff5a1c97a6
-  data.tar.gz: 30cf93f9ef8cf0fd8bc60009cd564e1dbd58980a
+  metadata.gz: a8777b449e7047ba218141d8e227aee5e6bb2311
+  data.tar.gz: a019f497edd579dcfc62c26da1ac6d53bd49612b
 SHA512:
-  metadata.gz: 20765de38667425c89ac7bfd72f06b2ea491861dd59dcb28a984ebdb365f9160a689cc04f34fa1f2316e4259b8fba3ce30edc0e0c6d94fa7d78cb810857ca3c1
-  data.tar.gz: cd9ff1818ea9fa56a48f44601337d21fd76fb277d01b512b2597ee206de108b37d266584e2affa53a722db023c64a90f8ee7dc45bcd699ec2885c365f48de048
+  metadata.gz: 106ec92ccd594c3f53d9bc631df7ddb0d3dfcfa4d8dd34bfce525d28d15c9569bb29eb9fb867f23c1c2648d0dac7c1bad76d28d58bc1b18bec9e332214020a8f
+  data.tar.gz: 0144effc35f9fa967662fed2a9a86a9e5125cbf43a78aa45a01ec7f784a91fbf260c81d6a2caf5630dbd872aa94546af31b413168569106b863f0b1a82c2834f

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    minder (0.2.2)
+    minder (0.3.0)
       activesupport (~> 4.2, >= 4.2.1)
       curses (~> 1.0, >= 1.0.1)
+      emoji
       rom (~> 0.7, >= 0.7)
       rom-sql (~> 0.5, >= 0.5)
       sqlite3 (~> 1.3, >= 1.3.10)
@@ -35,10 +36,12 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
+    emoji (1.0.4)
+      json
     equalizer (0.0.11)
     i18n (0.7.0)
     ice_nine (0.11.1)
-    json (1.8.2)
+    json (1.8.3)
     method_source (0.8.2)
     minitest (5.7.0)
     pry (0.10.1)
@@ -71,12 +74,12 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    sequel (4.22.0)
+    sequel (4.23.0)
     slop (3.6.0)
     sqlite3 (1.3.10)
     thread_safe (0.3.5)
     timecop (0.7.3)
-    transproc (0.2.2)
+    transproc (0.2.3)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     virtus (1.0.5)

data/README.md

@@ -61,7 +61,7 @@ pressing Tab. The commands for each frame only work when the frame is focused.
   Vim keystrokes:
   - `/` to open a dialog to search within the list of tasks.
   - `d` to mark a task as done.
-  - `e` to edit the whole tasks list in your `$EDITOR`.
+  - ~~`e` to edit the whole tasks list in your `$EDITOR`~~ (this is broken atm).
   - `f` to open a dialog to filter the list of tasks.
   - `gg` to go to top of task list and `G` to go to bottom of list.
   - `j` to do down the list and `k` to go up.

data/bin/minder

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
 require 'minder'
-require 'minder/database'
+require 'minder/database/database'
 database = Database.new
 DB = database.rom.repositories[:default]
 
 require 'minder/application'
-require 'minder/database_migrator'
+require 'minder/database/database_migrator'
 
 migrator = Minder::DatabaseMigrator.new(database: database)
 migrator.run

data/db/migrate/003_create_periods.rb

@@ -0,0 +1,16 @@
+Sequel.migration do
+  up do
+    create_table(:periods) do
+      primary_key :id
+      String :type, null: false
+      Datetime :started_at
+      Datetime :ended_at
+      Datetime :created_at
+      Datetime :updated_at
+    end
+  end
+
+  down do
+    drop_table(:periods)
+  end
+end

data/lib/minder/application.rb

@@ -1,10 +1,9 @@
 require 'minder/config'
-require 'minder/pomodoro_runner'
-require 'minder/task_recorder'
-require 'minder/scene'
-require 'active_support'
+require 'minder/pomodoro/pomodoro_runner'
+require 'minder/tasks/task_manager'
+require 'minder/cli/scene'
+
 require 'curses'
-require 'fileutils'
 
 module Minder
   class Application
@@ -39,7 +38,7 @@ module Minder
       self.scene = Scene.new
       scene.setup
 
-      options = { pomodoro_runner: pomodoro_runner, task_manager: task_recorder  }
+      options = { pomodoro_runner: pomodoro_runner, task_manager: task_manager  }
 
       self.pomodoro_frame = PomodoroFrame.new(options)
       self.help_frame = HelpFrame.new(options)
@@ -95,11 +94,12 @@ module Minder
       @runner ||= PomodoroRunner.new(
         work_duration: config.work_duration,
         short_break_duration: config.short_break_duration,
-        long_break_duration: config.long_break_duration)
+        long_break_duration: config.long_break_duration,
+        database: database)
     end
 
-    def task_recorder
-      @task_recorder ||= TaskRecorder.new(database: database)
+    def task_manager
+      @task_manager ||= TaskManager.new(database: database)
     end
 
     def handle_event(event, data = {})
@@ -114,27 +114,27 @@ module Minder
         pomodoro_runner.continue
       when :editor
         `$EDITOR ~/.minder/doing.txt`
-        task_recorder.reload
+        task_manager.reload
       when :add_task
-        task_recorder.add_task(data[:task])
+        task_manager.add_task(data[:task])
       when :switch_focus
         scene.switch_focus
       when :select_next_task
-        task_recorder.select_next_task
+        task_manager.select_next_task
       when :select_previous_task
-        task_recorder.select_previous_task
+        task_manager.select_previous_task
       when :delete_task
-        task_recorder.delete_task
+        task_manager.delete_task
       when :complete_task
-        task_recorder.complete_task
+        task_manager.complete_task
       when :start_task
-        task_recorder.start_task
+        task_manager.start_task
       when :unstart_task
-        task_recorder.unstart_task
+        task_manager.unstart_task
       when :select_last_task
-        task_recorder.select_last_task
+        task_manager.select_last_task
       when :select_first_task
-        task_recorder.select_first_task
+        task_manager.select_first_task
       when :help
         message_frame.hide
         help_frame.unhide
@@ -150,7 +150,7 @@ module Minder
         filter_frame.hide if data[:text] == ''
         scene.focus_frame(message_frame)
       when :update_filter
-        task_recorder.filter(data[:text])
+        task_manager.filter(data[:text])
       when :search
         search_frame.unhide
         search_frame.begin_search
@@ -158,12 +158,12 @@ module Minder
       when :submit_search
         search_frame.hide
         scene.focus_frame(message_frame)
-        task_recorder.search(data[:text])
-        task_recorder.select_search_result
+        task_manager.search(data[:text])
+        task_manager.select_search_result
       when :next_search
-        task_recorder.next_search
+        task_manager.next_search
       when :previous_search
-        task_recorder.previous_search
+        task_manager.previous_search
       when :escape_search
         search_frame.hide
         scene.focus_frame(message_frame)

data/lib/minder/{filter_frame.rb → cli/filter_frame.rb}

@@ -1,4 +1,4 @@
-require 'minder/frame'
+require 'minder/cli/frame'
 
 module Minder
   class FilterFrame < Frame
@@ -38,7 +38,7 @@ TEXT
         notify_observers(:submit_filter, { text: filter_string })
       end
 
-      @filter_string.chop! if key == 127
+      @filter_string.chop! if key == Curses::Key::BACKSPACE
 
       refresh
       changed

data/lib/minder/{frame.rb → cli/frame.rb}

@@ -1,5 +1,6 @@
 require 'observer'
 require 'erb'
+
 module Minder
   class Frame
     include Observable
@@ -35,6 +36,7 @@ module Minder
       self.left = left
 
       self.window = build_window
+      window.keypad(true)
       self.lines = []
     end
 

data/lib/minder/{help_frame.rb → cli/help_frame.rb}

@@ -1,4 +1,4 @@
-require 'minder/frame'
+require 'minder/cli/frame'
 
 module Minder
   class HelpFrame < Frame
@@ -10,10 +10,11 @@ Commands:   any key to dismiss
 (u) un-start task
 (d) mark task as done
 (x) delete task
-(e) open tasks in text editor
+(e) edit task
 (G) go to bottom of list
 (gg) go to top of list
 (/) Search among tasks
+(m) minimize messages frame
 (n) Next search result
 (N) Previous search result
 (?) to view this text

data/lib/minder/{message_frame.rb → cli/message_frame.rb}

@@ -1,13 +1,16 @@
-require 'minder/frame'
+require 'minder/cli/frame'
+require 'minder/cli/task_editor'
 
 module Minder
   class MessageFrame < Frame
-    attr_reader :current_line
+    attr_reader :current_line,
+                :task_editor
 
     def initialize(*)
       super
       self.height = desired_height
       @minimized = false
+      @editing = false
     end
 
     def minimize
@@ -23,6 +26,10 @@ module Minder
       @minimized
     end
 
+    def editing?
+      @editing
+    end
+
     def template
       if minimized?
         minimized_message
@@ -101,6 +108,9 @@ TEXT
     def set_cursor_position
       if minimized?
         window.setpos(1, 20)
+      elsif editing?
+        window.setpos(3 + task_manager.selected_task_index - scroll_offset,
+                      task_editor.cursor_position + 6)
       else
         window.setpos(3 + task_manager.selected_task_index - scroll_offset, 3)
       end
@@ -119,37 +129,64 @@ TEXT
       end
     end
 
+    def handle_keypress(key)
+      if editing?
+        task_editor.handle_keypress(key)
+      else
+        super
+      end
+    end
+
+    def handle_task_editor_event(event, data = {})
+      if event == :stop_editing
+        @editing = false
+        @task_editor = nil
+      elsif event == :update_task
+        task_manager.update_task(task_manager.selected_task, data)
+        @editing = false
+        @task_editor = nil
+      end
+
+      changed
+      notify_observers(event)
+    end
+
     def handle_char_keypress(key)
-      event = case key
-      when 'j' then :select_next_task
-      when 'k' then :select_previous_task
-      when 'd' then :complete_task
-      when 'x' then :delete_task
-      when 's' then :start_task
-      when 'u' then :unstart_task
-      when 'G' then :select_last_task
-      when 'e' then :editor
-      when '?' then :help
-      when '/' then :search
-      when 'm'
-        minimize
-        :redraw
-      when 'n' then :next_search
-      when 'N' then :previous_search
-      when 'f' then :open_filter
-      when 'g'
-        @keypress_memory ||= []
-        @keypress_memory << 'g'
-        if @keypress_memory == ['g', 'g']
-          @keypress_memory = []
-          :select_first_task
-        end
-      when ' '
-        if minimized?
-          unminimize
+      event =
+        case key
+        when 'j' then :select_next_task
+        when 'k' then :select_previous_task
+        when 'd' then :complete_task
+        when 'x' then :delete_task
+        when 's' then :start_task
+        when 'u' then :unstart_task
+        when 'G' then :select_last_task
+        when 'e'
+          @editing = true
+          @task_editor = TaskEditor.new(task_manager.selected_task, self)
+          @task_editor.add_observer(self, :handle_task_editor_event)
+          :edit_task
+        when '?' then :help
+        when '/' then :search
+        when 'm'
+          minimize
           :redraw
+        when 'n' then :next_search
+        when 'N' then :previous_search
+        when 'f' then :open_filter
+        when 'g'
+          @keypress_memory ||= []
+          @keypress_memory << 'g'
+          if @keypress_memory == ['g', 'g']
+            @keypress_memory = []
+            :select_first_task
+          end
+        when ' '
+          if minimized?
+            unminimize
+            :redraw
+          end
         end
-      end
 
       changed
       notify_observers(event)

data/lib/minder/{pomodoro_frame.rb → cli/pomodoro_frame.rb}

@@ -1,10 +1,10 @@
-require 'minder/frame'
+require 'minder/cli/frame'
 
 module Minder
   class PomodoroFrame < Frame
     def template
       text = <<-TEXT
-<%= period.title %>
+<%= period.title %>  #{pomodoros}
 TEXT
 
       if period.message
@@ -25,7 +25,7 @@ TEXT
     end
 
     def period
-      pomodoro_runner.current_action
+      pomodoro_runner.current_period
     end
 
     def handle_char_keypress(key)
@@ -49,5 +49,11 @@ TEXT
     def set_cursor_position
       window.setpos(1, lines[0].strip.length + 2)
     end
+
+    def pomodoros
+      pomodoro_runner.pomodoros_today.map do |pomodoro|
+        "\xF0\x9F\x8D\x85 "
+      end.join
+    end
   end
 end

data/lib/minder/{quick_add_frame.rb → cli/quick_add_frame.rb}

@@ -1,4 +1,4 @@
-require 'minder/frame'
+require 'minder/cli/frame'
 
 module Minder
   class QuickAddFrame < Frame
@@ -31,7 +31,7 @@ TEXT
 
     def handle_non_char_keypress(key)
       case key
-      when 127
+      when Curses::Key::BACKSPACE
         self.input.chop!
         refresh
       when 10

data/lib/minder/{scene.rb → cli/scene.rb}

@@ -1,10 +1,10 @@
 require 'ostruct'
-require 'minder/help_frame'
-require 'minder/search_frame'
-require 'minder/filter_frame'
-require 'minder/pomodoro_frame'
-require 'minder/message_frame'
-require 'minder/quick_add_frame'
+require 'minder/cli/help_frame'
+require 'minder/cli/search_frame'
+require 'minder/cli/filter_frame'
+require 'minder/cli/pomodoro_frame'
+require 'minder/cli/message_frame'
+require 'minder/cli/quick_add_frame'
 
 module Minder
   class Scene
@@ -15,6 +15,7 @@ module Minder
     end
 
     def setup
+      Curses.ESCDELAY = 0
       Curses.noecho
       Curses.init_screen
       Curses.timeout = 0

data/lib/minder/{search_frame.rb → cli/search_frame.rb}

@@ -1,4 +1,4 @@
-require 'minder/frame'
+require 'minder/cli/frame'
 
 module Minder
   class SearchFrame < Frame
@@ -35,7 +35,7 @@ TEXT
       when 27
         changed
         notify_observers(:escape_search)
-      when 127
+      when Curses::Key::BACKSPACE
         @search_string.chop!
         refresh
       when 10

data/lib/minder/cli/task_editor.rb

@@ -0,0 +1,68 @@
+require 'observer'
+
+module Minder
+  class TaskEditor
+    include Observable
+
+    attr_reader :cursor_position
+
+    def initialize(task, parent)
+      @original_text = task.description.dup
+      @cursor_position = 0
+      @task = task
+      @parent = parent
+    end
+
+    def text
+      @task.description
+    end
+
+    def handle_keypress(key)
+      return unless key
+
+      if key.is_a?(Fixnum)
+          handle_non_char_keypress(key)
+      else
+        handle_char_keypress(key)
+      end
+    end
+
+    def handle_non_char_keypress(key)
+      return unless key
+
+      data = {}
+
+      event =
+        case key
+        when Curses::Key::LEFT
+          @cursor_position -= 1 unless cursor_position == 0
+          :redraw
+        when Curses::Key::RIGHT
+          @cursor_position += 1 unless cursor_position > text.length - 1
+          :redraw
+        when Curses::Key::BACKSPACE
+          return if @cursor_position == 0
+          @task.description.slice!(@cursor_position - 1)
+          @cursor_position -= 1 unless cursor_position == 0
+          :redraw
+        when 27, 9
+          @task.description = @original_text
+          :stop_editing
+        when 10
+          data = { description: @task.description }
+          :update_task
+        end
+
+      changed
+      notify_observers(event, data)
+    end
+
+    def handle_char_keypress(key)
+      @task.description.insert(@cursor_position, key)
+      @cursor_position += 1
+
+      changed
+      notify_observers(:redraw)
+    end
+  end
+end

data/lib/minder/database/database.rb

@@ -0,0 +1,98 @@
+require "sqlite3"
+require 'rom'
+require 'rom-sql'
+require 'logger'
+
+class Database
+  attr_reader :rom
+
+  def initialize
+    FileUtils.mkdir_p(File.dirname(Minder::DATABASE_LOCATION))
+    ROM.setup(:sql, "sqlite://#{Minder::DATABASE_LOCATION}")
+
+    require 'minder/tasks/task'
+    require 'minder/database/task_mapper'
+    require 'minder/database/tasks'
+    require 'minder/database/period_mapper'
+    require 'minder/database/periods'
+
+    ROM.commands(:tasks) do
+      define(:delete)
+      define(:update)
+    end
+
+    ROM.commands(:periods) do
+      define(:update)
+    end
+
+    @rom = ROM.finalize.env
+    rom.repositories[:default].use_logger(Logger.new(Minder::LOG_LOCATION))
+  end
+
+  def tasks
+    rom.relation(:tasks).active.as(:entity).to_a
+  end
+
+  def tasks_filtered_by(text)
+    rom.relation(:tasks).active.as(:entity).filtered_by(text).to_a
+  end
+
+  def add_task(description)
+    rom.relations.tasks.insert(description: description)
+  end
+
+  def delete_task(task)
+    rom.command(:tasks).delete.by_id(task.id).call
+  end
+
+  def complete_task(task)
+    update_task(task, completed_at: Time.now)
+  end
+
+  def start_task(task)
+    update_task(task, started_at: Time.now)
+  end
+
+  def unstart_task(task)
+    update_task(task, started_at: nil)
+  end
+
+  def update_task(task, options = {})
+    rom.command(:tasks).update.by_id(task.id).call(options)
+  end
+
+  def complete_period(task)
+    update_period(task, ended_at: Time.now)
+  end
+
+  def add_period(period)
+    rom.relations.periods.insert(started_at: period.started_at,
+                                 type: period.type)
+  end
+
+  def last_period
+    require 'minder/pomodoro/work_period'
+    require 'minder/pomodoro/break_period'
+    require 'minder/pomodoro/idle_period'
+    data = rom.relations.periods.last
+    if data[:type] == 'work'
+      Minder::WorkPeriod.new(data)
+    elsif data[:type] == 'break'
+      Minder::BreakPeriod.new(data)
+    else
+      Minder::IdlePeriod.new(data)
+    end
+  end
+
+  def update_period(period, options = {})
+    rom.command(:periods).update.by_id(period.id).call(options)
+  end
+
+  def periods
+    rom.relation(:tasks).active.as(:entity).to_a
+  end
+
+  def pomodoros_today
+    rom.relation(:periods).pomodoros_today.as(:entity).to_a
+  end
+end

data/lib/minder/{database_migrator.rb → database/database_migrator.rb}

@@ -9,7 +9,7 @@ module Minder
     def run
       ROM::SQL::Migration::Migrator.new(
         ROM.env.repositories[:default].connection,
-        path: File.expand_path(File.dirname(__FILE__) + '/../../db/migrate')
+        path: File.expand_path(File.dirname(__FILE__) + '/../../../db/migrate')
       ).run
     end
   end

data/lib/minder/database/period_mapper.rb

@@ -0,0 +1,12 @@
+class PeriodMapper < ROM::Mapper
+  relation :periods
+  register_as :entity
+
+  # TODO: figure out STI
+  model Minder::Period
+
+  attribute :id
+  attribute :type
+  attribute :started_at
+  attribute :ended_at
+end

data/lib/minder/database/periods.rb

@@ -0,0 +1,18 @@
+class Periods < ROM::Relation[:sql]
+  def by_id(id)
+    where(id: id)
+  end
+
+  def completed_pomodoros
+    where(type: 'work')
+      .where('started_at IS NOT NULL')
+      .where('ended_at IS NOT NULL')
+  end
+
+  def pomodoros_today
+    completed_pomodoros.
+      where('ended_at BETWEEN ? AND ?',
+            Time.now.strftime('%Y-%m-%d 00:00:00'),
+            Time.now.strftime('%Y-%m-%d 23:59:59'))
+  end
+end

data/lib/minder/{tasks.rb → database/tasks.rb}

@@ -3,6 +3,10 @@ class Tasks < ROM::Relation[:sql]
     where("description LIKE '%#{text}%'")
   end
 
+  def active
+    where(completed_at: nil)
+  end
+
   def by_id(id)
     where(id: id)
   end

data/lib/minder/pomodoro/break_period.rb

@@ -0,0 +1,15 @@
+require 'minder/pomodoro/period'
+
+module Minder
+  class BreakPeriod < Period
+    attribute :duration_in_seconds, Integer, default: DEFAULT_BREAK_PERIOD * 60
+
+    def title
+      "Break period"
+    end
+
+    def type
+      'break'
+    end
+  end
+end

data/lib/minder/{idle_period.rb → pomodoro/idle_period.rb}

@@ -1,4 +1,4 @@
-require 'minder/period'
+require 'minder/pomodoro/period'
 
 module Minder
   class IdlePeriod < Period
@@ -11,7 +11,11 @@ module Minder
     end
 
     def start!
-      # noop
+      self.started_at = Time.now
+    end
+
+    def complete!
+      self.ended_at = Time.now
     end
 
     def elapsed?
@@ -21,5 +25,9 @@ module Minder
     def completed?
       true
     end
+
+    def type
+      'idle'
+    end
   end
 end

data/lib/minder/pomodoro/period.rb

@@ -0,0 +1,45 @@
+require 'virtus'
+
+module Minder
+  class Period
+    include Virtus.model
+
+    attribute :id, Integer
+    attribute :type, String
+    attribute :started_at, DateTime
+    attribute :ended_at, DateTime
+    attribute :duration_in_seconds, Integer, default: 0
+    attribute :completed, Boolean
+
+    def duration_in_minutes=(minutes)
+      self.duration_in_seconds = minutes.to_i * 60
+    end
+
+    def start!
+      Minder.play_sound('start.wav')
+      self.started_at = Time.now
+    end
+
+    def complete!
+      Minder.play_sound('done.wav')
+      self.ended_at = Time.now
+      self.completed = true
+    end
+
+    def elapsed?
+      elapsed_time >= duration_in_seconds
+    end
+
+    def message
+      "#{Minder.formatted_time(elapsed_time)} " \
+        "(out of #{Minder.formatted_time(duration_in_seconds)})"
+    end
+
+    def elapsed_time
+      return 0 unless started_at
+      return ended_at.to_i - started_at.to_i if ended_at
+
+      (Time.now.to_time.to_i - started_at.to_time.to_i)
+    end
+  end
+end

data/lib/minder/pomodoro/pomodoro_runner.rb

@@ -0,0 +1,83 @@
+require 'observer'
+
+require 'minder/pomodoro/work_period'
+require 'minder/pomodoro/break_period'
+require 'minder/pomodoro/idle_period'
+
+module Minder
+  class PomodoroRunner
+    include Observable
+
+    attr_accessor :work_duration,
+                  :short_break_duration,
+                  :long_break_duration,
+                  :database
+
+    attr_reader :period_count,
+                :current_period
+
+    def initialize(**options)
+      self.work_duration = options.fetch(:work_duration)
+      self.short_break_duration = options.fetch(:short_break_duration)
+      self.long_break_duration = options.fetch(:long_break_duration)
+      self.database = options.fetch(:database)
+      @period_count = 0
+      current_period = IdlePeriod.new
+      current_period.start!
+      database.add_period(current_period)
+      @current_period = database.last_period
+    end
+
+    def tick
+      return if !current_period.elapsed? || current_period.completed?
+
+      old_period = current_period
+      @current_period = IdlePeriod.new
+
+      changed
+      if old_period.is_a?(WorkPeriod)
+        notify_observers(:completed_work)
+      elsif old_period.is_a?(BreakPeriod)
+        notify_observers(:completed_break)
+      end
+    end
+
+    def continue
+      return unless current_period.elapsed?
+
+      current_period.complete!
+      @pomodoros = nil
+      database.complete_period(current_period)
+
+      advance_period
+      current_period.start!
+      database.add_period(current_period)
+      @current_period = database.last_period
+    end
+
+    def advance_period
+      @period_count += 1
+      changed
+
+      if period_count.odd?
+        notify_observers(:started_work)
+        @current_period = WorkPeriod.new(duration_in_minutes: work_duration)
+      else
+        notify_observers(:started_break)
+        @current_period = BreakPeriod.new(duration_in_minutes: break_duration)
+      end
+    end
+
+    def break_duration
+      if period_count % 8 == 0
+        long_break_duration
+      else
+        short_break_duration
+      end
+    end
+
+    def pomodoros_today
+      @pomodoros_today ||= database.pomodoros_today
+    end
+  end
+end

data/lib/minder/pomodoro/work_period.rb

@@ -0,0 +1,15 @@
+require 'minder/pomodoro/period'
+
+module Minder
+  class WorkPeriod < Period
+    attribute :duration_in_seconds, Integer, default: DEFAULT_WORK_PERIOD * 60
+
+    def title
+      "Work period"
+    end
+
+    def type
+      'work'
+    end
+  end
+end

data/lib/minder/{task_recorder.rb → tasks/task_manager.rb}

@@ -1,8 +1,7 @@
-require 'minder/task'
-require 'fileutils'
+require 'minder/tasks/task'
 
 module Minder
-  class TaskRecorder
+  class TaskManager
     attr_accessor :lines
 
     attr_reader :search_results,
@@ -40,6 +39,10 @@ module Minder
       !tasks.empty?
     end
 
+    def update_task(task, options = {})
+      database.update_task(task, options)
+    end
+
     def add_task(task)
       File.open(DOING_FILE, 'a') do |file|
         file.write("#{task}\n")
@@ -88,7 +91,10 @@ module Minder
 
     def complete_task
       task = selected_task
-      delete_task
+      database.complete_task(task)
+      write_file_with_backup
+      reload
+      select_previous_task
       add_to_done_file("Finished: #{task.description}")
     end
 

data/lib/minder/version.rb

@@ -1,3 +1,3 @@
 module Minder
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/lib/minder.rb

@@ -7,6 +7,14 @@ module Minder
   DONE_FILE = File.join(ENV["HOME"], '.minder', 'done.txt')
   MIGRATIONS_PATH = File.expand_path(File.dirname(__FILE__) + '/../')
   DATABASE_LOCATION = "#{ENV['HOME']}/.minder/database.sqlite3"
+  LOG_LOCATION = "#{ENV['HOME']}/.minder/info.log"
+
+  require 'minder/application'
+  require 'minder/config'
+  require 'minder/version'
+
+  require 'active_support'
+  require 'fileutils'
 
   def self.formatted_time(seconds)
     minutes = (seconds / 60).to_i

data/spec/minder/application_spec.rb

@@ -49,7 +49,7 @@ describe Minder::Application do
       expect(application).to have_received(:system).with('stty -raw echo')
       expect(STDIN).to have_received(:getc).with('stty -raw echo')
       expect(pomodoro_runner).to have_received(:next_action)
-      expect(interval).to receive(:)
+      expect(interval).to receive(:blah)
     end
   end
 end

data/spec/minder/{pomodoro_break_spec.rb → break_period_spec.rb}

@@ -1,11 +1,11 @@
-require 'minder/pomodoro_break'
+require 'minder/break_period'
 
-describe Minder::PomodoroBreak do
+describe Minder::BreakPeriod do
   describe '#run' do
     let(:timer) { instance_spy(Minder::Timer) }
 
     it 'runs the pomodoro' do
-      pomodoro = described_class.new(minutes: 5)
+      pomodoro = described_class.new(duration_in_minutes: 5)
 
       allow(Minder::Timer).to receive(:new)
         .with(seconds: 300)

data/spec/minder/{pomodoro_spec.rb → pomodoro_period_spec.rb}

@@ -1,11 +1,11 @@
-require 'minder/pomodoro'
+require 'minder/work_period'
 
-describe Minder::Pomodoro do
+describe Minder::WorkPeriod do
   describe '#run' do
     let(:timer) { instance_spy(Minder::Timer) }
 
     it 'runs the pomodoro' do
-      pomodoro = described_class.new(minutes: 5)
+      pomodoro = described_class.new(duration_in_minutes: 5)
 
       allow(Minder::Timer).to receive(:new)
         .with(seconds: 300)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minder
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Joseph Method
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -258,37 +258,40 @@ files:
 - bin/minder
 - db/migrate/001_create_tasks.rb
 - db/migrate/002_import_tasks.rb
+- db/migrate/003_create_periods.rb
 - lib/minder.rb
 - lib/minder/application.rb
-- lib/minder/break_period.rb
-- lib/minder/commands/delete_task.rb
+- lib/minder/cli/filter_frame.rb
+- lib/minder/cli/frame.rb
+- lib/minder/cli/help_frame.rb
+- lib/minder/cli/message_frame.rb
+- lib/minder/cli/pomodoro_frame.rb
+- lib/minder/cli/quick_add_frame.rb
+- lib/minder/cli/scene.rb
+- lib/minder/cli/search_frame.rb
+- lib/minder/cli/task_editor.rb
 - lib/minder/config.rb
-- lib/minder/database.rb
-- lib/minder/database_migrator.rb
-- lib/minder/filter_frame.rb
-- lib/minder/frame.rb
-- lib/minder/help_frame.rb
-- lib/minder/idle_period.rb
-- lib/minder/message_frame.rb
-- lib/minder/period.rb
-- lib/minder/pomodoro_frame.rb
-- lib/minder/pomodoro_period.rb
-- lib/minder/pomodoro_runner.rb
-- lib/minder/quick_add_frame.rb
-- lib/minder/scene.rb
-- lib/minder/search_frame.rb
-- lib/minder/task.rb
-- lib/minder/task_mapper.rb
-- lib/minder/task_recorder.rb
-- lib/minder/tasks.rb
-- lib/minder/timer.rb
+- lib/minder/database/commands/delete_task.rb
+- lib/minder/database/database.rb
+- lib/minder/database/database_migrator.rb
+- lib/minder/database/period_mapper.rb
+- lib/minder/database/periods.rb
+- lib/minder/database/task_mapper.rb
+- lib/minder/database/tasks.rb
+- lib/minder/pomodoro/break_period.rb
+- lib/minder/pomodoro/idle_period.rb
+- lib/minder/pomodoro/period.rb
+- lib/minder/pomodoro/pomodoro_runner.rb
+- lib/minder/pomodoro/work_period.rb
+- lib/minder/tasks/task.rb
+- lib/minder/tasks/task_manager.rb
 - lib/minder/version.rb
 - minder.gemspec
 - spec/minder/application_spec.rb
+- spec/minder/break_period_spec.rb
 - spec/minder/config_spec.rb
-- spec/minder/pomodoro_break_spec.rb
+- spec/minder/pomodoro_period_spec.rb
 - spec/minder/pomodoro_runner_spec.rb
-- spec/minder/pomodoro_spec.rb
 - spec/minder/timer_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/tristil/minder
@@ -318,9 +321,9 @@ summary: Combines a Pomodoro Technique runner with GTD-style task backlogs and D
   One-style prompts."
 test_files:
 - spec/minder/application_spec.rb
+- spec/minder/break_period_spec.rb
 - spec/minder/config_spec.rb
-- spec/minder/pomodoro_break_spec.rb
+- spec/minder/pomodoro_period_spec.rb
 - spec/minder/pomodoro_runner_spec.rb
-- spec/minder/pomodoro_spec.rb
 - spec/minder/timer_spec.rb
 - spec/spec_helper.rb

data/lib/minder/break_period.rb

@@ -1,13 +0,0 @@
-require 'minder/period'
-
-module Minder
-  class BreakPeriod < Period
-    def initialize(minutes: DEFAULT_WORK_PERIOD)
-      super
-    end
-
-    def title
-      "Break period"
-    end
-  end
-end

data/lib/minder/database.rb

@@ -1,47 +0,0 @@
-require 'fileutils'
-require "sqlite3"
-require 'rom'
-require 'rom-sql'
-
-class Database
-  attr_reader :rom
-
-  def initialize
-    FileUtils.mkdir_p(File.dirname(Minder::DATABASE_LOCATION))
-    ROM.setup(:sql, "sqlite://#{Minder::DATABASE_LOCATION}")
-    require 'minder/task'
-    require 'minder/task_mapper'
-    require 'minder/tasks'
-
-    ROM.commands(:tasks) do
-      define(:delete)
-      define(:update)
-    end
-
-    @rom = ROM.finalize.env
-  end
-
-  def tasks
-    rom.relation(:tasks).as(:entity).to_a
-  end
-
-  def tasks_filtered_by(text)
-    rom.relation(:tasks).as(:entity).filtered_by(text).to_a
-  end
-
-  def add_task(description)
-    rom.relations.tasks.insert(description: description)
-  end
-
-  def delete_task(task)
-    rom.command(:tasks).delete.by_id(task.id).call
-  end
-
-  def start_task(task)
-    rom.command(:tasks).update.by_id(task.id).call(started_at: Time.now)
-  end
-
-  def unstart_task(task)
-    rom.command(:tasks).update.by_id(task.id).call(started_at: nil)
-  end
-end

data/lib/minder/period.rb

@@ -1,35 +0,0 @@
-require 'minder/timer'
-
-module Minder
-  class Period
-    attr_accessor :minutes,
-                  :timer
-
-    def initialize(minutes: nil)
-      self.minutes = minutes
-      self.timer = Minder::Timer.new(seconds: minutes.to_i * 60)
-    end
-
-    def start!
-      Minder.play_sound('start.wav')
-      timer.start!
-    end
-
-    def complete!
-      Minder.play_sound('done.wav')
-      @status = :completed
-    end
-
-    def completed?
-      @status == :completed
-    end
-
-    def elapsed?
-      timer.completed?
-    end
-
-    def message
-      timer.to_s
-    end
-  end
-end

data/lib/minder/pomodoro_period.rb

@@ -1,13 +0,0 @@
-require 'minder/period'
-
-module Minder
-  class PomodoroPeriod < Period
-    def initialize(minutes: DEFAULT_WORK_PERIOD)
-      super
-    end
-
-    def title
-      "Work period"
-    end
-  end
-end

data/lib/minder/pomodoro_runner.rb

@@ -1,69 +0,0 @@
-require 'observer'
-
-require 'minder/pomodoro_period'
-require 'minder/break_period'
-require 'minder/idle_period'
-
-module Minder
-  class PomodoroRunner
-    include Observable
-
-    attr_accessor :work_duration,
-                  :short_break_duration,
-                  :long_break_duration
-
-    attr_reader :action_count,
-                :current_action
-
-    def initialize(**options)
-      self.work_duration = options.fetch(:work_duration)
-      self.short_break_duration = options.fetch(:short_break_duration)
-      self.long_break_duration = options.fetch(:long_break_duration)
-      @action_count = 0
-      @current_action = IdlePeriod.new
-    end
-
-    def tick
-      return if !current_action.elapsed? || current_action.completed?
-
-      old_action = current_action
-      current_action.complete!
-      @current_action = IdlePeriod.new
-
-      changed
-      if old_action.is_a?(PomodoroPeriod)
-        notify_observers(:completed_work)
-      elsif old_action.is_a?(BreakPeriod)
-        notify_observers(:completed_break)
-      end
-    end
-
-    def continue
-      return unless current_action.elapsed?
-
-      advance_action
-      current_action.start!
-    end
-
-    def advance_action
-      @action_count += 1
-      changed
-
-      if action_count.odd?
-        notify_observers(:started_work)
-        @current_action = PomodoroPeriod.new(minutes: work_duration)
-      else
-        notify_observers(:started_break)
-        @current_action = BreakPeriod.new(minutes: break_duration)
-      end
-    end
-
-    def break_duration
-      if action_count % 8 == 0
-        long_break_duration
-      else
-        short_break_duration
-      end
-    end
-  end
-end

data/lib/minder/timer.rb

@@ -1,32 +0,0 @@
-require 'minder'
-
-module Minder
-  class Timer
-    attr_accessor :seconds,
-                  :start_time
-
-    def initialize(seconds: DEFAULT_WORK_PERIOD)
-      self.seconds = seconds
-    end
-
-    def start!
-      self.start_time = Time.now
-    end
-
-    def completed?
-      elapsed_time.to_i >= seconds
-    end
-
-    def elapsed_time
-      return 0 unless start_time
-
-      (Time.now - start_time)
-    end
-
-    def to_s
-      "#{Minder.formatted_time(elapsed_time)} " \
-        "(out of #{Minder.formatted_time(seconds)})"
-    end
-  end
-end
-