eco-helpers 3.0.15 → 3.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb3a3362dc59886aca4136df89d2fbaabc5fddceab410a52556eb0c01bea4357
-  data.tar.gz: b66f988b6cc4dc9d1123860835c5163a96f1315fc9b94c9950a4c68d13f23bf7
+  metadata.gz: baeb42abbb1d31497328afd4c813dec4acfebb598546ad55a4f1265a45dc89b5
+  data.tar.gz: 7d4c88626946b84e1ea22f3b27eb7570a9daa6d2962036e6fbf667b000dd5996
 SHA512:
-  metadata.gz: 466af194495d8d185602b19ef32641123dccc29da95f0fd8347925112b510909061b613f49eeed986a25d25fbd9e319366f70fafa560247cfd889a04cde28c3c
-  data.tar.gz: 60c260b8c85efc6be8b695ecf0097f8dbc203b2162296848f9fe012f4fd0c9f4ebaa926ee55a0c2b59b6e7225274d6a2030f2e3433351d482d4bd25fd3bc700e
+  metadata.gz: 8af8fdbccacb57655756a01f0c30ff1d38c58e232f77fedc5aeb058cb7260ed1863834af1995d7268d355e09c00fedc671b4417f1f14d76c25c9609a038b47d3
+  data.tar.gz: c4daf6291086d8b15f5eb1606291e8161e0e0326b4f5ed8e917e95d09b9c1de7ff2665e44ec3ed35986d0cd07ec232dfe40822d0d32bbd12020f7290a9ce1405

data/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.0.17] - 2024-10-xx
+
+### Added
+
+### Changed
+
+### Fixed
+
+## [3.0.16] - 2024-10-15
+
+### Added
+
+### Changed
+
+- `Eco::API::Session::Batch#launch_batch`
+  - Made benchmarking consistent on last batch
+- upgrade `ecoportal-api` core gem
+
+### Fixed
+
 ## [3.0.15] - 2024-10-01
 
 ### Added

data/eco-helpers.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bcrypt_pbkdf',  '~> 1.0'
   spec.add_dependency 'docx',          '>= 0.8.0', '< 0.9'
   spec.add_dependency 'dotenv',        '~> 3'
-  spec.add_dependency 'ecoportal-api',         '~> 0.10', '>= 0.10.3'
+  spec.add_dependency 'ecoportal-api',         '~> 0.10', '>= 0.10.4'
   spec.add_dependency 'ecoportal-api-graphql', '~> 0.4',  '>= 0.4.2'
   spec.add_dependency 'ecoportal-api-v2',      '~> 2.0',  '>= 2.0.10'
   spec.add_dependency 'ed25519',       '~> 1.2'

data/lib/eco/api/microcases/people_refresh.rb

@@ -25,7 +25,7 @@ module Eco
 
         created = people.length - ini
         msg    = "Going to refresh #{people.length} people with server data"
-        msg   += " (including #{created} that were created)" if created.positive?
+        msg   << " (including #{created} that were created)" if created.positive?
         log(:info) { msg }
 
         start   = Time.now

data/lib/eco/api/session/batch.rb

@@ -164,7 +164,7 @@ module Eco
           ASSETS.cli.options
         end
 
-        def launch_batch( # rubocop:disable Metrics/AbcSize
+        def launch_batch( # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           data,
           method:,
           status:     nil,
@@ -185,17 +185,18 @@ module Eco
           )
 
           status.tap do
-            start_time  = Time.now
-            start_slice = Time.now
-
             pending_for_server_error = data.to_a[0..]
+
+            start_time = Time.now
+
             data.each_slice(per_page) do |slice|
-              msg  = "starting batch '#{method}' iteration #{iteration}/#{iterations},"
-              msg << " with #{slice.length} entries of #{data.length} -- #{done} done"
-              msg << " (last: #{str_stats(start_slice, slice.length)}; total: #{str_stats(start_time, done)})"
+              msg  = "starting batch '#{method}' iteration #{iteration}/#{iterations}, "
+              msg << "with #{slice.length} entries of #{data.length} -- #{done} done"
+              msg << (" " * 20)
               log(:info) { msg } unless silent
 
               start_slice = Time.now
+
               offer_retry_on(Ecoportal::API::Errors::TimeOut) do
                 people_api.batch(job_mode: job_mode?(options)) do |batch|
                   slice.each do |person|
@@ -211,8 +212,15 @@ module Eco
                 end # end batch
               end
 
+              done += slice.length
+
+              msg  = "  ... iteration #{iteration}/#{iterations} done "
+              msg << "in #{str_stats(start_slice, slice.length)} "
+              msg << "(average: #{str_stats(start_time, done)})"
+              msg << (" " * 20)
+              log(:info) { msg } unless silent
+
               iteration  += 1
-              done       += slice.length
             end # next slice
 
             # temporary working around (due to back-end problems with batch/jobs)
@@ -261,7 +269,7 @@ module Eco
 
         def str_stats(start, count)
           now     = Time.now
-          secs    = (now - start).round(3)
+          secs    = (now - start).round(2)
           if secs > 0.0
             per_sec = (count.to_f / secs).round(2)
             "#{secs}s -> #{per_sec} people/s"

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '3.0.15'.freeze
+  VERSION = '3.0.16'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.0.16
 platform: ruby
 authors:
 - Oscar Segura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -229,7 +229,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -239,7 +239,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: ecoportal-api-graphql
   requirement: !ruby/object:Gem::Requirement