thyme 0.0.1 → 0.0.2

data/README.md

@@ -14,7 +14,7 @@ Usage
 Start thyme with:
 
     $ thyme
-    [=.........................] 25m
+    [===                    ] 24:59
 
 You'll have 25 minutes by default.  `Ctrl-C` to interrupt.  You can also start
 it in daemon mode, which is only useful if you've got tmux integration to notify
@@ -32,66 +32,49 @@ Thyme is configurable and extensible.  All configurations live in the
 `~/.thymerc` file:
 
     set :timer, 25
-    set :outfile, "~/.thyme-tmux"
+    set :tmux, true
 
-    option :o, :open, 'opens today & records sheets' do
-      `vim -O ~/.thyme-today.md ~/.thyme-records.md`
+    option :o, :open, 'open sheets' do
+      `vim -O ~/.thyme-today.md ~/.thyme-records.md < \`tty\` > \`tty\``
     end
 
     before do
-      puts "Get ready, get set, GO!"
+      `mplayer ~/music/flight-of-the-bumble-bee.mp3 &`
     end
 
     after do
-      `mplayer ~/music/wohoo.mp3`
-      `vim -O ~/.thyme-today.md`
+      `notify-send -u critical "0:00 Thymes Up!"`
     end
 
 The `set` method sets different configurations.  There are only two:
 
 * `:timer` is the number of minutes to countdown from
-* `:outfile` is the file to write out progress to for tmux integration
+* `: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.
 
 The `before` and `after` adds hooks to our timer.  Now before the timer starts,
-STDOUT will receive a message.  After the timer ends, vim will open our today
-sheet.
+an mp3 will play.  After the timer ends, a notification will be sent.
 
 Integration
 ===========
 
-For tmux integration, make sure to set the outfile in `~/.thymerc`:
+For tmux integration, make sure to set the `:tmux` option in `~/.thymerc`:
 
-    set :outfile, "~/.thyme-tmux"
+    set :tmux, true
 
 Then in your `.tmux.conf` file:
 
     set-option -g status-right '#(cat ~/.thyme-tmux)'
+    set-option -g status-interval 1
 
 For vim integration, I like to execute `thyme -d` to toggle the timer.  This only
 works if you have tmux integration setup for the countdown:
 
-    nmap <leader>t :!thyme -d
-    nmap <leader>T :!thyme -s
-
-TODO
-====
-
-* add directory stucture (binary, lib file, tests, Rakefile, gemspec)
-* add `--help`
-* add 25 minute timer
-* add progress bar
-* add `--daemon` switch and `--stop`
-* add config reader
-* add config `set`
-* add `set :timer`
-* add `set :outfile`
-* add config `option`
-* add config `before` and `after`
-* add color to outfile tmux integration (?)
+    nmap <leader>t :!thyme -d<cr>
+    nmap <leader>T :!thyme -s<cr>
 
 License
 =======

data/thyme

@@ -2,11 +2,16 @@
 require 'optparse'
 require File.expand_path('thyme', File.dirname(__FILE__))
 
+$0 = 'thyme'
 ARGV.options do |o|
+  thyme = Thyme.new
+  thyme.load_config(o)
   o.set_summary_indent('  ')
   o.banner =    "Usage: #{File.basename($0)} [OPTION]"
   o.define_head "Timer for Pomodoro Technique"
+  o.on('-d', '--daemon', 'run in background') { thyme.daemonize! }
   o.on('-h', '--help', 'show this help message') { puts o; exit }
+  o.on('-s', '--stop', 'stops timer') { thyme.stop; exit }
   o.parse!
-  puts o
+  thyme.run
 end

data/thyme.rb

@@ -1,4 +1,111 @@
+require 'ruby-progressbar'
+require 'date'
+
 class Thyme
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
   CONFIG_FILE = "#{ENV['HOME']}/.thymerc"
+  PID_FILE = "#{ENV['HOME']}/.thyme-pid"
+  TMUX_FILE = "#{ENV['HOME']}/.thyme-tmux"
+  OPTIONS = [:timer, :tmux]
+
+  def initialize
+    @timer = 25
+    @tmux = false
+  end
+
+  def run
+    @before.call if @before
+    start = @timer * 60
+    start_time = DateTime.now
+    seconds = start + 1
+    min_length = (seconds / 60).floor.to_s.length
+    tmux_file = File.open(TMUX_FILE, "w")
+    bar = ProgressBar.create(
+      title: format(seconds-1, min_length),
+      total: seconds,
+      length: 50,
+      format: '[%B] %t')
+    while !bar.finished? && seconds > 0
+      seconds = start - seconds_since(start_time)
+      title = format(seconds, min_length)
+      fg = color(seconds)
+      bar.title = title
+      bar.increment
+      if @tmux
+        tmux_file.truncate(0)
+        tmux_file.rewind
+        tmux_file.write("#[default]#[fg=#{fg}]#{title}#[default]")
+        tmux_file.flush
+      end
+      sleep(1)
+    end
+  rescue SignalException => e
+    puts ""
+  ensure
+    tmux_file.close
+    @after.call if @after && seconds <= 0
+    stop
+  end
+
+  def stop
+    File.delete(TMUX_FILE) if File.exists?(TMUX_FILE)
+    if File.exists?(PID_FILE)
+      pid = File.read(PID_FILE).to_i
+      File.delete(PID_FILE)
+      Process.kill('TERM', pid) if pid > 1
+    end
+  end
+
+  def daemonize!
+    Process.daemon
+    File.open(PID_FILE, "w") { |f| f.print(Process.pid) }
+  end
+
+  def set(opt, val)
+    raise ThymeError.new("Invalid option: #{opt}") if !OPTIONS.include?(opt.to_sym)
+    self.instance_variable_set("@#{opt}", val)
+  end
+
+  def before(&block)
+    @before = block
+  end
+
+  def after(&block)
+    @after = block
+  end
+
+  def option(optparse, short, long, desc, &block)
+    optparse.on("-#{short}", "--#{long}", desc) { block.call; exit }
+  end
+
+  def load_config(optparse)
+    return if !File.exists?(CONFIG_FILE)
+    app = self
+    Object.class_eval do
+      define_method(:set) { |opt,val| app.set(opt,val) }
+      define_method(:before) { |&block| app.before(&block) }
+      define_method(:after) { |&block| app.after(&block) }
+      define_method(:option) { |sh,lo,desc,&b| app.option(optparse,sh,lo,desc,&b) }
+    end
+    load(CONFIG_FILE, true)
+  end
+
+  private
+  def seconds_since(time)
+    ((DateTime.now - time) * 24 * 60 * 60).to_i
+  end
+
+  def format(seconds, min_length)
+    min = (seconds / 60).floor
+    lead = ' ' * (min_length - min.to_s.length)
+    sec = (seconds % 60).floor
+    sec = "0#{sec}" if sec.to_s.length == 1
+    "#{lead}#{min}:#{sec}"
+  end
+
+  def color(seconds)
+    seconds < (5*60) ? 'red,bold' : 'default'
+  end
 end
+
+class ThymeError < StandardError; end;

data/thyme_test.rb

@@ -1,12 +1,30 @@
 require 'rubygems'
 require "#{File.dirname(__FILE__)}/thyme"
-require 'minitest/autorun'
+require 'minitest'
 
-class ThymeTest < MiniTest::Unit::TestCase
+Minitest.autorun
+
+class ThymeTest < Minitest::Test
   def setup
+    @thyme = Thyme.new
+  end
+
+  def test_format
+    assert_equal('25:00', @thyme.send(:format, 25*60, 2))
+    assert_equal('24:59', @thyme.send(:format, 25*60-1, 2))
+    assert_equal(' 5:00', @thyme.send(:format, 5*60, 2))
+    assert_equal(' 4:05', @thyme.send(:format, 4*60+5, 2))
+  end
+
+  def test_color
+    assert_equal('default', @thyme.send(:color, 5*60))
+    assert_equal('red,bold', @thyme.send(:color, 5*60-1))
   end
 
-  def test_truth
-    assert(true)
+  def test_set
+    assert_equal(25, @thyme.instance_variable_get('@timer'))
+    @thyme.set(:timer, 20)
+    assert_equal(20, @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.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: .
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement