devlog 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2712d58a9f98c77851b3453e22dd929f4aa7eae6
-  data.tar.gz: 30bfd02ebd5ad88eeef83084c15850b618bcaf21
+SHA256:
+  metadata.gz: b1a45392960ca81bf6302d673596bf04eccd7a070b66cb51b23e9ba692b9ccac
+  data.tar.gz: d641ca12c1ecf98e909162c47b6ff4a62c7d75f917cfc9c78a061ce06b3bad28
 SHA512:
-  metadata.gz: d3d76b2d648cdee3327ffcfdbca596a287bc38dc203800c3958f9121946daf7ee8bc39e7abc0a74e56009010ec8e512e08e1249725c6f3b590a4b60e632a6055
-  data.tar.gz: 47e76d5297ebaeaeed0e130c9cc3b0a9426522d02565d620a248e7a3abbc7821f21a4b0dfcf49c06d6a2c41fe0aeaf68c3bcd18c6723642e63116ef825b3fec5
+  metadata.gz: 2cf0628f73115547749bb7154aa7fc5711b87503afcb50109aef5905450b2fe25d09093f9fb4eab235bf58c2d5d0348ea6f2882389c16d37f79c7761282f90bb
+  data.tar.gz: 0e6be9b4a306be177a7234594c71c19962ea343773aec4ef5bd5fee04a3db4f18e9c7cb4c64278fa81a57c7e52d3058b3ae87750d1734d3e1ba284ebb3bcf0ee

data/.github/workflows/devlog_test.yml

@@ -0,0 +1,28 @@
+name: devlog CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [3.0.1, 2.7.3]
+        os: [ubuntu-latest, macOS-lates]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ runner.os }}-§${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/.ruby-version

@@ -1,3 +1 @@
-2.3.0
-
-
+3.0.1

data/README.md

@@ -28,15 +28,14 @@ like a book, top down, but always start a new session on top of the file, so tha
 devlog DSL
 ==========
 
+    #DD.MM.YYYY HH:MM:SS CodingSession::END
 
-#DD.MM.YYYY HH:MM:SS CodingSession::END
+    devlog text...
 
-devlog text...
+    #DD.MM.YYYY HH:MM:SS CodingSession::BEGIN
 
-#DD.MM.YYYY HH:MM:SS CodingSession::BEGIN
-
-using the devlog binary
-===================
+using the devlog CLI
+====================
 
 to parse a devlog file explicitly:
 
@@ -76,19 +75,33 @@ run in current folder and write out info.markdown, copy devlog to README.markdow
 
 `devlog saver`
 
+write out a weekly timesheet for the current week, using a ERB template producing html + PDF:
+
+`devlog w`
+
+writing out the week before the current one (and so on):
+
+`devlog w 1`
+
 settings
 ========
 
-currently only `devlog_file` can be configured. it represents the location of the devlog text file.
-
 the settings file is called `.devlog.yml`.
 
 it can be placed into a project folder from where one wants to be able to call `devlog`.
 
+this way you can keep your devlog.markdown anywhere on disk.
+
+`devlog_file` represents the location of the devlog text file.
+`weekly_timesheet_template` represents the location of the ERB weekly timesheet template, if you don't provide one, there's a default.
+`convert_to_pdf_command` represents the command used to convert the generated html into a signable PDF.
+
+file paths should be relative to `.devlog.yml`.
+
 example settings `.devlog.yml`:
 
 ```
 devlog_file: ../info/devlog.markdown
+weekly_timesheet_template: ../info/weekly_timesheet.erb.html
+convert_to_pdf_command: wkhtmltopdf --dpi 400  --viewport-size 600x800 --orientation Landscape
 ```
-
-the file path should be relative to `.devlog.yml`.

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.5

data/bin/devlog

@@ -31,11 +31,15 @@ exporting devlog into a book, which can be read top down, like normal books:
 
   #{'devlog'.green} x ~ exports into devlog.txt
 
+reporting devlog as a timesheet:
+
+  #{'devlog'.green} w ~ export the current weekly timesheet into a html page and convert that into PDF
 EOF
 
 # arguments
 $:.unshift File.join(File.dirname(__FILE__))
 @in_file_or_cmd = ARGV[0]
+@argument = ARGV[1] ? ARGV[1].to_i : 0
 
 def print_backtrace(exception)
   exception.backtrace.join("\n\t").to_s.blue
@@ -51,6 +55,7 @@ def parse_now(devlog_file = 'devlog.markdown', msg = '')
   puts t.validation_string
   puts t.to_info_string
   puts is_session_open(devlog_file) ? "\nSession is open...".yellow : "\nNo open session.".green
+  t
 end
 
 def export_now(devlog_file = 'devlog.markdown', msg = '')
@@ -63,6 +68,7 @@ include Devlog
 
 def dodo
   load_settings('.devlog.yml')
+  ENV['TZ'] = devlog_timezone_setting
   default_devlog_file = devlog_file_setting
   time = Benchmark.realtime do
     if @in_file_or_cmd =~ /.(markdown|md)$/ # devlog_file is passed directly via CLI
@@ -72,6 +78,8 @@ def dodo
       print_usage
     elsif @in_file_or_cmd == 'x'
       export_now(default_devlog_file, "Exporting #{default_devlog_file}...".green)
+    elsif @in_file_or_cmd == 'w'
+      weekly_pdf(parse_now(default_devlog_file, "Parsing #{default_devlog_file}...".green), @argument)
     elsif @in_file_or_cmd == 'commit'
       `git commit -am 'devlog';git push`
     elsif @in_file_or_cmd == 'b'

data/devlog.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: devlog 0.3.2 ruby lib
+# stub: devlog 0.3.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devlog".freeze
-  s.version = "0.3.2"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["mihael".freeze]
-  s.date = "2018-06-01"
+  s.date = "2023-09-25"
   s.description = "devlog.markdown time&space extractor".freeze
   s.email = "kitschmaster@gmail.com".freeze
   s.executables = ["devlog".freeze]
@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".github/workflows/devlog_test.yml",
     ".ruby-gemset",
     ".ruby-version",
-    ".travis.yml",
     "Gemfile",
     "LICENSE",
     "README.md",
@@ -43,6 +43,8 @@ Gem::Specification.new do |s|
     "sublime_text/devlog.tmbundle/Snippets/tu.tmSnippet",
     "sublime_text/devlog.tmbundle/info.plist",
     "sublime_text/tu.py",
+    "templates/background.jpg",
+    "templates/weekly_timesheet.erb.html",
     "test/devlog_file_test.rb",
     "test/devlog_settings_test.rb",
     "test/devlog_test.rb",
@@ -56,28 +58,24 @@ Gem::Specification.new do |s|
     "test/test_devlogs/test_settings.yml",
     "test/test_devlogs/test_single_devlog.markdown",
     "test/test_devlogs/test_stats_devlog.markdown",
+    "test/test_devlogs/test_weekly_devlog.markdown",
     "test/test_helper.rb",
     "tmp/.gitignore"
   ]
   s.homepage = "http://github.com/mihael/devlog".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.5.2".freeze
+  s.rubygems_version = "3.2.15".freeze
   s.summary = "takes devlog.markdown and gives info".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>.freeze, ["> 4.1"])
-      s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.1"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.0"])
-      s.add_development_dependency(%q<nokogiri>.freeze, ["~> 1.8"])
-    else
-      s.add_dependency(%q<activesupport>.freeze, ["> 4.1"])
-      s.add_dependency(%q<test-unit>.freeze, ["~> 3.1"])
-      s.add_dependency(%q<jeweler>.freeze, ["~> 2.0"])
-      s.add_dependency(%q<nokogiri>.freeze, ["~> 1.8"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<activesupport>.freeze, ["> 4.1"])
+    s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.1"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.0"])
+    s.add_development_dependency(%q<nokogiri>.freeze, ["~> 1.8"])
   else
     s.add_dependency(%q<activesupport>.freeze, ["> 4.1"])
     s.add_dependency(%q<test-unit>.freeze, ["~> 3.1"])

data/devlog.markdown

@@ -1,3 +1,50 @@
+#23.09.2019 23:08:08 CodingSession::END
+
+some quick adjustments...
+
+wkhtmltopdf does not work very well yet. it produces a huge canvas for some reason, making the actual table look miniature until zoomed in.
+it's not a big issue, ii can open the generated html with safari and make an excellent pdf export.
+but, why does it do it like that...
+
+ahm, it seems to produce canvas sized as the current OS resolution, which then on this iMac becomes 5120x2880.
+
+solved to a degree with: wkhtmltopdf --dpi 400 --viewport-size 600x800 --orientation Portrait
+
+so now there's two more settings, a settings file might look like:
+
+	devlog_file: info/devlog.markdown
+	weekly_timesheet_template: info/weekly_timesheet.erb.html
+	convert_to_pdf_command: wkhtmltopdf --dpi 400 --viewport-size 600x800 --orientation Landscape
+
+and that's it. will publish this as 0.3.3 if it turns out to work well.
+
+#23.09.2019 19:39:39 CodingSession::BEGIN
+
+#23.09.2019 01:04:21 CodingSession::END
+
+took me some time to decide how to do this.
+
+decided to generate a html from the pdf they gave.
+
+that was easy, but turned out as rubbish, so ii did it manually.
+
+then decided to populate that html with the data.
+
+and then decided to use wkhtmltopdf command line utility to convert the html back to pdf.
+
+have something, and it's configurable by devlogger. will need some more grind and polish.
+
+#22.09.2019 19:05:17 CodingSession::BEGIN
+
+#19.09.2019 23:34:08 CodingSession::END
+
+adding something ii need for a dayjob. at end of period employer wants a timesheet filled out.
+ii have no intent to do that manually ever again.
+
+weekly daily report, ...
+
+#19.09.2019 22:00:17 CodingSession::BEGIN
+
 #09.01.2018 23:38:01 CodingSession::END
 
 resolving a security issue reported by github. bumping nokogiri.

data/lib/devlog.rb

@@ -226,7 +226,7 @@ module Devlog
   def save_info(devlog_file = 'devlog.markdown', info_file = 'info.markdown')
     info = parse_devlog_now(devlog_file)
     if info.has_info?
-      File.open(File.join(File.dirname(devlog_file), info_file), 'w') {|f| f.write(info.to_info_string(short=true)) }
+      File.open(File.join(File.dirname(devlog_file), info_file), 'w') {|f| f.write(info.to_info_string(true)) }
     else
       puts "No info present.".red
     end
@@ -294,6 +294,131 @@ module Devlog
     devlog_export_file
   end
 
+  def weekly_pdf(tajm, weeks_from_now = 0, devlog_file = 'devlog.markdown')
+    require 'erb'
+    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
+
+    zezzions = tajm.zezzions_for_week(weeks_from_now, DateTime.current)
+
+    if zezzions.any?
+      file_id = zezzions.last.zzbegin.strftime("%Y-%m-%d")
+      pdf = File.join(File.dirname(devlog_file), "sevendays-#{file_id}.pdf")
+      html = File.join(File.dirname(devlog_file), "sevendays-#{file_id}.html")
+      @sevendays = Sevendays.new(zezzions)
+
+      renderer = ERB.new(File.read(template))
+
+      File.open(html,'w') {|f| f.write(renderer.result()) }
+
+      `#{convert_command} #{html} #{pdf}`
+    else
+      'No sessions to render.'.red
+    end
+  end
+
+  module SevendaysTotal
+    def total_hours
+      all.inject(0) { |time, zezzion| time + zezzion.session_time }.round(2)
+    end
+
+    def total_hours_string
+      total = total_hours
+
+      return "" if total <= 0
+
+      "#{total}h"
+    end
+  end
+
+  class Day
+    attr_accessor :all
+    include SevendaysTotal
+
+    def initialize(day, zezzions)
+      @all = zezzions.sort # sorting by default by zzbegin
+      @day = Sevendays::DAYS.include?(day) ? day : Sevendays::RANDOMDAY
+    end
+
+    def name
+      @day
+    end
+
+    def any?
+      all.any?
+    end
+
+    def begins_at
+      return '' unless any?
+      all.first.zzbegin.strftime('%H:%M')
+    end
+
+    def ends_at
+      return '' unless any?
+      all.last.zzend.strftime("%H:%M")
+    end
+
+    def breaks_at
+      return '' unless any?
+
+      size = all.size
+
+      return "" if size < 2
+
+      breaks = []
+      first = true
+      last = nil
+
+      all.each do |zezzion|
+        if first
+          last = zezzion
+          first = false
+        else
+          breaks << "#{last.zzend.strftime('%H:%M')} -> #{zezzion.zzbegin.strftime('%H:%M')}"
+          last = zezzion
+        end
+      end
+
+      breaks.join(', ')
+    end
+  end
+
+  class Sevendays
+    attr_accessor :all
+    include Devlog::SevendaysTotal
+
+    DAYS = %i(monday tuesday wednesday thursday friday saturday sunday).freeze
+    RANDOMDAY = 'Random'.freeze
+
+    def initialize(zezzions)
+      @all = zezzions.sort
+    end
+
+    def begins_at
+      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?
+        instance_variable_get("@__#{day.to_s}")
+      end
+    end
+  end
+
   # The parsing object
   class Parsing
     # this is the total time, but each session has these same params
@@ -379,14 +504,37 @@ module Devlog
       (coding_session_time + com_session_time + payed_time).round(2)
     end
 
-    # return hours worked for the last X days, from beginTime
-    def hours_for_last(days, beginTime = DateTime.now)
-      endTime = beginTime.to_time - days.days
-      selected_zezzions = @zezzions.select { |z| z.zzbegin.to_time < beginTime && z.zzend >= endTime }
-      # puts("Selected sessons from #{beginTime} to #{endTime}: #{selected_zezzions.size}")
+    # 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)
     end
 
+    # from time to time select some zezzions
+    def select_zezzions(from_time, to_time)
+      @zezzions.select { |z| z.zzbegin.to_time > from_time && z.zzend.to_time <= to_time }
+    end
+
+    # returns zezzions recorded during beginning of week and end of week
+    # fromnow - how many weeks into the past
+    def zezzions_for_week(fromnow = 0, current_time = DateTime.current)
+      moment = current_time - (7 * fromnow).days
+      begin_time = moment.beginning_of_week
+      end_time = moment.end_of_week
+
+      select_zezzions(begin_time, end_time)
+    end
+
+    def zezzions_for_month(fromnow = 0, current_time = DateTime.current_time)
+      moment = current_time - (fromnow).months
+      begin_time = moment.beginning_of_month
+      end_time = moment.end_of_month
+
+      select_zezzions(begin_time, end_time)
+    end
+
     def longest_session
       @zezzions.max_by(&:session_time)
     end
@@ -419,6 +567,10 @@ 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
@@ -463,6 +615,36 @@ module Devlog
         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 << ("\n")
+        s << ("Weekly Sessions\n")
+        s << ("\n")
+        sevendays = Sevendays.new(zezzions_for_week)
+        sevendays_total = 0
+        Sevendays::DAYS.each do |day|
+          current_day = sevendays.send(day.to_sym)
+          dayname = day.upcase
+          if current_day.any?
+            current_day_total_hours = current_day.total_hours
+            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}h\n")
+            s << ("\n")
+          end
+        end
+
+        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(:long)}" if last_payed_session
       end
       s
     end
@@ -486,6 +668,8 @@ module Devlog
   end
 
   class Zezzion
+    include Comparable
+
     COM = 1 # communication session
     COD = 0 # coding session
     attr_accessor :zzbegin, :zzend, :zzbegin_title, :zzend_title, :zztype
@@ -506,6 +690,10 @@ module Devlog
       @zzend_line_number = 0
     end
 
+    def <=>(other)
+      zzbegin <=> other.zzbegin
+    end
+
     # in seconds
     def time
       @zzend.to_time -  @zzbegin.to_time
@@ -516,6 +704,7 @@ module Devlog
       min = self.time / 60
       hours = min / 60
       days = hours / 24
+      days
     end
 
     # the whole coding session time

data/lib/devlog_settings.rb

@@ -8,6 +8,10 @@ module Devlog
   # Allow settings.key besides settings[:key]
   # If the method name exists as a key within this Hash, fetch it.
   class Settings < Hash
+    def has?(m)
+      return key?(m) || key?(m.to_s)
+    end
+
     def method_missing(m, *args, &block)
       if key?(m)
         fetch m
@@ -29,7 +33,7 @@ module Devlog
   end
 
   def settings
-    @settings
+    @settings ||= Settings.new
   end
 
   # The default is the current folder with devlog.markdown in it.
@@ -37,12 +41,22 @@ module Devlog
 
   # Calculate a devlog_file path.
   def devlog_file_setting
-    return DEVLOG_FILE unless @settings
-    devlog_file_setting = @settings['devlog_file']
-    if devlog_file_setting && File.exists?(File.join(Dir.pwd, devlog_file_setting))
+    return DEVLOG_FILE unless settings
+    devlog_file_setting = settings['devlog_file']
+    if devlog_file_setting && File.exist?(File.join(Dir.pwd, devlog_file_setting))
       devlog_file_setting
     else
       DEVLOG_FILE
     end
   end
+
+  def devlog_timezone_setting
+    return 'Amsterdam' unless settings
+    devlog_timezone_setting = settings['timezone']
+    if devlog_timezone_setting.present?
+      devlog_timezone_setting
+    else
+      'Amsterdam'
+    end
+  end
 end

data/templates/weekly_timesheet.erb.html

