ptimelog 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53f453d27b45af79d5bef690d87c5ad36984848f3df02a3114cc60fb3e4a4dbf
-  data.tar.gz: 77c4269e3d12bc42db29624bf4b06e2092f1c60459d13aed8a2d3bf28e03ba12
+  metadata.gz: f72b05fa5e616ace4ab1279b49b23bba94f5130edd06f54a1e8b21bda1a67d35
+  data.tar.gz: 334c78339b815942e0c3155d49ee8bb601603ab682936f240370eeeabe209196
 SHA512:
-  metadata.gz: 6db9a06490897de96ca955ad900876f8848482a2dfe1796cdf1f0dfdbb35ed0d44f61616e2c00fa56acc1cc427b3e39645b37fc65cf7144f55f414fd762fc15b
-  data.tar.gz: d6e38738b5f4384b03edac240bdcd7622e2812d8d056529d26d10903b6d1e73e3c72e1f3b4bfede1e4a234c5738ec8171d0385d276f3ab7843a8675759361251
+  metadata.gz: 400d45182b50402b0832adb98b4c31ea84ff1c5fb9b815c43ba9d575257f9bb371d7db920270399d74f97a6f2a6bb9d7b57d1a35cff4bdf3e15d0a085a0f7295
+  data.tar.gz: 5b8c16be0f1a3c6b3b4ae01442abaf10c381d860922cf84c58abc097ab9f1d1c82deb235e4857f58ca0b75654bc3df34b716d413a2692876e73e101e0e13f85c

data/.envrc

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

data/.gitignore

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

data/README.md

@@ -27,7 +27,7 @@ small tooling to transfer timelog-entries from gtimelog's timelog.txt to the Puz
 - [ ] avoid duplicate entries
   - [ ] 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?

data/lib/ptimelog.rb

@@ -6,6 +6,7 @@ $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'
@@ -16,6 +17,7 @@ module Ptimelog
 
   # 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'

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..-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,29 @@
+# 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
+      end
+
+      def needs_entries?
+        false
+      end
+
+      def run
+        date_time = Time.now.strftime('%F %R')
+
+        @timelog.timelog_txt.open('a') do |log|
+          log << "#{date_time}: #{@task}\n"
+        end
+      end
+    end
+  end
+end

data/lib/ptimelog/command/base.rb

@@ -4,9 +4,12 @@ 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 = Ptimelog::Day.new(day).entries
       end
 
       def needs_entries?

data/lib/ptimelog/command/edit.rb

@@ -28,8 +28,6 @@ module Ptimelog
         %i[
           timelog
           existing_inferer
-          existing_parser
-          billable
           empty_inferer
         ].each do |file_lookup|
           valid, filename = send(file_lookup, requested_file)
@@ -48,23 +46,9 @@ module Ptimelog
         [fn.exist?, fn]
       end
 
-      def existing_parser(file)
-        fn = @scripts.parser(file)
-
-        [fn.exist?, fn]
-      end
-
-      def billable(file)
-        [file == 'billable', @scripts.billable]
-      end
-
       def empty_inferer(file)
         [true, @scripts.inferer(file)]
       end
-
-      def empty_parser(file)
-        [true, @scripts.parser(file)]
-      end
     end
   end
 end

data/lib/ptimelog/day.rb

@@ -0,0 +1,37 @@
+# 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 == :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
+
+    private
+
+    def timelog
+      Timelog.load
+    end
+  end
+end

data/lib/ptimelog/entry.rb

@@ -63,16 +63,11 @@ module Ptimelog
       @billable == BILLABLE
     end
 
-    # this method will be reduced in 0.7, when support for parsers is removed
     def infer_ptime_settings
       return if hidden?
+      return unless @script.inferer(script_name).exist?
 
-      if @script.inferer(script_name).exist?
-        @account, @billable = infer_account_and_billable
-      else
-        @account  = infer_account
-        @billable = infer_billable
-      end
+      @account, @billable = infer_account_and_billable
     end
 
     def to_s
@@ -109,27 +104,6 @@ module Ptimelog
       @script_args ||= @tags.to_a[1..-1].to_a.map(&:inspect).join(' ')
     end
 
-    # this method will be removed in 0.7, when support for parsers is removed
-    def infer_account
-      parser = @script.parser(script_name)
-      return unless parser.exist?
-
-      @script.deprecate(parser)
-
-      cmd = %(#{parser} "#{@ticket}" "#{@description}" #{script_args})
-      `#{cmd}`.chomp # maybe only execute if parser is in correct dir?
-    end
-
-    # this method will be removed in 0.7, when support for billable is removed
-    def infer_billable
-      script = @script.billable
-      return BILLABLE unless script.exist?
-
-      @script.deprecate(script)
-
-      `#{script} #{@account}`.chomp == 'true' ? BILLABLE : NON_BILLABLE
-    end
-
     def infer_account_and_billable
       script = @script.inferer(script_name)
 

data/lib/ptimelog/script.rb

@@ -8,35 +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 billable
-      @config_dir.join('billable').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
 
       @config_dir.join('inferers').join(name).expand_path
     end
-
-    include DeprecationWarning
-
-    def deprecate_message(_)
-      <<~MESSAGE
-        Please move the parser- and billable-scripts to an inferer-script.
-        Support for the previous scripts in parsers/* and billable will
-        be dropped in 0.7.
-
-      MESSAGE
-    end
-
-    def deprecate_header(script_fn)
-      "DEPRECATION NOTICE: #{script_fn} is deprecated"
-    end
   end
 end

data/lib/ptimelog/version.rb

@@ -16,5 +16,5 @@
 # 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.6.0'
+  VERSION = '0.7.0'
 end

data/ptimelog.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   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 'timecop', '~> 0.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ptimelog
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Matthias Viehweger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: naught
@@ -70,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
@@ -130,6 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rspec"
@@ -147,11 +148,13 @@ 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/configuration.rb
+- lib/ptimelog/day.rb
 - lib/ptimelog/deprecation_warning.rb
 - lib/ptimelog/entry.rb
 - lib/ptimelog/named_date.rb
@@ -179,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Move time-entries from gTimelog to PuzzleTime