kobot 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e2452d15afce1b0ec273b240ab062cc526adedcf7f11ecaf98e7cbe3590d393
-  data.tar.gz: 16f3f7fefbf4f30c621148841ba93aa57b8859cc5adb092edad02b3e6970e95c
+  metadata.gz: e51c45d51bed6c3e614f58f41e557a9da9ab4dd6d457419bf1f2d654bc0e8e6d
+  data.tar.gz: 6cf858d531f3ef1b990751a8c821fd13965f04b234191a324598c9eefc68ac6c
 SHA512:
-  metadata.gz: 4ec4604ff3d7486b48bc574f3130f2856787d6cb46644ba11cf1832569590dfe5a6159518a8474390a28500f77cd506da58531981df855db8e0d220627bb6486
-  data.tar.gz: 6f57f5fdf3e1f5186ca8ae60b6a482d555ca5a6e23004fec8f5bef324942001f7008fddfc96e93151c8ad88a9d17a99440bfef912540c2715a622433ea67b1a1
+  metadata.gz: 4f00479950ad49f878f85fc515e5cb337a0fe3b047fa49a8b94dd5bcf2b776008f24d168c122c6f651445a1a883084c56296d9a4b034e9693f66b6336422351a
+  data.tar.gz: c6dc7304b15f26a6ae39dcfd9e644c82081b22519d2b28469f6671e570c73c70baf91be0e30eb4950833330b1a39cf200d3c9722d819c57377ab678f9efa2e6c

data/CHANGELOG.md

@@ -1,39 +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.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.5
+- Added I18n support for both English and Japanese KOT UI
 
-### v1.2.2
-- Improved login screen wait and logging
-- Applied fix for offenses about empty lines and long lines reported by Rubocop
+### 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.4
-- Changed to use boolean values for validation instead of raising exceptions
+### v1.2.2
+- Improved login screen wait and logging
+- Applied fix for offenses about empty lines and long lines reported by Rubocop
 
-### v1.2.5
-- Added I18n support for both English and Japanese KOT UI
+### 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.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.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
 
-### 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.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.0.0
+- Initial release

data/lib/kobot/engine.rb

@@ -100,13 +100,7 @@ module Kobot
       Kobot.logger.info("Navigate to: #{@top_url}")
       @browser.get @top_url
       @wait.until { @browser.find_element(id: 'modal_window') }
-      modal_title_element = @wait.until { @browser.find_element(css: '.modal-title') }
-      @selector = if modal_title_element.text.downcase.include? 'password'
-                    Selector.en
-                  else
-                    Selector.ja
-                  end
-      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
@@ -115,8 +109,20 @@ module Kobot
       @browser.find_element(css: 'div.btn-control-message').click
 
       Kobot.logger.info 'Login successful'
-      @wait.until do
-        @browser.find_element(id: 'notification_content').text.include?(@selector.login_success_notification_text)
+      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
@@ -127,7 +133,7 @@ module Kobot
           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
@@ -153,7 +159,7 @@ module Kobot
         date_cell = tr.find_element(css: 'td.htBlock-scrollTable_day')
         next unless date_cell.text.include? @today
 
-        Kobot.logger.info('Reading today record')
+        Kobot.logger.info('Read today record')
         @kot_data = {}
         @kot_data[:today] = date_cell.text
         @kot_data[:today_css_class] = date_cell.attribute('class')

data/lib/kobot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kobot
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Andy Jiang
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webdrivers
@@ -93,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
@@ -108,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-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: []