thyme 0.0.10 → 0.0.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 01f04a390342ec220db3518e9c4495a615526d9c
+  data.tar.gz: 9486f89eee4c8770a10c7d1b529e25d00a2a2b82
+SHA512:
+  metadata.gz: d206ec0493005d94414a7e8b46de5e3f739f0c4fa24ee897e0545c99a77c60675659c61a9126d66b1d3bde7b8ca7b6ff471c6618fe0e015324e1d07e8644f4b6
+  data.tar.gz: 55552b2da07a13917a2225aeba7840bbcd381ca441a3c46440018b547e79a67d0914c7053172a0fe40903fd84a2c8fa792a26a909866f4f7a3b811e039a30f2a

data/README.md

@@ -22,8 +22,8 @@ you of the timer:
 
     $ thyme -d
 
-To interrupt the timer in daemon mode, simply run `thyme --stop`.  Or wait 25
-minutes for it to kill itself.
+To interrupt the timer in daemon mode, run `thyme` again.  Or wait 25 minutes
+for it to kill itself.
 
 Configure
 =========
@@ -32,32 +32,38 @@ Thyme is configurable and extensible.  All configurations live in the
 `~/.thymerc` file:
 
     set :timer, 25*60
+    set :timer_break, 5*60
+    set :warning, 5*60
+    set :warning_color, "red,bold"
     set :interval, 1
     set :tmux, true
     set :tmux_theme, "#[fg=mycolor,bg=mycolor]#[fg=%s]%s#[fg=mycolor,bg=mycolor]"
 
-    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
 
+    option :s, 'seconds num', 'run with custom seconds' do |num|
+      @timer = num.to_i
+      run
+    end
+
     before do
       `mplayer ~/music/flight-of-the-bumble-bee.mp3 &`
     end
 
     after do |seconds_left|
-      `notify-send -u critical "Thymes Up!"` if seconds_left == 0
+      `notify-send -u critical "Thyme's Up!"` if seconds_left == 0
     end
 
-The `set` method sets different configurations.  There are only two:
+The `set` method sets different configurations.
 
-* `: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)
+* `:timer` seconds to countdown from
+* `:timer_break` seconds to countdown from in break mode
+* `:warning` seconds threshold before tmux timer turns red (use 0 to disable)
+* `:warning_color` color of the tmux timer during the warning period
+* `:interval` refresh rate of the progress bar and tmux status in seconds
+* `:tmux` whether or not you want tmux integration on (false by default)
 * `:tmux_theme` optionally lets you format the tmux status
 
 The `option` method adds new options to the `thyme` command.  In the above
@@ -83,7 +89,6 @@ For vim integration, I like to execute `thyme -d` to toggle the timer.  This onl
 works if you have tmux integration setup for the countdown:
 
     nmap <leader>t :!thyme -d<cr>
-    nmap <leader>T :!thyme -s<cr>
 
 License
 =======

data/bin/thyme

@@ -5,13 +5,13 @@ require File.expand_path('thyme', File.join(File.dirname(__FILE__), '..', 'lib')
 $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('-b', '--break', 'run break timer') { thyme.break! }
   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 }
+  thyme.load_config(o)
   o.parse!
-  thyme.run
+  thyme.run(true)
 end

data/lib/thyme.rb

@@ -2,70 +2,38 @@ require 'ruby-progressbar'
 require 'date'
 
 class Thyme
-  VERSION = '0.0.10'
+  VERSION = '0.0.12'
   CONFIG_FILE = "#{ENV['HOME']}/.thymerc"
   PID_FILE = "#{ENV['HOME']}/.thyme-pid"
   TMUX_FILE = "#{ENV['HOME']}/.thyme-tmux"
-  OPTIONS = [:timer, :tmux, :interval, :tmux_theme]
+  OPTIONS = [:interval, :timer, :timer_break, :tmux, :tmux_theme, :warning, :warning_color]
 
   def initialize
+    @break = false
+    @interval = 1
     @timer = 25 * 60
+    @timer_break = 5 * 60
     @tmux = false
-    @interval = 1
     @tmux_theme = "#[default]#[fg=%s]%s#[default]" 
+    @warning = 5 * 60
+    @warning_color = "red,bold"
   end
 
-  def run
-    before_hook = @before
-    seconds_start = @timer
-    seconds_left = seconds_start + 1
-    start_time = DateTime.now
-    min_length = (seconds_left / 60).floor.to_s.length
-    tmux_file = File.open(TMUX_FILE, "w")
-    bar = ProgressBar.create(
-      title: format(seconds_left-1, min_length),
-      total: seconds_start,
-      length: 50,
-      format: '[%B] %t')
-    while seconds_left > 0
-      seconds_passed = seconds_since(start_time)
-      seconds_left = [seconds_start - seconds_passed, 0].max
-      title = format(seconds_left, min_length)
-      fg = color(seconds_left)
-      bar.title = title
-      bar.progress = seconds_passed
-      if @tmux
-        tmux_file.truncate(0)
-        tmux_file.rewind
-        tmux_file.write(@tmux_theme % [fg, title])
-        tmux_file.flush
-      end
-      if before_hook
-        self.instance_exec(&before_hook)
-        before_hook = nil
-      end
-      sleep(@interval)
+  def run(force=false)
+    if force
+      running? ? stop_timer : start_timer
+    else
+      @run = true
     end
-  rescue SignalException => e
-    puts ""
-  ensure
-    tmux_file.close
-    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
-    self.instance_exec(seconds_left, &@after) if @after
   end
 
-  def stop
-    return if !File.exists?(PID_FILE)
-    pid = File.read(PID_FILE).to_i
-    File.delete(PID_FILE)
-    Process.kill('TERM', pid) if pid > 1
+  def break!
+    @break = true
   end
 
   def daemonize!
+    @daemon = true
     Process.daemon
-    File.open(PID_FILE, "w") { |f| f.print(Process.pid) }
   end
 
   def set(opt, val)
@@ -82,7 +50,10 @@ class Thyme
   end
 
   def option(optparse, short, long, desc, &block)
-    optparse.on("-#{short}", "--#{long}", desc) { self.instance_exec(&block); exit }
+    optparse.on("-#{short}", "--#{long}", desc) do |*args|
+      self.instance_exec(*args, &block)
+      exit if !@run
+    end
   end
 
   def load_config(optparse)
@@ -97,7 +68,65 @@ class Thyme
     load(CONFIG_FILE, true)
   end
 
+  def running?
+    File.exists?(PID_FILE)
+  end
+
   private
+
+  def start_timer
+    File.open(PID_FILE, "w") { |f| f.print(Process.pid) }
+    before_hook = @before
+    seconds_start = @break ? @timer_break : @timer
+    seconds_left = seconds_start + 1
+    start_time = DateTime.now
+    min_length = (seconds_left / 60).floor.to_s.length
+    tmux_file = File.open(TMUX_FILE, "w") if @tmux
+    bar = ENV['THYME_TEST'].nil? && !@daemon ?
+      ProgressBar.create(
+        title: format(seconds_left-1, min_length),
+        total: seconds_start,
+        length: 50,
+        format: '[%B] %t') : nil
+    while seconds_left > 0
+      seconds_passed = seconds_since(start_time)
+      seconds_left = [seconds_start - seconds_passed, 0].max
+      title = format(seconds_left, min_length)
+      fg = color(seconds_left)
+      if bar
+        bar.title = title
+        bar.progress = seconds_passed
+      end
+      if @tmux
+        tmux_file.truncate(0)
+        tmux_file.rewind
+        tmux_file.write(@tmux_theme % [fg, title])
+        tmux_file.flush
+      end
+      if before_hook
+        self.instance_exec(&before_hook)
+        before_hook = nil
+      end
+      sleep(@interval)
+    end
+  rescue SignalException => e
+    puts ""
+  ensure
+    tmux_file.close if tmux_file
+    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
+    self.instance_exec(seconds_left, &@after) if @after
+  end
+
+  def stop_timer
+    pid = File.read(PID_FILE).to_i
+    Process.kill('TERM', pid) if pid > 1
+  rescue Errno::ESRCH # process is already dead, cleanup files and restart
+    File.delete(TMUX_FILE) if File.exists?(TMUX_FILE)
+    File.delete(PID_FILE) if File.exists?(PID_FILE)
+  end
+
   def seconds_since(time)
     ((DateTime.now - time) * 24 * 60 * 60).to_i
   end
@@ -113,7 +142,7 @@ class Thyme
   end
 
   def color(seconds)
-    seconds < (5*60) ? 'red,bold' : 'default'
+    !@break && seconds < @warning ? @warning_color : 'default'
   end
 end
 

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: thyme
 version: !ruby/object:Gem::Version
-  version: 0.0.10
-  prerelease: 
+  version: 0.0.12
 platform: ruby
 authors:
 - Hugh Bien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-08-25 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'
 description: Extensible and configurable timer for Pomodoro Technique.
@@ -41,26 +38,25 @@ files:
 - lib/thyme.rb
 homepage: http://thymerb.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Timer for Pomodoro Technique
 test_files: []