kobot 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfc009d1da0376709ddb63ebec8176601a53cee00bc216c82554c403051d430f
-  data.tar.gz: d7df58f052b9e2e945efd43c5cb11169c20d00b7d09a5d25ebfd3b688d1e16e8
+  metadata.gz: c5280569d35d3db17de90830bc1b6b2fa7fd4ec17c1b3efae0772a2329288fbe
+  data.tar.gz: 51a08ceb2e07e577a503e6c5bbd17352e664612a9b6ae6fd6e3ca9aedc56a71e
 SHA512:
-  metadata.gz: 7728891bc95db5eb4dd2d9a4c4d20916930da12b32c82af6ee2458d4cb9e66a7c37cb4156a89f857b93141c22d06493b7f9bce4f5238786d0031bf8b0f64d0a6
-  data.tar.gz: e4bc4ae0867ecfbe3bdd1018c9ffb9c578f34bf189f820e7344bbca7a7d5f209faee49e73d45f737161993cb2b3ea2f006695ee7f9870ea0dd1f7dea7417ad64
+  metadata.gz: 9ce2200116a9c36f384edbc2a0a2b47b37819ddb44fb8f590a1a1af1afd0859ea4d56c2022c4990f720f9bbd42eb4aaaf26986333298ed61580a4ad37b41bbed
+  data.tar.gz: 783cd8e9c729404108119fc2c26b49729852c68e40e415dad7d5ab92066021a4c2496fe3aaeab355911ad174b848af1cda99510496a53ff282f5d4fa42f8d244

data/CHANGELOG.md

@@ -14,3 +14,7 @@
 - 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

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'kobot'

data/lib/kobot.rb

@@ -14,8 +14,6 @@ require 'kobot/engine'
 # and with Google Gmail service email notification can also be sent to notify the results.
 module Kobot
   class << self
-
-    # The entrance to run Kobot.
     def run
       configure
       Engine.new.start

data/lib/kobot/config.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Kobot
-
   # Configuration definition includes static ones hardcoded and
   # dynamic ones that can be specified by command line options.
   class Config

data/lib/kobot/credential.rb

@@ -4,7 +4,6 @@ module Kobot
   # Credentials include id and password to login to KOT and
   # Gmail SMTP id and password to send email notifications.
   class Credential
-
     class << self
       attr_accessor :kot_id,
                     :kot_password,

data/lib/kobot/engine.rb

@@ -6,7 +6,6 @@ module Kobot
   # The core class that launches browser, logins to KOT, reads today
   # record, and conducts clock in or clock out action based on config.
   class Engine
-
     def initialize
       @now = Time.now.getlocal(Config.kot_timezone_offset)
       @today = @now.strftime(Config.kot_date_format)
@@ -93,6 +92,8 @@ module Kobot
     def login
       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.debug do
         "Login with id=#{Credential.kot_id} and password=#{Credential.kot_password}"
       end
@@ -139,8 +140,12 @@ module Kobot
         @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(css: 'td.start_end_timerecord[data-ht-sort-index="START_TIMERECORD"]').text
-        @kot_today_clock_out = tr.find_element(css: 'td.start_end_timerecord[data-ht-sort-index="END_TIMERECORD"]').text
+        @kot_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(
+          css: 'td.start_end_timerecord[data-ht-sort-index="END_TIMERECORD"]'
+        ).text
         Kobot.logger.debug do
           {
             kot_toay: @kot_today,
@@ -158,26 +163,19 @@ module Kobot
       raise KotRecordError, "Today=#{@today} is not found on kot" if @kot_today.strip.empty?
 
       if kot_weekend?
-        unless Config.force
-          raise KotRecordError,
-                "Today=#{@today} is marked as weekend on kot: #{@kot_today}"
-        end
+        raise KotRecordError, "Today=#{@today} is marked as weekend on kot: #{@kot_today}" unless Config.force
 
         Kobot.logger.info(
           "[Force] should have exited: today=#{@today} is marked as weekend on kot: #{@kot_today}"
         )
       end
 
-      if kot_public_holiday?
-        unless Config.force
-          raise KotRecordError,
-                "Today=#{@today} is marked as public holiday on kot: #{@kot_today}"
-        end
+      return unless kot_public_holiday?
+      raise KotRecordError, "Today=#{@today} is marked as public holiday on kot: #{@kot_today}" unless Config.force
 
-        Kobot.logger.info(
-          "[Force] should have exited: today=#{@today} is marked as public holiday on kot: #{@kot_today}"
-        )
-      end
+      Kobot.logger.info(
+        "[Force] should have exited: today=#{@today} is marked as public holiday on kot: #{@kot_today}"
+      )
     end
 
     def clock_in!

data/lib/kobot/exception.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Kobot
-
   class KotRecordError < StandardError
   end
 
@@ -10,5 +9,4 @@ module Kobot
 
   class KotClockOutError < StandardError
   end
-
 end

data/lib/kobot/mailer.rb

@@ -3,11 +3,9 @@
 require 'net/smtp'
 
 module Kobot
-
   # Responsible for sending email notifications in SMTP with Gmail
   class Mailer
     class << self
-
       # Sends email in preconfigured Gmail SMTP credential and to the recipient
       # configured by #{Config.gmail_notify_to} or self if not configured, with
       # email subject set by #{Config.gmail_notify_subject}.

data/lib/kobot/option.rb

@@ -3,11 +3,9 @@
 require 'optparse'
 
 module Kobot
-
   # Responsible for parsing the command line options for custom execution.
   class Option
     class << self
-
       # Parses command line options and returns a hash containing the options.
       def parse!
         options = {}

data/lib/kobot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kobot
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Andy Jiang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webdrivers