haora 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfa559ad454e9144340aa59e327854c6bd4dc187
-  data.tar.gz: ecfabc805841a3352dbef5923bd2bd4fbf0a16d4
+  metadata.gz: 0ef2d689a29a331f842146a0a18d86975a8d61ef
+  data.tar.gz: 0a029f909c6be28e2c2e9cbabce6b53a9e7cfa01
 SHA512:
-  metadata.gz: 47689c4dadc88d8aaba74bc8a40afd287542b737e078f0f416ef850b890b5ce747b5a30b64438fdb96a425041025b7dd78bad1b06c12364df18a9b8fd19a383a
-  data.tar.gz: 6caba7632ef466873407ec2d299d3c84c8087268d3d44802c5e9085edfdcfbfb752422eedecaf6388481bee388849ea437e744506d4823b585b3160bbae0b85d
+  metadata.gz: f66929443442a39fc3655bea04e151c093569ccafe935f8c962c362d2c9becb518891d30dd5a023eea0f1121dfe0d266a2c2b104012460b8574ae9ea534ba2d4
+  data.tar.gz: fd831c44e0e26d049bf2dfe59d74edeeebae753a38ac4b370a9f6abf8d96a753556a09f7004e03523eed26ac5446843b9616cccef6fd9bc65f4184b9e4b41ec6

data/bin/haora

@@ -5,6 +5,9 @@ include GLI::App
 
 require 'haora'
 
+program_desc 'Command line application to manage working hours.'
+version Haora::VERSION
+
 desc 'Path to file containing working times'
 arg_name 'file_name'
 default_value File.join(ENV['HOME'], '.haora', 'workbook')
@@ -12,7 +15,7 @@ flag :f, :file
 
 desc 'Date to be used'
 arg_name 'date'
-default_value Date.today.strftime '%d.%m.%Y'
+default_value ENV['TODAY'] || Date.today.strftime('%d.%m.%Y')
 flag :d, :date
 
 desc 'Adds a task to the current or another day'

data/lib/haora/day.rb

@@ -6,7 +6,7 @@ module Haora
     attr_reader :date
 
     def initialize(date = nil)
-      @date = date.nil? ? Date.today : date
+      @date = date.nil? ? Day.today : date
     end
 
     def tasks
@@ -29,6 +29,22 @@ module Haora
       @date.strftime '%F'
     end
 
+    def self.today
+      if ENV['TODAY'] # for testing
+        Date.parse(ENV['TODAY'])
+      else
+        Date.today
+      end
+    end
+
+    def self.now
+      if ENV['NOW'] # for testing
+        Time.parse(ENV['NOW'])
+      else
+        Time.now
+      end
+    end
+
   end
 
   class DateParser

data/lib/haora/project.rb

@@ -5,7 +5,11 @@ module Haora
 
     @projects = Hash.new
     @projects.default_proc = proc do |hash, name|
-      hash[name] = Project.new(name)
+      if name == nil
+        hash[name] = Project.new('')
+      else
+        hash[name] = Project.new(name)
+      end
     end
 
     def self.by(params)

data/lib/haora/renderer.rb

@@ -10,7 +10,7 @@ module Haora
     private
 
     def rendered_date_of(day)
-      if day.date == Date.today
+      if day.date == Day.today
         'today'
       else
         day.date.strftime('%d.%m.%Y')
@@ -24,16 +24,17 @@ module Haora
     def rendered_task(task)
       timespan = rendered_timespan(task.start, task.stop)
       duration = rendered_duration(task.start, task.stop)
-      '%s = %s on %s: %s' % [timespan, duration, task.project.name, task.text]
+      '%s = %s  %s: %s' % [timespan, duration, task.project.name, task.text]
     end
 
     def rendered_timespan(start, stop)
-      timespan = start.to_s << ' - ' << stop.to_s
+      timespan = '%s - %s' % [start.to_s, stop.nil? ? ' now ' : stop.to_s]
       timespan.prepend(' ') if timespan.length < 13
       timespan
     end
 
     def rendered_duration(start, stop)
+      stop = stop.nil? ? Timestamp.now : stop
       '%5.2f' % (stop - start).hours
     end
 

data/lib/haora/timestamp.rb

@@ -13,7 +13,7 @@ module Haora
     end
 
     def self.now
-      now = Time.now
+      now = Day.now
       Timestamp.new(now.hour, now.min)
     end
 

data/lib/haora/version.rb

@@ -0,0 +1,5 @@
+module Haora
+
+  VERSION = '0.0.2'
+
+end

data/lib/haora/workbook.rb

@@ -21,7 +21,7 @@ module Haora
     private
 
     def parse_date_param(param)
-      date = Date.today
+      date = Day.today
       if param.is_a? String
         date = DateParser.parse param
       elsif param.is_a? Date

data/lib/haora.rb

@@ -1,3 +1,4 @@
+require 'haora/version'
 require 'haora/timestamp'
 require 'haora/task'
 require 'haora/project'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haora
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dirk Rademann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -96,6 +96,7 @@ files:
 - lib/haora/renderer.rb
 - lib/haora/task.rb
 - lib/haora/timestamp.rb
+- lib/haora/version.rb
 - lib/haora/workbook.rb
 homepage: http://github.com/drademann/haora-cli
 licenses: