eco-helpers 2.7.9 → 2.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41e63439f7a3d89c5e3c9e10be328b9487ecffe4dde6a83a6fd6f9a561d924a8
-  data.tar.gz: bafc6c443ce57b2611c177b00eca9aca0fd06718712511eb2b93762ff957179b
+  metadata.gz: e3c92964baf09be5673e74f4a1762d03ce0efe159e7d6a2bc6da3839ac99f4f0
+  data.tar.gz: 26525ccfbdbb06f348d293a50a02de644f7a0a32f3f5285537c75d8d14fe3601
 SHA512:
-  metadata.gz: '0094ce51df0b47838a44b679fe82a4acacfc64953edeea38ef2c51b6efeb08f0629f019751b319542dddcac5e77838786cdd1b7333b16babb0bf02ad4e197fb3'
-  data.tar.gz: ee5243547b98cdeabba4cf1fdbbd8759b0f24d1e5ea4f4e42b998569ebe0c00bf3d5139ef2c28886bfa96efe6cd7e65344245b4eb6d7c9bb0a08964d075ddd12
+  metadata.gz: 7620a74731fbfc7d17d1b21f7930df4753003a919fa9d79550083002f454c57716cceab6afec8738d9a37e5b2cd749cd42541f0913286d66c1387b7b88b27c5e
+  data.tar.gz: 1db57df2c9a4b8e5863580524d34e655c92d5e4ddd15e6a8cacbe8b9e9e8af73ae2d3fb05fd1f4dc6de119c2ee5e20b3971b234c073910153aec5137807ef37b

data/CHANGELOG.md

@@ -1,11 +1,26 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.7.10] - 2024-05-xx
+
+## [2.7.11] - 2024-05-xx
 
 ### Added
+### Changed\
+  - `Eco::API::Common::Session::SFTP#download`
+    - It now returns the local filename(s) of the downloaded files.
+  - `Eco::API::UseCases::GraphQL::Utils#sftp_download_files`
+    - It now returns the local filename(s) of the downloaded files.
+
+### Fixed
+
+## [2.7.10] - 2024-05-20
+
 ### Changed
+  - Temporarily silent warnings on tracking id changes (apparently the tracking locations tree is not up to date with latest version and gives false warnings)
+  - Upgrade SFTP access
+
 ### Fixed
+  - Remove enviro from tagtree download
 
 ## [2.7.9] - 2024-05-16
 

data/eco-helpers.gemspec

@@ -33,6 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ecoportal-api',         '>= 0.9.8', '< 0.10'
   spec.add_dependency 'ecoportal-api-v2',      '>= 1.1.8', '< 1.2'
   spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.18', '< 0.4'
+  spec.add_dependency 'ed25519', '>= 1.2'
+  spec.add_dependency 'bcrypt_pbkdf', '>= 1.0'
   spec.add_dependency 'aws-sdk-s3',    '>= 1.142.0', '< 2'
   spec.add_dependency 'aws-sdk-ses',   '>= 1.58.0', '< 2'
   spec.add_dependency 'dotenv',        '>= 2.8.1',  '< 3'

data/lib/eco/api/common/session/sftp.rb

@@ -74,15 +74,19 @@ module Eco
           # @see Net::SFTP::Operations::Download
           # @param files [String, Array<String>] full path to remote file(s) to be downloaded
           # @param local_folder [String] local destination folder (`"."` if not specified)
-          def download(files, local_folder: nil)
+          # @return [Array<String>] list of created files
+          def download(files, local_folder: nil, &block)
             puts "Creating local files:"
+            created_files = []
             [files].flatten.compact.map do |fullname|
               basename = windows_basename(fullname)
               dest_fullname = File.join(local_folder || ".", basename)
               puts " • #{dest_fullname}"
+              created_files << dest_fullname
               sftp_session.download(fullname, dest_fullname)
             end.each(&:wait)
             # run SSH event loop while dw.active?
+            created_files.tap { created_files.each(&block) }
           end
 
           # Upload a file to the specific `remote_folder`

data/lib/eco/api/organization/tag_tree.rb

@@ -40,11 +40,13 @@ module Eco
         # @param tagtree [String] representation of the tagtree in json.
         def initialize(
           tagtree = [],
-          name: nil, id: nil,
-          depth: -1, path: [],
-          parent: nil, _weight: nil # rubocop:disable Lint/UnderscorePrefixedVariableName
+          name:    nil,
+          id:      nil,
+          depth:   -1,
+          path:    [],
+          parent:  nil,
+          _weight: nil # rubocop:disable Lint/UnderscorePrefixedVariableName
         )
-
           @source = parse_source_input(tagtree)
 
           msg = "You are trying to initialize a TagTree with a null tagtree"

data/lib/eco/api/session/config/tagtree.rb

@@ -21,12 +21,16 @@ module Eco
           #   1. If there's a file tagtree.json file, it uses it
           #   2. If no file, retrieves `structure_id` (config)
           # @param include_archived [Boolean] whether or not it should include archived nodes.
+          # @param [recache] used for re-caching
           # @return [Eco::API::Organization::TagTree]
-          def scope_tree(enviro: nil, include_archived: true, raise_on_missing: true) # rubocop:disable Lint/UnusedMethodArgument
-            return @tagtree if instance_variable_defined?(:@tagtree) && @tagtree.enviro == enviro
+          def scope_tree(
+            include_archived: true,
+            recache:          false,
+            raise_on_missing: true  # rubocop:disable Lint/UnusedMethodArgument
+          )
+            return @tagtree if instance_variable_defined?(:@tagtree) && !recache
 
             kargs = {
-              enviro:               enviro,
               includeArchivedNodes: include_archived
             }
 
@@ -48,16 +52,16 @@ module Eco
 
           # Among all the locations structures it selects the one with more location nodes
           # If `id` is provided, it only retrieves this locations structure.
-          # @param [enviro] used for re-caching
-          def live_tree(id: nil, enviro: nil, include_archived: false, **kargs, &block) # rubocop:disable Metrics/AbcSize
+          # @param [recache] used for re-caching
+          def live_tree( # rubocop:disable Metrics/AbcSize
+            id:               nil,
+            include_archived: false,
+            **kargs,
+            &block
+          )
             existing_cache   = !@live_tree.nil?
             first_load       = !existing_cache
-
-            target_change    = existing_cache && id     && @live_tree.id != id
-            enviro_change    = existing_cache && enviro && @live_tree.enviro != enviro
-
-            switching_target = existing_cache && (target_change || enviro_change)
-            _refresh_cache   = existing_cache && !switching_target
+            switching_target = existing_cache && id && @live_tree.id != id
 
             kargs = {
               includeArchivedNodes: include_archived

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

@@ -248,10 +248,17 @@ module Eco
         # @note it does NOT include archived nodes by default.
         #   - This is for legacy (most usecases don't)
         # @param include_archived [Boolean] whether or not it should include archived nodes.
+        # @param [recache] used for re-caching
         # @return [Eco::API::Organization::TagTree]
-        def tagtree(enviro: nil, include_archived: false, raise_on_missing: true)
+        def tagtree(
+          include_archived: false,
+          recache:          false,
+          raise_on_missing: true
+        )
           kargs = {
-            enviro: enviro, include_archived: include_archived, raise_on_missing: raise_on_missing
+            recache:          recache,
+            include_archived: include_archived,
+            raise_on_missing: raise_on_missing
           }
           @tagtree ||= tagtree_config.scope_tree(**kargs)
         end
@@ -259,8 +266,8 @@ module Eco
         # It obtains the first of the live tagtree in the org
         # @note it requires graphql connection configuration parameters
         # @return [Eco::API::Organization::TagTree]
-        def live_tree(id: nil, enviro: nil, **kargs, &block)
-          tagtree_config.live_tree(id: id, enviro: enviro, **kargs, &block)
+        def live_tree(id: nil, **kargs, &block)
+          tagtree_config.live_tree(id: id, **kargs, &block)
         end
 
         # Retrieves all the location structures of the organisation

data/lib/eco/api/session.rb

@@ -58,19 +58,26 @@ module Eco
       # @see Eco::API::Session::Config#tagtree
       # @see Eco::API::Session#live_trees
       # @return [Eco::API::Organization::TagTree]
-      def tagtree(live: false, merge: false, include_archived: false, **kargs, &block)
+      def tagtree(
+        live:             false,
+        merge:            false,
+        include_archived: false,
+        recache:          false,
+        **kargs,
+        &block
+      )
         if live && api?(version: :graphql)
           return live_tree(include_archived: include_archived, **kargs, &block) unless merge
           live_trees(include_archived: include_archived, **kargs, &block).inject(&:merge)
         else
-          config.tagtree(enviro: enviro)
+          config.tagtree(recache: recache)
         end
       end
 
       # @see Eco::API::Session::Config#live_tree
       # @return [Eco::API::Organization::TagTree]
       def live_tree(id: nil, include_archived: false, **kargs, &block)
-        config.live_tree(id: id, include_archived: include_archived, enviro: enviro, **kargs, &block)
+        config.live_tree(id: id, include_archived: include_archived, **kargs, &block)
       end
 
       # @see Eco::API::Session::Config#live_tree

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

@@ -57,12 +57,12 @@ class Eco::API::UseCases::GraphQL::Samples::Location
 
         tags_remap_table << [[prev_id], [new_id]]
 
-        next unless ref_tree.is_a?(Eco::API::Organization::TagTree)
-        next unless ref_tree.tag?(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 }
+        # msg  = "Node '#{prev_id}' was updated to '#{new_id}', "
+        # msg << "but in current structure '#{new_id}' is not present"
+        # log(:warn) { msg }
       end
     end
 

data/lib/eco/api/usecases/graphql/utils/sftp.rb

@@ -19,20 +19,20 @@ module Eco::API::UseCases::GraphQL::Utils
       end
     end
 
-    def sftp_download_files(subfolder: remote_subfolder, pattern: nil, local_folder: self.local_folder)
-      with_remote_files(subfolder: subfolder, pattern: pattern).tap do |files|
-        next if files.empty?
-        file_names = files.map {|file| to_remote_path(file.name, subfolder: subfolder)}
-
-        log(:info) {
-          msg  = "Getting the following files into the local folder '#{local_folder}':\n"
-          msg << "  • "
-          msg << file_names.join("\n  • ")
-          msg
-        }
-
-        sftp.download(file_names, local_folder: local_folder)
-      end
+    def sftp_download_files(subfolder: remote_subfolder, pattern: nil, local_folder: self.local_folder, &block)
+      remote_files = with_remote_files(subfolder: subfolder, pattern: pattern)
+      return [] if remote_files.empty?
+
+      file_names = remote_files.map {|file| to_remote_path(file.name, subfolder: subfolder)}
+
+      log(:info) {
+        msg  = "Getting the following files into the local folder '#{local_folder}':\n"
+        msg << "  • "
+        msg << file_names.join("\n  • ")
+        msg
+      }
+
+      sftp.download(file_names, local_folder: local_folder, &block)
     end
 
     def sftp_move_file(source, dest)

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '2.7.9'.freeze
+  VERSION = '2.7.11'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.7.9
+  version: 2.7.11
 platform: ruby
 authors:
 - Oscar Segura
@@ -170,6 +170,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement