logbook-ruby 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22484a3be0fb4cd2f9fe9a65e3cbcc6ce6d684d50ca2c564f5a596902845b6d4
-  data.tar.gz: 576504fd44a95ff28812db23766035b6eefb9176419ba53573faeefef0313ec8
+  metadata.gz: 4bf9e794073c670236e9601796efb0ac9260d2825f409034b3f246dbe65cb4b6
+  data.tar.gz: 88bd820e0f1d5a07fccb6a75161c9d1e751d3d582ed3574ebaa5bdba983da17f
 SHA512:
-  metadata.gz: 6078139e9177245c0eab5dbad8c5b8fe5d4ce3f09217e0d92ff96a1b39ea6d9df428670d4d40c72217eb72a3aec310b3b8b155f3b7e447b01c9d3ca414e03622
-  data.tar.gz: 2a1bd31a73c1d826a576f0c8cc1a944d125fe66143e8198897f5ae8098d50142ce101399fddb8adf6a07c16fa545f22a9e5989e72f52ca1f8661562192208389
+  metadata.gz: 0f053d6ec96f78f6214449425e7e89d6f22f35095af529ea499d04ad261498cf52301b721b9a37812aba42e4c2071c49753232fbfc2eba0862508baa308d0e71
+  data.tar.gz: 7a9a11bc868752d1f3e50f59f0b5b99ec9b510f729710c85600f99b810cb490062e0bd2782d7828e32e8ad3f3ad0747c41d916a4aae2df2768de419f3c5d3d30

data/Guardfile

@@ -28,8 +28,6 @@ guard :rspec, cmd: "bundle exec rspec" do
   require "guard/rspec/dsl"
   dsl = Guard::RSpec::Dsl.new(self)
 
-  # Feel free to open issues for suggestions and improvements
-
   # RSpec files
   rspec = dsl.rspec
   watch(rspec.spec_helper) { rspec.spec_dir }

data/lib/logbook/builder.rb

@@ -47,6 +47,7 @@ module Logbook
           page.add(entry_or_property)
           page
         when LogEntry
+          entry_or_property.properties = current_properties.dup
           page.add(entry_or_property)
           page
         else

data/lib/logbook/log_entry.rb

@@ -0,0 +1,23 @@
+module Logbook
+  class LogEntry < Struct.new(:line_number, :time, :note)
+    DATE_PROPERTY_NAME = "Date"
+
+    attr_accessor :properties
+
+    def recorded_at
+      date = self.properties[DATE_PROPERTY_NAME]
+      time = self.time
+
+      DateTime.parse(date + " " + time)
+    rescue ArgumentError
+    end
+
+    def starts_clock?
+      false
+    end
+
+    def stops_clock?
+      true
+    end
+  end
+end

data/lib/logbook/page.rb

@@ -7,11 +7,33 @@ module Logbook
     end
 
     def add(entry)
-      entries.unshift(entry)
+      entries << entry
     end
 
     def entry_at(line_number)
-      entries.find { |entry| entry.line_number <= line_number }
+      entries.reverse.find { |entry| entry.line_number <= line_number }
+    end
+
+    def total_duration
+      _, duration = entries.inject([nil, Duration.new(0)]) do |(previous_entry, duration), current_entry|
+        if previous_entry && previous_entry.starts_clock?
+          if current_entry.stops_clock?
+            new_duration = Duration.new(duration.minutes + minutes_in_between(previous_entry, current_entry))
+            [current_entry, new_duration]
+          else
+            [previous_entry, duration]
+          end
+        else
+          [current_entry, duration]
+        end
+      end
+
+      duration
+    end
+
+    private
+    def minutes_in_between(previous_entry, current_entry)
+      (current_entry.recorded_at.to_time - previous_entry.recorded_at.to_time) / 60
     end
   end
 end

data/lib/logbook/parser.rb

@@ -11,11 +11,19 @@ module Logbook
     rule(:label) { match["a-zA-Z"] >> match["a-zA-Z0-9_-"].repeat }
 
     rule(:property_value) { match("[^\\n\\]\\[]").repeat(1) }
