toggl-worktime 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cfe44749042b8e44a2cb4eaf293b35fd8475c087af1040d3dd4af61da35b259
-  data.tar.gz: 32f74be718a831e0d1a14ddb2fc7ef23b9e1d9dcc3b6b37bd84ad0f2c3bc9e0b
+  metadata.gz: a6bd12811159316cdb35f131f3d312037d80120236c1fb10881431e240fee7ec
+  data.tar.gz: 1fb3c3aae79814dad772e3f427bdf0cf1ee9dc00319ab7156037a060f2efe719
 SHA512:
-  metadata.gz: dcad3dbe2c7aa33865839740bbbffdd6504e83a3fdf819fc80cb2fb96350b1bef30220d4db37aabc0dd46152260cee4e081a2e1fa3fd575b9e4b801262524c66
-  data.tar.gz: cf32344967d372151d617586eecffa13b9c84e2e6ad3ecbb1b5b4075ddacf1c54d2ac9374c1186a4d2bed1a008096e323f7858d28b6663d1e3c552c00922c2ae
+  metadata.gz: '08d5918bf3afb5f6127228ca89cc45c902642d49d27984c68c686d10866283aa3c2ced0a241844a0379628a3186a742b90898c093ae0554c7cb5e19439f5d233'
+  data.tar.gz: ed2b0510a16e84597e1dd79944230729415ae188db93e186247e599d2fc2d90c786ff640f0d6e5e5277668d7e0ead5199c590eaec30e7af82ca59c4f7f5d7a15

data/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: rspec CI
+
+on:
+  push:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.4.0
+
+      - name: Install dependencies
+        run: bundle install
+
+      - name: Run Rspec
+        run: bundle exec rspec

data/.gitignore

@@ -7,6 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 # rspec failure tracking
 .rspec_status

data/exe/toggl-worktime

@@ -40,13 +40,13 @@ else
     raise ArgumentError, 'Usage: toggl-worktime [YEAR] MONTH DAY'
   end
 
-  driver.merge!(year, month, day)
+  driver.merge_multi!(year, month, day, day)
   user = driver.me
 
   puts user['fullname']
   puts 'worktime'
 
-  driver.write
+  driver.write(day)
 
-  puts "Total worktime: #{driver.total_time}"
+  puts "Total worktime: #{driver.total_time(day: day)}"
 end

data/lib/toggl/worktime/calendar.rb

@@ -57,15 +57,14 @@ module Toggl
 
       def fetch
         @day_data = []
+        @driver.merge_multi!(@year, @month, 1, @days_in_month)
         (1..@days_in_month).each do |day|
           dateobj = Date.new(@year, @month, day)
           day_datum = nil
-          if day <= @last_fetch_day
-            @driver.merge!(@year, @month, day)
-            time = @driver.total_time
-            begin_at = @driver.work_time.first[0]&.getlocal(@zone_offset)&.strftime('%T')
-            end_at = @driver.work_time.last[1]&.getlocal(@zone_offset)&.strftime('%T')
-            day_datum = Toggl::Worktime::Day.new(dateobj, time, begin_at, end_at)
+          if @driver.days.include?(day)
+            begin_at = @driver.work_time_map[day].first[0]&.getlocal(@zone_offset)&.strftime('%T')
+            end_at = @driver.work_time_map[day].last[1]&.getlocal(@zone_offset)&.strftime('%T')
+            day_datum = Toggl::Worktime::Day.new(dateobj, @driver.total_time(day: day), begin_at, end_at)
           else
             day_datum = Toggl::Worktime::Day.new(dateobj, 0, '', '')
           end

data/lib/toggl/worktime/driver.rb

@@ -7,26 +7,29 @@ module Toggl
       ONE_DAY_SECONDS = 86_400
 
       attr_reader :toggl
-      attr_reader :work_time
+      attr_reader :work_time_map
+      attr_reader :days
 
       def initialize(config:)
         @toggl = TogglV9::API.new
         @config = config
-        @merger = nil
-        @work_time = nil
         @zone_offset = Toggl::Worktime::Time.zone_offset(@config.timezone)
         @calendar = nil
+        @days = []
+        @merger_map = {}
+        @work_time_map = {}
       end
 
       def calendar(week_begin, year, month)
         @calendar = Toggl::Worktime::Calendar.new(self, @zone_offset, week_begin, year, month)
       end
 
-      def time_entries(year, month, day)
+      # Multi-day time entries in a request
+      def time_entries_multi(year, month, begin_day, end_day)
         beginning_day = ::Time.new(
-          year, month, day, @config.day_begin_hour, 0, 0, @zone_offset
+          year, month, begin_day, @config.day_begin_hour, 0, 0, @zone_offset
         )
-        ending_day = beginning_day + ONE_DAY_SECONDS
+        ending_day = beginning_day + ONE_DAY_SECONDS * (end_day - begin_day + 1)
         start_iso = beginning_day.strftime('%FT%T%:z')
         end_iso = ending_day.strftime('%FT%T%:z')
         toggl.get_time_entries(start_date: start_iso, end_date: end_iso)
@@ -53,15 +56,41 @@ module Toggl
         @toggl.me(true)
       end
 
-      def merge!(year, month, day)
-        time_entries = time_entries(year, month, day)
-        time_entries = filter_entries(time_entries)
-        @merger = Toggl::Worktime::Merger.new(time_entries, @config)
-        @work_time = @merger.merge
+      # Generator: Split time_entries for multiple days into days
+      def split_by_day(entries_multi)
+        current_date = nil
+        beginning_day = nil
+        time_entries = []
+        entries_multi.sort { |a, b| a['start'] <=> b['start'] }.each do |time_entry|
+          start_ts = Toggl::Worktime::Merger.parse_date(time_entry['start'], @zone_offset)
+          if beginning_day.nil? || beginning_day.strftime('%F') != (start_ts - @config.day_begin_hour * 3600).strftime('%F')
+            # Push current buffer
+            unless beginning_day.nil?
+              yield [beginning_day.day, time_entries]
+            end
+            time_entries = []
+            beginning_day = ::Time.new(
+              start_ts.year, start_ts.month, start_ts.day, @config.day_begin_hour, 0, 0, @zone_offset
+            )
+            ending_day = beginning_day + ONE_DAY_SECONDS
+          end
+          time_entries << time_entry
+        end
+        yield [beginning_day.day, time_entries]
+      end
+
+      def merge_multi!(year, month, begin_day, end_day)
+        entries_multi = time_entries_multi(year, month, begin_day, end_day)
+        time_entries_filtered_multi = filter_entries(entries_multi)
+        split_by_day(time_entries_filtered_multi) do |day, time_entries|
+          @days << day
+          @merger_map[day] = Toggl::Worktime::Merger.new(time_entries, @config)
+          @work_time_map[day] = @merger_map[day].merge
+        end
       end
 
-      def write
-        @work_time.each do |span|
+      def write(day)
+        @work_time_map[day].each do |span|
           begin_s = time_expr(span[0])
           end_s = time_expr(span[1])
           puts "#{begin_s} - #{end_s}"
@@ -72,8 +101,9 @@ module Toggl
         time ? time.getlocal(@zone_offset).strftime('%F %T') : 'nil'
       end
 
-      def total_time
-        total_seconds = @merger.total_time.to_i
+      def total_time(day:)
+        merger = @merger_map[day]
+        total_seconds = merger.total_time.to_i
         hours = total_seconds / (60 * 60)
         minutes = (total_seconds - (hours * 60 * 60)) / 60
         seconds = total_seconds % 60

data/lib/toggl/worktime/merger.rb

@@ -46,8 +46,8 @@ module Toggl
       def time_entries_each
         zone_offset = Toggl::Worktime::Time.zone_offset(@config.timezone)
         @time_entries.sort { |a, b| a['start'] <=> b['start'] }.each do |te|
-          start = parse_date(te['start'], zone_offset)
-          stop = parse_date(te['stop'], zone_offset)
+          start = Merger.parse_date(te['start'], zone_offset)
+          stop = Merger.parse_date(te['stop'], zone_offset)
           @last_stop = stop
           @current_start = start if @current_start.nil?
           @current_stop = stop if @current_stop.nil?
@@ -58,10 +58,12 @@ module Toggl
         end
       end
 
-      def parse_date(date, zone_offset)
-        return nil if date.nil?
+      class << self
+        def parse_date(date, zone_offset)
+          return nil if date.nil?
 
-        ::Time.parse(date).getlocal(zone_offset)
+          ::Time.parse(date).getlocal(zone_offset)
+        end
       end
 
       def continuing(start)

data/lib/toggl/worktime/version.rb

@@ -2,6 +2,6 @@
 
 module Toggl
   module Worktime
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/toggl-worktime.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'togglv9', '>= 0.1.0'
   spec.add_dependency 'tty-table'
   spec.add_development_dependency 'bundler', '>= 2.2.10'
+  spec.add_development_dependency 'gem-release'
   spec.add_development_dependency 'github_changelog_generator'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '>= 12.3.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toggl-worktime
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Tomoya KABE
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-11 00:00:00.000000000 Z
+date: 2025-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.10
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +172,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"