kobot 1.2.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e8cedf9053f994144d21b233b2c68fb4e03aff011192f1273e1ad24d347c4f9
-  data.tar.gz: 8daab86f87c5ffe5e0588c9029ccd062954ca7ad3557769861ef19fd07347c79
+  metadata.gz: e51c45d51bed6c3e614f58f41e557a9da9ab4dd6d457419bf1f2d654bc0e8e6d
+  data.tar.gz: 6cf858d531f3ef1b990751a8c821fd13965f04b234191a324598c9eefc68ac6c
 SHA512:
-  metadata.gz: 4aaaa2f0e8eebe98487536158b0f571e794b76db95dec5cd2eb268037dfd0888045d6cebbeb46876162ed9944813f7429e8a4466da20ca9010ecacfd552cd302
-  data.tar.gz: 9ede3410f3ad664982db308f382140eb19bc8140970fc4991f68829a0c63fe664a6978b99ef5753036954a0bbabb9731b3f7e5fe08aff11c589798898ce0ec59
+  metadata.gz: 4f00479950ad49f878f85fc515e5cb337a0fe3b047fa49a8b94dd5bcf2b776008f24d168c122c6f651445a1a883084c56296d9a4b034e9693f66b6336422351a
+  data.tar.gz: c6dc7304b15f26a6ae39dcfd9e644c82081b22519d2b28469f6671e570c73c70baf91be0e30eb4950833330b1a39cf200d3c9722d819c57377ab678f9efa2e6c

data/CHANGELOG.md

@@ -1,27 +1,42 @@
-### v1.0.0
-- Initial release
+### v2.1.0
+- Changed i18n identification strategy due to that KOT displays in Japanese even though the login screen is in English
 
-### v1.1.0
-- Deprecated lower-case environment variables for credentials configuration
-- Updated option help doc to indicate weekends and public holidays are skipped by default
-- Updated required_ruby_version to be >= 2.4.0 to align with the webdrivers dependency
+### v2.0.0
+- Added -a, --auto-skip flag to support the enabling and disabling of auto-skipping feature
+- Renamed the schedule config option from -a, --auto-skip-without to -w, --auto-skip-without
 
-### v1.2.0
-- Added an option to allow forcibly running regardless of weekends or public holidays
-- Added an ENV flag to allow requiring lib in local workspace for development purpose
+### v1.3.0
+- Added config option (-a, --auto-skip-without) to enable automatic skipping based on schedule
+- Replaced deprecated options with capabilities option in Selenium driver initialization
+- Refactored scattered attr_accessors and reduced instance variables count reported by Rubocop
+
+### v1.2.5
+- Added I18n support for both English and Japanese KOT UI
+
+### v1.2.4
+- Changed to use boolean values for validation instead of raising exceptions
+
+### v1.2.3
+- Improved validation logic to skip running due to weekend or intentional skips
+- Refactored engine by reducing methods length based on reports by Rubocop
+
+### v1.2.2
+- Improved login screen wait and logging
+- Applied fix for offenses about empty lines and long lines reported by Rubocop
 
 ### v1.2.1
 - Improved logging for better readability in logs
 - Switched to builtin Logger#deprecate from Logger#warn for deprecations
 - Renamed internal method to skip? from holiday? as it was meant for skipping any specified date
 
-### v1.2.2
-- Improved login screen wait and logging
-- Applied fix for offenses about empty lines and long lines reported by Rubocop
+### v1.2.0
+- Added an option to allow forcibly running regardless of weekends or public holidays
+- Added an ENV flag to allow requiring lib in local workspace for development purpose
 
-### v1.2.3
-- Improved validation logic to skip running due to weekend or intentional skips
-- Refactored engine by reducing methods length based on reports by Rubocop
+### v1.1.0
+- Deprecated lower-case environment variables for credentials configuration
+- Updated option help doc to indicate weekends and public holidays are skipped by default
+- Updated required_ruby_version to be >= 2.4.0 to align with the webdrivers dependency
 
-### v1.2.4
-- Changed to use boolean values for validation instead of raising exceptions
+### v1.0.0
+- Initial release

data/README.md

@@ -62,6 +62,10 @@ Usage: kobot [options]
     -s, --skip [D1,D2,D3]            Specify dates to skip clock in/out with date format YYYY-MM-DD and
                                      multiple values separated by comma, such as: 2020-05-01,2020-12-31;
                                      weekends and public holidays in Japan will be skipped by default