@@ -0,0 +1,71 @@
+<!doctype html>
+<html>
+<head><meta http-equiv=Content-Type content="text/html; charset=UTF-8">
+<style type="text/css">
+<!--
+span.cls_005{font-family:Arial,serif;font-size:10.1px;color:rgb(118,112,113);font-weight:normal;font-style:normal;text-decoration: none}
+div.cls_005{font-family:Arial,serif;font-size:10.1px;color:rgb(118,112,113);font-weight:normal;font-style:normal;text-decoration: none}
+span.cls_003{font-family:Arial,serif;font-size:11.1px;color:rgb(118,112,113);font-weight:bold;font-style:normal;text-decoration: none}
+div.cls_003{font-family:Arial,serif;font-size:11.1px;color:rgb(118,112,113);font-weight:bold;font-style:normal;text-decoration: none}
+span.cls_006{font-family:Arial,serif;font-size:11.1px;color:rgb(118,112,113);font-weight:normal;font-style:normal;text-decoration: none}
+div.cls_006{font-family:Arial,serif;font-size:11.1px;color:rgb(118,112,113);font-weight:normal;font-style:normal;text-decoration: none}
+-->
+
+.time {
+  font-family:Arial,serif;font-size:8px;color:rgb(118,112,113);font-weight:bold;font-style:normal;text-decoration: none
+}
+</style>
+</head>
+<body style="width:900px;">
+<div style="position:absolute;left:50%;margin-left:-420px;top:0px;width:841px;height:595px;overflow:hidden">
+<div style="position:absolute;left:0px;top:0px">
+<img src="background.jpg" width=841 height=589></div>
+<div style="position:absolute;left:441.59px;top:158.60px" class="cls_005"><span class="cls_005">Clients Name</span></div>
+<div style="position:absolute;left:441.59px;top:173.71px" class="cls_005"><span class="cls_005">Contract Number</span></div>
+<div style="position:absolute;left:441.59px;top:189.07px" class="cls_005"><span class="cls_005">Consultancy Company Name</span></div>
+<div style="position:absolute;left:53.51px;top:191.72px" class="cls_003"><span class="cls_003">WEEK COMMENCING</span></div>
+  <div style="position:absolute;left:225px;top:193.72px" class="cls_006"><span class="time week-comencing"><%= @sevendays.begins_at %></span></div>
+
+
+<div style="position:absolute;left:441.59px;top:204.19px" class="cls_005"><span class="cls_005">Consultants Name</span></div>
+
+
+<!-- The weekly timesheet table -->
+<div style="position:absolute;left:54.71px;top:234.44px" class="cls_003"><span class="cls_003">DAY</span></div>
+<div style="position:absolute;left:146.39px;top:234.44px" class="cls_003"><span class="cls_003">START TIME</span></div>
+<div style="position:absolute;left:252.71px;top:234.44px" class="cls_003"><span class="cls_003">BREAK/S START & FINISH</span></div>
+<div style="position:absolute;left:578.87px;top:234.44px" class="cls_003"><span class="cls_003">END TIME</span></div>
+<div style="position:absolute;left:685.19px;top:234.44px" class="cls_003"><span class="cls_003">TOTAL HOURS</span></div>
+
+<% top = 251 %>
+<% %w[monday tuesday wednesday thursday friday saturday sunday].each do |day| %>
+  <% current_day = @sevendays.send(day.to_sym) %>
+  <% dayname = day.upcase %>
+  <div style="position:absolute;left:54.71px;top:<%= top.to_s %>px" class="cls_006"><span class="cls_006"><%= dayname %></span></div>
+    <div style="position:absolute;left:146.39px;top:<%= top.to_s %>px" class="cls_006"><span class="time <%= day %> start-time"><%= current_day.begins_at %></span></div>
+    <div style="position:absolute;left:252.7px;top:<%= top.to_s %>px" class="cls_006"><span class="time <%= day %> breaks"><%= current_day.breaks_at %></span></div>
+    <div style="position:absolute;left:578.8px;top:<%= top.to_s %>px" class="cls_006"><span class="time <%= day %> end-time"><%= current_day.ends_at %></span></div>
+    <div style="position:absolute;left:685.19px;top:<%= top.to_s %>px" class="cls_006"><span class="time <%= day %> total-hours"><%= current_day.total_hours %></span></div>
+  <% top += 16 %>
+<%end%>
+
+<div style="position:absolute;left:55.43px;top:380.83px" class="cls_006"><span class="cls_006">Notes Regarding Overtime or Expenses:</span></div>
+  <div style="position:absolute;left:60.43px;top:410.83px" class="cls_006"><span class="cls_006"><%= @sevendays.total_hours_string %></span></div>
+
+<div style="position:absolute;left:54.71px;top:450.43px" class="cls_006"><span class="cls_006">Signed by Consultant</span></div>
+  <div style="position:absolute;left:200.71px;top:450.43px" class="cls_006"><span class="cls_006"></span></div>
+
+<div style="position:absolute;left:467.03px;top:451.88px" class="cls_006"><span class="cls_006">Signed by Client</span></div>
+<div style="position:absolute;left:54.71px;top:468.67px" class="cls_006"><span class="cls_006">Print Name</span></div>
+  <div style="position:absolute;left:200.71px;top:468.67px" class="cls_006"><span class="cls_006"></span></div>
+
+<div style="position:absolute;left:467.03px;top:471.32px" class="cls_006"><span class="cls_006">Job Title</span></div>
+<div style="position:absolute;left:54.71px;top:488.83px" class="cls_006"><span class="cls_006">Date</span></div>
+  <div style="position:absolute;left:200px;top:488.83px" class="cls_006"><span class="date"><%= @sevendays.date %></span></div>
+<div style="position:absolute;left:467.03px;top:491.71px" class="cls_006"><span class="cls_006">Print Name</span></div>
+<div style="position:absolute;left:467.03px;top:511.16px" class="cls_006"><span class="cls_006">Date</span></div>
+</div>
+</body>
+</html>
+
+

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

@@ -189,7 +189,7 @@ class DevlogTest < Test::Unit::TestCase
 
   def test_devlog_export
     @exported_devlog = export_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_devlog_export.markdown'))
-    assert(File.exists?(@exported_devlog))
+    assert(File.exist?(@exported_devlog))
     assert(File.size(@exported_devlog)>0, "file should not be empty")
     File.open(@exported_devlog, "r") do |f|
       first = f.readline
@@ -207,4 +207,48 @@ class DevlogTest < Test::Unit::TestCase
   def test_default_devlog_file_setting
     assert(devlog_file_setting == 'devlog.markdown', 'should return default')
   end
+
+  def test_zezzions_for_week
+    load_devlog_weekly
+    assert(@tajm_weekly.devlog_sessions.size==15, "should be 15, but is #{@tajm_weekly.devlog_sessions.size}")
+
+    zezzions = @tajm_weekly.zezzions_for_week(0, DateTime.new(2019, 9, 11, 18, 0, 0))
+
+    assert(zezzions.size == 4, 'should be 4 but is not')
+
+    zezzions = @tajm_weekly.zezzions_for_week(1, DateTime.new(2019, 9, 11, 18, 0, 0))
+
+    assert(zezzions.size == 10, "should be 10 but is #{zezzions.size}")
+
+    zezzions = @tajm_weekly.zezzions_for_week(2, DateTime.new(2019, 9, 11, 18, 0, 0))
+
+    assert(zezzions.size == 1, "should be 1 but is #{zezzions.size}")
+
+    zezzions = @tajm_weekly.zezzions_for_week(0, DateTime.new(2019, 9, 6, 23, 0, 0))
+
+    assert(zezzions.size == 10, "should be 10 but is #{zezzions.size}")
+  end
+
+  def test_weekly_timesheet_html_generation
+    load_devlog_weekly
+
+    @sevendays = Sevendays.new(@tajm_weekly.zezzions_for_week(0, DateTime.new(2019, 9, 6, 23, 0, 0)))
+
+    assert(@sevendays.monday.begins_at == "08:00", "monday should begin at 08:00 but begins at #{@sevendays.monday.begins_at}")
+    assert(@sevendays.monday.ends_at == "16:00", "monday should end at 16:00 but ends at #{@sevendays.monday.ends_at}")
+
+    assert(@sevendays.tuesday.begins_at == "08:00", "tuesday should begin at 08:00 but begins at #{@sevendays.tuesday.begins_at}")
+    assert(@sevendays.tuesday.ends_at == "22:00", "tuesday should end at 22:00 but ends at #{@sevendays.tuesday.ends_at}")
+
+    assert(@sevendays.friday.begins_at == "08:00", "friday should begin at 08:00 but begins at #{@sevendays.friday.begins_at}")
+    assert(@sevendays.friday.ends_at == "18:00", "friday should end at 18:00 but ends at #{@sevendays.friday.ends_at}")
+
+    assert(@sevendays.begins_at == "2019/09/02", "seven days should begin on 2019/09/02 but beings on #{@sevendays.begins_at}")
+
+    assert(@sevendays.sunday.breaks_at == "", "no breaks on sunday but is: #{@sevendays.sunday.breaks_at}")
+
+    assert(@sevendays.friday.breaks_at == "12:00 -> 14:00", "one break on friday but is: #{@sevendays.friday.breaks_at}")
+
+    assert(@sevendays.tuesday.breaks_at == "12:00 -> 13:00, 15:00 -> 20:00", "two breaks on tuesday but is: #{@sevendays.tuesday.breaks_at}")
+  end
 end

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_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_devlogs/test_weekly_devlog.markdown

@@ -0,0 +1,89 @@
+#11.09.2019 17:00:00 CodingSession::END
+
+Wednesday
+
+#11.09.2019 13:00:00 CodingSession::BEGIN
+
+#11.09.2019 12:00:00 CodingSession::END
+
+Wednesday
+
+#11.09.2019 08:00:00 CodingSession::BEGIN
+
+#10.09.2019 16:00:00 CodingSession::END
+
+Tuesday
+
+#10.09.2019 08:00:00 CodingSession::BEGIN
+
+#09.09.2019 16:00:00 CodingSession::END
+
+Monday
+
+#09.09.2019 08:00:00 CodingSession::BEGIN
+
+#08.09.2019 16:00:00 CodingSession::END
+
+Sunday
+
+#08.09.2019 08:00:00 CodingSession::BEGIN
+
+#07.09.2019 16:00:00 CodingSession::END
+
+Saturday
+
+#07.09.2019 08:00:00 CodingSession::BEGIN
+
+#06.09.2019 18:00:00 CodingSession::END
+
+Friday
+
+#06.09.2019 14:00:00 CodingSession::BEGIN
+
+#06.09.2019 12:00:00 CodingSession::END
+
+Friday
+
+#06.09.2019 08:00:00 CodingSession::BEGIN
+
+#05.09.2019 16:00:00 CodingSession::END
+
+Thursday
+
+#05.09.2019 08:00:00 CodingSession::BEGIN
+
+#04.09.2019 16:00:00 CodingSession::END
+
+Wednesday
+
+#04.09.2019 08:00:00 CodingSession::BEGIN
+
+#03.09.2019 22:00:00 CodingSession::END
+
+Tuesday 3
+
+#03.09.2019 20:00:00 CodingSession::BEGIN
+
+#03.09.2019 15:00:00 CodingSession::END
+
+Tuesday 2
+
+#03.09.2019 13:00:00 CodingSession::BEGIN
+
+#03.09.2019 12:00:00 CodingSession::END
+
+Tuesday 1
+
+#03.09.2019 08:00:00 CodingSession::BEGIN
+
+#02.09.2019 16:00:00 CodingSession::END
+
+Monday
+
+#02.09.2019 08:00:00 CodingSession::BEGIN
+
+#01.09.2019 16:00:00 CodingSession::END
+
+Sunday
+
+#01.09.2019 08:00:00 CodingSession::BEGIN

data/test/test_helper.rb

@@ -12,6 +12,10 @@ end
 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}"
@@ -29,7 +33,7 @@ def load_devlog_now
 end
 
 def load_devlog_test
-  @tajm_test = parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_devlog.markdown'))
+  @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")
@@ -37,13 +41,17 @@ def load_devlog_test
 end
 
 def load_devlog_stat
-  @tajm_stat = parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_stats_devlog.markdown'))
+  @tajm_stat = parse_test_devlog('test_stats_devlog.markdown')
 end
 
 def load_devlog_single
-  @tajm_single = parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_single_devlog.markdown'))
+  @tajm_single = parse_test_devlog('test_single_devlog.markdown')
 end
 
 def load_devlog_negative
-  @tajm_negative = parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_negative_devlog.markdown'))
+  @tajm_negative = parse_test_devlog('test_negative_devlog.markdown')
+end
+
+def load_devlog_weekly
+  @tajm_weekly = parse_test_devlog('test_weekly_devlog.markdown')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devlog
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - mihael
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,9 +75,9 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".github/workflows/devlog_test.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -98,6 +98,8 @@ files:
 - sublime_text/devlog.tmbundle/Snippets/tu.tmSnippet
 - sublime_text/devlog.tmbundle/info.plist
 - sublime_text/tu.py
+- templates/background.jpg
+- templates/weekly_timesheet.erb.html
 - test/devlog_file_test.rb
 - test/devlog_settings_test.rb
 - test/devlog_test.rb
@@ -111,13 +113,14 @@ files:
 - test/test_devlogs/test_settings.yml
 - test/test_devlogs/test_single_devlog.markdown
 - test/test_devlogs/test_stats_devlog.markdown
+- test/test_devlogs/test_weekly_devlog.markdown
 - test/test_helper.rb
 - tmp/.gitignore
 homepage: http://github.com/mihael/devlog
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,9 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: takes devlog.markdown and gives info
 test_files: []

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
- #- "1.9.3"
- - "2.3.0"
-#before_install:
-#  - bundle update rdoc
-# uncomment this line if your project needs to run something other than `rake`:
-# script: bundle exec rspec spec