eco-helpers 1.5.3 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18474e8798272d1a5a62ca259d514642938372e21dc7668684c8659ed19ff0f8
-  data.tar.gz: a62a9696b955ee8b27067e7bf81cae34e78cc015af398b9c57a82177871b36ce
+  metadata.gz: 2b5a4fcfab321e9a7071a18fb52c38c21a67314a44a2edda63f4783de6ea9f38
+  data.tar.gz: 20b067294c6e2d47c6efa09c62052d2081ce3a56252216fb11c9e465ed0fc5af
 SHA512:
-  metadata.gz: f9a6af4022fb86db3ba85d1fccfcec42690dc3f337e2219d74fe0a980611fba04e62054bf03a4a391472f4b6584dd206d20fb20c9521a352f0e025bb5fccd898
-  data.tar.gz: 5f8b44e2323e118c6a927ae46b3435b71812dc6265afda199c08b66afa5e1e02d7ab1f690e3312d7d10a25ae59f0ce593301ce5dc1a24dba614295466ac7dbdd
+  metadata.gz: 92bc7a1814a8654bc9831ca8e763802ad40f0679c7ee31bc26b2146f7006744b576fa7586c16b2bd50deb1b74738c41d08d14e47b41fd3d34fd299d753213bb1
+  data.tar.gz: 1dbdacf348a3ec57718dbf15dc825adf97839ea070ae0463b4df1a8a020c3c8bee8edc5b3903029d57f112a8517f20ac0870a5b73a206257be21d27e425c66f2

data/CHANGELOG.md

@@ -1,7 +1,47 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [1.5.3] - 2020-11-xx
+## [1.5.8] - 2020-12-xx
+
+### Added
+### Changed
+### Fixed
+  - `Eco::API::Session::Batch::Jobs#job` shouldn't be calling the post-launch callback function on creation.
+  - `Eco::API::Session#new_job` should include a `&block` parameter.
+  - `Eco::API::UseCases::DefaultCases::RefreshCase`: fixed typo
+  
+## [1.5.7] - 2020-12-17
+
+### Added
+### Changed
+### Fixed
+  - `Eco::API::Sesssion#parse_attribute` was not using phase argument
+
+## [1.5.6] - 2020-12-04
+
+### Added
+### Changed
+### Fixed
+  - `Eco::API::UseCases::DefaultCases::RestoreDBCase` fixed typo and slightly improved
+  - fixed some back-end errors when chaining usecases
+  - `Eco::API::UseCases::DefaultCases::OrgDataConvertCase` improved
+
+## [1.5.5] - 2020-12-03
+
+### Added
+### Changed
+### Fixed
+  - rubies previous to `2.5` do not have `yield_self`
+
+## [1.5.4] - 2020-12-02
+
+### Added
+  - update `ecoportal-api` dependency
+### Changed
+### Fixed
+  - `Eco::API::MicroCases#people_refresh` typo
+
+## [1.5.3] - 2020-11-30
 
 ### Added
 ### Changed

data/eco-helpers.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yard",      ">= 0.9.18", "< 0.10"
   s.add_development_dependency "redcarpet", ">= 3.5.0",  "< 3.6"
 
-  s.add_dependency 'ecoportal-api', '>= 0.7.2', '< 0.8'
+  s.add_dependency 'ecoportal-api', '>= 0.7.3', '< 0.8'
   s.add_dependency 'ecoportal-api-oozes', '>= 0.7.2', '< 0.8'
   s.add_dependency 'aws-sdk-s3',    '>= 1.64.0', '< 2'
   s.add_dependency 'aws-sdk-ses',   '>= 1.29.0', '< 2'

data/lib/eco/api/common/version_patches.rb

@@ -7,6 +7,7 @@ module Eco
   end
 end
 
+require_relative 'version_patches/object'
 require_relative 'version_patches/exception'
 require_relative 'version_patches/hash'
 require_relative 'version_patches/ecoportal_api'

data/lib/eco/api/common/version_patches/object.rb

@@ -0,0 +1,10 @@
+Object.class_eval do
+  unless method_defined?(:yield_self)
+    define_method(:yield_self) do |&block|
+      return block.call(self) if block
+      out = self
+      out = [self] unless self.is_a?(Enumerable)
+      out.each
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module Eco
         missing = people.length - entries.length
         logger.error("Missed to obtain #{missing} people during the refresh") if missing > 0
 
-        Eco::API::Organization::People.new(status.people)
+        Eco::API::Organization::People.new(entries)
       end
 
     end

data/lib/eco/api/session.rb

@@ -126,7 +126,7 @@ module Eco
         unless parsers = entry_factory.person_parser
           raise "There are no parsers defined"
         end
-        parsers.parse(attr, source)
+        parsers.parse(attr, source, phase)
       end
 
       # @see Eco::API::Common::People::EntryFactory#export
@@ -217,6 +217,7 @@ module Eco
         @job_groups ||= Batch::JobsGroups.new(enviro)
       end
 
+      # It retrives the group of `Batch::Jobs` named `name`. It creates it if it doesn't exist.
       # @return [Eco::API::Session::Batch::Jobs]
       def job_group(name, order: :last)
         case
@@ -228,9 +229,10 @@ module Eco
       end
 
       # Shortcut to create a job of certain type within a group
+      # @param [see @Eco::API::Session::Batch::Jobs#new]
       # @return [Eco::API::Session::Batch::Job]
-      def new_job(group, name, type, usecase, sets = [:core, :details, :account])
-        job_group(group).new(name, usecase: usecase, type: type, sets: sets)
+      def new_job(group, name, type, usecase, sets = [:core, :details, :account], &block)
+        job_group(group).new(name, usecase: usecase, type: type, sets: sets, &block)
       end
 
       # @see Eco::API::Session::Batch::JobsGroups#launch

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

@@ -96,7 +96,7 @@ module Eco
           # @param entry [Ecoportal::API::V1::Person, Enumberable<Person>] the person(s) we want to update, carrying the changes to be done.
           # @param unique [Boolean] specifies if repeated entries should be avoided in the queue.
           # @yield [person] callback before launching the batch job request against the server.
-          # @yieldparam param [Person] current person object that that should be treated by the callback before launching the batch.
+          # @yieldparam person [Person] current person object that that should be treated by the callback before launching the batch.
           # @return [Eco::API::Session::Batch::Job] this `Batch::Job`.
           def add(entry, unique: true, &block)
             case entry

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

@@ -42,13 +42,23 @@ module Eco
             @jobs.key?(name)
           end
 
+          # It retrieves an existing job named `name` or creates it if it doesn't exist.
+          # @note
+          #   - the block should only be passed when creating the job
+          # @param [see @Eco::API::Session::Batch::Jobs#new]
+          # @return [Eco::API::Session::Batch::Job]
           def job(name, type: nil, sets: nil, usecase: nil, &block)
+            fatal "Can't give a job post-launch callback &block to an already existing job" if exists?(name)
             new(name, type: type, sets: sets, usecase: usecase, &block) unless exists?(name)
-            self[name].tap do |job|
-              block.call(job) if block
-            end
+            self[name]
           end
 
+          # Creates a new `Batch::Job` included as part of this `Batch::Jobs`.
+          # @param [see Eco::API::Session::Job#new]
+          # @yield [job, status] callback after launching the batch job request against the server.
+          # @yieldparam job [Eco::API::Session::Batch::Job] the job we have launched against the server.
+          # @yieldparam status [Eco::API::Session::Batch::Status] the status of the batch job launch.
+          # @return [Eco::API::Session::Batch::Job]
           def new(name, type:, sets:, usecase: nil, &block)
             fatal "Can't create job named '#{name}' because it already exists." if exists?(name)
 
@@ -57,6 +67,11 @@ module Eco
             end
           end
 
+          # @param job [Eco::API::Session::Batch::Job] the `Batch::Job` to add.
+          # @yield [job, status] callback after launching the batch job request against the server.
+          # @yieldparam job [Eco::API::Session::Batch::Job] the job we have launched against the server.
+          # @yieldparam status [Eco::API::Session::Batch::Status] the status of the batch job launch.
+          # @return [Eco::API::Session::Batch::Job]
           def add(job)
             fatal "Expected Eco::API::Session::Batch::Job object. Given #{job.class}" unless job.is_a?(Eco::API::Session::Batch::Job)
             @jobs[job.name] = job
@@ -67,6 +82,10 @@ module Eco
             any? {|job| job.pending?}
           end
 
+          # Launches every `Batch::Job` in the group.
+          # @note
+          #   - if there was post-launch callback for a `Batch::Job`, it calls it.
+          # @return [Hash<Eco::API::Session::Batch::Job, Eco::API::Session::Batch::Status>]
           def launch(simulate: false)
             each do |job|
               if job.pending?

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

@@ -58,6 +58,11 @@ module Eco
             @groups.key?(name)
           end
 
+          # Creates a new group of `Batch::Jobs` named `name`.
+          # @yield [group, group_status] callback after launching the batch job request against the server.
+          # @yieldparam group [Eco::API::Session::Batch::Jobs] the group of jobs we have launched against the server.
+          # @yieldparam group_status [Hash<Eco::API::Session::Batch::Job, Eco::API::Session::Batch::Status>] the status of the launched batch jobs.
+          # @return [Eco::API::Session::Batch::Jobs] the group of jobs.
           def new(name, order: :last)
             fatal "Can't create job group named '#{name}' because it already exists." if exists?(name)
 
@@ -78,6 +83,10 @@ module Eco
             any? {|group| group.pending?}
           end
 
+          # Launches every `Batch::Jobs` group in the current `Batch::JobGroups`
+          # @note
+          #   - if there was post-launch callback for a `Batch::Jobs` groups, it calls it.
+          # @return [Hash<Eco::API::Session::Batch::Jobs,Hash<Eco::API::Session::Batch::Job, Eco::API::Session::Batch::Status>>]
           def launch(simulate: false)
             @order.each_with_index do |group, idx|
               if group.pending?

data/lib/eco/api/usecases/default_cases/org_data_convert_case.rb

@@ -2,6 +2,8 @@ class Eco::API::UseCases::DefaultCases::OrgDataConvertCase < Eco::API::Common::L
   name "org-data-convert"
   type :import
 
+  attr_reader :session, :options
+
   def org_data_convert(people)
     pp "Going to convert data from '#{source_enviro}' to '#{ASSETS.active_config}'"
     puts "\n"
@@ -50,27 +52,43 @@ class Eco::API::UseCases::DefaultCases::OrgDataConvertCase < Eco::API::Common::L
 
   def policy_groups_convert(ids)
     ids.map do |id|
-      unless name = source_config.policy_groups.to_name(id)
-        error("Ops, do not know #{id} usergroup for source environment")
+      unless name = source_policy_groups.to_name(id) || ignore_missing_policy_groups?
+        msg  = "Ops, do not know #{id} usergroup for source environment"
+        msg += "\nUse the option -ignore-missing-policy-groups if you do not care"
+        error(msg)
       end
       session.policy_groups.to_id(name).tap do |new_id|
-        unless new_id
-          error("Ops, do not know #{name} usergroup for destination environment")
+        unless new_id || ignore_missing_policy_groups?
+          msg  = "Ops, do not know #{name} usergroup for destination environment"
+          msg += "\nUse the option -ignore-missing-policy-groups if you do not care"
+          error(msg)
         end
       end
-    end
+    end.compact
+  end
+
+  def source_policy_groups
+    source_config.policy_groups
   end
 
   def source_config
-    @source_config ||= ASSETS.config(key: source_enviro, update_active: false)
+    @source_config ||= ASSETS.config(key: source_enviro, update_active: false).tap do |config|
+      unless config
+        error("The source environment '#{source_enviro}' does not exit or is not configured")
+      end
+    end
   end
 
   def source_enviro
     @source_enviro ||= options.dig(:source_enviro).tap do |enviro|
-      error("A source organization is required to migrate data") unless enviro
+      error("A source environment is required to migrate data from") unless enviro
     end
   end
 
