haora 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b50be4b063db3e1bdda7a9319f174e9d65c049e
-  data.tar.gz: 38b6246c198ac1cb532ceb0b13ea1bd93eac779a
+  metadata.gz: 85ba46e866948e438e101cb4b2b89d9d3a68d732
+  data.tar.gz: f40ca3f38debc0fe0e4a8fd5abb431def1d7cb5d
 SHA512:
-  metadata.gz: 14d5b903d8cf19545c965b89bf0c55912f20db05a4d8434f7566469279c826c48b3a7815c3a2dc9eba0c130149b2537041c3cd57e30f316d443c5bdb57adc543
-  data.tar.gz: 9e17772fea15a6b217ccaebb29853229ee5850d4f2c09712115c2e2b6d8487688f7df18496bea8583cad8e0d90b21836faf540131dd4a4b9039e719a3d095f3b
+  metadata.gz: d31a00d0f96b49b5794881362773a2580c05200b40918aa4ce8be63d613522f1d6155f721a3860b0fc7b92717d0defd7e6a9c1dae661e3e8d380f435cb60d986
+  data.tar.gz: e0f9bedcd560443a86ef65ea9dfbc9a1bf8ee20544e55a3b716e9847f41011882256b1e73af2008ef8fafdd971cb5486016f5f286b74f012c12d45ef07684096

data/lib/haora/io.rb

@@ -19,13 +19,9 @@ module Haora
 
   module TextIOImporter
 
-    private
-
     DAY_RE = /DAY (\d\d\d\d-\d\d-\d\d)/
-    TASK_RE = /(\d?\d:\d\d)-(\d\d:\d\d)?\|(.*)\|(.*)?/
-
-    public
-
+    TASK_RE = /(\d?\d:\d\d)-(\d?\d:\d\d)?\|(.*)\|(.*)?/
+    
     def import(io)
       @workbook = Workbook.new
       io.each_line { |line|

data/lib/haora/project.rb

@@ -36,4 +36,4 @@ module Haora
 
   end
 
-end
+end

data/lib/haora/renderer.rb

@@ -1,26 +1,25 @@
 module Haora
-
   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
+      start = start.to_s
+      start.prepend(' ') if start.length < 5
+      stop = stop.nil? ? ' now ' : stop.to_s
+      stop.prepend(' ') if stop.length < 5
+      format('%s - %s', start, stop)
     end
 
     def rendered_duration(hours)
-      '%5.2f' % hours
+      format('%5.2f', hours)
     end
-
   end
 
   class DayRenderer < Renderer
-
     def render(day)
       raise 'none' if day.tasks.empty?
-      %W(#{rendered_date_of(day)} #{rendered(day.tasks)} #{rendered_total(day)}).join($/)
+      %W(#{rendered_date_of(day)} #{rendered(day.tasks)} #{rendered_total(day)})
+        .join("\n")
     end
 
     private
@@ -32,40 +31,48 @@ module Haora
     end
 
     def rendered(tasks)
-      tasks.map { |task| rendered_task(task, tasks[tasks.index(task) + 1]) }.join($/)
+      tasks
+        .map { |task| rendered_task(task, tasks[tasks.index(task) + 1]) }
+        .join("\n")
     end
 
     def rendered_total(day)
-      day.project_names
-          .collect { |name| rendered_project_total(name, day.duration(of_project: name)) }
-          .push('        Total = %5.2f' % day.hours)
-          .join($/)
+      day
+        .project_names
+        .collect { |name| rendered_project_total(name, day.duration(of_project: name)) }
+        .push('        Total = %5.2f' % day.hours)
+        .join("\n")
     end
 
     def rendered_project_total(name, duration)
-      total = '%s =' % name[0..12]
-      '%s %5.2f' % [total.rjust(15), duration.hours]
+      total = format('%s =', name[0..12])
+      format('%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.hours)
+      output = rendered_task_info(task, timespan, duration)
+      with_rendered_gap(task, next_task, output)
+    end
+
+    def rendered_task_info(task, timespan, duration)
       if task.project.noname?
-        output = '%s = %s  %s' % [timespan, duration, task.text]
+        output = format('%s = %s  %s',
+                        timespan, duration, task.text)
       else
-        output = '%s = %s  %s: %s' % [timespan, duration, task.project.name, task.text]
+        output = format('%s = %s  %s: %s',
+                        timespan, duration, task.project.name, task.text)
       end
-      include_rendered_gap(task, next_task, output)
+      output
     end
 
-    def include_rendered_gap(task, next_task, output)
+    def with_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
+        output << format("\n     %dm", gap.minutes) unless gap.minutes.zero?
       end
       output
     end
-
   end
-
 end

data/lib/haora/timestamp.rb

@@ -54,8 +54,8 @@ module Haora
     end
 
     def parts
-      {:hours => @minutes / 60,
-       :minutes => @minutes % 60}
+      { hours: @minutes / 60,
+        minutes: @minutes % 60 }
     end
 
     def hours
@@ -71,7 +71,7 @@ module Haora
     end
 
     def to_s
-      '%d h %d m' % [parts[:hours], parts[:minutes]]
+      format('%d h %d m', parts[:hours], parts[:minutes])
     end
 
     private

data/lib/haora/version.rb

@@ -1,5 +1,3 @@
 module Haora
-
-  VERSION = '0.1.0'
-
+  VERSION = '0.1.1'.freeze
 end

data/lib/haora.rb

@@ -1,3 +1,5 @@
+require 'English'
+
 require 'haora/version'
 require 'haora/timestamp'
 require 'haora/task'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haora
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dirk Rademann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="