domodoro 0.0.4 → 0.1.0

data/test/domodoro/config_test.rb

@@ -9,7 +9,7 @@ module Domodoro
   visual: true
   sound: false
     """
-        Domodoro::Config.load
+        Domodoro::Config.load_client_configuration
 
         assert_equal true, Domodoro::Config.visual
         assert_equal false, Domodoro::Config.sound
@@ -20,7 +20,7 @@ module Domodoro
       it 'sets both options to true' do
         File.stubs(:exist?).returns false
 
-        Domodoro::Config.load
+        Domodoro::Config.load_client_configuration
 
         assert_equal true, Domodoro::Config.visual
         assert_equal true, Domodoro::Config.sound

data/test/domodoro/schedule_test.rb

@@ -0,0 +1,108 @@
+require 'test_helper'
+require 'ostruct'
+require 'pp'
+
+module Domodoro
+  describe Schedule do
+    before do
+      File.stubs(:exist?).returns false
+      @schedule = Schedule.new
+      @schedule.generate!
+      @times = @schedule.to_hash
+    end
+
+    describe "before lunch" do
+      it 'generates start times correctly' do
+        %w(08:30 09:00 09:30 10:00 10:35 11:05 11:35 12:05 12:35).each do |time|
+          assert_equal :start, @times[time]
+        end
+      end
+
+      it 'generates stop times correctly' do
+        %w(08:55 09:25 09:55 10:25 11:00 11:30 12:00 12:30).each do |time|
+          assert_equal :stop, @times[time]
+        end
+        assert_equal :lunch, @times["13:00"]
+      end
+    end
+
+    describe 'after lunch' do
+      it 'generates start times correctly' do
+        %w(13:30 14:00 14:30 15:00 15:35 16:05).each do |time|
+          assert_equal :start, @times[time]
+        end
+      end
+
+      it 'generates stop times correctly' do
+        %w(13:55 14:25 14:55 15:25 16:00).each do |time|
+          assert_equal :stop, @times[time]
+        end
+        assert_equal :go_home, @times["16:30"]
+      end
+    end
+
+    describe 'uneven, weird schedules' do
+      before do
+        config = OpenStruct.new
+        config.pomodoro_duration = 25
+        config.pomodoro_break = 5
+        config.long_break_after = 4
+        config.day_start = Timepoint.new('9:13')
+        config.lunch_time = Timepoint.new('12:49')
+        config.lunch_duration = 120
+        config.day_end = Timepoint.new('15:00')
+
+        Config.expects(:get_server_configuration).returns config
+
+        @schedule = Schedule.new
+        @schedule.generate!
+        @times = @schedule.to_hash
+      end
+
+      it 'respect lunch' do
+        assert_equal :lunch, @times["12:49"]
+        assert_equal :start, @times["14:49"]
+      end
+
+      it 'respect home' do
+        assert_equal :go_home, @times["15:00"]
+      end
+    end
+
+    describe '#action_after' do
+      it 'returns the next action after a given timestamp' do
+        times = {
+          "08:30" => :start,
+          "09:15" => :stop,
+          "10:15" => :start,
+        }
+
+        @schedule = Schedule.new
+        @schedule.instance_variable_set(:@times, times)
+
+        @schedule.action_after("08:30").must_equal ['09:15', :stop]
+        @schedule.action_after("08:45").must_equal ['09:15', :stop]
+        @schedule.action_after("09:31").must_equal ['10:15', :start]
+      end
+    end
+
+    describe '#current_action' do
+      it 'returns the current or past action on a given timestamp' do
+        times = {
+          "08:30" => :start,
+          "09:15" => :stop,
+          "10:15" => :start,
+        }
+
+        @schedule = Schedule.new
+        @schedule.instance_variable_set(:@times, times)
+
+        @schedule.current_action("08:30").must_equal ['08:30', :start]
+        @schedule.current_action("08:31").must_equal ['08:30', :start]
+        @schedule.current_action("09:18").must_equal ['09:15', :stop]
+        @schedule.current_action("12:18").must_equal ['10:15', :start]
+      end
+    end
+
+  end
+end

data/test/domodoro/server_test.rb

@@ -5,19 +5,16 @@ module Domodoro
     include EM::MiniTest::Spec
 
     before do
+      File.stubs(:exist?).returns(false)
       @channel = Channel.new
-    end
-
-    it 'initializes with a channel' do
-      server = Domodoro::Server.new(nil, @channel)
-      assert_equal @channel, server.channel
+      @schedule = Schedule.new
+      @schedule.generate!
     end
 
     it 'repeats every message broadcasted to the channel' do
-      server = Server.new(nil, @channel)
-      EM.start_server('127.0.0.1', 8888, Server, :app => server)
+      EM.start_server('127.0.0.1', 8888, Server, @channel, @schedule)
 
-      server.expects(:send_data).with(":start\n")
+      Server.any_instance.expects(:send_data).with(":start\n")
 
       @channel << :start
     end
@@ -25,7 +22,8 @@ module Domodoro
     describe '.start' do
       it 'opens a server with a new channel' do
         Channel.expects(:new).returns @channel
-        EM.expects(:start_server).with('0.0.0.0', '8888', Server, @channel)
+        Schedule.expects(:new).returns @schedule
+        EM.expects(:start_server).with('0.0.0.0', '8888', Server, @channel, @schedule)
 
         Server.start('0.0.0.0', '8888')
       end
@@ -61,5 +59,37 @@ module Domodoro
       end
     end
 
+    describe 'on connection' do
+      it 'sends the current and next actions to the client', :timeout => 0.3 do
+        Server.stubs(:timestamp).returns "13:15"
+
+        EM.start_server('127.0.0.1', 8888, Server, @channel, @schedule)
+
+        FakeSocketClient = Class.new(EM::Connection) do
+          include EM::P::ObjectProtocol
+          @object = nil
+          def self.object=(obj)
+            @object = obj
+          end
+          def receive_object(object)
+            self.class.object = object
+          end
+        end
+
+        EM.connect('127.0.0.1', 8888, FakeSocketClient)
+
+        EM.add_timer(0.25) do
+          object = FakeSocketClient.class_eval "@object"
+
+          assert_equal ["13:00", :lunch], object[:current_action]
+          assert_equal ["13:30", :start], object[:next_action]
+
+          done!
+        end
+
+        wait!
+      end
+    end
+
   end
 end

data/test/domodoro/timepoint_test.rb

@@ -0,0 +1,105 @@
+require 'test_helper'
+
+module Domodoro
+  describe Timepoint do
+    before do
+      @timepoint = Timepoint.new("08:30")
+    end
+
+    it 'initializes with an hour/minute timestamp' do
+      assert_equal 8,  @timepoint.hour
+      assert_equal 30, @timepoint.min
+    end
+
+    it 'initializes with hours and minutes as fixnums' do
+      timepoint = Timepoint.new(8, 30)
+      assert_equal 8,  timepoint.hour
+      assert_equal 30, timepoint.min
+    end
+
+    describe '#to_s' do
+      it 'returns the original timestamp' do
+        assert_equal "08:30", @timepoint.to_s
+      end
+    end
+
+    describe '+' do
+      describe 'when the added minutes belong to the next hour' do
+        it 'adds time appropriately returning a new timepoint' do
+          new_timepoint = @timepoint + 45
+
+          assert_equal 9, new_timepoint.hour
+          assert_equal 15, new_timepoint.min
+        end
+      end
+
+      describe 'within the same hour' do
+        it 'works the same way' do
+          new_timepoint = @timepoint + 15
+
+          assert_equal 8, new_timepoint.hour
+          assert_equal 45, new_timepoint.min
+        end
+      end
+    end
+
+    describe '#after?' do
+      before do
+        @timepoint = Timepoint.new(8, 30)
+      end
+      it 'tells if the timepoint is after another timepoint' do
+        Timepoint.new(8, 45).after?(@timepoint).must_equal true
+        Timepoint.new(9, 15).after?(@timepoint).must_equal true
+        Timepoint.new(8, 25).after?(@timepoint).must_equal false
+        Timepoint.new(7, 10).after?(@timepoint).must_equal false
+      end
+    end
+
+    describe '#before?' do
+      before do
+        @timepoint = Timepoint.new(17, 30)
+      end
+      it 'tells if the timepoint is before another timepoint' do
+        Timepoint.new(17, 15).before?(@timepoint).must_equal true
+        Timepoint.new(13, 00).before?(@timepoint).must_equal true
+        Timepoint.new(17, 40).before?(@timepoint).must_equal false
+        Timepoint.new(19, 10).before?(@timepoint).must_equal false
+      end
+    end
+
+    describe '#==' do
+      before do
+        @timepoint = Timepoint.new(8, 30)
+      end
+      it 'tells if the timepoint equals another timepoint' do
+        Timepoint.new(8, 30).must_equal @timepoint
+        Timepoint.new(8, 45).wont_equal @timepoint
+        Timepoint.new(8, 15).wont_equal @timepoint
+      end
+
+      it 'tells if the timepoint equals another string' do
+        "08:30".must_equal @timepoint
+        "08:45".wont_equal @timepoint
+        "08:15".wont_equal @timepoint
+      end
+    end
+
+    describe '#left_until' do
+      it 'returns the time left until another timestamp' do
+        Time.stubs(:now).returns stub(:sec => 55)
+        @a = Timepoint.new(8, 30)
+        @b = Timepoint.new(9, 45)
+        @c = Timepoint.new(11, 10)
+        @d = Timepoint.new(8, 32)
+        @e = Timepoint.new(15, 01)
+        @f = Timepoint.new(8, 31)
+
+        assert_equal "01:14:04", @a.left_until(@b)
+        assert_equal "01:24:04", @b.left_until(@c)
+        assert_equal "00:01:04", @a.left_until(@d)
+        assert_equal "06:30:04", @a.left_until(@e)
+        assert_equal "00:00:04", @a.left_until(@f)
+      end
+    end
+  end
+end

metadata

@@ -1,139 +1,173 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: domodoro
-version: !ruby/object:Gem::Version
-  version: 0.0.4
+version: !ruby/object:Gem::Version 
+  hash: 1322991910812937300
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
-authors:
+authors: 
 - Josep M. Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-29 00:00:00.000000000 +02:00
+
+date: 2011-08-30 00:00:00 +02:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: &2155991320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2155991320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: notify
-  requirement: &2155990500 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2155990500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &2155989420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2155989420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &2155928300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2155928300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: purdytest
-  requirement: &2155927240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2155927240
+  version_requirements: *id005
 description: Distributed Pomodoro for the masses
-email:
+email: 
 - josep.m.bach@gmail.com
-executables:
+executables: 
 - domodoro
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
 - Guardfile
 - Rakefile
 - Readme.md
-- assets/start.wav
-- assets/stop.wav
+- assets/break.wav
+- assets/home.wav
+- assets/lunch.wav
+- assets/work.wav
 - bin/domodoro
 - domodoro.gemspec
 - lib/domodoro.rb
 - lib/domodoro/channel.rb
 - lib/domodoro/client.rb
 - lib/domodoro/config.rb
+- lib/domodoro/schedule.rb
 - lib/domodoro/server.rb
+- lib/domodoro/timepoint.rb
 - lib/domodoro/version.rb
 - test/domodoro/channel_test.rb
 - test/domodoro/client_test.rb
 - test/domodoro/config_test.rb
+- test/domodoro/schedule_test.rb
 - test/domodoro/server_test.rb
+- test/domodoro/timepoint_test.rb
 - test/domodoro_test.rb
 - test/support/em-minitest.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/txus/domodoro
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 2002549777813010636
+      segments: 
       - 0
-      hash: -4547981421582945209
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 2002549777813010636
+      segments: 
       - 0
-      hash: -4547981421582945209
+      version: "0"
 requirements: []
+
 rubyforge_project: domodoro
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Distributed Pomodoro for the masses
-test_files:
+test_files: 
 - test/domodoro/channel_test.rb
 - test/domodoro/client_test.rb
 - test/domodoro/config_test.rb
+- test/domodoro/schedule_test.rb
 - test/domodoro/server_test.rb
+- test/domodoro/timepoint_test.rb
 - test/domodoro_test.rb
 - test/support/em-minitest.rb
 - test/test_helper.rb