minder 0.1 → 0.2.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1bd7f4b433d3f09c0b5c5c932d45f65b7e00dd6
-  data.tar.gz: e8c92eac92153eea880e7762c040fef0f43ffc27
+  metadata.gz: a57aa002981f78574ea362295234ca6e673c87bb
+  data.tar.gz: fee6f114376157724bd5371bb88dda9bf32fe1b2
 SHA512:
-  metadata.gz: 44bbcf6c44358e936ad5d0896992a7ddb9d1815ab18bf4b5c077b346ab7651e19baba8ae5d1fbdb3c9391c97e8bc4f9d6fef108477fd29715c237fcc0d9860f3
-  data.tar.gz: efd8144a3790c3afe5d2848d8d392ec1ceb59bfedc6584e2b0b734e3f2215a8f775e988a2636ef2663d537f60a8490e000fae70786ff4a1bd19e4223ae160939
+  metadata.gz: 409d1644bf65106d27ad1e8893f951bdf4062b85bab27958bfcec605384cc2071da58f0186c7352b2b5949499ce6d1c964d9ff20958445d8515eaaec9b7afb12
+  data.tar.gz: 66cbb70b7a152744008236769fa0e47c3996334162329b80285928235333324184d453fa5aed2d3f297f0932c936a21dce4224df6c785e55b98264386eddb2c2

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/Gemfile.lock

@@ -2,12 +2,22 @@ PATH
   remote: .
   specs:
     minder (0.1)
-      curses
-      virtus
+      activesupport
+      curses (~> 1.0.0, >= 1.0.1)
+      rom (~> 0.7.0, >= 0.7)
+      rom-sql (~> 0.5.0, >= 0.5)
+      sqlite3
+      virtus (~> 1.0.0, >= 1.0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -26,8 +36,11 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     equalizer (0.0.11)
+    i18n (0.7.0)
     ice_nine (0.11.1)
+    json (1.8.2)
     method_source (0.8.2)
+    minitest (5.7.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -38,23 +51,34 @@ GEM
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    rake (10.4.2)
+    rom (0.7.1)
+      equalizer (~> 0.0, >= 0.0.9)
+      transproc (~> 0.2, >= 0.2.2)
+    rom-sql (0.5.1)
+      equalizer (~> 0.0, >= 0.0.9)
+      rom (~> 0.7, >= 0.7.0)
+      sequel (~> 4.18)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.2)
+    rspec-core (3.2.3)
       rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
+    sequel (4.22.0)
     slop (3.6.0)
+    sqlite3 (1.3.10)
     thread_safe (0.3.5)
     timecop (0.7.3)
+    transproc (0.2.2)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -65,11 +89,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
+  bundler (~> 1)
   minder!
-  pry
-  pry-byebug
-  pry-stack_explorer
-  rake
-  rspec
-  timecop
+  pry (~> 0.10, >= 0.10)
+  pry-byebug (~> 3.1, >= 3.1.0)
+  pry-stack_explorer (~> 0.4.9)
+  rspec (~> 3.2, >= 3.2)
+  timecop (~> 0.7, >= 0.7.3)

data/README.md

@@ -11,21 +11,25 @@ At present it has these features:
   soothing sounds of a "pomodoro" kitchen timer at the beginning and end of a
   break.
 - A todo log that allows starting, unstarting and completing a task.
-- Stores a simple text log of task and pomodoro activity.
+- Stores a simple text log of task and pomodoro activity (in `~/.minder/done.txt`).
 
 Plans for the future include:
 
-- Filtering by GTD-style labels (like @context, +project, and #tag)
+- Filtering by [Getting Things Done](http://gettingthingsdone.com/)-style labels (like @context, +project, and #tag)
 - Integration with a website blacklist tool like
   [SelfControl](https://github.com/SelfControlApp/selfcontrol/).
 - Keeping track of the number of pomodoros performed during a day.
 - Desktop notifications for Linux and MacOS
-- Prompts to summarize plans for the day and day's end progress.
+- Prompts to summarize plans for the day and day's end progress, inspired by [Day One](http://dayoneapp.com/).
 
 Audio files are from https://github.com/niftylettuce/pomodoro-timer
 
 ## Usage
 
+Minder is designed to be run in a separate pane in a Tmux session (or in a split 
+inside a program like iTerm2). The tasks list will scroll if there is not enough 
+room to display all tasks.
+
 There are three sections. You can switch between sections by pressing Tab. The
 commands for each section only work when the section is focused.
 
@@ -37,7 +41,9 @@ commands for each section only work when the section is focused.
   - Press 'x' to delete a task.
   - Press 's' to start a task.
   - Press 'u' to un-start a task.
-- The Quick Add Task section. Enter text here to add a task to the tasks list
+  - Press 'j' to do down the list and 'k' to go up.
+  - Press 'gg' to go to top of task list and 'G' to go to bottom of list.
+- The Quick Add Task section. Enter text here to add a task to the tasks list.
   at any time.
 
 ## License

data/bin/minder

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

data/db/migrate/001_create_tasks.rb

@@ -0,0 +1,15 @@
+Sequel.migration do
+  up do
+    create_table(:tasks) do
+      primary_key :id
+      String :description, null: false
+      Boolean :selected, default: false
+      Datetime :started_at
+      Datetime :completed_at
+    end
+  end
+
+  down do
+    drop_table(:tasks)
+  end
+end

data/db/migrate/002_import_tasks.rb

@@ -0,0 +1,15 @@
+Sequel.migration do
+  up do
+    next unless File.exists?(Minder::DOING_FILE)
+
+    tasks = ROM.env.repositories[:default].connection.from(:tasks)
+    tasks.delete
+
+    File.readlines(Minder::DOING_FILE).each do |line|
+      tasks.insert(description: line.strip)
+    end
+  end
+
+  down do
+  end
+end

data/lib/minder/application.rb

@@ -2,7 +2,7 @@ require 'minder/config'
 require 'minder/pomodoro_runner'
 require 'minder/task_recorder'
 require 'minder/scene'
-
+require 'active_support'
 require 'curses'
 require 'fileutils'
 
@@ -11,10 +11,17 @@ module Minder
     attr_accessor :config,
                   :scene,
                   :pomodoro_frame,
+                  :help_frame,
+                  :search_frame,
+                  :filter_frame,
                   :message_frame,
                   :quick_add_frame
 
-    def initialize(config: Minder::Config.new(CONFIG_LOCATION))
+    attr_reader :database
+
+    def initialize(config: Minder::Config.new(CONFIG_LOCATION),
+                   database: Database.new)
+      @database = database
       self.config = config
       config.load
       FileUtils.mkdir_p(File.join(ENV['HOME'], '.minder'))
@@ -35,12 +42,21 @@ module Minder
       options = { pomodoro_runner: pomodoro_runner, task_manager: task_recorder  }
 
       self.pomodoro_frame = PomodoroFrame.new(options)
+      self.help_frame = HelpFrame.new(options)
+      help_frame.hide
+      self.filter_frame = FilterFrame.new(options)
+      filter_frame.hide
+      self.search_frame = SearchFrame.new(options)
+      search_frame.hide
       self.message_frame = MessageFrame.new(options)
       self.quick_add_frame = QuickAddFrame.new(options)
       quick_add_frame.focus
 
       scene.frames << pomodoro_frame
       scene.frames << message_frame
+      scene.frames << help_frame
+      scene.frames << filter_frame
+      scene.frames << search_frame
       scene.frames << quick_add_frame
 
       scene.frames.each do |frame|
@@ -83,7 +99,7 @@ module Minder
     end
 
     def task_recorder
-      @task_recorder ||= TaskRecorder.new
+      @task_recorder ||= TaskRecorder.new(database: database)
     end
 
     def handle_event(event, data = {})
@@ -91,9 +107,9 @@ module Minder
 
       case event
       when :started_work
-        message_frame.hide
+        message_frame.minimize
       when :completed_work
-        message_frame.unhide
+        message_frame.unminimize
       when :continue
         pomodoro_runner.continue
       when :editor
@@ -119,6 +135,38 @@ module Minder
         task_recorder.select_last_task
       when :select_first_task
         task_recorder.select_first_task
+      when :help
+        message_frame.hide
+        help_frame.unhide
+        scene.focus_frame(help_frame)
+      when :hide_help
+        help_frame.hide
+        message_frame.unhide
+        scene.focus_frame(message_frame)
+      when :open_filter
+        filter_frame.unhide
+        scene.focus_frame(filter_frame)
+      when :submit_filter
+        filter_frame.hide if data[:text] == ''
+        scene.focus_frame(message_frame)
+      when :update_filter
+        task_recorder.filter(data[:text])
+      when :search
+        search_frame.unhide
+        search_frame.begin_search
+        scene.focus_frame(search_frame)
+      when :submit_search
+        search_frame.hide
+        scene.focus_frame(message_frame)
+        task_recorder.search(data[:text])
+        task_recorder.select_search_result
+      when :next_search
+        task_recorder.next_search
+      when :previous_search
+        task_recorder.previous_search
+      when :escape_search
+        search_frame.hide
+        scene.focus_frame(message_frame)
       end
 
       scene.redraw

data/lib/minder/commands/delete_task.rb

@@ -0,0 +1,9 @@
+module Minder
+  module Commands
+    class CreateUser < ROM::Commands::Delete[:sql]
+      register_as :delete
+      relation :tasks
+    end
+  end
+end
+

data/lib/minder/database.rb

@@ -0,0 +1,45 @@
+require "sqlite3"
+require 'rom'
+require 'rom-sql'
+
+class Database
+  attr_reader :rom
+
+  def initialize
+    ROM.setup(:sql, 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/database_migrator.rb

@@ -0,0 +1,13 @@
+module Minder
+  class DatabaseMigrator
+    attr_reader :database
+
+    def initialize(database:)
+      @database = database
+    end
+
+    def run
+      database.rom.repositories[:default].run_migrations
+    end
+  end
+end

data/lib/minder/filter_frame.rb

@@ -0,0 +1,49 @@
+require 'minder/frame'
+
+module Minder
+  class FilterFrame < Frame
+    attr_reader :filter_string
+
+    def initialize(*)
+      super
+      @filter_string = ''
+    end
+
+    def desired_height
+      3
+    end
+
+    def template
+      <<-TEXT
+Filter: #{filter_string}
+TEXT
+    end
+
+    def set_cursor_position
+      window.setpos(1, filter_string.length + 9)
+    end
+
+    def handle_char_keypress(key)
+      return unless key
+
+      @filter_string += key
+      refresh
+      changed
+      notify_observers(:update_filter, { text: filter_string })
+    end
+
+    def handle_non_char_keypress(key)
+      if key == 10
+        changed
+        notify_observers(:submit_filter, { text: filter_string })
+      end
+
+      @filter_string.chop! if key == 127
+
+      refresh
+      changed
+      notify_observers(:update_filter, { text: filter_string })
+    end
+  end
+end
+

data/lib/minder/help_frame.rb

@@ -0,0 +1,33 @@
+require 'minder/frame'
+
+module Minder
+  class HelpFrame < Frame
+    def template
+      <<-TEXT
+Commands:   any key to dismiss
+
+(s) start task
+(u) un-start task
+(d) mark task as done
+(x) delete task
+(e) open tasks in text editor
+(G) go to bottom of list
+(gg) go to top of list
+(/) Search among tasks
+(n) Next search result
+(N) Previous search result
+(?) to view this text
+      TEXT
+    end
+
+    def desired_height
+      template.split("\n").length + 2
+    end
+
+    def handle_keypress(key)
+      return unless key
+      changed
+      notify_observers(:hide_help)
+    end
+  end
+end

data/lib/minder/message_frame.rb

@@ -7,23 +7,36 @@ module Minder
     def initialize(*)
       super
       self.height = desired_height
+      @minimized = false
+    end
+
+    def minimize
+      @minimized = true
+    end
+
+    def unminimize
+      @minimized = false
+    end
+
+    def minimized?
+      @minimized
     end
 
     def template
-      if task_manager.tasks?
+      if minimized?
+        minimized_message
+      elsif task_manager.tasks?
         doing_message
       else
         prompt_message
       end
     end
 
-    #def build_window
-      #Curses::Pad.new(min_height, width)
-    #end
-
-    #def window_refresh
-      #window.refresh(scroll_offset, 0, 3, 0, height + 2, width)
-    #end
+    def minimized_message
+<<-TEXT
+Space to see tasks
+TEXT
+    end
 
     def prompt_message
       <<-TEXT
@@ -35,7 +48,7 @@ TEXT
 
     def header_text
 <<-TEXT
-Tasks        (s) start (x) to delete (d) to mark as done
+Tasks         ? to see commands
 
 TEXT
     end
@@ -61,6 +74,8 @@ TEXT
     end
 
     def desired_height
+      return 3 if minimized?
+
       header_text_lines.length + tasks_text_lines.length + 3
     end
 
@@ -72,22 +87,17 @@ TEXT
       tasks_text_lines[scroll_offset..(allocated_tasks_height + scroll_offset - 4)].join("\n")
     end
 
-    def blank_line
-      " " * (width - 2) + "\n"
-    end
-
     def doing_message
       header_text +
-        offset_tasks_text #+
-        #blank_lines
-    end
-
-    def blank_lines
-      blank_line * scroll_offset
+        offset_tasks_text
     end
 
     def set_cursor_position
-      window.setpos(3 + task_manager.selected_task_index - scroll_offset, 3)
+      if minimized?
+        window.setpos(1, 20)
+      else
+        window.setpos(3 + task_manager.selected_task_index - scroll_offset, 3)
+      end
     end
 
     def scroll_offset
@@ -108,6 +118,15 @@ TEXT
       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'
@@ -115,6 +134,11 @@ TEXT
           @keypress_memory = []
           :select_first_task
         end
+      when ' '
+        if minimized?
+          unminimize
+          :redraw
+        end
       end
 
       changed

data/lib/minder/pomodoro_frame.rb

@@ -31,7 +31,6 @@ TEXT
     def handle_char_keypress(key)
       event = case key
       when ' ' then :continue
-      when 'e' then :editor
       end
 
       changed

data/lib/minder/quick_add_frame.rb

@@ -39,8 +39,6 @@ TEXT
         notify_observers(:add_task, { task: input })
         self.input = ''
         refresh
-      else
-        #Minder.pry_open(binding)
       end
     end
   end

data/lib/minder/scene.rb

@@ -1,4 +1,7 @@
 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'
@@ -34,37 +37,66 @@ module Minder
       end
     end
 
+    def focus_frame(frame)
+      focused_frame.unfocus
+      frame.focus
+    end
+
     def refresh
       frames.map(&:refresh)
     end
 
     def resize_frames
       frames.map(&:resize)
+      first_frame = frames.first
+
+      first_frame.move(0, 0)
+      next_height = first_frame.height
 
-      available_height = Curses.lines - frames.last.height
+      other_frames = (frames.reject(&:hidden?) - [main_frame]).compact
+      if main_frame
 
-      frames.first.move(0, 0)
-      next_height = frames.first.height
-      second_frame = frames[1]
+        other_height = other_frames.reduce(0) do |num, frame|
+          num += frame.height
+          num
+        end
+
+        available_height = Curses.lines - other_height
 
-      unless second_frame.hidden?
-        proposed_height = available_height - frames.first.height
-        if proposed_height < second_frame.desired_height
-          second_frame.height = proposed_height
+        if available_height > main_frame.desired_height
+          main_frame.height = main_frame.desired_height
         else
-          second_frame.height = second_frame.desired_height
+          main_frame.height = available_height
         end
-        second_frame.move(next_height, 0)
-        next_height += second_frame.height
+        main_frame.move(next_height, 0)
+
+        next_height += main_frame.height
       end
 
-      if next_height <= available_height
-        frames.last.move(next_height, 0)
+      (other_frames - [first_frame]).each do |frame|
+        frame.move(next_height, 0)
+        next_height += frame.height
+      end
+    end
+
+    def main_frame
+      return if message_frame.hidden? && help_frame.hidden?
+
+      if message_frame.hidden?
+        help_frame
       else
-        frames.last.move(available_height, 0)
+        message_frame
       end
     end
 
+    def message_frame
+      @message_frame ||= frames.find { |frame| frame.is_a?(MessageFrame) }
+    end
+
+    def help_frame
+      @help_frame ||= frames.find { |frame| frame.is_a?(HelpFrame) }
+    end
+
     def redraw
       refresh
       resize_frames

data/lib/minder/search_frame.rb

@@ -0,0 +1,53 @@
+require 'minder/frame'
+
+module Minder
+  class SearchFrame < Frame
+    attr_reader :search_string
+
+    def initialize(*)
+      super
+      @search_string = ''
+    end
+
+    def desired_height
+      3
+    end
+
+    def template
+      <<-TEXT
+/#{search_string}
+TEXT
+    end
+
+    def set_cursor_position
+      window.setpos(1, search_string.length + 2)
+    end
+
+    def handle_char_keypress(key)
+      return unless key
+
+      @search_string += key
+      refresh
+    end
+
+    def handle_non_char_keypress(key)
+      case key
+      when 27
+        changed
+        notify_observers(:escape_search)
+      when 127
+        @search_string.chop!
+        refresh
+      when 10
+        changed
+        notify_observers(:submit_search, { text: search_string })
+        refresh
+      end
+    end
+
+    def begin_search
+      @search_string = ''
+    end
+  end
+end
+

data/lib/minder/task.rb

@@ -4,21 +4,14 @@ module Minder
   class Task
     include Virtus.model
 
+    attribute :id, Integer
     attribute :description, String
-    attribute :selected, Boolean, default: false
-    attribute :started, Boolean, default: false
-
-    def start
-      self.started = true
-    end
-
-    def unstart
-      self.description.gsub!(/\* /, '')
-      self.started = false
-    end
+    attribute :selected, Boolean
+    attribute :started_at, DateTime
+    attribute :completed_at, DateTime
 
     def started?
-      super || description =~ /\* /
+      !!started_at
     end
 
     def to_s

data/lib/minder/task_mapper.rb

@@ -0,0 +1,11 @@
+class TaskMapper < ROM::Mapper
+  relation :tasks
+  register_as :entity
+
+  model Minder::Task
+
+  attribute :id
+  attribute :description
+  attribute :selected
+  attribute :started
+end

data/lib/minder/task_recorder.rb

@@ -3,16 +3,36 @@ require 'fileutils'
 
 module Minder
   class TaskRecorder
-    attr_accessor :tasks,
-                  :lines
+    attr_accessor :lines
 
-    def initialize
+    attr_reader :search_results,
+                :database,
+                :tasks
+
+    def initialize(database:)
+      @database = database
       @selected_task_index = 0
+      @selected_search_result = 0
+      @search_results = []
+      @filter = ''
       reload
     end
 
+    def filter(text)
+      @tasks = nil
+      @filter = text
+    end
+
     def tasks
-      @tasks ||= lines.map { |task| Task.new(description: task) }
+      @tasks ||= fetch_filtered_tasks
+    end
+
+    def unfiltered_tasks
+      database.tasks
+    end
+
+    def fetch_filtered_tasks
+      database.tasks_filtered_by(@filter)
     end
 
     def tasks?
@@ -23,6 +43,7 @@ module Minder
       File.open(DOING_FILE, 'a') do |file|
         file.write("#{task}\n")
       end
+      database.add_task(task)
       reload
     end
 
@@ -51,7 +72,7 @@ module Minder
     end
 
     def delete_task
-      lines.delete_at(selected_task_index)
+      database.delete_task(selected_task)
       @tasks = nil
       write_file_with_backup
       reload
@@ -83,7 +104,7 @@ module Minder
 
     def write_file(path)
       File.open(path, 'w') do |file|
-        tasks.each do |task|
+        unfiltered_tasks.each do |task|
           line = task.to_s
           line = "* #{line}" if task.started?
           file.write("#{line}\n")
@@ -92,14 +113,14 @@ module Minder
     end
 
     def start_task
-      selected_task.start
+      database.start_task(selected_task)
       write_file_with_backup
       add_to_done_file("Started: #{selected_task.description}")
       reload
     end
 
     def unstart_task
-      selected_task.unstart
+      database.unstart_task(selected_task)
       write_file_with_backup
       add_to_done_file("Un-started: #{selected_task.description}")
       reload
@@ -116,5 +137,39 @@ module Minder
     def select_first_task
       @selected_task_index = 0
     end
+
+    def search(text)
+      @search_results = tasks.select do |task|
+        task.description.downcase.include?(text.downcase)
+      end
+      @selected_search_result = 0
+    end
+
+    def select_search_result(search_index = 0)
+      return if search_results.empty?
+
+      @selected_task_index = tasks.find_index do |task|
+        task.description == search_results[search_index].description
+      end
+    end
+
+    def next_search
+      @selected_search_result += 1
+
+      if @selected_search_result > search_results.length - 1
+        @selected_search_result = 0
+      end
+      select_search_result(@selected_search_result)
+    end
+
+    def previous_search
+      @selected_search_result -= 1
+
+      if @selected_search_result < 0
+        @selected_search_result = search_results.length - 1
+      end
+
+      select_search_result(@selected_search_result)
+    end
   end
 end

data/lib/minder/tasks.rb

@@ -0,0 +1,9 @@
+class Tasks < ROM::Relation[:sql]
+  def filtered_by(text)
+    where("description LIKE '%#{text}%'")
+  end
+
+  def by_id(id)
+    where(id: id)
+  end
+end

data/lib/minder/version.rb

@@ -1,3 +1,3 @@
 module Minder
-  VERSION = 0.1
+  VERSION = '0.2.beta1'
 end

data/lib/minder.rb

@@ -5,6 +5,9 @@ module Minder
   ASSETS_LOCATION = File.expand_path(File.dirname(__FILE__) + '/../assets')
   DOING_FILE = File.join(ENV["HOME"], '.minder', 'doing.txt')
   DONE_FILE = File.join(ENV["HOME"], '.minder', 'done.txt')
+  MIGRATIONS_PATH = File.expand_path(File.dirname(__FILE__) + '/../')
+  DATABASE_LOCATION = "sqlite://#{ENV['HOME']}/.minder/database.sqlite3"
+
   def self.formatted_time(seconds)
     minutes = (seconds / 60).to_i
     seconds = (seconds % 60).round

data/minder.gemspec

@@ -18,8 +18,12 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'curses', '~> 1.0', '>= 1.0.1'
   spec.add_runtime_dependency 'virtus', '~> 1.0', '>= 1.0.5'
+  spec.add_runtime_dependency 'rom', '~> 0.7', '>= 0.7'
+  spec.add_runtime_dependency 'rom-sql', '~> 0.5', '>= 0.5'
+  spec.add_runtime_dependency 'sqlite3', '~> 1.3', '>= 1.3.10'
+  spec.add_runtime_dependency 'activesupport', '~> 4.2', '>= 4.2.1'
 
-  spec.add_development_dependency "bundler", '~> 0'
+  spec.add_development_dependency "bundler", '~> 1'
   spec.add_development_dependency "rspec", '~> 3.2', '>= 3.2'
   spec.add_development_dependency "timecop", '~> 0.7', '>= 0.7.3'
   spec.add_development_dependency "pry", '~> 0.10', '>= 0.10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minder
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.2.beta1
 platform: ruby
 authors:
 - Joseph Method
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -50,20 +50,100 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: rom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rom-sql
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.10
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +246,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".rspec"
 - ".ruby-version"
 - Gemfile
@@ -175,11 +256,18 @@ files:
 - assets/done.wav
 - assets/start.wav
 - bin/minder
+- db/migrate/001_create_tasks.rb
+- db/migrate/002_import_tasks.rb
 - lib/minder.rb
 - lib/minder/application.rb
 - lib/minder/break_period.rb
+- lib/minder/commands/delete_task.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
@@ -188,8 +276,11 @@ files:
 - 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/version.rb
 - minder.gemspec
@@ -215,9 +306,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5