eco-helpers 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18d17b73673167619a4e704756a4e59f5d81d61a97e495721e100fe3e10d2374
-  data.tar.gz: a873e8e8970c5d67aa224ac226bec8194f81e2025bcd434b4f1005b8ddba21a3
+  metadata.gz: b0fea8f72b2d0037d801b6150661827607326151c71b93df924d1f1271c17166
+  data.tar.gz: d0059328bb938ace9e481a8023a4e5574f1e37e034220418e752c4647de4e382
 SHA512:
-  metadata.gz: 362fa919cbbdd98a7d69e99fa793f42a31fd790513d4d0e62db1e5838bf4937526fceb03139f394c069fd376d7a10c2cfcedf7207cda9377838b441022fa1a2f
-  data.tar.gz: 95064a493e111f68cf5da145f6322e9a30d1c7a2ce48c022b776109fc581ba7c1fd63dbb0a26dae7dcbd0c67086ec5ee0c7c507deae55cf45aa8ed73704ecb4c
+  metadata.gz: 01eb1d82295aa464cad0b5898e1fa3a295a7f01953f77b1591a2c1e96a96704f1bf82beb0b41b0ce6b6e0ed6eeea07568e029f2797b62d162dd541d93b37b9ed
+  data.tar.gz: 21258ac597601cad5559f847f26defc78a564733b0e4ed4610d4f70b404cbf6977292a462040374f36706eb69cffabafa52179aa24531c23e29e10a53d9c539b

data/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [3.0.7] - 2024-08-xx
+## [3.0.8] - 2024-08-xx
 
 ### Added
 
@@ -10,6 +10,17 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+## [3.0.7] - 2024-08-27
+
+### Added
+
+- `Eco::API::UseCases::GraphQL::Helpers::Base::ErrorHandling`
+
+### Fixed
+
+- `Service:TreeUpdate`
+  - Should NOT call `re_archive` when there was a error that is NOT due to an interrupt (i.e. so when raised **error** or `exit`ed)
+
 ## [3.0.6] - 2024-08-26
 
 ### Added

data/lib/eco/api/usecases/graphql/helpers/base/case_env.rb

@@ -2,6 +2,7 @@ module Eco::API::UseCases::GraphQL::Helpers::Base
   # Basic stuff you would need in any use case
   module CaseEnv
     include Eco::Language::AuxiliarLogger
+    include ErrorHandling
 
     private
 

data/lib/eco/api/usecases/graphql/helpers/base/error_handling.rb

@@ -0,0 +1,52 @@
+module Eco::API::UseCases::GraphQL::Helpers::Base
+  # Basic stuff you would need in any use case
+  module ErrorHandling
+    include Eco::Language::AuxiliarLogger
+
+    attr_reader :exception
+
+    private
+
+    def interrupted?(err = exception)
+      interrupt_errors.any? {|klass| err.is_a?(klass)}
+    end
+
+    def error_raised?
+      exception && !interrupted?
+    end
+
+    def rescued
+      yield
+    rescue StandardError => err
+      self.exception ||= err
+      log(:error) { err.patch_full_message }
+    end
+
+    def with_error_handling
+      @exception = nil
+      yield
+    rescue SystemExit => sext
+      @exception = sext
+      exit sext.status
+    rescue *interrupt_errors => int
+      @exception = int
+      raise
+    rescue SystemStackError
+      puts $! # rubocop:disable Style/SpecialGlobalVars
+      puts caller[0..100]
+      raise
+    rescue StandardError, SignalException => err
+      @exception = err
+      raise
+    end
+
+    def interrupt_errors
+      return @interrupt_errors if @interrupt_errors
+
+      errs = [Interrupt]
+      errs << IRB::Abort if Object.const_defined?(:IRB) && IRB.const_defined?(:Abort)
+
+      @interrupt_errors = errs
+    end
+  end
+end

data/lib/eco/api/usecases/graphql/helpers/base.rb

@@ -1,5 +1,6 @@
 module Eco::API::UseCases::GraphQL::Helpers
   module Base
+    require_relative 'base/error_handling'
     require_relative 'base/case_env'
     require_relative 'base/graphql_env'
 

data/lib/eco/api/usecases/graphql/samples/location/command/dsl.rb

@@ -24,38 +24,39 @@ class Eco::API::UseCases::GraphQL::Samples::Location
 
     # Main processor
     def process # rubocop:disable Metrics/AbcSize
-      self.error     = false
-      self.exception = nil
+      self.error = false
 
-      super if defined?(super)
+      with_error_handling do
+        super if defined?(super)
 
-      # this may trigger a backup of the tagtree
-      self.current_tree ||= live_tree
+        # this may trigger a backup of the tagtree
+        self.current_tree ||= live_tree
 
-      inputs(force_continue: force_continue?) do |input, stage|
-        results[stage] ||= []
+        inputs(force_continue: force_continue?) do |input, stage|
+          results[stage] ||= []
 
-        track_mode = batch_tree_track_mode(stage)
+          track_mode = batch_tree_track_mode(stage)
 
-        # yields the result of each batch
-        sliced_batches(input, desc: stage, track_tree_mode: track_mode) do |sliced_input, response, page, pages, done, total| # rubocop:disable Metrics/ParameterLists, Layout/LineLength
-          track_current_tree(response&.structure)
+          # yields the result of each batch
+          sliced_batches(input, desc: stage, track_tree_mode: track_mode) do |sliced_input, response, page, pages, done, total| # rubocop:disable Metrics/ParameterLists, Layout/LineLength
+            track_current_tree(response&.structure)
 
-          results[stage] << (page_results = request_results_class.new(sliced_input, response))
-          update_tags_remap_table(page_results, stage, current_tree)
+            results[stage] << (page_results = request_results_class.new(sliced_input, response))
+            update_tags_remap_table(page_results, stage, current_tree)
+
+            self.error = page_errors?(page_results, page, pages, done, total, stage: stage)
+            break if error
+          end
 
-          self.error = page_errors?(page_results, page, pages, done, total, stage: stage)
           break if error
         end
-
-        break if error
       end
     rescue SystemStackError
       puts $! # rubocop:disable Style/SpecialGlobalVars
       puts caller[0..100]
       raise
-    rescue StandardError => e
-      log(:error) { self.exception ||= e.patch_full_message }
+    rescue StandardError => err
+      log(:error) { err.patch_full_message }
       raise
     ensure
       rescued { self.tags_remap_csv_file = generate_tags_remap_csv }

data/lib/eco/api/usecases/graphql/samples/location/command/results.rb

@@ -3,13 +3,7 @@ class Eco::API::UseCases::GraphQL::Samples::Location
   module Command::Results
     include Eco::API::UseCases::GraphQL::Helpers::Base::CaseEnv
 
-    attr_accessor :error, :exception
-
-    def rescued
-      yield
-    rescue StandardError => e
-      log(:error) { self.exception ||= e.patch_full_message }
-    end
+    attr_accessor :error
 
     def request_results_class
       Eco::API::UseCases::GraphQL::Helpers::Location::Command::Results

data/lib/eco/api/usecases/graphql/samples/location/command/service/tree_update.rb

@@ -7,7 +7,7 @@ class Eco::API::UseCases::GraphQL::Samples::Location
 
       class << self
         def included(base)
-          super(base)
+          super
           base.send :include, Eco::API::UseCases::GraphQL::Samples::Location::Service::TreeDiff
           base.send :include, Eco::API::UseCases::GraphQL::Samples::Location::Command::DSL
           base.send :include, Eco::API::UseCases::GraphQL::Utils::Sftp
@@ -17,9 +17,11 @@ class Eco::API::UseCases::GraphQL::Samples::Location
 
       module InstanceMethods
         def process
-          super
+          with_error_handling do
+            super
+          end
         ensure
-          rescued { re_archive }
+          rescued { re_archive } unless error_raised?
           rescued { email_digest('TagTree Update') }
         end
 
@@ -28,6 +30,7 @@ class Eco::API::UseCases::GraphQL::Samples::Location
         # @note this is an additional necessary step
         def re_archive
           return if simulate?
+          return if error_raised?
 
           stage = :rearchive
 
@@ -85,9 +88,9 @@ class Eco::API::UseCases::GraphQL::Samples::Location
           return if simulate?
           return if options.dig(:workflow, :no_email)
 
-          digest_msgs = logger.cache.logs(level: %i[info error warn])
-          exception   = exception ? " - Exception!" : ''
-          subject     = "#{config.active_enviro} - #{title}#{exception}"
+          digest_msgs   = logger.cache.logs(level: %i[info error warn])
+          str_exception = exception ? " - Exception!" : ''
+          subject       = "#{config.active_enviro} - #{title}#{str_exception}"
           session.mail(subject: subject, body: digest_msgs.join)
         end
 

data/lib/eco/api/usecases/graphql/samples/location/command/track_changed_ids.rb

@@ -58,23 +58,17 @@ class Eco::API::UseCases::GraphQL::Samples::Location
         next if prev_id == new_id
 
         tags_remap_table << [[prev_id], [new_id]]
-
-        # next unless ref_tree.is_a?(Eco::API::Organization::TagTree)
-        # next unless ref_tree.tag?(new_id)
-
-        # msg  = "Node '#{prev_id}' was updated to '#{new_id}', "
-        # msg << "but in current structure '#{new_id}' is not present"
-        # log(:warn) { msg }
       end
     end
 
     # Generates the final tags remap file
     def generate_tags_remap_csv(filename = tags_remap_csv_full_filename)
-      return nil if tags_remap_table.empty?
+      return if tags_remap_table.empty?
 
       timestamp_file(filename).tap do |file|
         CSV.open(file, 'w') do |csv|
           csv << %w[prev_node_ids new_node_ids]
+
           tags_remap_table.each do |tags_remap|
             csv << tags_remap.to_csv_row
           end

data/lib/eco/api/usecases/graphql/samples/location/service/tree_diff/convertible.rb

@@ -8,7 +8,7 @@ module Eco::API::UseCases::GraphQL::Samples::Location::Service
     module Convertible
       class << self
         def included(base)
-          super(base)
+          super
           base.send :include, Inputable
         end
       end
@@ -24,12 +24,15 @@ module Eco::API::UseCases::GraphQL::Samples::Location::Service
 
           csv.transform_headers do |name|
             next name unless header_maps.key?(name)
+
             header_maps[name]
           end
         end.then do |csv|
           transform_input_csv(csv).tap do |res|
             next if res.is_a?(Eco::CSV::Table)
-            raise ArgumentError, "Expecting and Eco::CSV::Table. Given: #{res.class}"
+
+            msg = "Expecting and Eco::CSV::Table. Given: #{res.class}"
+            raise ArgumentError, msg
           end
         end
       end

data/lib/eco/api/usecases/graphql/samples/location/service/tree_diff.rb

@@ -46,13 +46,15 @@ module Eco::API::UseCases::GraphQL::Samples
 
       class << self
         def included(base)
-          super(base)
+          super
           base.send :include, Convertible
         end
       end
 
       def process
-        compare
+        with_error_handling do
+          compare
+        end
       end
 
       def compare

data/lib/eco/api/usecases/graphql/samples/location/service/tree_to_list.rb

@@ -31,10 +31,12 @@ module Eco::API::UseCases::GraphQL::Samples
       include Converter
 
       def process
-        as_nodes_json(input_tagtree).tap do |list|
-          next generate_live_nodes_file(list) unless list.empty?
+        with_error_handling do
+          as_nodes_json(input_tagtree).tap do |list|
+            next generate_live_nodes_file(list) unless list.empty?
 
-          log(:error) { "There are no location nodes!" }
+            log(:error) { "There are no location nodes!" }
+          end
         end
       end
     end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '3.0.6'.freeze
+  VERSION = '3.0.7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Oscar Segura
@@ -726,6 +726,7 @@ files:
 - lib/eco/api/usecases/graphql/helpers.rb
 - lib/eco/api/usecases/graphql/helpers/base.rb
 - lib/eco/api/usecases/graphql/helpers/base/case_env.rb
+- lib/eco/api/usecases/graphql/helpers/base/error_handling.rb
 - lib/eco/api/usecases/graphql/helpers/base/graphql_env.rb
 - lib/eco/api/usecases/graphql/helpers/location.rb
 - lib/eco/api/usecases/graphql/helpers/location/base.rb