paradeiser 0.1.0 → 0.2.0

data/test/unit/test_repository.rb

@@ -71,12 +71,35 @@ class TestRepository < MiniTest::Test
   end
 
   def test_any
+    refute(invoke(:any?){|p| p.length > 2})
+    @backend[:foo] = SchedulableMock.new(:length => 1)
+    @backend[:bar] = SchedulableMock.new(:length => 2)
+    @backend[:baz] = SchedulableMock.new(:length => 3)
+    assert(invoke(:any?){|p| p.length > 2})
+  end
+
+  def test_last_finished
+    @backend[:foo] = SchedulableMock.new(:finished => false)
+    @backend[:bar] = SchedulableMock.new(:finished => true)
+    @backend[:baz] = SchedulableMock.new(:finished => false)
+
+    last_finished = invoke(:last_finished)
+    assert(last_finished)
+   end
+
+  def test_last_canceled
+    @backend[:foo] = SchedulableMock.new(:canceled => false)
+    @backend[:bar] = SchedulableMock.new(:canceled => true)
+    @backend[:baz] = SchedulableMock.new(:canceled => false)
+
+    last_canceled = invoke(:last_canceled)
+    assert(last_canceled)
   end
 
   def test_find
-    @backend[:foo] = PomodoroMock.new(:length => 3)
-    @backend[:bar] = PomodoroMock.new(:length => 3)
-    @backend[:baz] = PomodoroMock.new(:length => 2)
+    @backend[:foo] = SchedulableMock.new(:length => 3)
+    @backend[:bar] = SchedulableMock.new(:length => 3)
+    @backend[:baz] = SchedulableMock.new(:length => 2)
     assert_equal(3, @backend.size)
 
     all = invoke(:find){|pom| pom.length == 3}
@@ -85,35 +108,35 @@ class TestRepository < MiniTest::Test
   end
 
   def test_active
-    @backend[:foo] = PomodoroMock.new(:active => false)
-    @backend[:bar] = PomodoroMock.new(:active => true)
-    @backend[:baz] = PomodoroMock.new(:active => false)
+    @backend[:foo] = SchedulableMock.new(:active => false)
+    @backend[:bar] = SchedulableMock.new(:active => true)
+    @backend[:baz] = SchedulableMock.new(:active => false)
 
     active = invoke(:active)
     assert_equal(@backend[:bar], active)
   end
 
   def test_active_true
-    @backend[:foo] = PomodoroMock.new(:active => false)
-    @backend[:bar] = PomodoroMock.new(:active => true)
-    @backend[:baz] = PomodoroMock.new(:active => false)
+    @backend[:foo] = SchedulableMock.new(:active => false)
+    @backend[:bar] = SchedulableMock.new(:active => true)
+    @backend[:baz] = SchedulableMock.new(:active => false)
 
     assert(invoke(:active?))
   end
 
   def test_active_false
-    @backend[:foo] = PomodoroMock.new(:active => false)
-    @backend[:bar] = PomodoroMock.new(:active => false)
-    @backend[:baz] = PomodoroMock.new(:active => false)
+    @backend[:foo] = SchedulableMock.new(:active => false)
+    @backend[:bar] = SchedulableMock.new(:active => false)
+    @backend[:baz] = SchedulableMock.new(:active => false)
 
     refute(invoke(:active?))
   end
 
   def test_corrupted_repo
-    @backend[:foo] = PomodoroMock.new(:active => true)
-    @backend[:bar] = PomodoroMock.new(:active => true)
+    @backend[:foo] = SchedulableMock.new(:active => true)
+    @backend[:bar] = SchedulableMock.new(:active => true)
 
-    assert_raises SingletonError do
+    assert_raises RuntimeError do
       invoke(:active?)
     end
   end

data/test/unit/test_router.rb

@@ -14,12 +14,12 @@ class TestRouter < MiniTest::Test
   end
 
   def test_init
-    refute(Dir.exists?(Paradeiser.pom_dir), "Expect #{Paradeiser.pom_dir} to not exist yet")
+    refute(Dir.exists?(Paradeiser.par_dir), "Expect #{Paradeiser.par_dir} to not exist yet")
 
-    block = Router.new.dispatch(CommandMock.new(:init))
+    block = Router.new.dispatch(CommandMock.new('init'))
     refute_nil(block)
 
-    refute(Dir.exists?(Paradeiser.pom_dir), "Expect #{Paradeiser.pom_dir} to not exist yet")
+    refute(Dir.exists?(Paradeiser.par_dir), "Expect #{Paradeiser.par_dir} to not exist yet")
 
     # fake the view
     dirname = File.join(File.dirname(__FILE__), '..', '..', 'lib', 'paradeiser', 'views', 'paradeiser')
@@ -30,7 +30,7 @@ class TestRouter < MiniTest::Test
     begin
       block.call(nil, OptionsMock.new(:trace => true, :verbose => false))
     ensure
-      FileUtils.rm_r(Paradeiser.pom_dir, :force => true)
+      FileUtils.rm_r(Paradeiser.par_dir, :force => true)
     end
   end
 end

data/test/unit/test_status.rb

@@ -0,0 +1,26 @@
+require 'helper'
+require 'ostruct'
+
+class TestStatus < MiniTest::Test
+  def test_pomodoro_active
+    assert_equal(0, Status.of(thing('pomodoro', 'active')).to_i)
+  end
+
+  def test_pomodoro_finished
+    assert_equal(1, Status.of(thing('pomodoro', 'finished')).to_i)
+  end
+
+  def test_break_active
+    assert_equal(2, Status.of(thing('break', 'active')).to_i)
+  end
+
+  def test_break_finished
+    assert_equal(3, Status.of(thing('break', 'finished')).to_i)
+  end
+
+  private
+
+  def thing(name, status)
+    OpenStruct.new(:name => name, :status => status)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paradeiser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Nicholas E. Rabenau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -52,6 +52,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +240,7 @@ description: Paradeiser is a command-line tool for the Pomodoro Technique. It ke
 email:
 - nerab@gmx.net
 executables:
-- pom
+- par
 extensions: []
 extra_rdoc_files: []
 files:
@@ -226,43 +254,60 @@ files:
 - Rakefile
 - TODO.md
 - VISION.md
-- bin/pom
+- bin/par
+- doc/Paradeiser::Break_status.svg
 - doc/Paradeiser::Pomodoro_status.svg
 - lib/paradeiser.rb
+- lib/paradeiser/controllers/breaks_controller.rb
 - lib/paradeiser/controllers/controller.rb
 - lib/paradeiser/controllers/paradeiser_controller.rb
 - lib/paradeiser/controllers/pomodori_controller.rb
 - lib/paradeiser/errors.rb
 - lib/paradeiser/executor.rb
+- lib/paradeiser/initializers/inflections.rb
+- lib/paradeiser/models/break.rb
 - lib/paradeiser/models/hook.rb
+- lib/paradeiser/models/interrupt.rb
 - lib/paradeiser/models/job.rb
 - lib/paradeiser/models/pomodoro.rb
 - lib/paradeiser/models/repository.rb
+- lib/paradeiser/models/scheduled.rb
 - lib/paradeiser/models/scheduler.rb
-- lib/paradeiser/refinements.rb
+- lib/paradeiser/models/status.rb
+- lib/paradeiser/refinements/numeric.rb
 - lib/paradeiser/router.rb
 - lib/paradeiser/version.rb
 - lib/paradeiser/view.rb
 - lib/paradeiser/views/paradeiser/init.erb
+- lib/paradeiser/views/paradeiser/report.erb
+- lib/paradeiser/views/paradeiser/status.erb
 - lib/paradeiser/views/pomodori/finish.erb
-- lib/paradeiser/views/pomodori/report.erb
 - lib/paradeiser/views/pomodori/start.erb
-- lib/paradeiser/views/pomodori/status.erb
 - paradeiser.gemspec
-- templates/linux/hooks/after-finish
-- templates/linux/hooks/after-start
-- templates/mac/hooks/after-finish
-- templates/mac/hooks/after-start
+- templates/linux/hooks/after-finish-break
+- templates/linux/hooks/after-finish-pomodoro
+- templates/linux/hooks/after-start-break
+- templates/linux/hooks/after-start-pomodoro
+- templates/mac/hooks/after-finish-break
+- templates/mac/hooks/after-finish-pomodoro
+- templates/mac/hooks/after-start-break
+- templates/mac/hooks/after-start-pomodoro
 - test/helper.rb
-- test/integration/test_pom.rb
+- test/integration/test_par.rb
 - test/lib/assertions.rb
 - test/lib/at_mock.rb
 - test/lib/options_mock.rb
-- test/lib/pomodoro_mock.rb
 - test/lib/process_status_mock.rb
 - test/lib/pstore_mock.rb
+- test/lib/schedulable_mock.rb
 - test/templates/hooks/pre-finish
-- test/unit/test_paradeiser_controller.rb
+- test/unit/test_break.rb
+- test/unit/test_break_controller.rb
+- test/unit/test_interrupt.rb
+- test/unit/test_paradeiser_controller_init.rb
+- test/unit/test_paradeiser_controller_report.rb
+- test/unit/test_paradeiser_controller_status.rb
+- test/unit/test_paradeiser_view.rb
 - test/unit/test_pomodori_controller.rb
 - test/unit/test_pomodori_view.rb
 - test/unit/test_pomodoro.rb
@@ -270,6 +315,7 @@ files:
 - test/unit/test_repository.rb
 - test/unit/test_router.rb
 - test/unit/test_scheduler.rb
+- test/unit/test_status.rb
 homepage: https://github.com/nerab/paradeiser
 licenses:
 - MIT
@@ -296,15 +342,21 @@ specification_version: 4
 summary: Command-line tool for the Pomodoro Technique
 test_files:
 - test/helper.rb
-- test/integration/test_pom.rb
+- test/integration/test_par.rb
 - test/lib/assertions.rb
 - test/lib/at_mock.rb
 - test/lib/options_mock.rb
-- test/lib/pomodoro_mock.rb
 - test/lib/process_status_mock.rb
 - test/lib/pstore_mock.rb
+- test/lib/schedulable_mock.rb
 - test/templates/hooks/pre-finish
-- test/unit/test_paradeiser_controller.rb
+- test/unit/test_break.rb
+- test/unit/test_break_controller.rb
+- test/unit/test_interrupt.rb
+- test/unit/test_paradeiser_controller_init.rb
+- test/unit/test_paradeiser_controller_report.rb
+- test/unit/test_paradeiser_controller_status.rb
+- test/unit/test_paradeiser_view.rb
 - test/unit/test_pomodori_controller.rb
 - test/unit/test_pomodori_view.rb
 - test/unit/test_pomodoro.rb
@@ -312,3 +364,4 @@ test_files:
 - test/unit/test_repository.rb
 - test/unit/test_router.rb
 - test/unit/test_scheduler.rb
+- test/unit/test_status.rb

data/lib/paradeiser/views/pomodori/report.erb

@@ -1,5 +0,0 @@
-ID | Status | Started | Ended
-<% @pom.each do |pom| %>
-<%= pom.id %> | <%= pom.status %> | <%= pom.started_at.strftime('%R') %> | <%= pom.finished_at.strftime('%R') if pom.finished? %>
-
-<% end %>

data/lib/paradeiser/views/pomodori/status.erb

@@ -1,9 +0,0 @@
-<% case @pom.status_name
-when :active
-  %>Pomodoro #<%= @pom.id %> is active for another <%= @pom.remaining.minutes %> minutes (started at <%= @pom.started_at.strftime('%R') %>).<%
-when :finished
-  %>No active pomodoro. Last one was finished at <%= @pom.finished_at.strftime('%R') %>.<%
-else
-  %>Current state is <%= @pom.status %>.<%
-end
-%>

data/templates/linux/hooks/after-finish

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# Sample post-finish hook for Paradeiser (called when a pomodoro ended). It
-# displays a simple notification.
-#
-# $POM_ID - the ID of the pomodoro that just ended
-# $POM_STARTED_AT - the time when the pomodoro was started
-#
-notify-send "Pomodoro" "The Pomodoro $POM_ID (started at $POM_STARTED_AT) is over." -u critical > /dev/null

data/templates/linux/hooks/after-start

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#
-# Sample post-finish hook for Paradeiser (called after a pomodoro started). It
-# displays a simple notification.
-#
-notify-send "Pomodoro" "A new Pomodoro started." -u critical > /dev/null

data/templates/mac/hooks/after-finish

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# Sample post-finish hook for Paradeiser (called when a pomodoro ended). It
-# displays a simple notification.
-#
-# $POM_ID - the ID of the pomodoro that just ended
-# $POM_STARTED_AT - the time when the pomodoro was started
-#
-terminal-notifier-success -message "The Pomodoro $POM_ID (started at $POM_STARTED_AT) is over." > /dev/null

data/templates/mac/hooks/after-start

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#
-# Sample post-finish hook for Paradeiser (called after a pomodoro started). It
-# displays a simple notification.
-#
-terminal-notifier-success -message "A new Pomodoro started." > /dev/null

data/test/unit/test_paradeiser_controller.rb

@@ -1,88 +0,0 @@
-require 'helper'
-require 'fakefs/safe'
-
-class TestParadeiserController < MiniTest::Test
-  HOOKS = ['after-finish', 'before-finish']
-
-  def setup
-    @orig_pom_dir = ENV['POM_DIR']
-    FakeFS.activate!
-    create_hook_templates
-  end
-
-  def teardown
-    FileUtils.rm_r(Paradeiser.pom_dir, :force => true) if Dir.exists?(Paradeiser.pom_dir)
-    FakeFS.deactivate!
-    ENV['POM_DIR'] = @orig_pom_dir
-  end
-
-  def test_init_virgin
-    ENV.delete('POM_DIR')
-    refute(Dir.exists?(Paradeiser.pom_dir), "Expect #{Paradeiser.pom_dir} to not exist yet")
-
-    ParadeiserController.new(:init).call(nil, nil)
-    assert(Dir.exists?(Paradeiser.pom_dir))
-    assert_hooks_exist
-  end
-
-  def test_init_existing
-    FileUtils.mkdir_p(Paradeiser.pom_dir, 0700)
-    assert(Dir.exists?(Paradeiser.pom_dir))
-
-    ParadeiserController.new(:init).call(nil, nil)
-    assert(Dir.exists?(Paradeiser.pom_dir))
-    assert_hooks_exist
-  end
-
-  def test_init_virgin_with_env_override
-    dir = tempdir_name
-    refute_equal(dir, Paradeiser.pom_dir)
-    ENV['POM_DIR'] = dir
-    assert_equal(dir, Paradeiser.pom_dir)
-    refute(Dir.exists?(Paradeiser.pom_dir), "POM_DIR override #{Paradeiser.pom_dir} must not exist")
-
-    ParadeiserController.new(:init).call(nil, nil)
-
-    assert(Dir.exists?(Paradeiser.pom_dir))
-    assert_hooks_exist
-  end
-
-  def test_init_existing_with_env_override
-    ENV.delete('POM_DIR')
-
-    Dir.mktmpdir do |dir|
-      refute_equal(dir, Paradeiser.pom_dir)
-      ENV['POM_DIR'] = dir
-      assert_equal(dir, Paradeiser.pom_dir)
-      assert(Dir.exists?(Paradeiser.pom_dir), "POM_DIR override #{Paradeiser.pom_dir} must exist")
-
-      ParadeiserController.new(:init).call(nil, nil)
-      assert(Dir.exists?(Paradeiser.pom_dir), "POM_DIR override #{Paradeiser.pom_dir} must exist")
-      assert_hooks_exist
-    end
-  end
-
-private
-
-  # Makes a temporary directory name, but does not create the directory
-  def tempdir_name
-    dir = File.join(Dir.tmpdir, SecureRandom.uuid)
-    refute(Dir.exists?(dir))
-    dir
-  end
-
-  def create_hook_templates
-    hook_templates_dir = File.join(Paradeiser.templates_dir, Paradeiser.os.to_s, 'hooks')
-    FileUtils.mkdir_p(hook_templates_dir)
-
-    HOOKS.each do |hook|
-      FileUtils.touch(File.join(hook_templates_dir, hook))
-    end
-  end
-
-  def assert_hooks_exist
-    HOOKS.each do |hook|
-      assert(File.exist?(File.join(Paradeiser.hooks_dir, hook)))
-    end
-  end
-end