tacgo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 046eae30a45b2fa4a4e9a489e6de11557a493ec8
-  data.tar.gz: d41a0b23e5571125542ad5c8c6382d882953ad0e
+  metadata.gz: 72112fda85742ac175d7809c27f0568c5221555e
+  data.tar.gz: dd860e32dbd0a0414d64d64b7067f459a6e0335f
 SHA512:
-  metadata.gz: 1da183586fa8a54b1e722429d980edf93e0df778a89f2d81f62efd99f9ff9b067e72f232dee42fa0b3754e73710ec2dea61e5ceb3fbb57e37e1bbd64720cdb90
-  data.tar.gz: 002a24f516df83e5745b698b2555f36777d912adf74113ddaced9e13dda66c9709f20c0fc8ebe1d395c9738e137475d00a718ae4d3828172195af54a826c7cc2
+  metadata.gz: ad40617d73679ca7f4f3002570f1f709e42fe171be4532c16f56f01d97056a9070e32f90cc241c74047f6909a90b8f796567950410863ad111db9b00c712e0a0
+  data.tar.gz: c44089ba2aa0bba5584f9368eab9813d667f3cd68b6f854e931c76072a857e1eb6137a6cac1a1111d386c4152ebcb77f899777c9371d81802dc56049b7a6a2d6

data/bin/tacgo

@@ -38,7 +38,33 @@ Task = Struct.new(:id, :label) do
   end
 end
 
-Pomodoro = Struct.new(:task, :started, :completed) do
+Pomodoro = Struct.new(:task, :duration, :started, :completed) do
+  attr_accessor :restarted, :canceled
+
+  def initialize(task = nil, duration = 25 * 60, started = nil, completed = nil)
+    super task, duration, started, completed
+  end
+
+  def active?
+    canceled.nil? and progress < duration
+  end
+
+  def canceled?
+    !canceled.nil?
+  end
+
+  def progress
+    [ Time.now - (restarted || started), duration ].min
+  end
+
+  def restart
+    self.restarted = Time.now
+  end
+
+  def cancel
+    self.canceled = Time.now
+  end
+
   def start(store)
     self.started = Time.now
     store.transaction do
@@ -61,21 +87,27 @@ def start
   task     = fetch_top_task
   pomodoro = Pomodoro.new(task)
   pomodoro.start(store)
-
-  duration = 25 * 60
-  progress = ProgressBar.create(title: task.label[0..40], total: duration)
+  progress = ProgressBar.create(title:  task.label[0..40],
+                                total:  pomodoro.duration,
+                                format: '%t: |%B| %p%%')
 
   Thread.abort_on_exception = true
-  Thread.new(pomodoro, duration, progress) do |pomodoro, duration, progress|
-    while (now = Time.now) < pomodoro.started + duration
-      progress.progress = now - pomodoro.started
-      sleep 1
+  Thread.new(pomodoro, progress) do |pomodoro, progress|
+    $stdin.echo = false
+    Signal.trap('INT')  { pomodoro.cancel }
+    Signal.trap('QUIT') { pomodoro.restart }
+
+    while pomodoro.active?
+      progress.progress = pomodoro.progress
+      sleep 0.1
     end
-  end.join
-  progress.finish
 
-  pomodoro.complete(store)
-  `osascript -e 'display notification "Pomodoro complete" with title "Pomodoro complete" sound name "Glass"'`
+    unless pomodoro.canceled?
+      progress.finish
+      pomodoro.complete store
+      `osascript -e 'display notification "Pomodoro complete" with title "Pomodoro complete" sound name "Glass"'`
+    end
+  end.join
 end
 
 def store

data/tacgo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'tacgo'
-  spec.version     = '0.0.2'
+  spec.version     = '0.0.3'
   spec.summary     = 'Taco and Pomodoro'
   spec.description = 'Time and track pomodori against the top task in Taco'
   spec.authors     = ['Larry Marburger']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tacgo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Larry Marburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize