toggl-jobcan 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f9409b50dbb7a50bbb50c7eac270ffff8ac0d995a9cdc9c19ecdbfd608c30d5
-  data.tar.gz: 60008600e79980bed6b248065de164253442b84cfee24b098b8fd78c86dd13cc
+  metadata.gz: 7d97f44c04aaab1de12ddf25087a02b870db237b7926db2a760f6d93888a1eff
+  data.tar.gz: 7b5833d24e69598835625fd86e2e12063053ea4ca358f835f27eaf27f8711d62
 SHA512:
-  metadata.gz: 1c0c214e0e8446594c20dcc08c22cfd651c00d6ca36c4b0022f297617b5352fdf32d7e76fbe8ee584be5b0ecca0a7b562c237b20fd4dd46d712257a2a908c0b0
-  data.tar.gz: 21f7d72c42cec704226a061c7d9b19bf0430ad0888e6732fa7e3b7f86d0f1b8d518960ab92372b78c9d82719e5578db7d949cca80c5e2fe1a3a3c5f66d785166
+  metadata.gz: 8d5b2f45ee2502f36d4e4e6ca82c31d425a1efd511d2f49fec521d4af2eaf370b529bf4d129c91d9ba3de75102b166318b0220b81d1366e242defbd124cfa94d
+  data.tar.gz: 6fdeff1edb4f8cde58487cff610cfd4a7e845aef732e2e2775ae887fae3037c04bddd2aeb94a474f59bc8de986e5f9e058dc4d67e736259faf0c0adbc3d3aa81

data/.github/workflows/rspec.yml

@@ -0,0 +1,25 @@
+name: Run RSpec tests
+on: [push]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        ruby:
+          - 3.2
+          - 3.3
+          - 3.4
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: latest
+          bundler-cache: true
+      - name: Run tests
+        run: |
+          bundle exec rake spec

data/.gitignore

@@ -12,3 +12,4 @@
 
 /vendor/
 *~
+Gemfile.lock

data/Dockerfile

@@ -20,11 +20,11 @@ RUN anyenv install rbenv
 RUN git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
 
 # ruby
-RUN rbenv install 2.7.7
-RUN rbenv global 2.7.7
+RUN rbenv install 3.1.4
+RUN rbenv global 3.1.4
 
 # toggl-jobcan
-RUN gem install selenium-webdriver -v 4.9.0
+RUN gem install selenium-webdriver -v 4.21.1
 RUN gem install toggl-jobcan
 
 ENTRYPOINT ["toggl-jobcan"]

data/README.md