+  def ignore_missing_policy_groups?
+    options.dig(:ignore, :missing, :policy_groups)
+  end
+
   def logger
     @session.logger
   end

data/lib/eco/api/usecases/default_cases/refresh_case.rb

@@ -4,7 +4,7 @@ class Eco::API::UseCases::DefaultCases::RefreshCase < Eco::API::Common::Loaders:
 
   def main(people, session, options, usecase)
     update   = session.new_job("main", "update", :update, usecase)
-    people.each {|person| job.add(person)}
+    people.each {|person| update.add(person)}
   end
 
 end

data/lib/eco/api/usecases/default_cases/restore_db_case.rb

@@ -2,7 +2,11 @@ class Eco::API::UseCases::DefaultCases::RestoreDBCase < Eco::API::Common::Loader
   name "restore-db"
   type :sync
 
+  attr_reader :session, :options
+
   def main(entries, people, session, options, usecase)
+    @session = session; @options = options
+
     micro    = session.micro
     require_people_as_entries!(entries)
 
@@ -26,21 +30,21 @@ class Eco::API::UseCases::DefaultCases::RestoreDBCase < Eco::API::Common::Loader
 
       person.new? ? restart.add(person) : update.add(person)
 
-      core_copy(entry, person, options) unless options.dig(:exclude, :core)
-      person.details = entry.details    unless options.dig(:exclude, :details)
+      core_copy(entry, person)        unless options.dig(:exclude, :core)
+      person.details = entry.details  unless options.dig(:exclude, :details)
 
       unless options.dig(:exclude, :account) || !entry.account
         person.account ||= {}
-        account_copy(entry.account, person.account, options)
+        account_copy(entry.account, person.account)
       end
     end
 
-    report_re_starters(re_starters, session.logger)
+    report_re_starters(re_starters)
   end
 
   private
 
-  def core_copy(entry, person, options)
+  def core_copy(entry, person)
     person.external_id   = entry.external_id   unless options.dig(:exclude, :external_id)
     person.name          = entry.name          unless options.dig(:exclude, :name)
     person.email         = entry.email         unless options.dig(:exclude, :email)
@@ -49,8 +53,8 @@ class Eco::API::UseCases::DefaultCases::RestoreDBCase < Eco::API::Common::Loader
     person.freemium      = entry.freemium
   end
 
-  def account_copy(src, dst, options)
-    if src = entry.account
+  def account_copy(src, dst)
+    if src
       dst.default_tag        = src.default_tag      unless options.dig(:exclude, :filter_tags)
       dst.policy_group_ids   = src.policy_group_ids unless options.dig(:exclude, :policy_groups)
 
@@ -59,27 +63,31 @@ class Eco::API::UseCases::DefaultCases::RestoreDBCase < Eco::API::Common::Loader
         dst.permissions_custom = src.permissions_custom
       end
 
-      dst.login_provider_ids = src.login_provider_ids
-      dst.accept_eula        = src.accept_eula
+      unless options.dig(:exclude, :login_providers) || options.dig(:source_enviro)
+        dst.login_provider_ids = src.login_provider_ids
+      end
 
       if src.preferences
         dst.doc["preferences"] = JSON.parse((src.doc["preferences"] || {}).to_json)
       end
 
-      dst.starred_ids        = src.starred_ids
-      dst.landing_page_id    = src.landing_page_id
+      unless options.dig(:source_enviro)
+        dst.starred_ids        = src.starred_ids
+        dst.landing_page_id    = src.landing_page_id
+      end
+      
       dst&.send_invites      = options[:send_invites] if options.key?(:send_invites)
     end
   end
 
-  def require_people_as_entries!(entries, logger)
+  def require_people_as_entries!(entries)
     unless entries.is_a?(Eco::API::Organization::People)
       logger.error("Your input should be an 'Eco::API::Organization::People' object. Got: #{entries.class}")
       exit(1)
     end
   end
 
-  def report_re_starters(re_starters, logger)
+  def report_re_starters(re_starters)
     unless re_starters.empty?
       logger.error("There were #{re_starters.length} entries of the backup that do not exist in the (filtered?) people manager")
       logger.error("Some examples:")
@@ -89,4 +97,8 @@ class Eco::API::UseCases::DefaultCases::RestoreDBCase < Eco::API::Common::Loader
     end
   end
 
+  def logger
+    session.logger
+  end
+
 end

data/lib/eco/api/usecases/use_case.rb

@@ -36,7 +36,7 @@ module Eco
         # @option kargs [Eco::API:Session] :session
         # @option kargs [Hash] :options hash with symbol keys (i.e. behaviour modifiers, cli trackers, filters, etc.)
         def launch(io: nil, **kargs)
-          params = io&.params(keyed: true) || {}
+          params = io&.params(keyed: true, all: true) || {}
           kargs  = params.merge(kargs).merge(usecase: self)
 
           UseCaseIO.new(**kargs).tap do |uio|

data/lib/eco/api/usecases/use_case_io.rb

@@ -65,7 +65,6 @@ module Eco
           #kargs  = aux_io.params(keyed: true)
           kargs  = params(keyed: true, all: true).merge(usecase: usecase)
           kargs.delete(:job)
-
           case self.type
           when :import
             kargs[:input]  = output

data/lib/eco/cli/config/default/usecases.rb

@@ -55,6 +55,27 @@ ASSETS.cli.config do |cnf|
       options.deep_merge!(super: {new: new_id})
     end
 
+    desc  = "Usage '-org-data-convert backup.json -restore-db-from'."
+    desc += " Transforms an input .json file to the values of the destination environment "
+    desc += " (names missmatch won't solve: i.e. usergroups)"
+    cases.add("-org-data-convert", :import, desc, case_name: "org-data-convert") do |input, session, options|
+      unless input && input.is_a?(Eco::API::Organization::People)
+        file  = SCR.get_file("-org-data-convert", required: true)
+        input = Eco::API::Organization::People.new(JSON.parse(File.read(file)))
+        session.logger.info("Source DB: loaded #{input.length} entries.")
+      end
+
+      if source_enviro = SCR.get_arg("-source-enviro", with_param: true)
+        options.merge!(source_enviro: source_enviro)
+      else
+        session.logger.error("You need to specify a -source-enviro for the conversion to work out")
+        exit(1)
+      end
+
+      options.deep_merge!(ignore: {missing: {policy_groups: true}}) if SCR.get_arg("-ignore-missing-policy-groups")
+      
+    end
+
     desc = "Restores the people manager by using a backup.json file"
     cases.add("-restore-db-from", :sync, desc, case_name: "restore-db") do |input, people, session, options|
       unless input && input.is_a?(Eco::API::Organization::People)

data/lib/eco/cli/config/default/workflow.rb

@@ -122,7 +122,7 @@ ASSETS.cli.config do |config|
 
     wf.on(:report) do |wf_report, io|
       #config.reports.active(io: io)
-      #io.session.reports 
+      #io.session.reports
       io
     end
 

data/lib/eco/cli/config/use_cases.rb

@@ -94,7 +94,7 @@ module Eco
           when Eco::API::UseCases::UseCaseIO
             io.chain(usecase: usecase)
           when Eco::API::UseCases::BaseIO
-            params = io.params(keyed: true).merge(usecase: usecase)
+            params = io.params(keyed: true, all: true).merge(usecase: usecase)
             Eco::API::UseCases::UseCaseIO.new(**params)
           end
         end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "1.5.3"
+  VERSION = "1.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.8
 platform: ruby
 authors:
 - Oscar Segura
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -126,7 +126,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -296,6 +296,7 @@ files:
 - lib/eco/api/common/version_patches/exception.rb
 - lib/eco/api/common/version_patches/hash.rb
 - lib/eco/api/common/version_patches/hash/deep_merge.rb
+- lib/eco/api/common/version_patches/object.rb
 - lib/eco/api/custom.rb
 - lib/eco/api/custom/error_handler.rb
 - lib/eco/api/custom/namespace.rb