haora 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ef2d689a29a331f842146a0a18d86975a8d61ef
-  data.tar.gz: 0a029f909c6be28e2c2e9cbabce6b53a9e7cfa01
+  metadata.gz: ddd1a2d1274b551373f6976d215271c9a72f1858
+  data.tar.gz: ce8b10a80fdeb3459d2558eb5b9c86cc623dc840
 SHA512:
-  metadata.gz: f66929443442a39fc3655bea04e151c093569ccafe935f8c962c362d2c9becb518891d30dd5a023eea0f1121dfe0d266a2c2b104012460b8574ae9ea534ba2d4
-  data.tar.gz: fd831c44e0e26d049bf2dfe59d74edeeebae753a38ac4b370a9f6abf8d96a753556a09f7004e03523eed26ac5446843b9616cccef6fd9bc65f4184b9e4b41ec6
+  metadata.gz: 881997389e63129d3b34c686a88b205771d6a05cfe0d2c373437c67f7d5b8f261f7c1d28149d8177e58de3be03679786c4c173694d4a464e8e7c40d8767c9553
+  data.tar.gz: 40596f11a030a6bd9a5a7415e00caa7d39245295c3278ccd363f0d6f4bc91545ec548e46fec6e5e155c5cce968db8c311d92f93731104763d27dbedcb2a34264

data/bin/haora

@@ -25,12 +25,30 @@ command :add do |c|
   c.flag :e, :end
   c.action do |global_actions, options, args|
     file_name = global_actions[:file]
-    date = global_actions[:date]
-    start = options[:begin]
-    stop = options[:end]
-    project = options[:project]
-    text = args[0]
-    Haora::Service.for(file_name).add_task(date: date, start: start, stop: stop, project: project, text: text)
+    params = {
+        :date => global_actions[:date],
+        :start => options[:begin],
+        :stop => options[:end],
+        :project => options[:project],
+        :text => args[0]
+    }
+    Haora::Service.for(file_name).add_task(params)
+  end
+end
+
+desc 'Finish the last task of a day'
+command :finish do |c|
+  c.flag :p, :project
+  c.flag :e, :end
+  c.action do |global_actions, options, args|
+    file_name = global_actions[:file]
+    params = {
+        :date => global_actions[:date],
+        :stop => options[:end],
+        :project => options[:project],
+        :text => args[0]
+    }
+    Haora::Service.for(file_name).finish(params)
   end
 end
 

data/lib/haora/day.rb

@@ -15,14 +15,23 @@ module Haora
 
     def <<(task)
       tasks << task
+      tasks.sort!
+      self
     end
 
     def ==(other)
-      date == other.date
+      @date == other.date
     end
 
     def <=>(other)
-      date <=> other.date
+      @date <=> other.date
+    end
+
+    def finish(params = {})
+      last = tasks.last
+      last.stop_at(params[:stop] || Timestamp.now)
+      last.project = params[:project] if params[:project]
+      last.text = params[:text] if params[:text]
     end
 
     def to_s
@@ -39,9 +48,12 @@ module Haora
 
     def self.now
       if ENV['NOW'] # for testing
-        Time.parse(ENV['NOW'])
+        /(\d?\d):(\d\d)/.match(ENV['NOW']) do |m|
+          {:hour => m[1].to_i, :minute => m[2].to_i}
+        end
       else
-        Time.now
+        now = Time.now
+        {:hour => now.hour, :minute => now.min}
       end
     end
 

data/lib/haora/task.rb

@@ -4,12 +4,36 @@ module Haora
     attr_reader :start, :stop, :project, :text
 
     def initialize(params)
-      @start = params[:start] ? Timestamp.new(params[:start]) : Timestamp.now
-      @stop = params[:stop] ? Timestamp.new(params[:stop]) : nil
+      @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])
       @text = params[:text] || ''
     end
 
+    def project=(project)
+      if project.is_a? String
+        @project = Project.by(name: project)
+      else
+        @project = project
+      end
+    end
+
+    def text=(text)
+      @text = text ||''
+    end
+
+    def <=>(other)
+      @start.to_minutes <=> other.start.to_minutes
+    end
+
+    def stop_at(timestamp)
+      if timestamp.is_a? String
+        @stop = Timestamp.new(literal: timestamp)
+      else
+        @stop = timestamp
+      end
+    end
+
     def to_s
       '%s - %s : %s : %s' % [@start, @stop, @project.name, @text]
     end

data/lib/haora/timestamp.rb

@@ -3,18 +3,17 @@ module Haora
   class Timestamp
     attr_reader :hour, :minute
 
-    def initialize(*params)
-      if params.size == 1 && params.first.is_a?(String)
-        @hour, @minute = parse_timestamp_literal(params.first)
-      elsif params.size == 2 && (params.all? { |p| p.is_a?(Integer) })
-        @hour, @minute = params.first(2)
+    def initialize(params)
+      if params.has_key?(:literal)
+        @hour, @minute = parse_timestamp_literal(params[:literal])
+      elsif params.has_key?(:hour) && params.has_key?(:minute)
+        @hour, @minute = params[:hour], params[:minute]
       end
-      raise ArgumentError if invalid?
+      invalid?
     end
 
     def self.now
-      now = Day.now
-      Timestamp.new(now.hour, now.min)
+      Timestamp.new(Day.now)
     end
 
     private

data/lib/haora/version.rb

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

data/lib/haora.rb

@@ -23,6 +23,12 @@ module Haora
       }
     end
 
+    def finish(params)
+      apply {
+        @workbook[params[:date]].finish(params)
+      }
+    end
+
     def list(date = nil)
       day = @workbook[date]
       StandardDayRenderer.new.render(day)

metadata

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