-    rule(:property) { whitespace >> str("[") >> label.as(:name) >> str(":") >> whitespace >> property_value.as(:value) >> str("]") >> whitespace >> newline.maybe }
+    rule(:property) do
+      whitespace >> str("[") >> label.as(:name) >> str(":") >> whitespace >>
+      property_value.as(:value) >> str("]") >> whitespace >> newline.maybe
+    end
     rule(:tag) { whitespace >> str("#") >> label.as(:tag) >> whitespace >> newline.maybe }
     rule(:property_or_tag_list) { (property.as(:property) | tag).repeat }
 
-    rule(:time) { str("[") >> (match["0-9"].repeat(2, 2) >> str(":") >> match["0-9"].repeat(2, 2)).as(:time) >> str("]") }
+    rule(:time_value) do
+      match["0-9"].repeat(2, 2) >> str(":") >> match["0-9"].repeat(2, 2)
+    end
+    rule(:time) do
+      str("[") >> time_value.as(:time) >> str("]")
+    end
     rule(:status) { str("[") >> label.as(:status) >> str("]") }
     rule(:title) { text.repeat }
 
@@ -26,18 +34,14 @@ module Logbook
 
     rule(:task_definition) do
       status >> whitespace >> title.as(:title) >> str("\n") >>
-        newline.repeat >>
-        property_or_tag_list.as(:properties) >>
-        newline.repeat >>
-        note.as(:note)
+      newline.repeat >> property_or_tag_list.as(:properties) >>
+      newline.repeat >> note.as(:note)
     end
 
     rule(:task_entry) do
       time >> whitespace >> status >> whitespace >> title.as(:title) >> str("\n") >>
-        newline.repeat >>
-        property_or_tag_list.as(:properties) >>
-        newline.repeat >>
-        note.as(:note)
+      newline.repeat >> property_or_tag_list.as(:properties) >>
+      newline.repeat >> note.as(:note)
     end
 
     rule(:page) do

data/lib/logbook/task.rb

@@ -0,0 +1,9 @@
+module Logbook
+  class Task
+    DONE = "Done"
+    PAUSE = "Pause"
+    REOPEN = "Reopen"
+    RESUME = "Resume"
+    START = "Start"
+  end
+end

data/lib/logbook/task_definition.rb

@@ -3,5 +3,13 @@ module Logbook
     def merge_page_properties(properties)
       self.properties = properties.merge(self.properties)
     end
+
+    def starts_clock?
+      false
+    end
+
+    def stops_clock?
+      false
+    end
   end
 end

data/lib/logbook/task_entry.rb

@@ -1,7 +1,27 @@
+require "date"
+
 module Logbook
   class TaskEntry < Struct.new(:line_number, :time, :title, :status, :properties, :tags, :note)
+    DATE_PROPERTY_NAME = "Date"
+
     def merge_page_properties(properties)
       self.properties = properties.merge(self.properties)
     end
+
+    def recorded_at
+      date = self.properties[DATE_PROPERTY_NAME]
+      time = self.time
+
+      DateTime.parse(date + " " + time)
+    rescue ArgumentError
+    end
+
+    def starts_clock?
+      [Task::START, Task::RESUME, Task::REOPEN].include?(self.status)
+    end
+
+    def stops_clock?
+      true
+    end
   end
 end

data/lib/logbook.rb

@@ -1,14 +1,15 @@
 module Logbook
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 
   require "logbook/builder"
   require "logbook/page"
   require "logbook/parser"
+  require "logbook/log_entry"
+  require "logbook/task"
   require "logbook/task_definition"
   require "logbook/task_entry"
 
+  Duration = Struct.new(:minutes)
   Property = Struct.new(:name, :value)
   Tag = Struct.new(:value)
-
-  LogEntry = Struct.new(:line_number, :time, :note)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logbook-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Gabriel Malkas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-21 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,8 +114,10 @@ files:
 - bin/setup
 - lib/logbook.rb
 - lib/logbook/builder.rb
+- lib/logbook/log_entry.rb
 - lib/logbook/page.rb
 - lib/logbook/parser.rb
+- lib/logbook/task.rb
 - lib/logbook/task_definition.rb
 - lib/logbook/task_entry.rb
 - logbook-ruby.gemspec