syc-task 0.0.3 → 0.0.4

data/lib/syctask/schedule.rb

@@ -83,6 +83,7 @@ module Syctask
         title = titles[index] ? titles[index] : "Meeting #{index}"
         @meetings << Syctask::Meeting.new(busy, title) 
       end
+      raise Exception, "Busy times have to be within work time" unless within?(@meetings, @starts, @ends)
       @tasks = tasks
     end
 
@@ -167,6 +168,20 @@ module Syctask
 
     private 
 
+    # Checks if meetings are within work times. Returns true if fullfilled
+    # otherwise false
+    def within?(meetings, starts, ends)
+      meetings.each do |meeting|
+        return false if meeting.starts.h < starts.h
+        return false if meeting.starts.h == starts.h and 
+                        meeting.starts.m < starts.m 
+        return false if meeting.ends.h > ends.h
+        return false if meeting.ends.h == ends.h and 
+                        meeting.ends.m > ends.m
+      end
+      true
+    end
+
     # Colors the time line free time green, busy time red and tasks blue. The
     # past time is colored black
     def colorize(time_line)
@@ -183,9 +198,14 @@ module Syctask
     # future part.
     def split_time_line(time_line)
       time = Time.now
-      offset = (time.hour - @starts.h) * 4 + time.min.div(15)      
-      past = time_line.slice(0,offset)
-      future = time_line.slice(offset, time_line.size - offset)
+      if time.hour < @starts.h
+        past = ""
+        future = time_line
+      else
+        offset = (time.hour - @starts.h) * 4 + time.min.div(15)      
+        past = time_line.slice(0,offset)
+        future = time_line.slice(offset, time_line.size - offset)
+      end
       [past, future]
     end
 

data/lib/syctask/task.rb

@@ -9,6 +9,8 @@ module Syctask
   # about a task.
   class Task
 
+    include Comparable
+
     # Holds the options of the task. 
     # Options are
     # * description - additional information about the task
@@ -50,6 +52,17 @@ module Syctask
       @id == other.id and @dir == other.dir
     end
 
+    # Compares this Task to the other task and compares them regarding the ID 
+    # and the dir. If ID is equal then dir is compared
+    def <=>(other)
+      id_compare = @id.to_i <=> other.id.to_i
+      if id_compare == 0
+        @dir <=> other.dir
+      else
+        id_compare
+      end
+    end
+
     # Updates the task with new values. Except for note and tags which are
     # supplemented with the new values and not overridden.
     def update(options)

data/lib/syctask/task_service.rb

@@ -60,7 +60,7 @@ module Syctask
         next if not all and task.done?
         tasks << task if task.matches?(filter)
       end
-      tasks
+      tasks.sort
     end
 
     # Updates the task with the given id in the given directory dir with the

data/lib/syctask/version.rb

@@ -1,5 +1,5 @@
 # Syctask provides functions for managing tasks in a task list
 module Syctask
   #Holds the version number of syctask
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syc-task
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake