haora 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddd1a2d1274b551373f6976d215271c9a72f1858
-  data.tar.gz: ce8b10a80fdeb3459d2558eb5b9c86cc623dc840
+  metadata.gz: 71868010980f691b42a132185e7203b94c79764b
+  data.tar.gz: c1da986fb12b723bb1d606905c6acdc0681b7655
 SHA512:
-  metadata.gz: 881997389e63129d3b34c686a88b205771d6a05cfe0d2c373437c67f7d5b8f261f7c1d28149d8177e58de3be03679786c4c173694d4a464e8e7c40d8767c9553
-  data.tar.gz: 40596f11a030a6bd9a5a7415e00caa7d39245295c3278ccd363f0d6f4bc91545ec548e46fec6e5e155c5cce968db8c311d92f93731104763d27dbedcb2a34264
+  metadata.gz: 071cc6e4cec4a3fe53cf20350d2c34656e4dbab3279aaec56bce5481a52bdd0b6370e109a9196d85b1e77e6a26b369f1c697edbd48114f9e0cc66a32e92730d8
+  data.tar.gz: e6fc745ed025ab5c69aaa8fc217fee56db24fb5330156d00bf2aed19d213d2f5a995196d158a7910c0229789328f6a853c6ea94ba0badfcaa21225ecaade9765

data/lib/haora/day.rb

@@ -13,7 +13,14 @@ module Haora
       @tasks ||= []
     end
 
+    def hours
+      tasks.map { |t| t.duration }
+          .reduce { |acc, d| acc + d }
+          .hours
+    end
+
     def <<(task)
+      finish(stop: task.start) if tasks.last&.open?
       tasks << task
       tasks.sort!
       self

data/lib/haora/project.rb

@@ -24,6 +24,10 @@ module Haora
       @projects.clear
     end
 
+    def noname?
+      @name&.empty?
+    end
+
     private
 
     def initialize(name)

data/lib/haora/renderer.rb

@@ -4,7 +4,8 @@ module Haora
 
     def render(day)
       'Tasks of ' << rendered_date_of(day) << "\n" \
-        << rendered(day.tasks)
+        << rendered(day.tasks) << "\n" \
+        << rendered_total(day)
     end
 
     private
@@ -21,10 +22,22 @@ module Haora
       tasks.map { |task| rendered_task(task) }.join("\n")
     end
 
+    def rendered_total(day)
+      if day.tasks.empty?
+        'none'
+      else
+        '        Total = %5.2f' % day.hours
+      end
+    end
+
     def rendered_task(task)
       timespan = rendered_timespan(task.start, task.stop)
-      duration = rendered_duration(task.start, task.stop)
-      '%s = %s  %s: %s' % [timespan, duration, task.project.name, task.text]
+      duration = rendered_duration(task)
+      if task.project.noname?
+        '%s = %s  %s' % [timespan, duration, task.text]
+      else
+        '%s = %s  %s: %s' % [timespan, duration, task.project.name, task.text]
+      end
     end
 
     def rendered_timespan(start, stop)
@@ -33,9 +46,8 @@ module Haora
       timespan
     end
 
-    def rendered_duration(start, stop)
-      stop = stop.nil? ? Timestamp.now : stop
-      '%5.2f' % (stop - start).hours
+    def rendered_duration(task)
+      '%5.2f' % task.duration.hours
     end
 
   end

data/lib/haora/task.rb

@@ -3,7 +3,7 @@ module Haora
   class Task
     attr_reader :start, :stop, :project, :text
 
-    def initialize(params)
+    def initialize(params = {})
       @start = params[:start] ? Timestamp.new(literal: params[:start]) : Timestamp.now
       @stop = params[:stop] ? Timestamp.new(literal: params[:stop]) : nil
       @project = Project.by(name: params[:project])
@@ -22,6 +22,14 @@ module Haora
       @text = text ||''
     end
 
+    def open?
+      @stop.nil?
+    end
+
+    def duration
+      (@stop.nil? ? Timestamp.now : @stop) - @start
+    end
+
     def <=>(other)
       @start.to_minutes <=> other.start.to_minutes
     end

data/lib/haora/timestamp.rb

@@ -62,6 +62,10 @@ module Haora
       minutes / 60.0
     end
 
+    def +(other)
+      Duration.of_minutes(@minutes + other.minutes)
+    end
+
     def to_s
       '%d h %d m' % [parts[:hours], parts[:minutes]]
     end

data/lib/haora/version.rb

@@ -1,5 +1,5 @@
 module Haora
 
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haora
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dirk Rademann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli