paradeiser 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd9b4f1eb7fe225041e03d1824dcfce44b17e680
-  data.tar.gz: 010a924c64c9ffc32d18a68324afd6a8a79b46fe
+  metadata.gz: 456d9290ae49e511ab834fb7230bce40bfb49499
+  data.tar.gz: 25244e3c436466d740dfd34f9d9d6472522fefc3
 SHA512:
-  metadata.gz: e0ab299f7782dd479bc50981b203a02a8e69725a3b89559ac6683dcdbcadd8197c6bacccf34b9084193d08d46cbb6b704a2013bea2234a23717d350a3378406b
-  data.tar.gz: 46eb79b934a8210f6ceff2f25855905f06dbcae751a445039e33d49e5ee44b4f57663bff1c9ca29c1001bc6c5dd19ee5b78201e0c71e575207920c9ea4027cfa
+  metadata.gz: ea0ab79272226ec07de5c8d89b09e8045af9c76d9ad22b5be10260e656628fe543b504533b6f62967d34706d3ae9caeb5ad5fcb98d8ca0942046b98d19500988
+  data.tar.gz: 6da4ed5b67a54b24af4cf3dc78d4c0681c22a2d0fef82e8e42eced3ff2e8434548ae11e84670e4fb86db326abf0b8d9fab42e30caf307cfe022b7ba7276c14c0

data/Gemfile

@@ -5,6 +5,6 @@ gemspec
 
 group :test do
   gem 'rake'
-  gem 'minitest', '~> 5.0.0'
+  gem 'minitest'
   gem 'fakefs', :require => "fakefs/safe"
 end

data/Guardfile

@@ -3,16 +3,21 @@ guard 'bundler' do
   watch(%r|^.*\.gemspec|)
 end
 
-guard 'minitest' do
-  watch(%r|^test/unit/test_(.*)\.rb|){|m| "test/unit/test_#{m[1]}.rb"}
-  watch(%r|^lib/*\.rb|){'test'}
-  watch(%r|^lib/.*/*\.rb|){'test'}
-  watch(%r{^lib/.*/([^/]+)\.rb$}){|m| "test/unit/test_#{m[1]}.rb"}
-  watch(%r|^test/helper\.rb|){'test'}
-  watch(%r{^lib/.*/views/(.*)/[^/]+\.erb$}){|m| "test/unit/test_#{m[1]}_view.rb"}
+group 'unit' do
+  guard 'minitest' do
+    watch(%r|^test/unit/test_(.*)\.rb|){|m| "test/unit/test_#{m[1]}.rb"}
+    watch(%r|^lib/*\.rb|){'test/unit'}
+    watch(%r|^lib/.*/*\.rb|){'test/unit'}
+    watch(%r{^lib/.*/([^/]+)\.rb$}){|m| "test/unit/test_#{m[1]}.rb"}
+    watch(%r|^test/helper\.rb|){'test/unit'}
+    watch(%r{^lib/.*/views/(.*)/[^/]+\.erb$}){|m| "test/unit/test_#{m[1]}_view.rb"}
+  end
+end
 
-  # Integration tests
-  watch(%r{^bin/([^/]+)$}){|m| "test/integration/test_#{m[1]}.rb"}
-  watch(%r|^test/integration/test_(.*)\.rb|){|m| "test/integration/test_#{m[1]}.rb"}
-  watch(%r|^test/lib/*\.rb|){'test'}
+group 'integration' do
+  guard 'minitest' do
+    watch(%r{^bin/([^/]+)$}){"test/integration"}
+    watch(%r|^test/integration/test_(.*)\.rb|){|m| "test/integration/test_#{m[1]}.rb"}
+    watch(%r|^test/lib/*\.rb|){'test/integration'}
+  end
 end

data/README.md

@@ -128,7 +128,7 @@ It will appear in the reports and will count towards efficiency calculations. Th
 
   Creates the `$PAR_DIR` directory and the sample hooks in `$PAR_DIR/hooks`. The data store will not be created on `par init`, but when the first write operation happens (e.g. `par pomodoro start`, but not `par report`).
 
-* Initialize an abritrary directory
+* Initialize an arbitrary directory
 
           $ par init /tmp
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'paradeiser'
 require 'tasks/state_machine'
 
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test' << 'test/helpers'
+  test.libs << 'test'
   test.test_files = FileList['test/**/test_*.rb']
 end
 

data/TODO.md

@@ -1,14 +1,25 @@
 # Paradeiser Backlog
 
-* By default, hooks copied by `par init` should not be executable, otherwise the hooks will fail if the optional dependencies (e.g. `notify-send` on Linux) are not present
+* Remove the token files generated in TestPomodoroHooks
+
+* BUG: A failing after-start-pomodoro hook seems to prevent `par start` from running, but it actually should not: Only before-hooks are allowed to cancel actions.
 
 * Add validations to models. `finished_at` must occur at after created at, etc.
 
 * There must be no overlap in pomodori, even if we log one.
   - Logging one while another one is active must fail unless finished at is before the active one's started at.
+  - Could use a range operator with it, e.g. within a pomodoro:
+
+    class Pomodoro
+      def include?(time)
+        (started_at..finished_at).cover?(time)
+      end
+    end
 
 * `par log` needs options for when the logged pomodoro was started and / or stopped
 
+* Refactoring: Replace our custom `pluralize` with the one from actionview
+
 * Improve tests with more doubles
   - Sandy Metz rules about testing messages:
     - Incoming: Assert state

data/bin/par

@@ -1,10 +1,13 @@
 #!/usr/bin/env ruby
 
-require 'commander/import'
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
 require 'paradeiser'
+require 'commander/import'
+
 include Paradeiser
 
-program :version, Paradeiser::VERSION
+program :version, VERSION
 program :description, "Paradeiser is a command-line tool for the Pomodoro Technique. It keeps track of the current pomodoro and assists the user in managing active and past pomodori as well as breaks. Status commands and reports are provided to get insights."
 program :help, 'Author', 'Nicholas E. Rabenau <nerab@gmx.at>'
 

data/lib/paradeiser.rb

@@ -2,8 +2,28 @@ require 'pstore'
 require 'erb'
 require 'state_machine'
 
-require 'require_all'
-require_rel "paradeiser"
+require 'paradeiser/errors'
+require 'paradeiser/executor'
+require 'paradeiser/models/scheduled'
+require 'paradeiser/models/break'
+require 'paradeiser/models/hook'
+require 'paradeiser/models/interrupt'
+require 'paradeiser/models/job'
+require 'paradeiser/models/pomodoro'
+require 'paradeiser/models/repository'
+require 'paradeiser/models/scheduler'
+require 'paradeiser/models/status'
+require 'paradeiser/refinements/numeric'
+require 'paradeiser/refinements/pluralize'
+require 'paradeiser/router'
+require 'paradeiser/version'
+require 'paradeiser/view'
+require 'paradeiser/controllers/controller'
+require 'paradeiser/controllers/breaks_controller'
+require 'paradeiser/controllers/paradeiser_controller'
+require 'paradeiser/controllers/pomodori_controller'
+
+require 'paradeiser/initializers/inflections'
 
 module Paradeiser
   def self.par_dir

data/lib/paradeiser/controllers/controller.rb

@@ -6,6 +6,7 @@ module Paradeiser
       @method = method
       @exitstatus = 0
       @has_output = false
+      @already_rendered = nil
     end
 
     def call(args, options)

data/lib/paradeiser/controllers/paradeiser_controller.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-#require 'action_view/helpers/text_helper'
 require 'active_support/core_ext/enumerable'
 require 'active_model'
 require 'active_model/serializers/json'

data/lib/paradeiser/models/hook.rb

@@ -13,6 +13,10 @@ module Paradeiser
         ENV["PAR_#{pom.name.upcase}_STARTED_AT"] = pom.started_at.strftime('%H:%M') if pom.started_at
 
         out, err, status = Open3.capture3(hook)
+
+        ENV.delete("PAR_#{pom.name.upcase}_ID")
+        ENV.delete("PAR_#{pom.name.upcase}_STARTED_AT")
+
         raise HookFailedError.new(hook, out, err, status) if 0 != status.exitstatus
       end
     end

data/lib/paradeiser/models/repository.rb

@@ -62,7 +62,7 @@ module Paradeiser
         if all.empty?
           1
         else
-          all.max{|a, b| a.id <=> b.id}.id + 1
+          all.max{|a, b| a.id <=> b.id}.id.next
         end
       end
 

data/lib/paradeiser/models/scheduled.rb

@@ -4,6 +4,10 @@ module Paradeiser
   class Scheduled
     attr_accessor :id, :started_at, :finished_at
 
+    def initialize
+      @id = nil
+    end
+
     def new?
       @id.nil?
     end

data/lib/paradeiser/version.rb

@@ -1,3 +1,3 @@
 module Paradeiser
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/paradeiser.gemspec

@@ -19,19 +19,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'commander'
-  spec.add_runtime_dependency 'require_all'
   spec.add_runtime_dependency 'state_machine'
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'actionpack'
-#  spec.add_runtime_dependency 'actionview'
   spec.add_runtime_dependency 'activemodel'
 
-  # Moved to the Gemfile so that Travis CI can load the test group
-  # spec.add_development_dependency 'rake'
-  # spec.add_development_dependency 'minitest'
-
   spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'guard-bundler'
+  spec.add_development_dependency 'terminal-notifier'
   spec.add_development_dependency 'terminal-notifier-guard'
   spec.add_development_dependency 'libnotify'
   spec.add_development_dependency 'rb-inotify'

data/templates/linux/hooks/after-finish-break

@@ -7,4 +7,6 @@
 # $PAR_BREAK_ID - the ID of the break that just ended
 # $PAR_BREAK_STARTED_AT - the time when the break was started
 #
+# In order to use this hook, you'll have to chmod +x the hook in ~/paradeiser/hooks/*.
+#
 notify-send "Pomodoro" "The break $PAR_BREAK_ID (started at $PAR_BREAK_STARTED_AT) is over." -u critical > /dev/null

data/templates/linux/hooks/after-finish-pomodoro

@@ -7,4 +7,6 @@
 # $PAR_POMODORO_ID - the ID of the pomodoro that just ended
 # $PAR_POMODORO_STARTED_AT - the time when the pomodoro was started
 #
+# In order to use this hook, you'll have to chmod +x the hook in ~/paradeiser/hooks/*.
+#
 notify-send "Pomodoro" "The pomodoro $PAR_POMODORO_ID (started at $PAR_POMODORO_STARTED_AT) is over." -u critical > /dev/null

data/templates/linux/hooks/after-start-break

@@ -4,4 +4,6 @@
 # Sample after-start-break hook for Paradeiser (called after a break started). It
 # displays a simple notification.
 #
+# In order to use this hook, you'll have to chmod +x the hook in ~/paradeiser/hooks/*.
+#
 notify-send "Pomodoro" "A new break started." -u critical > /dev/null

data/templates/linux/hooks/after-start-pomodoro

@@ -4,4 +4,6 @@
 # Sample after-start-pomodoro hook for Paradeiser (called after a pomodoro started). It
 # displays a simple notification.
 #
+# In order to use this hook, you'll have to chmod +x the hook in ~/paradeiser/hooks/*.
+#
 notify-send "Pomodoro" "A new pomodoro started." -u critical > /dev/null

data/templates/mac/hooks/after-finish-break

@@ -7,4 +7,6 @@
 # $PAR_BREAK_ID - the ID of the break that just ended
 # $PAR_BREAK_STARTED_AT - the time when the break was started
 #
+# In order to use this hook, you'll have to chmod +x the hook in ~/paradeiser/hooks/*.
+#
 terminal-notifier-success -message "The break $PAR_BREAK_ID (started at $PAR_BREAK_STARTED_AT) is over." > /dev/null

data/templates/mac/hooks/after-finish-pomodoro

@@ -7,4 +7,6 @@
 # $PAR_POMODORO_ID - the ID of the pomodoro that just ended
 # $PAR_POMODORO_STARTED_AT - the time when the pomodoro was started
 #
+# In order to use this hook, you'll have to chmod +x the hook in ~/paradeiser/hooks/*.
+#
 terminal-notifier-success -message "The pomodoro $PAR_POMODORO_ID (started at $PAR_POMODORO_STARTED_AT) is over." > /dev/null

data/templates/mac/hooks/after-start-break

@@ -4,4 +4,6 @@
 # Sample after-start-break hook for Paradeiser (called after a break started). It
 # displays a simple notification.
 #
+# In order to use this hook, you'll have to chmod +x the hook in ~/paradeiser/hooks/*.
+#
 terminal-notifier-success -message "A new break started." > /dev/null

data/templates/mac/hooks/after-start-pomodoro

@@ -4,4 +4,6 @@
 # Sample after-start-pomodoro hook for Paradeiser (called after a pomodoro started). It
 # displays a simple notification.
 #
+# In order to use this hook, you'll have to chmod +x the hook in ~/paradeiser/hooks/*.
+#
 terminal-notifier-success -message "A new pomodoro started." > /dev/null

data/test/helper.rb

@@ -1,40 +1,18 @@
-require 'minitest/autorun'
-require 'paradeiser'
-require_rel 'lib'
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'lib/at_mock'
-
+require 'paradeiser'
 include Paradeiser
 
-class MiniTest::Test
-
-protected
-
-  def produce(clazz)
-    @started = srand
-
-    Time.stub :now, Time.at(@started) do
-      Scheduler.stub(:add, nil) do
-        clazz.new
-      end
-    end
-  end
-
-  def interrupt!(type = :internal, pom = @pom)
-    Scheduler.stub(:clear, nil) do
-      pom.interrupt!(type)
-    end
-  end
-
-  def finish!(thing = @pom || @break)
-    Scheduler.stub(:clear, nil) do
-      thing.finish!
-    end
-  end
-
-  def cancel!(pom = @pom)
-    Scheduler.stub(:clear, nil) do
-      pom.cancel!
-    end
-  end
-end
+require_relative 'lib/unit_test'
+require_relative 'lib/assertions'
+require_relative 'lib/at_mock'
+require_relative 'lib/controller_test'
+require_relative 'lib/integration_test'
+require_relative 'lib/options_mock'
+require_relative 'lib/paradeiser_controller_test'
+require_relative 'lib/process_status_mock'
+require_relative 'lib/pstore_mock'
+require_relative 'lib/schedulable_mock'
+require_relative 'lib/token_file_registry'
+require_relative 'lib/view_test'

data/test/integration/test_annotate.rb

@@ -1,19 +1,21 @@
 require 'helper'
 
-class TestAnnotateCommand < Paradeiser::IntegrationTest
-  def test_annotate_no_previous
-    refute_command('annotate')
-  end
+module ParadeiserTest
+  class TestAnnotateCommand < IntegrationTest
+    def test_annotate_no_previous
+      refute_command('annotate')
+    end
 
-  def test_annotate_active
-    assert_command('start')
-    assert_command('annotate', 0, name.split('_'))
-  end
+    def test_annotate_active
+      assert_command('start')
+      assert_command('annotate', 0, name.split('_'))
+    end
 
-  def test_annotate_second_last_successful
-    assert_command('start')
-    assert_command('finish')
-    assert_command('break')
-    assert_command('annotate', 0, name.split('_'))
+    def test_annotate_second_last_successful
+      assert_command('start')
+      assert_command('finish')
+      assert_command('break')
+      assert_command('annotate', 0, name.split('_'))
+    end
   end
 end

data/test/integration/test_finish.rb

@@ -1,9 +1,11 @@
 require 'helper'
 
-class TestFinishCommand < Paradeiser::IntegrationTest
-  def test_finish
-    refute_command('finish')
-    assert_command('start')
-    assert_command('finish')
+module ParadeiserTest
+  class TestFinishCommand < IntegrationTest
+    def test_finish
+      refute_command('finish')
+      assert_command('start')
+      assert_command('finish')
+    end
   end
 end

data/test/integration/test_interrupt.rb

@@ -1,9 +1,11 @@
 require 'helper'
 
-class TestInterruptCommand < Paradeiser::IntegrationTest
-  def test_interrupt
-    refute_command('interrupt')
-    assert_command('start')
-    assert_command('interrupt')
+module ParadeiserTest
+  class TestInterruptCommand < IntegrationTest
+    def test_interrupt
+      refute_command('interrupt')
+      assert_command('start')
+      assert_command('interrupt')
+    end
   end
 end

data/test/integration/test_log.rb

@@ -1,12 +1,14 @@
 require 'helper'
 
-class TestLogCommand < Paradeiser::IntegrationTest
-  def test_log_inactive
-    assert_command('log', 0, name.split('_'))
-  end
+module ParadeiserTest
+  class TestLogCommand < IntegrationTest
+    def test_log_inactive
+      assert_command('log', 0, name.split('_'))
+    end
 
-  def test_log_active
-    assert_command('start')
-    assert_command('log', 0, name.split('_'))
+    def test_log_active
+      assert_command('start')
+      assert_command('log', 0, name.split('_'))
+    end
   end
 end

data/test/integration/test_no_args.rb

@@ -1,7 +1,9 @@
 require 'helper'
 
-class TestNoArgsCommand < Paradeiser::IntegrationTest
-  def test_no_args
-    assert_command('')
+module ParadeiserTest
+  class TestNoArgsCommand < IntegrationTest
+    def test_no_args
+      assert_command('')
+    end
   end
 end