eco-helpers 2.0.52 → 2.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6424664c072321d2d1c45388fea06cfe16e8e42f4949e202be31555e8e052fa
-  data.tar.gz: 7b18ae74a24157949fbb80b26320b31312ef91c43eb73f1384c8c964da52e79c
+  metadata.gz: a4e49d95179b6066cd2729e64c1db009ed77de653c45a73eaebeab2387ae3bde
+  data.tar.gz: 746f3e6e1f8e17be778ec1c902a71810fa46c6439ea886449f2cf5dc7223d2b4
 SHA512:
-  metadata.gz: 6d1e57dc41b76a01bc80cf08108b4e50a456976dbe05bb33a4620cccb2ae745c76e88ce5af0c43795171ac758f6f55465835e22373a484967dd5a4f3ed57e318
-  data.tar.gz: 901007d2346ef608b67011e6f49f560c16a5cb6f0010b16fa24441bf2cfd06a8f8aa82dfd4ba78b86e50cd0aca340047173f6e80800f56340dad668bb27f1516
+  metadata.gz: 88b70189433c7d4c71ea6b549e0eedbadafe9172bd8ea206d83e09f5bade447707f503e92b28f315e720e75743876f8aac480daf0ef5527d4525d17603e00bb2
+  data.tar.gz: d1d513c1c032101ab2aa9af5b1b41a542e99c0cb8312473c0b188698e855cdae965decda09134f01ec57123f2b518438dfe60c3a82265c2d93fdef51495ed0b3

data/CHANGELOG.md

@@ -1,12 +1,34 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.0.52] - 2022-02-xx
+## [2.0.55] - 2022-04-xx
 
 ### Added
-  - `Eco::API::UseCases::DefaultCases::CleanUnknownTags` include `default_tag` refresh
-  
 ### Changed
+  - `Eco::API::UseCases::DefaultCases::Samples::Sftp` should move the basename to Windows compatible chars.
+
+### Fixed
+
+## [2.0.54] - 2022-04-04
+
+### Added
+  - `Eco::API::UseCases::DefaultCases::Samples::Sftp` should tell where the files went in the local.
+
+
+## [2.0.53] - 2022-04-04
+
+### Added
+  - `Eco::API::MicroCases#set_supervisor` prevent to set someone as supervisor of themselves.
+  - `Eco::API::UseCases::DefaultCases::Samples::Sftp` integration to modify the `source_folder`
+
+### Changed
+  - upgrade `ecoportal-api` and `ecoportal-api-v2` dependencies
+
+## [2.0.52] - 2022-03-04
+
+### Added
+  - `Eco::API::UseCases::DefaultCases::CleanUnknownTags` include `default_tag` refresh
+
 ### Fixed
   - `Eco::Data::Files::Directory#dir_files` to be returned in alphabetic order
 

data/eco-helpers.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard",      ">= 0.9.26", "< 0.10"
   spec.add_development_dependency "redcarpet", ">= 3.5.1",  "< 3.6"
 
-  spec.add_dependency 'ecoportal-api', '>= 0.8.4', '< 0.9'
-  spec.add_dependency 'ecoportal-api-v2', '>= 0.8.25', '< 0.9'
+  spec.add_dependency 'ecoportal-api', '>= 0.8.5', '< 0.9'
+  spec.add_dependency 'ecoportal-api-v2', '>= 0.8.26', '< 0.9'
   spec.add_dependency 'aws-sdk-s3',    '>= 1.83.0', '< 2'
   spec.add_dependency 'aws-sdk-ses',   '>= 1.36.0', '< 2'
   spec.add_dependency 'dotenv',        '>= 2.7.6', '< 2.8'

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

@@ -65,8 +65,11 @@ module Eco
           # @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)
+            puts "Creating local files:"
             [files].flatten.compact.map do |fullname|
-              dest_fullname = File.join(local_folder || ".", File.basename(fullname))
+              basename = windows_basename(fullname)
+              dest_fullname = File.join(local_folder || ".", basename)
+              puts " • #{dest_fullname}"
               sftp_session.download(fullname, dest_fullname)
             end.each do |dw|
               # run SSH event loop while dw.active?
@@ -76,6 +79,12 @@ module Eco
 
           private
 
+          def windows_basename(remote_fullname)
+            parts = remote_fullname.split(/[\\\/]/).map {|node| node.gsub(/[<>:\\\/\|?*]/, '_')}
+            local_fullname = File.join(*parts)
+            File.basename(local_fullname)
+          end
+
           def logger
             @enviro&.logger || ::Logger.new(IO::NULL)
           end

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

@@ -2,6 +2,8 @@ module Eco
   module API
     class MicroCases
       # Unique access point to set the `supervisor_id` value on a person.
+      # @note
+      #   - It prevents the basic cyclic supervisor case (supervisor to be supervisor of hemselves)
       # @param person [Ecoportal::API::V1::Person] the person we want to update, carrying the changes to be done.
       # @param sup_id [nil, String] the **supervisor id** we should set on the `person`.
       # @param people [Eco::API::Organization::People] _People_ involved in the current update.
@@ -10,6 +12,7 @@ module Eco
       # @yieldparam supervisor_id [String] the **unknown** `supervisor_id`.
       def set_supervisor(person, sup_id, people, options)
         unless options.dig(:exclude, :core) || options.dig(:exclude, :supervisor)
+          return false if sup_id && ((person.id == sup_id) || (person.external_id == sup_id))
           cur_id    = person.supervisor_id
           cur_super = cur_id && with_supervisor(cur_id, people)
           micro.with_supervisor(sup_id, people) do |new_super|

data/lib/eco/api/usecases/default_cases/samples/sftp_case.rb

@@ -2,10 +2,10 @@ class Eco::API::UseCases::DefaultCases::Samples::Sftp < Eco::API::Common::Loader
   name "sftp-sample"
   type :other
 
-  attr_reader :session
+  attr_reader :session, :options
 
   def main(session, options, usecase)
-    @session = session
+    @session = session; @options = options
     options[:end_get] = false
     raise "The SFTP is not configured" unless session.sftp?
     case options.dig(:sftp, :command)
@@ -50,7 +50,7 @@ class Eco::API::UseCases::DefaultCases::Samples::Sftp < Eco::API::Common::Loader
     with_remote_files.tap do |files|
       unless files.empty?
         file_names = files.map {|file| to_remote_path(file.name)}
-        puts "Getting the following files:"
+        puts "Getting the following files into the local folder '#{local_folder}':"
         puts file_names
         sftp.download(file_names, local_folder: local_folder)
       end
@@ -92,7 +92,7 @@ class Eco::API::UseCases::DefaultCases::Samples::Sftp < Eco::API::Common::Loader
   end
 
   def local_folder
-    "."
+    options.dig(:sftp, :local_folder) || "."
   end
 
   def remote_folder

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.0.52"
+  VERSION = "2.0.55"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.52
+  version: 2.0.55
 platform: ruby
 authors:
 - Oscar Segura
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
@@ -126,7 +126,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
@@ -136,7 +136,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.25
+        version: 0.8.26
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.25
+        version: 0.8.26
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'