gpuzzletime 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3f853932bdf602db7566b6e122e7b130f09b55f8520da2922c178a621bad930
-  data.tar.gz: 2be9f507dc5f3501a3f204505a255c86f2db62e7262f9339a0ba90ca457f191c
+  metadata.gz: '085c039e47e90785456469afa634a2bdec1a0827f6338002ad328aec65bd3ebe'
+  data.tar.gz: 90c4d988689fbdd1984b8d03ada7cb7c323239275dcb58bdf93966d7d17e7b0f
 SHA512:
-  metadata.gz: a2ba71e0e22135f99f34e38ed95cf37342d20f79f92f8f78b19a53ca5a8df0469c07562a4a508fc006797899e5a99284f4a65398b6c1f5b93ab359532460ab9b
-  data.tar.gz: 55b6f2fa52083b8708d59cc5c9bb2b430945151ff013fad5b0993f8eae495da12782082ce6d8d15d3e8d82bce4296e418c225fc9906d8f7c50c87406b621ad0f
+  metadata.gz: 3ca42c92cb96a54088514f351317a09c96bfc8d566fa12153f7a2ee843900575bca8389913223cd1ebd8ab8b37aeb0f5f9ae549c8545be4e0e5b080bc2551011
+  data.tar.gz: cb59f1b6ef96d3b94eab51713d39ff8f3fa18980d45815988804da871fac27210470d83bd7c8641f6ee59eefbcf771dfc494dcef8e2031168eaf2f038cfc4b3e

data/.overcommit.yml

@@ -0,0 +1,26 @@
+# Use this file to configure the Overcommit hooks you wish to use. This will
+# extend the default configuration defined in:
+# https://github.com/brigade/overcommit/blob/master/config/default.yml
+#
+# For a complete list of hooks, see:
+# https://github.com/brigade/overcommit/tree/master/lib/overcommit/hook
+#
+# For a complete list of options that you can use to customize hooks, see:
+# https://github.com/brigade/overcommit#configuration
+
+PreCommit:
+  RuboCop:
+    enabled: true
+    on_warn: fail # Treat all warnings as failures
+
+  TrailingWhitespace:
+    enabled: true
+    # exclude:
+    #   - '**/db/structure.sql' # Ignore trailing whitespace in generated files
+
+#PostCheckout:
+#  ALL: # Special hook name that customizes all hooks of this type
+#    quiet: true # Change all post-checkout hooks to only display output on failure
+#
+#  IndexTags:
+#    enabled: true # Generate a tags file with `ctags` each time HEAD changes

data/.rubocop.yml

@@ -0,0 +1,8 @@
+Metrics/LineLength:
+  Max: 120
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma

data/README.md

@@ -27,6 +27,15 @@ small tooling to transfer timelog-entries from gtimelog's timelog.txt to the Puz
   - [ ] start/end time as indicator?
 - [ ] offer rounding times to the next 5, 10 or 15 minutes
 - [ ] 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?
+    - [ ] from a REST-Endpoint of PTime?
+  - [ ] automatically prefill billable
+    - [ ] from time-accounts
+    - [ ] from *-notation
+  - [ ] allow to have a list of "favourite" time-accounts
+  - [ ] select best-matching time-account according to tags, possibly limited to the favourites
 
 
 ## Installation
@@ -45,6 +54,7 @@ Currently supported actions are
 
 - show
 - upload
+- edit
 
 ### Date-Identifier
 
@@ -54,9 +64,18 @@ For reusability in a shell-history the following keywords are supported:
 
 - today
 - yesterday
+- last
 
 If nothing is specified, the action is applied to all entries.
 
+### Edit-Identifier
+
+When the action is "edit", the next argument is treated as script that shoudl be edited.
+
+If nothing is passed, the main timelog.txt is loaded.
+
+Otherwise, a script to determine the time-account is loaded.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment. Run `bundle exec gpuzzletime` to use the gem in this directory, ignoring other installed copies of this gem.

data/gpuzzletime.gemspec

@@ -1,26 +1,28 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gpuzzletime/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "gpuzzletime"
+  spec.name          = 'gpuzzletime'
   spec.version       = Gpuzzletime::VERSION
-  spec.authors       = ["Matthias Viehweger"]
-  spec.email         = ["kronn@kronn.de"]
+  spec.authors       = ['Matthias Viehweger']
+  spec.email         = ['kronn@kronn.de']
 
-  spec.summary       = %q{Move time-entries from gTimelog to PuzzleTime}
+  spec.summary       = 'Move time-entries from gTimelog to PuzzleTime'
   # spec.description   = %q{}
-  spec.homepage      = "https://github.com/kronn/gpuzzletime"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/kronn/gpuzzletime'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "~> 0.50"
+  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'overcommit', '~> 0.45'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop', '~> 0.50'
 end

data/lib/gpuzzletime/app.rb

@@ -4,8 +4,8 @@ require 'date'
 require 'erb'
 require 'pathname'
 
-# Wrapper for everything
 module Gpuzzletime
+  # Wrapper for everything
   class App
     def initialize(args)
       @base_url = 'https://time.puzzle.ch'
@@ -23,26 +23,52 @@ module Gpuzzletime
     end
 
     def run
-      launch_editor if @command == :edit
+      case @command
+      when :show
+        fill_entries(@command)
+        entries.each do |date, entries|
+          puts date, '----------'
+          entries.each do |entry|
+            puts entry
+          end
+          puts nil
+        end
+      when :upload
+        fill_entries(@command)
+        entries.each do |date, entries|
+          puts "Uploading #{date}"
+          entries.each do |start, entry|
+            open_browser(start, entry)
+          end
+        end
+      when :edit
+        launch_editor
+      end
+    end
+
+    private
 
-      @entries = {}
+    def entries
+      @entries ||= {}
+    end
 
-      parse(read).each do |date, entries|
+    def fill_entries(purpose)
+      parse(read).each do |date, lines|
         # this is mixing preparation, assembly and output, but gets the job done
         next unless date                           # guard against the machine
         next unless @date == :all || @date == date # limit to one day if passed
-        @entries[date] = []
+        entries[date] = []
 
         start = nil             # at the start of the day, we have no previous end
 
-        entries.each do |entry|
+        lines.each do |entry|
           finish = entry[:time] # we use that twice
           hidden = entry[:description].match(/\*\*$/) # hide lunch and breaks
 
           if start && !hidden
-            case @command # assemble data according to command
+            case purpose # assemble data according to command
             when :show
-              @entries[date] << [
+              entries[date] << [
                 start, '-', finish,
                 [
                   entry[:ticket],
@@ -52,35 +78,15 @@ module Gpuzzletime
                 ].compact.join(' ∴ '),
               ].compact.join(' ')
             when :upload
-              @entries[date] << [start, entry]
+              entries[date] << [start, entry]
             end
           end
 
           start = finish # store previous ending for nice display of next entry
         end
       end
-
-      case @command
-      when :show
-        @entries.each do |date, entries|
-          puts date, '----------'
-          entries.each do |entry|
-            puts entry
-          end
-          puts nil
-        end
-      when :upload
-        @entries.each do |date, entries|
-          puts "Uploading #{date}"
-          entries.each do |start, entry|
-            open_browser(start, entry)
-          end
-        end
-      end
     end
 
-    private
-
     def open_browser(start, entry)
       url = "#{@base_url}/ordertimes/new?#{url_options(start, entry)}"
       system "gnome-open '#{url}' > /dev/null 2> /dev/null"
@@ -111,6 +117,7 @@ module Gpuzzletime
       case date
       when 'yesterday' then Date.today.prev_day.to_s
       when 'today'     then Date.today.to_s
+      when 'last'      then parse(read).to_h.keys.compact.sort[-2] || Date.today.prev_day.to_s
       else                  date
       end
     end
@@ -125,9 +132,9 @@ module Gpuzzletime
 
     def parse(data)
       data.split("\n")
-        .map { |line| tokenize(line) }
-        .group_by { |match| match && match[:date] }
-        .to_a
+          .map { |line| tokenize(line) }
+          .group_by { |match| match && match[:date] }
+          .to_a
     end
 
     def tokenize(line)
@@ -142,7 +149,7 @@ module Gpuzzletime
     end
 
     def parser_file(parser_name)
-      Pathname.new("~/.config/gpuzzletime/parsers/#{parser_name}") # security-hole, prevent relative paths!
+      Pathname.new("~/.config/gpuzzletime/parsers/#{parser_name}") # FIXME: security-hole, prevent relative paths!
               .expand_path
     end
 
@@ -156,7 +163,8 @@ module Gpuzzletime
 
       return unless parser.exist?
 
-      `#{parser} "#{entry[:ticket]}" "#{entry[:description]}" #{tags}`.chomp # maybe only execute if parser is in correct dir?
+      cmd = %(#{parser} "#{entry[:ticket]}" "#{entry[:description]}" #{tags.map(&:inspect).join(' ')})
+      `#{cmd}`.chomp # maybe only execute if parser is in correct dir?
     end
   end
 end

data/lib/gpuzzletime/version.rb

@@ -2,5 +2,5 @@
 
 # Version
 module Gpuzzletime
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gpuzzletime
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matthias Viehweger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: overcommit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.45'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.45'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +89,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".overcommit.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"