thyme 0.0.5 → 0.0.6

data/README.md

@@ -31,9 +31,9 @@ Configure
 Thyme is configurable and extensible.  All configurations live in the
 `~/.thymerc` file:
 
-    set :timer, 25
-    set :tmux, true
+    set :timer, 25*60
     set :interval, 1
+    set :tmux, true
 
     option :o, :open, 'open sheets' do
       `vim -O ~/.thyme-today.md ~/.thyme-records.md < \`tty\` > \`tty\``
@@ -43,15 +43,15 @@ Thyme is configurable and extensible.  All configurations live in the
       `mplayer ~/music/flight-of-the-bumble-bee.mp3 &`
     end
 
-    after do
-      `notify-send -u critical "0:00 Thymes Up!"`
+    after do |seconds_left|
+      `notify-send -u critical "Thymes Up!"` if seconds_left == 0
     end
 
 The `set` method sets different configurations.  There are only two:
 
-* `:timer` is the number of minutes to countdown from
-* `:tmux` is whether or not you want tmux integration on (off by default)
+* `:timer` is the number of seconds to countdown from
 * `:interval` is the refresh rate of the progress bar and tmux status in seconds
+* `:tmux` is whether or not you want tmux integration on (off by default)
 
 The `option` method adds new options to the `thyme` command.  In the above
 example, we can now execute `thyme -o`.  Use `thyme -h` to see available

data/thyme.rb

@@ -2,21 +2,21 @@ require 'ruby-progressbar'
 require 'date'
 
 class Thyme
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
   CONFIG_FILE = "#{ENV['HOME']}/.thymerc"
   PID_FILE = "#{ENV['HOME']}/.thyme-pid"
   TMUX_FILE = "#{ENV['HOME']}/.thyme-tmux"
   OPTIONS = [:timer, :tmux, :interval]
 
   def initialize
-    @timer = 25
+    @timer = 25 * 60
     @tmux = false
     @interval = 1
   end
 
   def run
-    @before.call if @before
-    seconds_start = @timer * 60
+    before_hook = @before
+    seconds_start = @timer
     seconds_left = seconds_start + 1
     start_time = DateTime.now
     min_length = (seconds_left / 60).floor.to_s.length
@@ -28,7 +28,7 @@ class Thyme
       format: '[%B] %t')
     while seconds_left > 0
       seconds_passed = seconds_since(start_time)
-      seconds_left = seconds_start - seconds_passed
+      seconds_left = [seconds_start - seconds_passed, 0].max
       title = format(seconds_left, min_length)
       fg = color(seconds_left)
       bar.title = title
@@ -39,14 +39,19 @@ class Thyme
         tmux_file.write("#[default]#[fg=#{fg}]#{title}#[default]")
         tmux_file.flush
       end
+      if before_hook
+        before_hook.call
+        before_hook = nil
+      end
       sleep(@interval)
     end
   rescue SignalException => e
     puts ""
   ensure
     tmux_file.close
-    @after.call if @after && seconds_left <= 0
     stop
+    seconds_left = [seconds_start - seconds_since(start_time), 0].max
+    @after.call(seconds_left) if @after
   end
 
   def stop
@@ -98,7 +103,6 @@ class Thyme
   end
 
   def format(seconds, min_length)
-    seconds = [0, seconds].max
     min = (seconds / 60).floor
     lead = ' ' * (min_length - min.to_s.length)
     sec = (seconds % 60).floor

data/thyme_test.rb

@@ -22,9 +22,9 @@ class ThymeTest < Minitest::Test
   end
 
   def test_set
-    assert_equal(25, @thyme.instance_variable_get('@timer'))
-    @thyme.set(:timer, 20)
-    assert_equal(20, @thyme.instance_variable_get('@timer'))
+    assert_equal(25*60, @thyme.instance_variable_get('@timer'))
+    @thyme.set(:timer, 20*60)
+    assert_equal(20*60, @thyme.instance_variable_get('@timer'))
     assert_raises(ThymeError) { @thyme.set(:invalid, nil) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thyme
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: