tamarillo 0.1.1 → 0.2.0

data/CHANGES

@@ -1,3 +1,6 @@
+Version 0.2.0, 2012-06-24
+- Switchd to GLI for binary
+
 Version 0.1.1, 2012-06-18
 - Add help command
 

data/README.md

@@ -29,55 +29,48 @@ can.
 
 ## Examples
 
-These examples are just thought experiments, this interface has not been
-implemented yet.
-
 ### Starting and stopping a tomato
 
 ```
   $ tam start
-  > tamarillo started
+  > Pomodoro started, about 25 minutes.
 
   $ tam stop
-  > tomato stopped around ~17m
-
-  $ tam pause
-  > tomato paused around ~16m
-
-  $ tam interrupt
-  > tomato interrupted around ~14m
+  > Pomorodo stopped, around 17 minutes.
 ```
 
 ### Status of current tomato
 
 ```
   $ tam status
-  > ~19m # rough time only, don't sweat the seconds
+  > About 19 minutes.
 
-  $ tam
-  > ~19m
-
-  $ tam status --full
-  > active 19:21
+  $ tam status --prompt
+  > 19:21 1161 1500
 ```
 
 ### Configuration
 
 ```
-$ tam config --duration=25
-> tamarillo duration is 25 minutes
-
-$ tam config --alert=growl
-> tamarillo will use Growl for notifications
-
-$ tam config --daemon ~/.tamarillo/pid
-> tamarillo will monitor the current tomato from here
+  $ tam config
+  > --
+  > duration: 25
+  > notifier: bell
+
+  $ tam config duration=10
+  > --
+  > duration: 10
+  > notifier: bell
+
+  $ tam config notifier=growl
+  > --
+  > duration: 10
+  > notifier: growl
 ```
 
 
 ## Future ideas
 
 * task management, tomatoes are assigned to a task
-* daemon process for monitoring the current tomato
-* notification helper app for various environments
 * instaweb view of history
+* helpers for shell and prompt integration

data/bin/tam

@@ -1,4 +1,64 @@
 #!/usr/bin/env ruby
 
-require 'tamarillo/command'
-Tamarillo::Command.new.execute(*ARGV)
+$: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
+
+gem 'gli', '~>1.6.0'
+require 'gli'
+require 'tamarillo'
+
+# Setup paths
+path = ENV['TAMARILLO_PATH']
+path ||= ENV['HOME'] + '/.tamarillo'
+tamarillo_path = Pathname.new(File.expand_path(path))
+config_path = tamarillo_path.join('config.yml')
+
+# Setup environment
+config = Tamarillo::Config.load(config_path)
+storage = Tamarillo::Storage.new(tamarillo_path, config)
+controller = Tamarillo::Controller.new(config, storage)
+
+include GLI
+
+program_desc "Command line pomodoro timer."
+version Tamarillo::VERSION
+
+desc "Status of the current pomodoro."
+command :status do |c|
+  c.desc 'Format status for display in prompt.'
+  c.switch [:p, :prompt]
+
+  c.action do |global_options, options, args|
+    format = options[:prompt] ? Tamarillo::Formats::PROMPT : Tamarillo::Formats::HUMAN
+    status = controller.status(format)
+    printf "%s\n", status unless status.nil? || status.empty?
+  end
+end
+
+desc "Start a new pomodoro."
+command :start do |c|
+  c.action do |global_options, options, args|
+    if tomato = controller.start_new_tomato
+      printf "Started new pomodoro, about %d minutes.\n", tomato.approx_minutes_remaining
+    end
+  end
+end
+
+desc "Stops the current pomodoro."
+command :stop do |c|
+  c.action do |global_options, options, args|
+    if tomato = controller.interrupt_current_tomato
+      printf "Pomodoro stopped, about %d minutes.\n", tomato.approx_minutes_remaining
+    end
+  end
+end
+
+desc "View and update the configuration."
+command :config do |c|
+  c.action do |global_options, options, args|
+    params = Hash[args.map { |pair| pair.split('=', 2) }]
+    controller.update_config(params)
+    print controller.config.to_yaml
+  end
+end
+
+exit run(ARGV)

data/lib/tamarillo/controller.rb

@@ -47,10 +47,12 @@ module Tamarillo
       stop_monitor
 
       tomato = @storage.latest
-      return if tomato.nil?
+      return if tomato.nil? || tomato.interrupted?
 
       tomato.interrupt!
       @storage.write_tomato(tomato)
+
+      tomato
     end
 
     # Public: Returns the current config.

data/lib/tamarillo/tomato.rb

@@ -43,12 +43,16 @@ module Tamarillo
 
     # Public: Returns the number of seconds until completion.
     def remaining
-      return 0 if @interrupted
-
       d = @duration - @clock.elapsed
       d > 0 ? d : 0
     end
 
+    # Public: Returns the approximate number of minutes until
+    # completetion.
+    def approx_minutes_remaining
+      (remaining / 60.0).round.to_i
+    end
+
     # Public: Returns the number of seconds elapsed since start.
     def elapsed
       @clock.elapsed

data/lib/tamarillo/version.rb

@@ -1,3 +1,3 @@
 module Tamarillo
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/lib/tamarillo/controller_spec.rb

@@ -85,6 +85,7 @@ describe Tamarillo::Controller do
 
     it "interrupts the current tomato" do
       tomato = double('tomato')
+      tomato.stub(:interrupted?) { false }
       tomato.should_receive(:interrupt!)
       storage.stub(:write_tomato)
       storage.should_receive(:latest).and_return(tomato)
@@ -98,14 +99,30 @@ describe Tamarillo::Controller do
         .should_not raise_error(NoMethodError)
     end
 
+    it "returns nil if the tomato is already interrupted" do
+      tomato = double('tomato')
+      tomato.stub(:interrupted?) { true }
+      storage.stub(:latest => tomato)
+      subject.interrupt_current_tomato.should be_nil
+    end
+
     it "writes the tomato" do
       tomato = double('tomato')
+      tomato.stub(:interrupted?) { false }
       tomato.stub(:interrupt!)
       storage.stub(:latest => tomato)
       storage.should_receive(:write_tomato).with(tomato)
 
       subject.interrupt_current_tomato
     end
+
+    it "returns the interrupted tomato" do
+      tomato = double('tomato').as_null_object
+      tomato.stub(:interrupted?) { false }
+      storage.stub(:latest => tomato, :write_tomato => nil)
+
+      subject.interrupt_current_tomato.should == tomato
+    end
   end
 
   describe "#config" do

data/spec/lib/tamarillo/tomato_spec.rb

@@ -71,7 +71,23 @@ describe Tomato do
         subject.interrupt!
       end
 
-      its(:remaining) { should == 0 }
+      its(:remaining) { should == 25.minutes }
+    end
+
+  end
+
+  describe "approximate time remaining" do
+    let(:clock) { stub(:elapsed => elapsed) }
+    subject { Tomato.new(10.minutes, clock) }
+
+    context "when more than 30 seconds between minutes" do
+      let(:elapsed) { 5.minutes + 10.seconds }
+      its(:approx_minutes_remaining) { should == 5 }
+    end
+
+    context "when less than 30 seconds between minutes" do
+      let(:elapsed) { 5.minutes + 50.seconds }
+      its(:approx_minutes_remaining) { should == 4 }
     end
   end
 

data/tamarillo.gemspec

@@ -2,6 +2,7 @@
 require File.expand_path('../lib/tamarillo/version', __FILE__)
 
 Gem::Specification.new do |gem|
+
   gem.name          = "tamarillo"
   gem.version       = Tamarillo::VERSION
   gem.authors       = ["Tim Uruski"]
@@ -21,6 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 2.9.0'
   gem.add_development_dependency 'timecop', '~> 0.3.5'
 
-  gem.add_runtime_dependency 'gli', '~> 2.0.0.rc4'
+  gem.add_runtime_dependency 'gli', '~> 1.6.0'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tamarillo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70337279930920 !ruby/object:Gem::Requirement
+  requirement: &70093955101400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.11
   type: :development
   prerelease: false
-  version_requirements: *70337279930920
+  version_requirements: *70093955101400
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70337279930300 !ruby/object:Gem::Requirement
+  requirement: &70093955068320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70337279930300
+  version_requirements: *70093955068320
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70337279929700 !ruby/object:Gem::Requirement
+  requirement: &70093938686480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70337279929700
+  version_requirements: *70093938686480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70337279928780 !ruby/object:Gem::Requirement
+  requirement: &70093938600700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70337279928780
+  version_requirements: *70093938600700
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70337279928040 !ruby/object:Gem::Requirement
+  requirement: &70093937676840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,18 +65,18 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70337279928040
+  version_requirements: *70093937676840
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70337279879600 !ruby/object:Gem::Requirement
+  requirement: &70093937644740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc4
+        version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70337279879600
+  version_requirements: *70093937644740
 description: Manage pomodoros from the command-line.
 email:
 - timuruski@gmail.com
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1744679301037157510
+      hash: 3768224559069028415
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1744679301037157510
+      hash: 3768224559069028415
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11