thyme 0.0.8 → 0.0.9

data/README.md

@@ -36,7 +36,12 @@ Thyme is configurable and extensible.  All configurations live in the
     set :tmux, true
     set :tmux_theme "#[fg=mycolor,bg=mycolor]#[fg=%s]%s#[fg=mycolor,bg=mycolor]"
 
-    option :o, :open, 'open sheets' do
+    option :b, :break, 'start a break' do
+      set :timer, 5*60
+      run
+    end
+
+    option :t, :today, 'open today sheet' do
       `vim -O ~/.thyme-today.md ~/.thyme-records.md < \`tty\` > \`tty\``
     end
 
@@ -55,8 +60,8 @@ The `set` method sets different configurations.  There are only two:
 * `: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
-options.
+example, we can now execute `thyme -b` or `thyme -t`.  Use `thyme -h` to see
+available options.
 
 The `before` and `after` adds hooks to our timer.  Now before the timer starts,
 an mp3 will play.  After the timer ends, a notification will be sent.

data/thyme.rb

@@ -2,7 +2,7 @@ require 'ruby-progressbar'
 require 'date'
 
 class Thyme
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
   CONFIG_FILE = "#{ENV['HOME']}/.thymerc"
   PID_FILE = "#{ENV['HOME']}/.thyme-pid"
   TMUX_FILE = "#{ENV['HOME']}/.thyme-tmux"
@@ -41,7 +41,7 @@ class Thyme
         tmux_file.flush
       end
       if before_hook
-        before_hook.call
+        self.instance_exec(&before_hook)
         before_hook = nil
       end
       sleep(@interval)
@@ -53,7 +53,7 @@ class Thyme
     File.delete(TMUX_FILE) if File.exists?(TMUX_FILE)
     File.delete(PID_FILE) if File.exists?(PID_FILE)
     seconds_left = [seconds_start - seconds_since(start_time), 0].max
-    @after.call(seconds_left) if @after
+    self.instance_exec(seconds_left, &@after) if @after
   end
 
   def stop
@@ -82,7 +82,7 @@ class Thyme
   end
 
   def option(optparse, short, long, desc, &block)
-    optparse.on("-#{short}", "--#{long}", desc) { block.call; exit }
+    optparse.on("-#{short}", "--#{long}", desc) { self.instance_exec(&block); exit }
   end
 
   def load_config(optparse)

data/thyme_test.rb

@@ -6,7 +6,10 @@ Minitest.autorun
 
 class ThymeTest < Minitest::Test
   def setup
+    # TODO: stub out progress bar
     @thyme = Thyme.new
+    @thyme.set(:interval, 0)
+    @thyme.set(:timer, 0)
   end
 
   def test_format
@@ -22,9 +25,23 @@ class ThymeTest < Minitest::Test
   end
 
   def test_set
-    assert_equal(25*60, @thyme.instance_variable_get('@timer'))
+    assert_equal(0, @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
+
+  def test_run
+    @thyme.run
+  end
+
+  def test_hooks
+    @thyme.before { @before_flag = true }
+    @thyme.after { @after_flag = true }
+    refute(@thyme.instance_variable_get('@before_flag'))
+    refute(@thyme.instance_variable_get('@after_flag'))
+    @thyme.run
+    assert(@thyme.instance_variable_get('@before_flag'))
+    assert(@thyme.instance_variable_get('@after_flag'))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thyme
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: .
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar