minder 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66b3a3442d25126ae9c577eea879ad652a5d68cf
-  data.tar.gz: 47664732c3c2d7cd647732951d9a3ad8e6295ca4
+  metadata.gz: 04665cae7902282fb0354f8897c7267e463c3aad
+  data.tar.gz: 3f0a83899f2269bc469f073fd3c0a3d012d1e44d
 SHA512:
-  metadata.gz: 78e7312555108b90e7ae3745a5c393f9e1cc888a9c4967f6173d771277dbd3cb7ffa6524d39d17595973b5ab641509c15d363017eabf1f1f58739a6160c12f82
-  data.tar.gz: 3fd237cd9452fa32cb5aeac920f475dd61e4585157e819c48f58d7ac7b7b7665afa4d7f558189cfd0615a57d94bd5bd95cba9eb6fc0f33cc931c64e45319cf9b
+  metadata.gz: 53f6d0608801071dfa6ba6b5c1a2ef81978b244bd2f69026f35bd2dce90dbf5946198f2c63f8322480bb6f33514128b464089c7e4a734b73184dfce0b476c0a1
+  data.tar.gz: ed2a922c027a2fd7d12737d124a2dfa71fe0ee048f67e2f2d462bf48e5de0941d5b71e07769634c0591747714e67f996008c1b4351cbed754f87a70e9396d754

data/lib/minder.rb

@@ -6,7 +6,6 @@ module Minder
   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 = "#{ENV['HOME']}/.minder/database.sqlite3"
   LOG_LOCATION = "#{ENV['HOME']}/.minder/info.log"
 
   require 'minder/application'
@@ -16,6 +15,18 @@ module Minder
   require 'active_support'
   require 'fileutils'
 
+  def self.config
+    @config ||= begin
+                  config = Minder::Config.new(CONFIG_LOCATION)
+                  config.load
+                  config
+                end
+  end
+
+  def self.database_location
+    "#{ENV['HOME']}/.minder/#{config.database_name}.sqlite3"
+  end
+
   def self.formatted_time(seconds)
     minutes = (seconds / 60).to_i
     seconds = (seconds % 60).round

data/lib/minder/config.rb

@@ -6,7 +6,8 @@ module Minder
       work_duration: 25,
       short_break_duration: 5,
       long_break_duration: 15,
-      emoji: 'tomato'
+      emoji: 'tomato',
+      database_name: 'database'
     }
 
     attr_accessor :location

data/lib/minder/database/database.rb

@@ -7,9 +7,9 @@ class Database
   attr_reader :rom
 
   def initialize
-    FileUtils.mkdir_p(File.dirname(Minder::DATABASE_LOCATION))
+    FileUtils.mkdir_p(File.dirname(Minder.database_location))
     ROM.use :auto_registration
-    ROM.setup(:sql, "sqlite://#{Minder::DATABASE_LOCATION}")
+    ROM.setup(:sql, "sqlite://#{Minder.database_location}")
 
     require 'minder/tasks/task'
     require 'minder/database/task_mapper'

data/lib/minder/pomodoro/pomodoro_runner.rb

@@ -48,7 +48,6 @@ module Minder
     def continue
       return unless current_period.elapsed?
 
-      current_period.complete!
       complete_period(current_period)
 
       advance_period
@@ -58,6 +57,7 @@ module Minder
     end
 
     def complete_period(period)
+      period.complete!
       database.complete_period(period)
       @pomodoros_today = nil
     end

data/lib/minder/version.rb

@@ -1,3 +1,3 @@
 module Minder
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minder
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Joseph Method
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -304,9 +304,8 @@ files:
 - assets/start.wav
 - bin/minder
 - db/migrate/001_create_tasks.rb
-- db/migrate/002_import_tasks.rb
-- db/migrate/003_create_periods.rb
-- db/migrate/004_add_duration_in_seconds_to_periods.rb
+- db/migrate/002_create_periods.rb
+- db/migrate/003_add_duration_in_seconds_to_periods.rb
 - lib/minder.rb
 - lib/minder/application.rb
 - lib/minder/cli/filter_frame.rb

data/db/migrate/002_import_tasks.rb

@@ -1,15 +0,0 @@
-Sequel.migration do
-  up do
-    next unless File.exists?(Minder::DOING_FILE)
-
-    tasks = ROM.env.gateways[: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