+    -a, --auto-skip                  Enable auto-skipping by reading schedule from the Time Card page
+    -w [SCHEDULE],                   Skip today if the provided text is not contained in the schedule
+        --auto-skip-without          column on the Time Card page of KOT; by default 裁量労働 is used;
+                                     effective only if --auto-skip is passed to enable auto-skipping.
     -t, --to [TO]                    Email address to send notification to; by default it is sent to
                                      the same self email account used in SMTP config as the sender
     -n, --notify                     Enable email notification

data/lib/kobot/config.rb

@@ -8,24 +8,22 @@ module Kobot
       attr_accessor :clock,
                     :loglevel,
                     :skip,
+                    :auto_skip,
+                    :auto_skip_without,
                     :dryrun,
-                    :force
-
-      attr_accessor :kot_url,
+                    :force,
+                    :kot_url,
                     :kot_timezone_offset,
-                    :kot_date_format
-
-      attr_accessor :gmail_notify_enabled,
+                    :kot_date_format,
+                    :gmail_notify_enabled,
                     :gmail_notify_subject,
                     :gmail_notify_to,
                     :gmail_smtp_address,
-                    :gmail_smtp_port
-
-      attr_accessor :browser_headless,
+                    :gmail_smtp_port,
+                    :browser_headless,
                     :browser_geolocation,
-                    :browser_wait_timeout
-
-      attr_accessor :credentials_file
+                    :browser_wait_timeout,
+                    :credentials_file
 
       def configure
         yield self

data/lib/kobot/engine.rb

@@ -81,7 +81,10 @@ module Kobot
       }
       options = Selenium::WebDriver::Chrome::Options.new(prefs: prefs)
       options.headless! if Config.browser_headless
-      @browser = Selenium::WebDriver.for(:chrome, options: options)
+      caps = [
+        options
+      ]
+      @browser = Selenium::WebDriver.for(:chrome, capabilities: caps)
       @wait = Selenium::WebDriver::Wait.new(timeout: Config.browser_wait_timeout)
       Kobot.logger.info('Launch browser successful')
     end
@@ -97,7 +100,7 @@ module Kobot
       Kobot.logger.info("Navigate to: #{@top_url}")
       @browser.get @top_url
       @wait.until { @browser.find_element(id: 'modal_window') }
-      Kobot.logger.info "Page title: #{@browser.title}"
+      Kobot.logger.info "Page title (before login): #{@browser.title}"
       Kobot.logger.debug do
         "Login with id=#{Credential.kot_id} and password=#{Credential.kot_password}"
       end
@@ -106,57 +109,75 @@ module Kobot
       @browser.find_element(css: 'div.btn-control-message').click
 
       Kobot.logger.info 'Login successful'
-      @wait.until { @browser.find_element(id: 'notification_content').text.include?('データを取得しました') }
+      clock_in_button = @wait.until { @browser.find_element(css: '.record-clock-in') }
+      @selector = if clock_in_button.text.include? '出勤'
+                    Kobot.logger.info('Identify UI in Japanese')
+                    Selector.ja
+                  else
+                    Kobot.logger.info('Identify UI in English')
+                    Selector.en
+                  end
+      begin
+        @wait.until do
+          @browser.find_element(id: 'notification_content').text.include?(@selector.login_success_notification_text)
+        end
+      rescue StandardError => e
+        Kobot.logger.warn "Failed to validate login success notification text: #{e.message}"
+      end
       if Config.browser_geolocation
         begin
-          @wait.until { @browser.find_element(id: 'location_area').text.include?('位置情報取得済み') }
+          @wait.until do
+            @browser.find_element(id: 'location_area').text.include?(@selector.location_area_notification_text)
+          end
         rescue StandardError => e
           Kobot.logger.warn "Get geolocation failed: #{e.message}"
         end
       end
-      Kobot.logger.info "Page title: #{@browser.title}"
+      Kobot.logger.info "Page title (after login): #{@browser.title}"
     end
 
     def logout
       if @browser.current_url.include? 'admin'
-        Kobot.logger.info('Logout from タイムカード page')
+        Kobot.logger.info('Logout from Time Card (タイムカード) page')
         @browser.find_element(css: 'div.htBlock-header_logoutButton').click
       else
-        Kobot.logger.info('Logout from Myレコーダー page')
+        Kobot.logger.info('Logout from My Recorder (Myレコーダー) page')
         @wait.until { @browser.find_element(id: 'menu_icon') }.click
-        @wait.until { @browser.find_element(link: 'ログアウト') }.click
+        @wait.until { @browser.find_element(link: @selector.logout_menu_link_text) }.click
         @browser.switch_to.alert.accept
       end
       Kobot.logger.info 'Logout successful'
     end
 
     def read_today_record
-      Kobot.logger.info('Navigate to タイムカード page')
+      Kobot.logger.info('Navigate to Time Card (タイムカード) page')
       @wait.until { @browser.find_element(id: 'menu_icon') }.click
-      @wait.until { @browser.find_element(link: 'タイムカード') }.click
+      @wait.until { @browser.find_element(link: @selector.time_card_menu_link_text) }.click
 
       time_table = @wait.until { @browser.find_element(css: 'div.htBlock-adjastableTableF_inner > table') }
       time_table.find_elements(css: 'tbody > tr').each do |tr|
         date_cell = tr.find_element(css: 'td.htBlock-scrollTable_day')
         next unless date_cell.text.include? @today
 
-        Kobot.logger.info('Reading today record')
-        @kot_today = date_cell.text
-        @kot_today_css_class = date_cell.attribute('class')
-        @kot_today_type = tr.find_element(css: 'td.work_day_type').text
-        @kot_today_clock_in = tr.find_element(
+        Kobot.logger.info('Read today record')
+        @kot_data = {}
+        @kot_data[:today] = date_cell.text
+        @kot_data[:today_css_class] = date_cell.attribute('class')
+        @kot_data[:today_type] = tr.find_element(css: 'td.work_day_type').text
+        @kot_data[:today_schedule] = tr.find_element(css: 'td.schedule').text
+        @kot_data[:today_clock_in] = tr.find_element(
           css: 'td.start_end_timerecord[data-ht-sort-index="START_TIMERECORD"]'
         ).text
-        @kot_today_clock_out = tr.find_element(
+        @kot_data[:today_clock_out] = tr.find_element(
           css: 'td.start_end_timerecord[data-ht-sort-index="END_TIMERECORD"]'
         ).text
         Kobot.logger.debug do
           {
-            kot_toay: @kot_today,
-            kot_today_css_class: @kot_today_css_class,
-            kot_today_type: @kot_today_type,
-            kot_today_clock_in: @kot_today_clock_in,
-            kot_today_clock_out: @kot_today_clock_out
+            kot_toay: @kot_data[:today],
+            kot_today_css_class: @kot_data[:today_css_class],
+            kot_today_type: @kot_data[:today_type],
+            kot_today_clock_in: @kot_data[:today_clock_in],
+            kot_today_clock_out: @kot_data[:today_clock_out]
           }
         end
         break
@@ -164,60 +185,71 @@ module Kobot
     end
 
     def validate_today_record!
-      raise KotRecordError, "Today=#{@today} is not found on kot" if @kot_today.strip.empty?
+      raise KotRecordError, "Today=#{@today} is not found on kot" if @kot_data[:today].strip.empty?
 
       if kot_weekend?
-        raise KotRecordError, "Today=#{@today} is marked as weekend on kot: #{@kot_today}" unless Config.force
+        raise KotRecordError, "Today=#{@today} is marked as weekend: #{@kot_data[:today]}" unless Config.force
+
+        Kobot.logger.info(
+          "[Force] should have exited: today=#{@today} is marked as weekend: #{@kot_data[:today]}"
+        )
+      end
+
+      if kot_public_holiday?
+        raise KotRecordError, "Today=#{@today} is marked as public holiday: #{@kot_data[:today]}" unless Config.force
 
         Kobot.logger.info(
-          "[Force] should have exited: today=#{@today} is marked as weekend on kot: #{@kot_today}"
+          "[Force] should have exited: today=#{@today} is marked as public holiday: #{@kot_data[:today]}"
         )
       end
 
-      return unless kot_public_holiday?
-      raise KotRecordError, "Today=#{@today} is marked as public holiday on kot: #{@kot_today}" unless Config.force
+      return unless Config.auto_skip
+
+      if kot_non_work_schedule?
+        raise KotRecordError, "Today=#{@today} is non-work schedule: #{@kot_data[:today_schedule]}" unless Config.force
 
-      Kobot.logger.info(
-        "[Force] should have exited: today=#{@today} is marked as public holiday on kot: #{@kot_today}"
-      )
+        Kobot.logger.info(
+          "[Force] should have exited: today=#{@today} is non-work schedule: #{@kot_data[:today_schedule]}"
+        )
+      end
     end
 
     def clock_in!
       Kobot.logger.warn("Clock in during the afternoon: #{@now}") if @now.hour > 12
-      if @kot_today_clock_in.strip.empty?
+      if @kot_data[:today_clock_in].strip.empty?
         click_clock_in_button
         return if Config.dryrun
 
         read_today_record
-        raise KotClockInError, 'Clock in operation seems to have failed' if @kot_today_clock_in.strip.empty?
+        raise KotClockInError, 'Clock in operation seems to have failed' if @kot_data[:today_clock_in].strip.empty?
 
-        Kobot.logger.info("Clock in successful: #{@kot_today_clock_in}")
+        Kobot.logger.info("Clock in successful: #{@kot_data[:today_clock_in]}")
         Mailer.send(clock_notify_message(clock: :in))
       else
-        Kobot.logger.warn("Clock in done already: #{@kot_today_clock_in}")
+        Kobot.logger.warn("Clock in done already: #{@kot_data[:today_clock_in]}")
       end
     end
 
     def clock_out!
       Kobot.logger.warn("Clock out during the morning: #{@now}") if @now.hour <= 12
       unless Config.dryrun
-        if @kot_today_clock_in.strip.empty?
+        if @kot_data[:today_clock_in].strip.empty?
           raise KotClockOutError,
-                "!!!No clock in record for today=#{@kot_today}!!!"
+                "!!!No clock in record for today=#{@kot_data[:today]}!!!"
         end
       end
 
-      if @kot_today_clock_out.strip.empty?
+      if @kot_data[:today_clock_out].strip.empty?
         click_clock_out_button
         return if Config.dryrun
 
         read_today_record
-        raise KotClockOutError, 'Clock out operation seems to have failed' if @kot_today_clock_out.strip.empty?
+        raise KotClockOutError, 'Clock out operation seems to have failed' if @kot_data[:today_clock_out].strip.empty?
 
-        Kobot.logger.info("Clock out successful: #{@kot_today_clock_out}")
+        Kobot.logger.info("Clock out successful: #{@kot_data[:today_clock_out]}")
         Mailer.send(clock_notify_message(clock: :out))
       else
-        Kobot.logger.warn("Clock out done already: #{@kot_today_clock_out}")
+        Kobot.logger.warn("Clock out done already: #{@kot_data[:today_clock_out]}")
       end
     end
 
@@ -226,9 +258,9 @@ module Kobot
       @browser.get @top_url
       clock_in_button = @wait.until { @browser.find_element(css: 'div.record-clock-in') }
       if Config.dryrun
-        Kobot.logger.info('[Dryrun] clock in button (出勤) would have been clicked')
+        Kobot.logger.info('[Dryrun] Clock-in button (出勤) would have been clicked')
       else
-        Kobot.logger.info('Clicking the clock in button (出勤)')
+        Kobot.logger.info('Clicking the Clock-in button (出勤)')
         clock_in_button.click
       end
     end
@@ -238,9 +270,9 @@ module Kobot
       @browser.get @top_url
       clock_out_button = @wait.until { @browser.find_element(css: 'div.record-clock-out') }
       if Config.dryrun
-        Kobot.logger.info('[Dryrun] clock out button (退勤) would have been clicked')
+        Kobot.logger.info('[Dryrun] Clock-out button (退勤) would have been clicked')
       else
-        Kobot.logger.info('Clicking the clock in button (退勤)')
+        Kobot.logger.info('Clicking the Clock-out button (退勤)')
         clock_out_button.click
       end
     end
@@ -257,18 +289,25 @@ module Kobot
     end
 
     def kot_weekend?
-      %w[土 日].any? { |kanji| @kot_today&.include? kanji }
+      [
+        @selector.kot_date_saturday,
+        @selector.kot_date_sunday
+      ].any? { |weekend| @kot_data[:today]&.include? weekend }
+    end
+
+    def kot_non_work_schedule?
+      !@kot_data[:today_schedule]&.include?(Config.auto_skip_without)
     end
 
     def kot_public_holiday?
-      return true if @kot_today_type&.include? '休日'
+      return true if @kot_data[:today_type]&.include? @selector.kot_workday_time_off_text
 
       kot_today_highlighted = %w[sunday saturday].any? do |css|
-        @kot_today_css_class&.include? css
+        @kot_data[:today_css_class]&.include? css
       end
       if kot_today_highlighted
         Kobot.logger.warn(
-          "Today=#{@kot_today} is highlighted (holiday) but not marked as 休日"
+          "Today=#{@kot_data[:today]} is highlighted (holiday) but not marked as #{@selector.kot_workday_time_off_text}"
         )
       end
       kot_today_highlighted
@@ -280,8 +319,8 @@ module Kobot
         "<b>Date:</b> #{@today}",
         "<b>Status:</b> <span style='color:#{color}'>#{status}</span>"
       ]
-      message << "<b>Clock_in:</b> #{@kot_today_clock_in}" if clock
-      message << "<b>Clock_out:</b> #{@kot_today_clock_out}" if clock == :out
+      message << "<b>Clock_in:</b> #{@kot_data[:today_clock_in]}" if clock
+      message << "<b>Clock_out:</b> #{@kot_data[:today_clock_out]}" if clock == :out
       message.join('<br>')
     end
   end

data/lib/kobot/mailer.rb

@@ -47,7 +47,7 @@ module Kobot
           To: <#{to}>
           MIME-Version: 1.0
           Content-type: text/html
-          Subject: #{subject} 
+          Subject: #{subject}
           Date: #{Time.now.getlocal(Config.kot_timezone_offset)}
 
           #{body}

data/lib/kobot/option.rb

@@ -27,6 +27,17 @@ module Kobot
             options[:skip] = skip
           end
 
+          opt.on('-a', '--auto-skip', 'Enable auto-skipping by reading schedule from the Time Card page') do |auto_skip|
+            options[:auto_skip] = auto_skip
+          end
+
+          opt.on('-w', '--auto-skip-without [SCHEDULE]',
+                 'Skip today if the provided text is not contained in the schedule',
+                 'column on the Time Card page of KOT; by default 裁量労働 is used;',
+                 'effective only if --auto-skip is passed to enable auto-skipping.') do |schedule|
+            options[:auto_skip_without] = schedule
+          end
+
           opt.on('-t', '--to [TO]',
                  'Email address to send notification to; by default it is sent to',
                  'the same self email account used in SMTP config as the sender') do |to|

data/lib/kobot/selector.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Kobot
+  # The texts used in selectors to identify the elements on KOT UI.
+  class Selector
+    attr_accessor :login_success_notification_text,
+                  :location_area_notification_text,
+                  :time_card_menu_link_text,
+                  :kot_date_saturday,
+                  :kot_date_sunday,
+                  :kot_workday_time_off_text,
+                  :logout_menu_link_text
+
+    class << self
+      def en
+        selector = Selector.new
+        selector.login_success_notification_text = 'Data has been obtained'
+        selector.location_area_notification_text = 'Obtained location'
+        selector.time_card_menu_link_text = 'Time Card'
+        selector.kot_date_saturday = 'Sat'
+        selector.kot_date_sunday = 'Sun'
+        selector.kot_workday_time_off_text = 'time-off'
+        selector.logout_menu_link_text = 'Sign out'
+        selector
+      end
+
+      def ja
+        selector = Selector.new
+        selector.login_success_notification_text = 'データを取得しました'
+        selector.location_area_notification_text = '位置情報取得済み'
+        selector.time_card_menu_link_text = 'タイムカード'
+        selector.kot_date_saturday = '土'
+        selector.kot_date_sunday = '日'
+        selector.kot_workday_time_off_text = '休日'
+        selector.logout_menu_link_text = 'ログアウト'
+        selector
+      end
+    end
+  end
+end

data/lib/kobot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kobot
-  VERSION = '1.2.4'
+  VERSION = '2.1.0'
 end

data/lib/kobot.rb

@@ -4,6 +4,7 @@ require 'kobot/version'
 require 'kobot/exception'
 require 'kobot/option'
 require 'kobot/config'
+require 'kobot/selector'
 require 'kobot/credential'
 require 'kobot/logger'
 require 'kobot/mailer'
@@ -33,6 +34,8 @@ module Kobot
         config.dryrun                = options[:dryrun]
         config.force                 = options[:force]
         config.skip                  = options[:skip] || []
+        config.auto_skip             = options[:auto_skip]
+        config.auto_skip_without     = options[:auto_skip_without] || '裁量労働'
 
         config.kot_url               = 'https://s2.kingtime.jp/independent/recorder/personal/'
         config.kot_timezone_offset   = '+09:00'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kobot
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Andy Jiang
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webdrivers
@@ -83,6 +83,7 @@ files:
 - lib/kobot/logger.rb
 - lib/kobot/mailer.rb
 - lib/kobot/option.rb
+- lib/kobot/selector.rb
 - lib/kobot/version.rb
 homepage: https://github.com/yuan-jiang/kobot
 licenses:
@@ -92,7 +93,7 @@ metadata:
   homepage_uri: https://github.com/yuan-jiang/kobot
   source_code_uri: https://github.com/yuan-jiang/kobot
   changelog_uri: https://github.com/yuan-jiang/kobot/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Kobot automates the clock in/out of KING OF TIME.
 test_files: []