devlog 0.3.3 → 0.4.0

data/lib/devlog.rb

@@ -1,26 +1,17 @@
-#require "time"
-#require "date"
 require "active_support/all"
-require_relative "./devlog_settings"
-
-# Colors for devlog
-class String
-  def red; colorize(self, "\e[1m\e[31m"); end
-  def green; colorize(self, "\e[1m\e[32m"); end
-  def dark_green; colorize(self, "\e[32m"); end
-  def yellow; colorize(self, "\e[1m\e[33m"); end
-  def blue; colorize(self, "\e[1m\e[34m"); end
-  def dark_blue; colorize(self, "\e[34m"); end
-  def pur; colorize(self, "\e[1m\e[35m"); end
-  def colorize(text, color_code) "#{color_code}#{text}\e[0m" end
-end
+require_relative "devlog/date_time_ago_in_words"
+require_relative "devlog/version"
+require_relative "devlog/utils"
+require_relative "devlog/settings"
+
+# DEPRECATION WARNING: to_time will always preserve the timezone offset of the receiver in Rails 8.0. To opt in to the new behavior, set `ActiveSupport.to_time_preserves_timezone = true`
+ActiveSupport.to_time_preserves_timezone = true
 
 # The devlog module with all the mumbo
 module Devlog
   # :stopdoc:
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-  VERSION = File.open(File.join(File.dirname(__FILE__), %w[.. VERSION]), 'r').read
 
   # :startdoc:
   # Returns the version string for the library.
@@ -69,10 +60,21 @@ module Devlog
   end
 
   # Parsing datetime
+  def time_with_zone
+    if !Time.zone
+      tz = devlog_timezone_setting
+      puts "Setting timezone to: #{tz}"
+      Time.zone = tz
+    end
+    Time.zone
+  end
+
   DATETIME_FORMAT = '%d.%m.%Y %H:%M:%S'.freeze
   def parse_datetime(line)
     parts = line[1..-1].split
-    DateTime.strptime("#{parts[0]} #{parts[1]}", DATETIME_FORMAT)
+    result = time_with_zone.strptime("#{parts[0]} #{parts[1]}", DATETIME_FORMAT)
+    # puts "parse_datetime: #{line} => #{result}\n"
+    result
   rescue StandardError
     abort "\nError\nCan not parse line with invalid date:\n\n#{line}".to_s.blue
   end
@@ -114,9 +116,13 @@ module Devlog
           timeBegin_line_number = line_number
 
           # cs_time += (timeEnd - timeBegin).to_f * 24 #hours *60 #minutes *60 #seconds
-          delta = (timeEnd - timeBegin).to_f * 24 #hours *60 #minutes *60 #seconds
+          delta = (timeEnd - timeBegin) #.to_f * 24 #hours *60 #minutes *60 #seconds
           t.coding_session_time += delta
 
+          #puts "timeBegin: #{timeBegin.class} #{timeEnd.to_i - timeBegin.to_i}"
+          #puts "timeEnd: #{timeEnd}"
+          #puts "delta: #{delta}"
+
           # zezzion
           temp_zezzion.coding_session_time += delta
           temp_zezzion.zzbegin = timeBegin
@@ -141,7 +147,7 @@ module Devlog
           timeBegin = parse_datetime(line)
           timeBegin_line_number = line_number
 
-          delta = (timeEnd - timeBegin).to_f * 24
+          delta = (timeEnd - timeBegin) #.to_f * 24
           t.com_session_time += delta
 
           # zezzion
@@ -163,7 +169,7 @@ module Devlog
           puts "error adding temp_zezzion com_session_time at line: #{line}"
         end
       elsif line =~ /\A\+[0-9]+[m]/
-        delta = (line.to_f / 60)
+        delta = (line.to_f * 60)
         t.com_session_time += delta
 
         # zezzion
@@ -173,7 +179,7 @@ module Devlog
           puts "error adding temp_zezzion com_session_time at line: #{line}"
         end
       elsif line =~ /\A\-[0-9]+[h]/
-        delta = (line.to_f)
+        delta = (line.to_f * 60 * 60)
         t.payed_time += delta
 
         # zezzion
@@ -192,7 +198,7 @@ module Devlog
 
   # Helper for the time entries
   def devlog_session_entry(session_type = 'Coding', begin_end = 'BEGIN')
-    "\n##{Time.now.strftime(DATETIME_FORMAT)} #{session_type}Session::#{begin_end}\n"
+    "\n##{time_with_zone.now.strftime(DATETIME_FORMAT)} #{session_type}Session::#{begin_end}\n"
   end
 
   # Prepend a string to a text file
@@ -296,7 +302,7 @@ module Devlog
 
   def weekly_pdf(tajm, weeks_from_now = 0, devlog_file = 'devlog.markdown')
     require 'erb'
-    devlog_file = settings.devlog_file || devlog_file
+    devlog_file = settings.devlog_file_setting || devlog_file
     template = settings.has?(:weekly_timesheet_template) ? settings.weekly_timesheet_template : File.join(Devlog.path, 'templates', 'weekly_timesheet.erb.html')
     convert_command = settings.has?(:convert_to_pdf_command) ? settings.convert_to_pdf_command : 'wkhtmltopdf'
     puts "Using weekly template: #{template} #{settings.has?(:weekly_timesheet_template)}".green
@@ -321,7 +327,7 @@ module Devlog
 
   module SevendaysTotal
     def total_hours
-      all.inject(0) { |time, zezzion| time + zezzion.session_time }.round(2)
+      ((all.inject(0) { |time, zezzion| time + zezzion.session_time }) / 60 / 60).round(2)
     end
 
     def total_hours_string
@@ -329,7 +335,7 @@ module Devlog
 
       return "" if total <= 0
 
-      "#{total}h"
+      "#{total} [h]"
     end
   end
 
@@ -400,13 +406,15 @@ module Devlog
       all.first.zzbegin.strftime("%Y/%m/%d")
     end
 
+    def ends_at
+      all.last.zzend.strftime("%Y/%m/%d")
+    end
+
     def date
       DateTime.current.strftime("%Y/%m/%d")
     end
 
     DAYS.each do |day|
-      attr_accessor day
-
       define_method(day) do
         value = Day.new(day, all.select { |zezzion| zezzion.zzbegin.send("#{day.to_s}?") } )
         instance_variable_set("@__#{day.to_s}", value) unless instance_variable_get("@__#{day.to_s}")&.any?
@@ -452,14 +460,13 @@ module Devlog
       @zezzions.first.zzend
     end
 
-    # how much time between first session begin and last session end
-    # in seconds
-    # def devlog_time
-    #   (self.devlog_end.to_time - self.devlog_begin.to_time)/60.0/60.0
-    # end
-
+    # total session time
     def session_time
-      @zezzions.inject(0) { |time, zezzion| time + zezzion.session_time }.round(2)
+      @zezzions.inject(0) { |time, zezzion| time + zezzion.session_time }
+    end
+
+    def session_time_h
+      session_time.rounded_hours
     end
 
     # how many days devlog spans
@@ -477,35 +484,55 @@ module Devlog
       count_time( :months => 1)
     end
 
-    # hours per day
+    # seconds per day
     def per_day
-      (self.session_time/self.devlog_days).round(2)
+      self.session_time/self.devlog_days
+    end
+
+    def per_day_h
+      per_day.rounded_hours
     end
 
     def per_week
-      (self.session_time/self.devlog_weeks).round(2)
+      self.session_time/self.devlog_weeks
+    end
+
+    def per_week_h
+      per_week.rounded_hours
     end
 
     def per_month
-      (self.session_time/self.devlog_months).round(2)
+      self.session_time/self.devlog_months
+    end
+
+    def per_month_h
+      per_month.rounded_hours
     end
 
     # total charge time in hours, coding plus communication sessions
     def charge_time
-      (coding_session_time + com_session_time).round(2)
+      coding_session_time + com_session_time
+    end
+
+    def charge_time_h
+      charge_time.rounded_hours
     end
 
     # total charge time in hours, coding plus communication sessions - payed hours
     def unpayed_time
-      (coding_session_time + com_session_time + payed_time).round(2)
+      coding_session_time + com_session_time + payed_time
+    end
+
+    def unpayed_time_h
+      unpayed_time.rounded_hours
     end
 
     # return hours worked for the last X days, from current_time
     def hours_for_last(days, current_time = DateTime.now)
       endTime = current_time.to_time - days.days
       selected_zezzions = @zezzions.select { |z| z.zzbegin.to_time < current_time && z.zzend >= endTime }
