haora 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0547d25210e816ce4b8c79a840d98b562375bc6a
-  data.tar.gz: 17c0b9c91a53c07cd2a52acb69e37d83ff574527
+  metadata.gz: 8b50be4b063db3e1bdda7a9319f174e9d65c049e
+  data.tar.gz: 38b6246c198ac1cb532ceb0b13ea1bd93eac779a
 SHA512:
-  metadata.gz: 31f23994b28746e41264a1862773ca03231d3c0f822bbfebac63491c08736957b77ecfafaaa3b2d8624bb33aece124d31b2e6eb9b0dfd21a7373a9d199a4c43e
-  data.tar.gz: 8d97505344e4993ee5a752b238f0b7873e4f8ac37733458a959507c794dcf1ea9ef37f7758caad161b1c56621a343ada7f70fd573a44cd95bb13eed27cfd907e
+  metadata.gz: 14d5b903d8cf19545c965b89bf0c55912f20db05a4d8434f7566469279c826c48b3a7815c3a2dc9eba0c130149b2537041c3cd57e30f316d443c5bdb57adc543
+  data.tar.gz: 9e17772fea15a6b217ccaebb29853229ee5850d4f2c09712115c2e2b6d8487688f7df18496bea8583cad8e0d90b21836faf540131dd4a4b9039e719a3d095f3b

data/bin/haora

@@ -32,7 +32,7 @@ command :add do |c|
         :project => options[:project],
         :text => args[0]
     }
-    Haora::Service.for(file_name).add_task(params)
+    print Haora::Service.for(file_name).add_task(params)
   end
 end
 
@@ -48,17 +48,25 @@ command :finish do |c|
         :project => options[:project],
         :text => args[0]
     }
-    Haora::Service.for(file_name).finish(params)
+    print Haora::Service.for(file_name).finish(params)
   end
 end
 
 desc 'Lists tasks of a day'
 command :list do |c|
+  c.switch :w, :week
   c.action do |global_actions, options, args|
     file_name = global_actions[:file]
-    date = global_actions[:date]
-    puts Haora::Service.for(file_name).list(date)
+    params = {
+        :date => global_actions[:date],
+        :week => options[:week]
+    }
+    print Haora::Service.for(file_name).list(params)
   end
 end
 
+def print(output)
+  puts output unless output.nil?
+end
+
 exit run(ARGV)

data/lib/haora/add_task.rb

@@ -0,0 +1,21 @@
+module Haora
+
+  class AddTaskCommand < Command
+
+    def self.with(workbook)
+      AddTaskCommand.new(workbook)
+    end
+
+    def execute
+      day(at: date) << Task.new(@params)
+    end
+
+    private
+
+    def initialize(workbook)
+      super(workbook)
+    end
+
+  end
+
+end

data/lib/haora/command.rb

@@ -0,0 +1,38 @@
+module Haora
+
+  class Command
+
+    def initialize(workbook)
+      @workbook = workbook
+    end
+
+    def params(params)
+      @params = params
+      self
+    end
+
+    def day(date_params)
+      @workbook[date_params[:at]]
+    end
+
+    def week(date_params)
+      day = day(date_params)
+      date = day.date
+      [
+          day,
+          day(at: date.next_day(1)),
+          day(at: date.next_day(2)),
+          day(at: date.next_day(3)),
+          day(at: date.next_day(4)),
+          day(at: date.next_day(5)),
+          day(at: date.next_day(6)),
+      ]
+    end
+
+    def date
+      @params[:date]
+    end
+
+  end
+
+end

data/lib/haora/day.rb

@@ -1,5 +1,14 @@
 require 'date'
 
+class Date
+
+  def prev_wday(wday)
+    before = self.prev_day
+    before.wday == wday ? before : before.prev_wday(wday)
+  end
+
+end
+
 module Haora
 
   class Day
@@ -14,11 +23,28 @@ module Haora
     end
 
     def hours
-      tasks.map { |t| t.duration }
+      tasks
+          .collect { |t| t.duration }
           .reduce { |acc, d| acc + d }
           .hours
     end
 
+    def project_names
+      tasks
+          .select { |t| not t.project.noname? }
+          .collect { |t| t.project.name }
+          .uniq
+    end
+
+    def duration(params = {})
+      if (project_name = params[:of_project])
+        selected_tasks = tasks.select { |t| t.project.name == project_name }
+      else
+        selected_tasks = tasks
+      end
+      selected_tasks.reduce(Duration.new) { |acc, t| acc = acc + t.duration }
+    end
+
     def <<(task)
       finish(stop: task.start) if tasks.last&.open?
       tasks << task
@@ -70,7 +96,53 @@ module Haora
   class DateParser
 
     def self.parse(date)
