ptimelog 0.5.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4683decb77f362d2861b903e30db9dcb330151f7ee43d6ddb3c332d3af4243b2
-  data.tar.gz: 23c0c132975613fb3f16c064930e6aa72b49e28fbd7cd9b3636aef6863cbb1e4
+  metadata.gz: 3a7ad17dbf09bc8d7694f9261ffcc8216af2f1ec04be03e62ccabadf9732e8b0
+  data.tar.gz: 4ee34a775b9300e50971421adedee472fbfa5f5c0ec226b93e299d17474df411
 SHA512:
-  metadata.gz: e24c93aefa5a8ae475013593af737f872bade8f0f02997551bd2fe2cce049e64bd42869fe9648630f1b02191f2f7fc87883b942a9e266492c0fa09227c51b592
-  data.tar.gz: 043b2383d127e1aeccb716f8e14e47a365cdc309862c0d1309916ceb1695b194e1cb9aad1e4bc5f63f3b9a95aa3aae55981606018370b03d077a1f5a3d42159a
+  metadata.gz: 198b9c6aefbab6f64b617a6b2ad125f9e9921c829e1740ca08faa41c69c797fda1cca1181665adec6b68b51560b3a5bed88ad3b23a8bceba6382dd4b222bb129
+  data.tar.gz: d37ed829daa68c7527caafe929874c6523986609661f9a9155463f0307ac2fb9d14d3237878d6c6659f799ca59c9536e8cae46770f21cdb13916753277beaf2c

data/.envrc

@@ -0,0 +1 @@
+PATH_add exe

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/spec/state.txt

data/.rubocop.yml

@@ -1,6 +1,15 @@
 inherit_from: .rubocop_todo.yml
 
-Metrics/LineLength:
+# require:
+#   - rubocop-rake
+#   - rubocop-rspec
+#   - rubocop-packaging
+#   - rubocop-performance
+
+AllCops:
+    NewCops: enable
+
+Layout/LineLength:
   Max: 120
 
 Metrics/BlockLength:
@@ -13,12 +22,12 @@ Style/TrailingCommaInArrayLiteral:
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
 
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
   EnforcedLastArgumentHashStyle: always_inspect # default
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   AllowedNames:
     - fn
     # default allowed names

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-08-06 22:23:40 +0200 using RuboCop version 0.65.0.
+# on 2020-01-22 14:10:50 +0100 using RuboCop version 0.79.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
+# Offense count: 4
 Metrics/AbcSize:
   Max: 16
 

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+2.7.0

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.2

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2018 Matthias Viehweger
+Copyright (c) 2017-2020 Matthias Viehweger
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,8 @@
 # pTimeLog
 