-      #puts("Selected sessons from #{current_time} to #{endTime}: #{selected_zezzions.size}")
-      selected_zezzions.inject(0) { |time, z| time + z.session_time }.round(2)
+
+      selected_zezzions.inject(0) { |time, z| time + z.session_time }.to_f.rounded_hours
     end
 
     # from time to time select some zezzions
@@ -563,11 +590,27 @@ module Devlog
       @zezzions.last # devlog_end
     end
 
+    def last_payed_session
+      @zezzions.select{|zezzion| zezzion.payed_time<0}.first
+    end
+
     # return all sessions
     def devlog_sessions
       @zezzions
     end
 
+    def coding_session_time_h
+      coding_session_time.rounded_hours
+    end
+
+    def com_session_time_h
+      com_session_time.rounded_hours
+    end
+
+    def payed_time_h
+      payed_time.rounded_hours
+    end
+
     def validation_string
       vs = ''
       vs << (@zezzions.any? ? '' : "No sessions recorded, add some first...\n".red)
@@ -576,17 +619,17 @@ module Devlog
 
     def to_info_string(short=false)
       s = ''
-      s <<  "\nSession::Time:      = #{self.session_time} [h]\n"
-      s << ("\nCodingSession::Time = %.1f [h]\n" % self.coding_session_time)
-      s << ("\nComSession::Time    = %.1f [h]\n" % self.com_session_time)
-      s << ("\nCharge::Time        = #{self.charge_time} [h]\n")
-      s << ("\nUnpayed::Time       = #{self.unpayed_time.to_s} [h]\n")
+      s <<  "\nSession::Time:      = #{session_time_h} [h]\n"
+      s << ("\nCodingSession::Time = %.1f [h]\n" % coding_session_time_h)
+      s << ("\nComSession::Time    = %.1f [h]\n" % com_session_time_h)
+      s << ("\nCharge::Time        = #{charge_time_h} [h]\n")
+      s << ("\nUnpayed::Time       = #{unpayed_time_h} [h]\n")
       s << ("\n")
       unless short
         s << ("Num of Sessions     = #{self.devlog_sessions.size}\n")
-        s << ("Hours per Day       = #{self.per_day} [h]\n")
-        s << ("Hours per Week      = #{self.per_week} [h]\n")
-        s << ("Hours per Month     = #{self.per_month} [h]\n")
+        s << ("Hours per Day       = #{self.per_day_h} [h]\n")
+        s << ("Hours per Week      = #{self.per_week_h} [h]\n")
+        s << ("Hours per Month     = #{self.per_month_h} [h]\n")
         s << ("Hours last 7 days   = #{self.hours_for_last(7)} [h]\n")
         s << ("Hours last 14 days  = #{self.hours_for_last(14)} [h]\n")
         s << ("Hours last 28 days  = #{self.hours_for_last(28)} [h]\n")
@@ -605,8 +648,8 @@ module Devlog
         end
         s << ("\n")
         s << ("Longest Session     = #{self.longest_session.to_s}\n")
-        s << ("Shortest Session    = #{self.shortest_session.to_s}\n")
-        s << ("Last Session        = #{self.devlog_end.ago_in_words}, duration: #{self.last_session.session_time.round(3)} [h]")
+        s << ("Shortest Session    = #{self.shortest_session.to_s_in_seconds}\n")
+        s << ("Last Session        = #{self.devlog_end.ago_in_words}, duration: #{self.last_session.in_hours} [h]")
         s << ("\n")
         s << ("Weekly Sessions\n")
         s << ("\n")
@@ -620,13 +663,23 @@ module Devlog
             sevendays_total += current_day_total_hours
             s << ("#{dayname.upcase}\n")
             s << ("begins at: #{current_day.begins_at}\n")
-            s << ("breaks: #{current_day.breaks_at}\n")
-            s << ("end_at: #{current_day.ends_at}\n")
-            s << ("sum: #{current_day_total_hours}\n")
+            s << ("breaks at: #{current_day.breaks_at}\n")
+            s << ("ends at: #{current_day.ends_at}\n")
+            s << ("sum: #{current_day_total_hours} [h]\n")
             s << ("\n")
           end
         end