-      return Date.strptime(date, '%d.%m.%Y')
+      begin
+        case date
+          when /m([0-9]+)/
+            Day.today.prev_day($1.to_i)
+          when /([0-9]?[0-9]).([0-9]?[0-9]).([0-9]?[0-9]?[0-9][0-9])/
+            return Date.new(year($3), mon($2), mday($1))
+          when /([0-9]?[0-9]).([0-9]?[0-9]).?/
+            return Date.new(year, mon($2), mday($1))
+          when /([0-9]?[0-9]).?/
+            return Date.new(year, mon, mday($1))
+          when /mon?/
+            return Day.today.prev_wday(1)
+          when /tue?/
+            return Day.today.prev_wday(2)
+          when /wed?/
+            return Day.today.prev_wday(3)
+          when /thu?/
+            return Day.today.prev_wday(4)
+          when /fri?/
+            return Day.today.prev_wday(5)
+          when /sat?/
+            return Day.today.prev_wday(6)
+          when /sun?/
+            return Day.today.prev_wday(0)
+          else
+            return Date.today
+        end
+      rescue => error
+        puts error
+        raise ArgumentError, 'invalid date'
+      end
+    end
+
+    private
+
+    def self.year(year_param = Day.today.year)
+      year = year_param.to_i
+      year = year + 2000 if year < 100 && year + 2000 <= Date.today.year
+      year
+    end
+
+    def self.mon(mon_param = Day.today.mon)
+      mon_param.to_i
+    end
+
+    def self.mday(mday_param = Day.today.mday)
+      mday_param.to_i
     end
 
   end

data/lib/haora/finish.rb

@@ -0,0 +1,21 @@
+module Haora
+
+  class FinishCommand < Command
+
+    def self.with(workbook)
+      FinishCommand.new(workbook)
+    end
+
+    def execute
+      day(at: date).finish(@params)
+    end
+
+    private
+
+    def initialize(workbook)
+      super(workbook)
+    end
+
+  end
+
+end

data/lib/haora/list.rb

@@ -0,0 +1,29 @@
+module Haora
+
+  class ListCommand < Command
+
+    def self.with(workbook)
+      ListCommand.new(workbook)
+    end
+
+    def execute
+      if week_display?
+        WeekRenderer.new.render(week(at: date))
+      else
+        DayRenderer.new.render(day(at: date))
+      end
+    end
+
+    private
+
+    def initialize(workbook)
+      super(workbook)
+    end
+
+    def week_display?
+      @params[:week]
+    end
+
+  end
+
+end

data/lib/haora/renderer.rb

@@ -1,54 +1,69 @@
 module Haora
 
-  class StandardDayRenderer
+  class Renderer
+
+    private
+
+    def rendered_timespan(start, stop)
+      timespan = '%s - %s' % [start.to_s, stop.nil? ? ' now ' : stop.to_s]
+      timespan.prepend(' ') if timespan.length < 13
+      timespan
+    end
+
+    def rendered_duration(hours)
+      '%5.2f' % hours
+    end
+
+  end
+
+  class DayRenderer < Renderer
 
     def render(day)
       raise 'none' if day.tasks.empty?
-      'Tasks of ' << rendered_date_of(day) << "\n" \
-        << rendered(day.tasks) << "\n" \
-        << rendered_total(day)
+      %W(#{rendered_date_of(day)} #{rendered(day.tasks)} #{rendered_total(day)}).join($/)
     end
 
     private
 
     def rendered_date_of(day)
-      if day.date == Day.today
-        'today'
-      else
-        day.date.strftime('%d.%m.%Y')
-      end
+      date = day.date.strftime('%a %d.%m.%Y')
+      date << ' (today)' if day.date == Day.today
+      date
     end
 
     def rendered(tasks)
-      tasks.map { |task| rendered_task(task) }.join("\n")
+      tasks.map { |task| rendered_task(task, tasks[tasks.index(task) + 1]) }.join($/)
     end
 
     def rendered_total(day)
-      if day.tasks.empty?
-        'none'
-      else
-        '        Total = %5.2f' % day.hours
-      end
+      day.project_names
+          .collect { |name| rendered_project_total(name, day.duration(of_project: name)) }
+          .push('        Total = %5.2f' % day.hours)
+          .join($/)
     end
 
-    def rendered_task(task)
+    def rendered_project_total(name, duration)
+      total = '%s =' % name[0..12]
+      '%s %5.2f' % [total.rjust(15), duration.hours]
+    end
+
+    def rendered_task(task, next_task)
       timespan = rendered_timespan(task.start, task.stop)
-      duration = rendered_duration(task)
+      duration = rendered_duration(task.duration.hours)
       if task.project.noname?
-        '%s = %s  %s' % [timespan, duration, task.text]
+        output = '%s = %s  %s' % [timespan, duration, task.text]
       else
-        '%s = %s  %s: %s' % [timespan, duration, task.project.name, task.text]
+        output = '%s = %s  %s: %s' % [timespan, duration, task.project.name, task.text]
       end
+      include_rendered_gap(task, next_task, output)
     end
 
-    def rendered_timespan(start, stop)
-      timespan = '%s - %s' % [start.to_s, stop.nil? ? ' now ' : stop.to_s]
-      timespan.prepend(' ') if timespan.length < 13
-      timespan
-    end
-
-    def rendered_duration(task)
-      '%5.2f' % task.duration.hours
+    def include_rendered_gap(task, next_task, output)
+      unless next_task.nil?
+        gap = task.gap(to_next: next_task)
+        output << "\n     %dm" % gap.minutes unless gap.minutes == 0
+      end
+      output
     end
 
   end

data/lib/haora/task.rb

@@ -30,6 +30,11 @@ module Haora
       (@stop.nil? ? Timestamp.now : @stop) - @start
     end
 
+    def gap(params)
+      next_task = params[:to_next]
+      next_task.start - @stop
+    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)
+      @minutes == other.minutes
+    end
+
     def +(other)
       Duration.of_minutes(@minutes + other.minutes)
     end