-small tooling to transfer timelog-entries from gtimelog's timelog.txt to the PuzzleTime TimeTracking Website.
+small tooling to transfer timelog-entries from gtimelog's timelog.txt to the PuzzleTime Timetracking Website.
+
+[![Build Status](https://travis-ci.org/kronn/ptimelog.svg?branch=master)](https://travis-ci.org/kronn/ptimelog)
 
 ## Approach
 
@@ -17,17 +19,17 @@ small tooling to transfer timelog-entries from gtimelog's timelog.txt to the Puz
 - [x] infer time-account from ticket-format
   - [x] support user-supplied ticket-parsers
   - [x] get ticket-parser from tags
-- [ ] merge equal adjacent entries into one
+- [x] merge equal adjacent entries into one
 - [ ] complete login/entry automation
   - [ ] handle authentication
-    - [ ] login and store cookie
+    - [ ] login and store cookie (https://stackoverflow.com/questions/12399087/curl-to-access-a-page-that-requires-a-login-from-a-different-page#12399176)
     - [ ] send user and pwd with every request
   - [ ] make entries
   - [ ] open day in browser for review
-- [ ] avoid duplicate entries
-  - [ ] start/end time as indicator?
+- [x] avoid duplicate entries
+  - [x] start/end time as indicator?
 - [x] offer rounding times to the next 5, 10 or 15 minutes
-- [ ] allow to add entries from the command-line
+- [x] allow to add entries from the command-line
 - [ ] handle time-account and billable better
   - [ ] import time-accounts from ptime (https://time.puzzle.ch/work_items/search.json?q=search%20terms)
     - [ ] with a dedicated cli?
@@ -37,6 +39,7 @@ small tooling to transfer timelog-entries from gtimelog's timelog.txt to the Puz
     - [ ] from *-notation
   - [ ] allow to have a list of "favourite" time-accounts
   - [ ] select best-matching time-account according to tags, possibly limited to the favourites
+  - [x] combine billable and account-lookup into one script
 - [ ] add cli-help
   - [ ] use commander for CLI?
 
@@ -57,10 +60,13 @@ Currently supported actions are
 - show
 - upload
 - edit
+- add
+- version
 
 ### Date-Identifier
 
-To handle a specific date, the format YYYY-MM-DD is expected, e.g. 2017-12-25. Please note that you should not work on that day, unless you bring presents.
+To handle a specific date, the format YYYY-MM-DD is expected, e.g. 2017-12-25.
+Please note that you should not work on that day, unless you bring presents.
 
 For reusability in a shell-history the following keywords are supported:
 
@@ -73,27 +79,58 @@ If nothing is specified, the action is applied to entries of the last day.
 
 ### Edit-Identifier
 
-When the action is "edit", the next argument is treated as script that should be edited.
+When the action is "edit", the next argument is treated as script that should
+be edited.
 
 If nothing is passed, the main timelog.txt is loaded.
 
 Otherwise, a script to determine the time-account is loaded.
 
+### Adding entries
+
+In order to add entries with the ptimelog-cli, the complete entry needs to be
+quoted on the command-line to count as one argument.
+
+    $ ptimelog add 'ticket 1337: Implement requirements -- client coding'
+
+While this requires some knowledge of the file-format, it is no different than
+entering the same string in gTimelog. For now, the entry is added to the
+timelog.txt as it is passed. By default, the date/time added to the entry is
+the one when the command is executed.
+
+You can prefix a positive or negative signed number to slightly skew the entry
+(think: '-5 meeting' or '+5 lunch \*\*') or even set a precise time ('10:30
+meeting').
+
+    $ ptimelog add '-5 meeting: Discuss requirements -- client planning'
+
+### Showing the Version
+
+I got tired of asking rubygems which version I installed, so I took on the
+herculean task of letting ptimelog show its own version.
+
+### Formatting the Output
+
+In order to format the output of the show-action into a table, a hopefully
+convienient field-marker has been chosen. I think it is unlikely, that ∴ is
+being used in a time-entry. Therefore, you can pipe the output into `column`:
+
+    ptimelog show today | column -t -s ∴
+
 ## Helper-Scripts
 
 ptimelog can prefill the account-number and billable-state of an entry.
 
 The tags are used to determine a script that helps infer the time-account.
-These scripts should be located in `~/.config/ptimelog/parsers/` and be named
+These scripts should be located in `~/.config/ptimelog/inferers/` and be named
 like the first tag used. The script gets the ticket, the description and all
-remaining tags passed as arguments. The output of the script should only be the
-ID of the time-account.
+remaining tags passed as arguments.
 
-In order to infer the billable-state of an entry, a script
-`~/.config/ptimelog/billable` is called. It only gets the previously infered
-account-id as argument and is expected to output "true" or "false".
+The output of the script should be the ID of the time-account and the
+billable-state as "true" or "false". Both items need to be separated by
+whitespace, so you can output those two on the same line or on different lines.
 
-Since these script are called a lot, it is better to write them in a compiled
+Since these scripts are called a lot, it is better to write them in a compiled
 language. If you only like ruby, take a look at crystal. For such simple
 scripts, the code is almost identical and "just" needs to be compiled.
 
@@ -102,8 +139,8 @@ scripts, the code is almost identical and "just" needs to be compiled.
 A config-file is read from `$HOME/.config/ptimelog/config`. It is expected
 to be a YAML-file. Currently, it supports the following keys:
 
-	- rounding: [integer or false, default 15]
-	- base_url: [url to your puzzletime-installation, default https://time.puzzle.ch]
+  - rounding: [integer or false, default 15]
+  - base_url: [url to your puzzletime-installation, default https://time.puzzle.ch]
 
 ## Development
 

data/lib/ptimelog.rb

@@ -6,17 +6,22 @@ $LOAD_PATH.unshift File.dirname(__FILE__)
 module Ptimelog
   autoload :App, 'ptimelog/app'
   autoload :Configuration, 'ptimelog/configuration'
+  autoload :Day, 'ptimelog/day'
+  autoload :DeprecationWarning, 'ptimelog/deprecation_warning'
   autoload :Entry, 'ptimelog/entry'
   autoload :NamedDate, 'ptimelog/named_date'
+  autoload :NullPathname, 'ptimelog/null_pathname'
   autoload :Script, 'ptimelog/script'
   autoload :Timelog, 'ptimelog/timelog'
   autoload :VERSION, 'ptimelog/version'
 
   # Collection of commands available at the CLI
   module Command
+    autoload :Add, 'ptimelog/command/add'
     autoload :Base, 'ptimelog/command/base'
     autoload :Edit, 'ptimelog/command/edit'
     autoload :Show, 'ptimelog/command/show'
     autoload :Upload, 'ptimelog/command/upload'
+    autoload :Version, 'ptimelog/command/version'
   end
 end

data/lib/ptimelog/app.rb

@@ -1,58 +1,21 @@
 # frozen_string_literal: true
 
 module Ptimelog
-  # Wrapper for everything
+  # Wrapper for everything, dispatching to a command
   class App
     def initialize(args)
       @config = Configuration.instance
-      command = (args[0] || :show).to_sym
+      command = (args[0] || 'show')
 
-      @command = case command
-                 when :show
-                   @date = NamedDate.new.date(args[1])
-                   Command::Show.new
-                 when :upload
-                   @date = NamedDate.new.date(args[1])
-                   Command::Upload.new
-                 when :edit
-                   file = args[1]
-                   Command::Edit.new(file)
-                 else
-                   raise ArgumentError, "Unsupported Command #{@command}"
-                 end
+      constant_name = command.to_s[0].upcase + command[1..].downcase
+      command_class = Command.const_get(constant_name.to_sym)
+      raise ArgumentError, "Unsupported Command '#{command}'" if command_class.nil?
+
+      @command = command_class.new(args[1]) # e.g. Ptimelog::Command::Show.new('today')
     end
 
     def run
-      @command.entries = entries if @command.needs_entries?
-
       @command.run
     end
-
-    private
-
-    def timelog
-      Timelog.load
-    end
-
-    def entries
-      timelog.each_with_object({}) do |(date, lines), entries|
-        next unless date                           # guard against the machine
-        next unless @date == :all || @date == date # limit to one day if passed
-
-        entries[date] = []
-        start = nil # at the start of the day, we have no previous end
-
-        lines.each do |line|
-          entry = Entry.from_timelog(line)
-          entry.start_time = start
-
-          entries[date] << entry if entry.valid?
-
-          start = entry.finish_time # store previous ending for nice display of next entry
-        end
-
-        entries
-      end
-    end
   end
 end

data/lib/ptimelog/command/add.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+module Ptimelog
+  module Command
+    # add a new entrie with the current date and time
+    class Add < Base
+      def initialize(task)
+        super()
+
+        @task = task
+        @timelog = Ptimelog::Timelog.instance
+        @new_lines = []
+      end
+
+      def needs_entries?
+        false
+      end
+
+      def run
+        add_empty_line if @timelog.previous_entry.date == yesterday
+        add_entry(*parse_task(@task))
+
+        save_file
+      end
+
+      private
+
+      def parse_task(line)
+        matches = line.match('(?<time>\d{1,2}:\d{2} )?(?<offset>[+-]\d+ )?(?<task>.*)')
+        formatted_time = if matches[:time]
+                           Time.parse(matches[:time])
+                         else
+                           Time.now
+                         end
+                         .localtime
+                         .then { |time| time + (matches[:offset].to_i * 60) }
+                         .strftime('%F %R')
+
+        [formatted_time, matches[:task]]
+      end
+
+      def add_entry(date_time, task)
+        @new_lines << "#{date_time}: #{task}"
+      end
+
+      def add_empty_line
+        @new_lines << ''
+      end
+
+      def save_file
+        @timelog.timelog_txt.open('a') do |log|
+          @new_lines.each do |line|
+            log << "#{line}\n"
+          end
+        end
+      end
+
+      def yesterday
+        NamedDate.new.named_date('yesterday')
+      end
+    end
+  end
+end

data/lib/ptimelog/command/base.rb

@@ -4,9 +4,13 @@ module Ptimelog
   module Command
     # Foundation and common API for all commands
     class Base
-      def initialize
-        @config  = Configuration.instance
-        @entries = {} if needs_entries?
+      def initialize(day = nil)
+        @config = Configuration.instance
+
+        return unless needs_entries?
+
+        @entries = {}
+        self.entries = Ptimelog::Day.new(day).entries
       end
 
       def needs_entries?

data/lib/ptimelog/command/edit.rb

@@ -13,7 +13,7 @@ module Ptimelog
       end
 
       def run
-        launch_editor(@file)
+        launch_editor(find_file(@file))
       end
 
       private
@@ -21,10 +21,34 @@ module Ptimelog
       def launch_editor(file)
         editor = `which $EDITOR`.chomp
 
-        file = file.nil? ? Timelog.timelog_txt : @scripts.parser(@file)
-
         exec "#{editor} #{file}"
       end
+
+      def find_file(requested_file)
+        %i[
+          timelog
+          existing_inferer
+          empty_inferer
+        ].each do |file_lookup|
+          valid, filename = send(file_lookup, requested_file)
+
+          return filename if valid
+        end
+      end
+
+      def timelog(file)
+        [file.nil?, Timelog.timelog_txt]
+      end
+
+      def existing_inferer(file)
+        fn = @scripts.inferer(file)
+
+        [fn.exist?, fn]
+      end
+
+      def empty_inferer(file)
+        [true, @scripts.inferer(file)]
+      end
     end
   end
 end

data/lib/ptimelog/command/show.rb

@@ -4,17 +4,30 @@ module Ptimelog
   module Command
     # show entries of one day or all of them
     class Show < Base
+      def initialize(*args)
+        @durations = Hash.new(0)
+
+        super
+      end
+
       def needs_entries?
         true
       end
 
       def run
         @entries.each do |date, list|
-          puts date, '----------'
+          puts date,
+               '----------'
+
+          next if list.empty?
+
           list.each do |entry|
             puts entry
           end
-          puts nil
+          puts '----------',
+               "Total work done: #{duration(date)} hours",
+               '----------------------------',
+               nil
         end
       end
 
@@ -23,18 +36,15 @@ module Ptimelog
           @entries[date] = []
 
           list.each do |entry|
-            @entries[date] << [
-              entry.start_time, '-', entry.finish_time,
-              [
-                entry.ticket,
-                entry.description,
-                entry.tags,
-                entry.account,
-              ].compact.join(' ∴ '),
-            ].compact.join(' ')
+            @durations[date] += entry.duration
+            @entries[date] << entry.to_s
           end
         end
       end
+
+      def duration(date)
+        Time.at(@durations[date]).utc.strftime('%H:%M')
+      end
     end
   end
 end

data/lib/ptimelog/command/version.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Ptimelog
+  module Command
+    # Output the Version-Number
+    class Version < Base
+      def initialize(_arg)
+        super(nil)
+      end
+
+      def run
+        puts Ptimelog::VERSION
+      end
+    end
+  end
+end

data/lib/ptimelog/configuration.rb

@@ -2,6 +2,7 @@
 
 require 'singleton'
 require 'pathname'
+require 'yaml'
 
 module Ptimelog
   # Wrapper around configuration-options and -loading
@@ -9,10 +10,10 @@ module Ptimelog
     include Singleton
 
     CONFIGURATION_DEFAULTS = {
-      base_url: 'https://time.puzzle.ch',
-      rounding: 15,
-      dir:      '~/.config/ptimelog',
-      timelog:  '~/.local/share/gtimelog/timelog.txt',
+      'base_url' => 'https://time.puzzle.ch',
+      'rounding' => 15,
+      'dir'      => '~/.config/ptimelog',
+      'timelog'  => '~/.local/share/gtimelog/timelog.txt',
     }.freeze
 
     def initialize
@@ -21,10 +22,12 @@ module Ptimelog
 
     def reset
       @config = load_config(
-        Pathname.new(CONFIGURATION_DEFAULTS[:dir]).join('config')
+        Pathname.new(CONFIGURATION_DEFAULTS['dir'])
+                .expand_path
+                .join('config')
       )
-      wrap_with_pathname(:dir)
-      wrap_with_pathname(:timelog)
+      wrap_with_pathname('dir')
+      wrap_with_pathname('timelog')
     end
 
     def load_config(fn)
@@ -34,13 +37,13 @@ module Ptimelog
     end
 
     def [](key)
-      @config[key.to_sym]
+      @config[key.to_s]
     end
 
     def []=(key, value)
-      @config[key.to_sym] = value
+      @config[key.to_s] = value
 
-      wrap_with_pathname(key.to_sym) if %w[dir timelog].include?(key.to_s)
+      wrap_with_pathname(key.to_s) if %w[dir timelog].include?(key.to_s)
     end
 
     private

data/lib/ptimelog/day.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Ptimelog
+  # Wrap loading of all entries of a day
+  class Day
+    def initialize(date)
+      @date = NamedDate.new.date(date)
+    end
+
+    def entries
+      timelog.each_with_object({}) do |(date, lines), entries|
+        next unless date # guard against the machine
+        next unless @date.to_s == 'all' || @date == date # limit to one day if passed
+
+        entries[date] = join_similar(entries_of_day(lines)) # lines |> entries_of_day |> join_similar
+      end
+    end
+
+    private
+
+    def timelog
+      Timelog.load
+    end
+
+    def entries_of_day(lines)
+      entries = []
+      start = nil # at the start of the day, we have no previous end
+
+      lines.each do |line|
+        entry = Entry.from_timelog(line)
+        entry.start_time = start
+
+        entries << entry if entry.valid?
+
+        start = entry.finish_time # store previous ending for nice display of next entry
+      end
+
+      entries
+    end
+
+    def join_similar(list)
+      return [] if list.empty?
+      return list if list.one?
+
+      one, *tail = list
+      two, *rest = tail
+
+      joined = maybe_join(one, two)
+
+      if joined.one?
+        join_similar(joined + rest)
+      else
+        [one] + join_similar(tail)
+      end
+    end
+
+    def maybe_join(one, two)
+      if one.ticket == two.ticket &&
+         one.description == two.description &&
+         one.finish_time == two.start_time
+
+        joined = one.dup
+        joined.finish_time = two.finish_time
+
+        [joined]
+      else
+        [one, two]
+      end
+    end
+  end
+end

data/lib/ptimelog/deprecation_warning.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Ptimelog
+  # Allow to add some (hopefully) helpful deprecation warning
+  module DeprecationWarning
+    def self.included(base)
+      base.send :extend, ClassMethods
+    end
+
+    # Keep track of wether the deprecation have been shown already or not
+    module ClassMethods
+      def deprecation_warning_rendered?
+        @deprecation_warning_rendered == true
+      end
+
+      def reset_deprecation_warning!
+        @deprecation_warning_rendered = false
+      end
+
+      def deprecation_warning_rendered!
+        @deprecation_warning_rendered = true
+      end
+    end
+
+    def deprecate(*args)
+      warn deprecate_header(*args)
+
+      return if self.class.deprecation_warning_rendered?
+
+      warn deprecate_message(*args)
+      self.class.deprecation_warning_rendered!
+    end
+
+    def deprecate_header(_)
+      raise <<~MESSAGE
+        deprecate_header(args) not implemented
+
+        Please define a header/short-info for the deprecation, rendered every
+        time the deprecation is hit.
+      MESSAGE
+    end
+
+    def deprecate_message(_)
+      raise <<~MESSAGE
+        deprecate_message(args) not implemented
+
+        Please define a message () for the deprecation, rendered only the first
+        time the deprecation is hit.
+      MESSAGE
+    end
+  end
+end

data/lib/ptimelog/entry.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
+require 'time'
+
 module Ptimelog
   # Dataclass to wrap an entry
   class Entry
-    # allow to read everything
-    attr_reader :date, :start_time, :finish_time, :ticket, :description,
-                :tags, :billable, :account
-
     # define only trivial writers, omit special and derived values
-    attr_writer :date,                            :ticket, :description
+    attr_accessor :date, :ticket, :description
+
+    # allow to read everything else
+    attr_reader :start_time, :finish_time, :tags, :billable, :account
+
+    BILLABLE     = 1
+    NON_BILLABLE = 0
 
     def initialize(config = Configuration.instance)
       @config = config
@@ -49,32 +53,43 @@ module Ptimelog
     end
 
     def valid?
-      @start_time && !hidden?
+      @start_time && duration.positive? && !hidden?
     end
 
     def hidden?
-      @description =~ /\*\*$/ # hide lunch and breaks
+      @description.to_s.end_with?('**') # hide lunch and breaks
+    end
+
+    def billable?
+      @billable == BILLABLE
     end
 
     def infer_ptime_settings
-      @account  = infer_account
-      @billable = infer_billable
+      return if hidden?
+      return unless @script.inferer(script_name).exist?
+
+      @account, @billable = infer_account_and_billable
+    end
+
+    def duration
+      (Time.parse(@finish_time) - Time.parse(@start_time)).to_i
     end
 
     def to_s
+      billable = billable? ? '($)' : nil
+      tag_list = Array(@tags).compact
+
+      tags = tag_list.join(' ') if tag_list.any?
+      desc = [@ticket, @description].compact.join(': ')
+      acc  = [@account, billable].compact.join(' ') if @account
+
       [
-        @start_time, '-', @finish_time,
-        [
-          @ticket,
-          @description,
-          @tags,
-          @account,
-        ].compact.join(' : '),
+        @start_time, '-', @finish_time, '∴',
+        [desc, tags, acc].compact.join(' ∴ '),
       ].compact.join(' ')
     end
 
     # make sortable/def <=>
-    # duration if start and finish is set
 
     private
 
@@ -92,24 +107,22 @@ module Ptimelog
       end.map { |part| part.to_s.rjust(2, '0') }.join(':')
     end
 
-    def infer_account
-      return unless @tags
-
-      parser_name = @tags.first
-      parser = @script.parser(parser_name)
-
-      return unless parser.exist?
+    def script_name
+      @script_name ||= @tags.to_a.first.to_s
+    end
 
-      cmd = %(#{parser} "#{@ticket}" "#{@description}" #{@tags[1..-1].map(&:inspect).join(' ')})
-      `#{cmd}`.chomp # maybe only execute if parser is in correct dir?
+    def script_args
+      @script_args ||= @tags.to_a[1..].to_a.map(&:inspect).join(' ')
     end
 
-    def infer_billable
-      script = @script.billable
+    def infer_account_and_billable
+      script = @script.inferer(script_name)
+
+      cmd = %(#{script} "#{@ticket}" "#{@description}" #{script_args})
 
-      return 1 unless script.exist?
+      account, billable = `#{cmd}`.chomp.split
 
-      `#{script} #{@account}`.chomp == 'true' ? 1 : 0
+      [account, (billable == 'true' ? BILLABLE : NON_BILLABLE)]
     end
   end
 end

data/lib/ptimelog/named_date.rb

@@ -9,17 +9,39 @@ module Ptimelog
       named_date(arg) || :all
     end
 
-    def named_date(date)
+    def named_date(date) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize
       case date.to_s
-      when 'yesterday'        then Date.today.prev_day.to_s
+      when 'yesterday'        then yesterday
       when 'today'            then Date.today.to_s
-      when 'last', ''         then timelog.to_h.keys.compact.sort[-2] || Date.today.prev_day.to_s
-      when /\d{4}(-\d{2}){2}/ then date
+      when 'last', ''         then last_entry.to_s || yesterday
+      when 'mon', 'monday'    then previous_weekday('monday')
+      when 'tue', 'tuesday'   then previous_weekday('tuesday')
+      when 'wed', 'wednesday' then previous_weekday('wednesday')
+      when 'thu', 'thursday'  then previous_weekday('thursday')
+      when 'fri', 'friday'    then previous_weekday('friday')
+      when 'sat', 'saturday'  then previous_weekday('saturday')
+      when 'sun', 'sunday'    then previous_weekday('sunday')
+      when /\d{4}(-\d{2}){2}/ then date.to_s
       end
     end
 
     private
 
+    def previous_weekday(date)
+      Date.today.prev_day(7)
+          .step(Date.today.prev_day)
+          .find { |d| d.send(:"#{date}?") }
+          .to_s
+    end
+
+    def last_entry
+      timelog.to_h.keys.compact.sort[-2]
+    end
+
+    def yesterday
+      Date.today.prev_day.to_s
+    end
+
     def timelog
       Timelog.load
     end

data/lib/ptimelog/null_pathname.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'naught'
+require 'pathname'
+
+NullPathname = Naught.build do |config|
+  config.impersonate Pathname
+  config.predicates_return false
+end

data/lib/ptimelog/script.rb

@@ -8,13 +8,11 @@ module Ptimelog
       @config_dir = config_dir
     end
 
-    def parser(parser_name)
-      @config_dir.join("parsers/#{parser_name}") # FIXME: security-hole, prevent relative paths!
-                 .expand_path
-    end
+    def inferer(name)
+      return NullPathname.new if name.to_s.empty?
+      raise if name =~ %r{[\\/]} # prevent relavtive paths, stupidly, FIXME: really check FS
 
-    def billable
-      @config_dir.join('billable').expand_path
+      @config_dir.join('inferers').join(name).expand_path
     end
   end
 end

data/lib/ptimelog/timelog.rb

@@ -15,6 +15,14 @@ module Ptimelog
       def timelog_txt
         Pathname.new(Configuration.instance[:timelog]).expand_path
       end
+
+      def previous_entry
+        lines = timelog_txt.readlines.last(2)
+        last_line = lines.map(&:chomp).delete_if(&:empty?).last
+        last_entry = instance.tokenize(last_line)
+
+        Entry.from_timelog(last_entry)
+      end
     end
 
     def load
@@ -25,6 +33,10 @@ module Ptimelog
       self.class.timelog_txt
     end
 
+    def previous_entry
+      self.class.previous_entry
+    end
+
     def read
       timelog_txt.read
     end

data/lib/ptimelog/version.rb

@@ -1,6 +1,20 @@
 # frozen_string_literal: true
 
-# Version
+# the version, following semver
+#
+# Someone wanted to have documentation, so here goes...
+#
+# Please note that the version-string is not frozen. Although it of course is,
+# because all strings in this file are frozen. That's what the magic comment
+# at the top of the file does. :gasp:
+#
+# What else? Yeah, the VERSION-constant is part of the module Ptimelog because
+# that is what is described here.
+#
+# So, I truly hope you are happy now, that I documented this file properly. For
+# any remaining questions, please open an issue or even better a pull-request
+# with an improvement. Keep in mind that this is also covered by rspec so I
+# expect (pun intended) 100% test-coverage for any additional code.
 module Ptimelog
-  VERSION = '0.5.3'
+  VERSION = '0.10.0'
 end

data/ptimelog.gemspec

@@ -22,11 +22,19 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.7.0'
+
+  spec.add_dependency 'naught'
+
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'overcommit', '~> 0.45'
   spec.add_development_dependency 'pry', '~> 0.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.50'
+  # spec.add_development_dependency 'rubocop-rake'
+  # spec.add_development_dependency 'rubocop-rspec'
+  # spec.add_development_dependency 'rubocop-packaging'
+  # spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'timecop', '~> 0.9'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ptimelog
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Matthias Viehweger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: naught
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -116,13 +130,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".ruby-gemset"
 - ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -133,13 +148,18 @@ files:
 - exe/ptimelog
 - lib/ptimelog.rb
 - lib/ptimelog/app.rb
+- lib/ptimelog/command/add.rb
 - lib/ptimelog/command/base.rb
 - lib/ptimelog/command/edit.rb
 - lib/ptimelog/command/show.rb
 - lib/ptimelog/command/upload.rb
+- lib/ptimelog/command/version.rb
 - lib/ptimelog/configuration.rb
+- lib/ptimelog/day.rb
+- lib/ptimelog/deprecation_warning.rb
 - lib/ptimelog/entry.rb
 - lib/ptimelog/named_date.rb
+- lib/ptimelog/null_pathname.rb
 - lib/ptimelog/script.rb
 - lib/ptimelog/timelog.rb
 - lib/ptimelog/version.rb
@@ -156,14 +176,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Move time-entries from gTimelog to PuzzleTime

data/.ruby-gemset

@@ -1 +0,0 @@
-gpuzzletime