-        s << ("Weekly sessions total: #{sevendays_total}\n")
+
+        0.upto(5) do |week|
+          weekly_zezzions = zezzions_for_week(week, DateTime.current)
+          if weekly_zezzions.any?
+            sevendays = Sevendays.new(weekly_zezzions)
+            s << ("#{sevendays.begins_at}->#{sevendays.ends_at}: #{sevendays.total_hours_string}\n")
+          else
+            s << "No weekly sessions for week #{week}.\n"
+          end
+        end
+        s << "Last payed: #{last_payed_session.zzend.to_s}" if last_payed_session
       end
       s
     end
@@ -711,7 +764,15 @@ module Devlog
     end
 
     def to_s
-      "#{session_time.round(3)} [h] #{type}, begin on line #{@zzbegin_line_number} at #{@zzbegin}, ends on line #{@zzend_line_number} at #{@zzend}"
+      "#{(session_time / 60 / 60).round(3)} [h] #{type}, begin on line #{@zzbegin_line_number} at #{@zzbegin}, ends on line #{@zzend_line_number} at #{@zzend}"
+    end
+
+    def to_s_in_seconds
+      "#{session_time.round(3)} [s] #{type}, begin on line #{@zzbegin_line_number} at #{@zzbegin}, ends on line #{@zzend_line_number} at #{@zzend}"
+    end
+
+    def in_hours
+      (session_time / 60 / 60).round(3)
     end
   end
 
@@ -725,36 +786,3 @@ module Devlog
     end
   end
 end
-
-module DateTimeAgoInWords
-  def ago_in_words
-    return 'a very very long time ago' if self.year < 1800
-    secs = Time.now - self
-    return 'just over' if secs > -1 && secs < 1
-    return 'now' if secs <= -1
-    pair = ago_in_words_pair(secs)
-    ary = ago_in_words_singularize(pair)
-    ary.size == 0 ? '' : ary.join(' and ') << ' ago'
-  end
-  private
-  def ago_in_words_pair(secs)
-    [[60, :seconds], [60, :minutes], [24, :hours], [100_000, :days]].map{ |count, name|
-      if secs > 0
-        secs, n = secs.divmod(count)
-        "#{n.to_i} #{name}"
-      end
-    }.compact.reverse[0..1]
-  end
-  def ago_in_words_singularize(pair)
-    if pair.size == 1
-      pair.map! {|part| part[0, 2].to_i == 1 ? part.chomp('s') : part }
-    else
-      pair.map! {|part| part[0, 2].to_i == 1 ? part.chomp('s') : part[0, 2].to_i == 0 ? nil : part }
-    end
-    pair.compact
-  end
-end
-
-class DateTime
-  include DateTimeAgoInWords
-end

data/test/devlog_settings_test.rb

@@ -26,6 +26,8 @@ class DevlogSettingsTest < Test::Unit::TestCase
   def test_loading_from_yaml
     assert(settings.devlog_file == 'development_log.markdown',
            'example setting should be loaded')
+    assert(settings.timezone == 'Amsterdam',
+           'example setting should be loaded')
   end
 
   def test_devlog_file_setting_returns_default_when_overriden_devlog_file_does_not_exist

data/test/devlog_test.rb

@@ -1,6 +1,17 @@
 require 'test_helper'
 
 class DevlogTest < Test::Unit::TestCase
+  def test_version
+    assert ::Devlog.const_defined?(:VERSION)
+  end
+
+  def test_devlog_session_entry
+    dse = devlog_session_entry
+    tajmstring = "\n##{Time.zone.now.strftime(DATETIME_FORMAT)} CodingSession::BEGIN\n"
+
+    assert_equal tajmstring, dse
+  end
+
   def test_empty_devlog
     @tajm = parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'empty_devlog.markdown'))
     puts "#{@tajm.coding_session_time} #{@tajm.com_session_time} #{@tajm.payed_time}"
@@ -13,25 +24,34 @@ class DevlogTest < Test::Unit::TestCase
     load_devlog
     load_devlog_now
 
-    assert(@tajm.coding_session_time==@tajm_now.coding_session_time, "not equal coding times")
+    assert(@tajm.coding_session_time==@tajm_now.coding_session_time, "not equal coding times #{@tajm.coding_session_time} #{@tajm_now.coding_session_time}")
     assert(@tajm.com_session_time==@tajm_now.com_session_time, "selftalk not repeated")
     assert(@tajm.payed_time==@tajm_now.payed_time, "selfpay not equal")
 
     assert(@tajm_now.zezzions.size>0, "where are the seeds of zezzions?")
-    assert(@tajm_now.unpayed_time<0, "let's make sure opensource is free to develop it self")
+    assert(@tajm_now.unpayed_time<0, "let's make sure opensource is free to develop it self #{@tajm_now.unpayed_time} should be less than zero")
     assert(@tajm_now.zezzions.size>4, "at least 4 recorded sessions must there be?")
-    assert(@tajm_now.devlog_begin.to_s=="2014-01-19T10:16:08+00:00", "a historycal moment in the akashic records was deleted, what?")
-    assert(@tajm_now.devlog_begin.to_time.to_i == 1390126568, "or just a random number in a random dream...")
+    assert(@tajm_now.devlog_begin.to_s=="2014-01-19 10:16:08 +0100", "a historycal moment in the akashic records was deleted, what?")
+    assert(@tajm_now.devlog_begin.to_time.to_i == 1390122968, "or just a random number in a random dream...")
   end
 
   def test_devlog_test
     load_devlog_test
 
-    assert(@tajm_test.coding_session_time== 4.5, "wrong total coding session time")
-    assert(@tajm_test.com_session_time==1.0 , "wrong com session time")
-    assert(@tajm_test.payed_time==-1, "wrong payed time")
-    assert(@tajm_test.unpayed_time==4.5, "wrong unpayed wrong")
-    assert(@tajm_test.charge_time==5.5, "wrong charge wrong")
+    assert_equal 16200.0, @tajm_test.coding_session_time, "wrong coding session time in seconds"
+    assert_equal 4.5, @tajm_test.coding_session_time_h , "wrong coding session time in hours"
+
+    assert_equal 3600.0, @tajm_test.com_session_time, "wrong com session time in seconds"
+    assert_equal 1.0, @tajm_test.com_session_time_h, "wrong com session time in hours"
+
+    assert_equal (-3600.0), @tajm_test.payed_time, "wrong payed time in seconds"
+    assert_equal (-1.0), @tajm_test.payed_time_h, "wrong payed time in hours"
+
+    assert_equal 16200.0, @tajm_test.unpayed_time, "wrong unpayed time in seconds"
+    assert_equal 4.5, @tajm_test.unpayed_time_h, "wrong unpayed time in hours"
+
+    assert_equal 19800.0, @tajm_test.charge_time, "wrong charge time in seconds"
+    assert_equal 5.5, @tajm_test.charge_time_h, "wrong charge time in hours"
   end
 
   def test_devlog_invalid_date
@@ -57,14 +77,17 @@ class DevlogTest < Test::Unit::TestCase
 
   def test_how_much_per_day
     load_devlog_stat
+
     assert(@tajm_stat.per_day>0, "the middle day value, not the mean")
-    assert(@tajm_stat.per_day==1.0, "per day should be 1.0 but is #{@tajm_stat.per_day}")
+    assert_equal 3600.0, @tajm_stat.per_day, "per day should be 3600.0 but is #{@tajm_stat.per_day}"
+    assert_equal 1.0, @tajm_stat.per_day_h, "per day in hours should be 1.0 but is #{@tajm_stat.per_day_h}"
   end
 
   def test_how_much_per_week
     load_devlog_stat
     assert(@tajm_stat.per_week>0, "the middle week value, not the mean")
-    assert(@tajm_stat.per_week==7.02, "per week should be 7.02 but is #{@tajm_stat.per_week}")
+    assert_equal 7.02, @tajm_stat.per_week_h, "per week in hours should be 7.02 but is #{@tajm_stat.per_week_h}"
+    assert(@tajm_stat.per_week>=25263.15, "per week in seconds should be 25263.16 but is #{@tajm_stat.per_week}")
   end
 
   def test_devlog_weeks
@@ -74,7 +97,9 @@ class DevlogTest < Test::Unit::TestCase
 
   def test_how_much_per_month
     load_devlog_stat
-    assert(@tajm_stat.per_week>0, "the middle month value, not the mean")
+    assert(@tajm_stat.per_month>0, "the middle month value, not the mean")
+    assert_equal 8.0, @tajm_stat.per_month_h, "per month in hours should be 8.0 but is #{@tajm_stat.per_month_h}"
+    assert_equal 28800.0, @tajm_stat.per_month, "per month in seconds should be 28800.0 but is #{@tajm_stat.per_month}"
   end
 
   def test_devlog_days_0
@@ -84,22 +109,24 @@ class DevlogTest < Test::Unit::TestCase
 
   def test_devlog_days_1
     load_devlog_stat
-    assert(@tajm_stat.devlog_days==8, "should be 8 devlog days")
+    assert_equal 8, @tajm_stat.devlog_days, "should be 8 devlog days"
   end
 
   def test_devlog_days_2
     load_devlog_single
-    assert(@tajm_single.devlog_days==1, "should be 1 devlog day")
+    assert_equal 1, @tajm_single.devlog_days, "should be 1 devlog day"
   end
 
   def test_devlog_begin
     load_devlog_stat
-    assert(@tajm_stat.devlog_begin.to_s=="2014-03-01T10:00:00+00:00", "devlog begin is wrong")
+
+    assert_equal "2014-03-01 10:00:00 +0100", @tajm_stat.devlog_begin.to_s, "devlog begin is wrong"
   end
 
   def test_devlog_end
     load_devlog_stat
-    assert(@tajm_stat.devlog_end.to_s=="2014-03-08T11:00:00+00:00", "devlog end is wrong")
+
+    assert_equal "2014-03-08 11:00:00 +0100", @tajm_stat.devlog_end.to_s, "devlog end is wrong"
   end
 
   def test_hours_for_last0
@@ -107,11 +134,13 @@ class DevlogTest < Test::Unit::TestCase
     hours = @tajm_stat.hours_for_last(0, parse_datetime("#09.03.2014 11:00:00"))
     assert(hours==0, "should be 0, but is #{hours}")
   end
+
   def test_hours_for_last7
     load_devlog_stat
     hours = @tajm_stat.hours_for_last(7, parse_datetime("#09.03.2014 11:00:00"))
     assert(hours==7, "should be 7, but is #{hours}")
   end
+
   def test_hours_for_last1
     load_devlog_stat
     hours = @tajm_stat.hours_for_last(1, parse_datetime("#09.03.2014 11:00:00"))
@@ -125,9 +154,12 @@ class DevlogTest < Test::Unit::TestCase
 
   def test_negative_sessions
     load_devlog_negative
+
     assert(@tajm_negative.devlog_sessions.size==5, "should be 5, but is #{@tajm_negative.devlog_sessions.size}")
+
     shortest_session_time_rounded = @tajm_negative.shortest_session.session_time.round(2)
-    assert(shortest_session_time_rounded==-2, "should be -2.0, but is #{shortest_session_time_rounded}")
+
+    assert_equal (-7200.0), shortest_session_time_rounded, "should be -7200.0, but is #{shortest_session_time_rounded}"
     assert(@tajm_negative.negative_sessions.size==2, "should be 2, but is #{@tajm_negative.negative_sessions.size}")
   end
 
@@ -171,7 +203,7 @@ class DevlogTest < Test::Unit::TestCase
     stop_coding_session(@empty_devlog)
     assert(File.readlines(@empty_devlog).grep(/CodingSession::END/).size>0, "should insert CodingSession::END at top of file")
     assert(is_session_open(@empty_devlog)==false, "should be false, session should be closed after stopping")
-    assert(File.exists?(@devlog_info)==true, "should exist")
+    assert(File.exist?(@devlog_info)==true, "should exist")
     hasinfo = parse_devlog_now(@empty_devlog).has_info?
     assert(hasinfo==true, 'should have info')
     assert(File.readlines(@devlog_info).grep(/Session::Time/).size>0, "should have info about Session::Time")

data/test/test_devlogs/.devlog.yml

@@ -1 +1,2 @@
-devlog_file: "test/test_devlogs/test_devlog.markdown"
+devlog_file: "test/test_devlogs/test_devlog.markdown"
+timezone: 'Ljubljana'

data/test/test_devlogs/test_invalid_date_devlog.markdown

@@ -4,7 +4,7 @@ let's see how it goes today.
 
 #01.06.2017 09:38:35 CodingSession::BEGIN
 
-#31.06.2017 18:20:50 CodingSession::END
+#32.06.2017 18:20:50 CodingSession::END
 
 nevermind, just do it...
 

data/test/test_devlogs/test_settings.yml

@@ -1,5 +1,5 @@
 # Override the default location of the_project_folder_path/../info/devlog.markdown
 devlog_file: development_log.markdown
-
+timezone: Amsterdam
 nested:
   setting: xyz

data/test/test_helper.rb

@@ -1,57 +1,55 @@
-require 'rubygems'
-require 'test/unit'
-
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'devlog'
-
-class Test::Unit::TestCase
-  include Devlog
-end
+require 'test/unit'
 
 TEST_FILES_PATH = 'test_devlogs'.freeze
 TEMP_PATH = '../tmp'.freeze
 
-def parse_test_devlog(filename)
-  parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, filename))
-end
-
-def load_devlog
-  @tajm = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'devlog.markdown'))
-  puts "#{@tajm.coding_session_time} #{@tajm.com_session_time} #{@tajm.payed_time}"
-  assert(@tajm.coding_session_time>0, "truth")
-  assert(@tajm.com_session_time>0, "love")
-  assert(@tajm.payed_time<0, "simplicity")
-end
-
-def load_devlog_now
-  @tajm_now = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'devlog.markdown'))
-  puts "#{@tajm_now.coding_session_time} #{@tajm_now.com_session_time} #{@tajm_now.payed_time}"
-  assert(@tajm_now.coding_session_time>0, "truth")
-  assert(@tajm_now.com_session_time>0, "love")
-  assert(@tajm_now.payed_time<0, "simplicity")
-end
-
-def load_devlog_test
-  @tajm_test = parse_test_devlog('test_devlog.markdown')
-  puts "#{@tajm_test.coding_session_time} #{@tajm_test.com_session_time} #{@tajm_test.payed_time}"
-  assert(@tajm_test.coding_session_time>0, "truth")
-  assert(@tajm_test.com_session_time>0, "love")
-  assert(@tajm_test.payed_time<0, "simplicity")
-end
-
-def load_devlog_stat
-  @tajm_stat = parse_test_devlog('test_stats_devlog.markdown')
-end
-
-def load_devlog_single
-  @tajm_single = parse_test_devlog('test_single_devlog.markdown')
-end
-
-def load_devlog_negative
-  @tajm_negative = parse_test_devlog('test_negative_devlog.markdown')
-end
+class Test::Unit::TestCase
+  include Devlog
 
-def load_devlog_weekly
-  @tajm_weekly = parse_test_devlog('test_weekly_devlog.markdown')
+  def parse_test_devlog(filename)
+    parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, filename))
+  end
+
+  def load_devlog
+    @tajm = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'devlog.markdown'))
+    puts "#{@tajm.coding_session_time} #{@tajm.com_session_time} #{@tajm.payed_time}"
+    assert(@tajm.coding_session_time>0, "truth")
+    assert(@tajm.com_session_time>0, "love")
+    assert(@tajm.payed_time<0, "simplicity")
+  end
+
+  def load_devlog_now
+    @tajm_now = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'devlog.markdown'))
+    puts "#{@tajm_now.coding_session_time} #{@tajm_now.com_session_time} #{@tajm_now.payed_time}"
+    assert(@tajm_now.coding_session_time>0, "truth")
+    assert(@tajm_now.com_session_time>0, "love")
+    assert(@tajm_now.payed_time<0, "simplicity")
+  end
+
+  def load_devlog_test
+    @tajm_test = parse_test_devlog('test_devlog.markdown')
+    puts "#{@tajm_test.coding_session_time} #{@tajm_test.com_session_time} #{@tajm_test.payed_time}"
+    assert(@tajm_test.coding_session_time>0, "truth")
+    assert(@tajm_test.com_session_time>0, "love")
+    assert(@tajm_test.payed_time<0, "simplicity")
+  end
+
+  def load_devlog_stat
+    @tajm_stat = parse_test_devlog('test_stats_devlog.markdown')
+  end
+
+  def load_devlog_single
+    @tajm_single = parse_test_devlog('test_single_devlog.markdown')
+  end
+
+  def load_devlog_negative
+    @tajm_negative = parse_test_devlog('test_negative_devlog.markdown')
+  end
+
+  def load_devlog_weekly
+    @tajm_weekly = parse_test_devlog('test_weekly_devlog.markdown')
+  end
 end