@@ -72,7 +76,7 @@ module Haora
 
     private
 
-    def initialize(minutes)
+    def initialize(minutes = 0)
       @minutes = minutes
     end
 

data/lib/haora/version.rb

@@ -1,5 +1,5 @@
 module Haora
 
-  VERSION = '0.0.6'
+  VERSION = '0.1.0'
 
 end

data/lib/haora/week_renderer.rb

@@ -0,0 +1,43 @@
+module Haora
+
+  class WeekRenderer < Renderer
+
+    def render(week_days)
+      days = rendered_days(week_days)
+      if days.length > 0
+        days << $/ << rendered_total(week_days)
+      else
+        'none'
+      end
+    end
+
+    private
+
+    def rendered_days(days)
+      days.select { |day| day.tasks.length > 0 }
+          .collect { |day| rendered_day(day) }
+          .join($/)
+    end
+
+    def rendered_total(days)
+      hours = days.select { |day| day.tasks.length > 0 }
+                  .collect { |day| day.hours }
+                  .reduce(:+)
+      '                       Total = %s' % rendered_duration(hours)
+    end
+
+    def rendered_day(day)
+      start = day.tasks.first.start
+      stop = day.tasks.last.stop
+      '%s %s = %s' % [rendered_date(day.date),
+                      rendered_timespan(start, stop),
+                      rendered_duration(day.hours)]
+    end
+
+    def rendered_date(date)
+      date.strftime('%a %d.%m.%Y')
+    end
+
+  end
+
+end

data/lib/haora.rb

@@ -4,10 +4,16 @@ require 'haora/task'
 require 'haora/project'
 require 'haora/day'
 require 'haora/renderer'
+require 'haora/week_renderer'
 require 'haora/workbook'
 require 'haora/io'
 require 'haora/file'
 
+require 'haora/command'
+require 'haora/add_task'
+require 'haora/finish'
+require 'haora/list'
+
 module Haora
 
   class Service
@@ -18,22 +24,30 @@ module Haora
     end
 
     def add_task(params)
-      write {
-        @workbook[params[:date]] << Task.new(start: params[:start], stop: params[:stop], project: params[:project], text: params[:text])
-      }
+      write do
+        AddTaskCommand
+            .with(@workbook)
+            .params(params)
+            .execute
+      end
     end
 
     def finish(params)
-      write {
-        @workbook[params[:date]].finish(params)
-      }
+      write do
+        FinishCommand
+            .with(@workbook)
+            .params(params)
+            .execute
+      end
     end
 
-    def list(date = nil)
-      read {
-        day = @workbook[date]
-        StandardDayRenderer.new.render(day)
-      }
+    def list(params)
+      read do
+        ListCommand
+            .with(@workbook)
+            .params(params)
+            .execute
+      end
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haora
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Dirk Rademann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -89,14 +89,19 @@ extra_rdoc_files: []
 files:
 - bin/haora
 - lib/haora.rb
+- lib/haora/add_task.rb
+- lib/haora/command.rb
 - lib/haora/day.rb
 - lib/haora/file.rb
+- lib/haora/finish.rb
 - lib/haora/io.rb
+- lib/haora/list.rb
 - lib/haora/project.rb
 - lib/haora/renderer.rb
 - lib/haora/task.rb
 - lib/haora/timestamp.rb
 - lib/haora/version.rb
+- lib/haora/week_renderer.rb
 - lib/haora/workbook.rb
 homepage: http://github.com/drademann/haora-cli
 licenses: