devlog 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 152a77a9bf2759dee53158b75e850e5fa7eac445ffc96c1640f63994afa95657
-  data.tar.gz: fa39e2749400e54807d883f106e0a79371633f471d7ad0eb84d54254b4f586d8
+  metadata.gz: b1a45392960ca81bf6302d673596bf04eccd7a070b66cb51b23e9ba692b9ccac
+  data.tar.gz: d641ca12c1ecf98e909162c47b6ff4a62c7d75f917cfc9c78a061ce06b3bad28
 SHA512:
-  metadata.gz: 3240402228afcfe9dc9d8826f96b0a3e3579604e3d3ff139a66c9f8dc65562d03218ee66886c03fc468c1382b81b3d347f30a513c1a0e486f42f8f4d4b7c927f
-  data.tar.gz: '080462e56cd322f1af89edf7053ff912b8f9cc0a90dc4c36c2d35839a93abdcf45243b5af2dcb724a6f960e826b53312b362a1703ea6f79cd7f38830da184857'
+  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:
 

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.5

data/bin/devlog

@@ -68,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

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.3 ruby lib
+# stub: devlog 0.3.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devlog".freeze
-  s.version = "0.3.3"
+  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 = "2019-10-19"
+  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",
@@ -64,23 +64,18 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mihael/devlog".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.0.6".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/lib/devlog.rb

@@ -296,7 +296,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
@@ -400,6 +400,10 @@ 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
@@ -563,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
@@ -622,11 +630,21 @@ module Devlog
             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 << ("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(:long)}" if last_payed_session
       end
       s
     end

data/lib/devlog_settings.rb

@@ -49,4 +49,14 @@ module Devlog
       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/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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devlog
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - mihael
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-19 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
@@ -120,7 +120,7 @@ homepage: http://github.com/mihael/devlog
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,8 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-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