ptimelog 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ef3bd0d847dd1a258f83f7e1a41123352f4831270d89f550560d0ae802c3f72
-  data.tar.gz: 4a407b654336ca4e37272dffa964e7abeceb478ffb46d1f54926fa2fec0700a8
+  metadata.gz: efde9baef775527079705c4a87dfa656a8df4f186381a88c6ebd51e0cfdfd4c8
+  data.tar.gz: d68a4f17937165e47fe381dedade07ab625ae98c426a30c6cf09d806a2b77466
 SHA512:
-  metadata.gz: 4441aa2504527e658d29c83903e94a8e939f5f2bfbb529cb2f3cb4dabc57b0766ae0674784888f1696a9a85a5137285064b71edb089218d9bdf38170daf88b47
-  data.tar.gz: 44265b7b8be6540b726e61919f912c1cbd460636b88b3da2296dc4114f940644b72124fa89f893e67bb7823c104a5948d6227ef6f251ee4e1a1ef4179dc64bf1
+  metadata.gz: 439357c8e138db02f373cdefedbcd3abd79e16aa5997a8140449327352e0efbdb436b293989b0a19086fcbe41a07c09e7743a3e68b9945cd885080e31b06f056
+  data.tar.gz: 2ca4a1333cd8f21fc07deb995f2ab31b62ada7a8b95286f050bb3f481adbddf85471df28be2c80b5a838c0a91d0e770dbf144830f1349298157161284d545a6f

data/README.md

@@ -17,10 +17,10 @@ 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

data/lib/ptimelog.rb

@@ -22,5 +22,6 @@ module Ptimelog
     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/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/day.rb

@@ -12,26 +12,60 @@ module Ptimelog
         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
+        entries[date] = join_similar(entries_of_day(lines)) # lines |> entries_of_day |> join_similar"
+      end
+    end
+
+    private
+
+    def timelog
+      Timelog.load
+    end
 
-        lines.each do |line|
-          entry = Entry.from_timelog(line)
-          entry.start_time = start
+    def entries_of_day(lines)
+      entries = []
+      start = nil # at the start of the day, we have no previous end
 
-          entries[date] << entry if entry.valid?
+      lines.each do |line|
+        entry = Entry.from_timelog(line)
+        entry.start_time = start
 
-          start = entry.finish_time # store previous ending for nice display of next entry
-        end
+        entries << entry if entry.valid?
 
-        entries
+        start = entry.finish_time # store previous ending for nice display of next entry
       end
+
+      entries
     end
 
-    private
+    def join_similar(list)
+      return [] if list.empty?
+      return list if list.one?
 
-    def timelog
-      Timelog.load
+      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/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.8.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ptimelog
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Matthias Viehweger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: naught
@@ -153,6 +153,7 @@ files:
 - 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