@@ -1,7 +1,6 @@
 # Toggl::Jobcan
 
 ![](https://img.shields.io/gem/v/toggl-jobcan.svg?style=popout)
-[![Build Status](https://travis-ci.com/limitusus/toggl-jobcan.svg?branch=main)](https://travis-ci.com/limitusus/toggl-jobcan)
 
 This gem provides `toggl-jobcan` command, which synchronises working time data in Toggl to JobCan.
 

data/lib/toggl/jobcan/cli.rb

@@ -104,27 +104,40 @@ module Toggl
           end
         end
 
+        # To collect time entries in an API call, target days must be in a single month
+        def validate_days_in_a_month
+          day = @target_days.first
+          y = day.year
+          m = day.month
+          unless @target_days.all? { |d| d.year == y and d.month == m }
+            raise DifferentYearMonthError, "Different year/month=#{d.year}/#{d.month}"
+          end
+        end
+
         def register_days
+          validate_days_in_a_month
+          working_times_map = jobcan.fetch_toggl_worktime(@target_days)
           @target_days.each do |date|
-            register_day(date)
+            register_day(working_times_map, date)
           end
         end
 
-        def register_day(date)
+        def register_day(working_times_map, date)
           puts "Input date: #{date}"
-          working_times = jobcan.fetch_toggl_worktime(date).flatten
-          if working_times.any?(&:nil?)
+          working_times = working_times_map[date.day]&.flatten
+          if working_times.nil? || working_times.any?(&:nil?)
             puts 'Includes nil data: skip'
             return
           end
           jobcan.navigate_to_attendance_modify_day(date)
           jobcan.input_day_worktime(date, working_times)
           sleep 1
-          puts "  - Finish: #{date}; Total time: #{jobcan.toggl.total_time}"
+          puts "  - Finish: #{date}; Total time: #{jobcan.toggl.total_time(day: date.day)}"
         end
       end
     end
 
     class NoDayGivenError < StandardError; end
+    class DifferentYearMonthError < StandardError; end
   end
 end

data/lib/toggl/jobcan/toggl_support.rb

@@ -4,9 +4,11 @@ module Toggl
   module Jobcan
     # Provides support methods for Toggl
     module TogglSupport
-      def fetch_toggl_worktime(date)
-        @toggl.merge!(date.year, date.month, date.day)
-        @toggl.work_time
+      def fetch_toggl_worktime(dates)
+        first_day = dates.sort.first
+        last_day = dates.sort.last
+        @toggl.merge_multi!(first_day.year, first_day.month, first_day.day, last_day.day)
+        @toggl.work_time_map
       end
 
       def toggl_time_format(date, timestamp)

data/lib/toggl/jobcan/version.rb

@@ -2,6 +2,6 @@
 
 module Toggl
   module Jobcan
-    VERSION = '0.5.0'
+    VERSION = '0.7.0'
   end
 end

data/toggl-jobcan.gemspec

@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'selenium-webdriver'
   spec.add_dependency 'thor'
-  spec.add_dependency 'toggl-worktime', '~> 0.5.0', '>= 0.5.0'
+  spec.add_dependency 'toggl-worktime', '~> 0.7.0', '>= 0.7.0'
   spec.add_dependency 'webdrivers'
-  spec.add_development_dependency 'bundler', '~> 2.2.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'gem-release'
   spec.add_development_dependency 'github_changelog_generator'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toggl-jobcan
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Tomoya Kabe
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-02 00:00:00.000000000 Z
+date: 2025-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +76,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
+- !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
@@ -164,15 +178,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Dockerfile
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -205,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Sync toggl worktime to JobCan.

data/.travis.yml

@@ -1,7 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.3
-  - 2.7.3
-  - 3.0.1
-before_install: gem install bundler -v 2.2.21

data/Gemfile.lock

@@ -1,184 +0,0 @@
-PATH
-  remote: .
-  specs:
-    toggl-jobcan (0.4.3)
-      selenium-webdriver
-      thor
-      toggl-worktime (~> 0.5.0, >= 0.5.0)
-      webdrivers
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (7.1.3.3)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
-    async (1.32.1)
-      console (~> 1.10)
-      nio4r (~> 2.3)
-      timers (~> 4.1)
-    async-http (0.64.2)
-      async (>= 1.25)
-      async-io (>= 1.28)
-      async-pool (>= 0.2)
-      protocol-http (~> 0.26.0)
-      protocol-http1 (~> 0.19.0)
-      protocol-http2 (~> 0.16.0)
-      traces (>= 0.10.0)
-    async-http-faraday (0.13.1)
-      async-http (~> 0.42)
-      faraday
-    async-io (1.43.2)
-      async
-    async-pool (0.4.0)
-      async (>= 1.25)
-    awesome_print (1.9.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.3.1)
-    connection_pool (2.4.1)
-    console (1.24.0)
-      fiber-annotation
-      fiber-local
-      json
-    diff-lcs (1.5.1)
-    drb (2.2.1)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-http-cache (2.5.1)
-      faraday (>= 0.8)
-    faraday-net_http (3.1.0)
-      net-http
-    fiber-annotation (0.2.0)
-    fiber-local (1.0.0)
-    github_changelog_generator (1.16.4)
-      activesupport
-      async (>= 1.25.0)
-      async-http-faraday
-      faraday-http-cache
-      multi_json
-      octokit (~> 4.6)
-      rainbow (>= 2.2.1)
-      rake (>= 10.0)
-    i18n (1.14.5)
-      concurrent-ruby (~> 1.0)
-    json (2.7.2)
-    logger (1.6.0)
-    method_source (1.1.0)
-    mini_portile2 (2.8.7)
-    minitest (5.23.1)
-    multi_json (1.15.0)
-    mutex_m (0.2.0)
-    net-http (0.4.1)
-      uri
-    nio4r (2.7.3)
-    nokogiri (1.16.5)
-      mini_portile2 (~> 2.8.2)
-      racc (~> 1.4)
-    octokit (4.25.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
-    oj (3.16.3)
-      bigdecimal (>= 3.0)
-    pastel (0.8.0)
-      tty-color (~> 0.5)
-    protocol-hpack (1.4.3)
-    protocol-http (0.26.4)
-    protocol-http1 (0.19.1)
-      protocol-http (~> 0.22)
-    protocol-http2 (0.16.0)
-      protocol-hpack (~> 1.4)
-      protocol-http (~> 0.18)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
-    public_suffix (5.0.5)
-    racc (1.8.0)
-    rainbow (3.1.1)
-    rake (13.2.1)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubyzip (2.3.2)
-    sawyer (0.9.2)
-      addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
-    selenium-webdriver (4.21.1)
-      base64 (~> 0.2)
-      rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
-    strings (0.2.1)
-      strings-ansi (~> 0.2)
-      unicode-display_width (>= 1.5, < 3.0)
-      unicode_utils (~> 1.4)
-    strings-ansi (0.2.0)
-    strscan (3.1.0)
-    thor (1.3.1)
-    timers (4.3.5)
-    toggl-worktime (0.5.0)
-      awesome_print
-      togglv9 (>= 0.1.0)
-      tty-table
-    togglv9 (0.1.0)
-      faraday (>= 2.0.0)
-      logger
-      oj
-    traces (0.11.1)
-    tty-color (0.6.0)
-    tty-screen (0.8.2)
-    tty-table (0.12.0)
-      pastel (~> 0.8)
-      strings (~> 0.2.0)
-      tty-screen (~> 0.8)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    unicode_utils (1.4.0)
-    uri (0.13.0)
-    webdrivers (5.2.0)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
-    websocket (1.2.10)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.2.0)
-  github_changelog_generator
-  pry
-  pry-byebug
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  toggl-jobcan!
-
-BUNDLED WITH
-   2.2.28