kobot 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5280569d35d3db17de90830bc1b6b2fa7fd4ec17c1b3efae0772a2329288fbe
-  data.tar.gz: 51a08ceb2e07e577a503e6c5bbd17352e664612a9b6ae6fd6e3ca9aedc56a71e
+  metadata.gz: 3eba14b1e3b076a368dd700c2ac46a9db4fd13bf57a58e29797de7db7eb16fc3
+  data.tar.gz: 1926333cefbaf4272ae117cc7afb12284ed85d6ff41aa96a02094904599b5312
 SHA512:
-  metadata.gz: 9ce2200116a9c36f384edbc2a0a2b47b37819ddb44fb8f590a1a1af1afd0859ea4d56c2022c4990f720f9bbd42eb4aaaf26986333298ed61580a4ad37b41bbed
-  data.tar.gz: 783cd8e9c729404108119fc2c26b49729852c68e40e415dad7d5ab92066021a4c2496fe3aaeab355911ad174b848af1cda99510496a53ff282f5d4fa42f8d244
+  metadata.gz: '08ad9cb2d55c2931a34ed4243884a7e16c189d1d914e5aa935cfd4d32fc3d3d7567cdaecdb53de54e980e84ec4c6e696761b7f9b15fb65e3a0eef11f829370e5'
+  data.tar.gz: f8662e41fe53d35df04b1b530f946621330124684d6bd955e6b18e53830efaef74c22db66818a8a3958aa8a4745b4d37090419f538962c3a4876e8dbb9b6c1d7

data/CHANGELOG.md

@@ -18,3 +18,7 @@
 ### v1.2.2
 - Improved login screen wait and logging
 - Applied fix for offenses about empty lines and long lines reported by Rubocop
+
+### 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

data/lib/kobot/engine.rb

@@ -24,32 +24,19 @@ module Kobot
     # System errors or any unknown exceptions occurred if any are
     # to be popped up and should be handled by the outside caller.
     def start
-      if weekend?
-        if Config.force
-          Kobot.logger.info("[Force] should have exited: today=#{@today} is weekend")
-        else
-          Kobot.logger.info("Today=#{@today} is weekend")
-          return
-        end
-      end
-      if skip?
-        Kobot.logger.info("Today=#{@today} is skipped as per: --skip=#{Config.skip}")
-        return
-      end
-      unless %i[in out].include? Config.clock
-        Kobot.logger.warn("Invalid clock operation: #{Config.clock}")
-        return
-      end
+      validate_today!
       launch_browser
       login
       read_today_record
-      verify_today_record!
+      validate_today_record!
       if Config.clock == :in
         clock_in!
       else
         clock_out!
       end
       logout
+    rescue KotSkip => e
+      Kobot.logger.warn(e.message)
     rescue KotRecordError => e
       Kobot.logger.warn(e.message)
       Mailer.send(clock_notify_message(status: e.message))
@@ -68,12 +55,20 @@ module Kobot
       Mailer.send(clock_notify_message(status: e.message))
       logout
     ensure
-      Kobot.logger.info('Close browser')
-      @browser&.quit
+      close_browser
     end
 
     private
 
+    def validate_today!
+      raise KotSkip, "Today=#{@today} is skipped as per: --skip=#{Config.skip}" if skip?
+
+      return unless weekend?
+      raise KotSkip, "Today=#{@today} is weekend" unless Config.force
+
+      Kobot.logger.info("[Force] should have exited: today=#{@today} is weekend")
+    end
+
     def launch_browser
       prefs = {
         profile: {
@@ -89,6 +84,13 @@ module Kobot
       Kobot.logger.info('Launch browser successful')
     end
 
+    def close_browser
+      return unless @browser
+
+      Kobot.logger.info('Close browser')
+      @browser.quit
+    end
+
     def login
       Kobot.logger.info("Navigate to: #{@top_url}")
       @browser.get @top_url
@@ -159,7 +161,7 @@ module Kobot
       end
     end
 
-    def verify_today_record!
+    def validate_today_record!
       raise KotRecordError, "Today=#{@today} is not found on kot" if @kot_today.strip.empty?
 
       if kot_weekend?

data/lib/kobot/exception.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 module Kobot
+  class KotSkip < StandardError
+  end
+
   class KotRecordError < StandardError
   end
 

data/lib/kobot/version.rb

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

metadata

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