eco-helpers 2.0.17 → 2.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d982e3f0bdb6c5831544cc5a1e232f4d0902220adf9bf65dac88b64eee97d08
-  data.tar.gz: 0cc1d65f0336bef75df0f99cd972a99e5c986307fcb9e14bb3a7a3e5eef69173
+  metadata.gz: 678fc1c610a5aafd8321a74367a6aaca67aa70bf159f638209b45da0361bb575
+  data.tar.gz: 280a74a3a3877c5d58bfbe84d0f6a8f8b6f8eda5c68f376fea87522b03a59e42
 SHA512:
-  metadata.gz: 72b1e364f326a3d6e7fb0145ff8e4727bc41da1ae9f453be7d2aeec1c749e0b4463750cbe95370a5f241794d394ab79f3836339369ea6be131f2ebc18d7287ca
-  data.tar.gz: be3e03507f60c643a0b4d14eeca65f7a34534042a86a06239f9a015e9a2e8be6e2a757d1dfc94c7608663e53e503d6e0cc8bc9ffebe4ac54df8391be422df6a6
+  metadata.gz: 30c74c7aa8b7f59a4610cb4da804714a165a095d6280b756dcec17df37a81f2b5438a7178cc279750e5f97a43ae6d0041e464d9ed7965af39c39fc71ce4efc99
+  data.tar.gz: 1abe7f74b0a0452565c1add7778086030372f63912fe2c6279a2d40eb9f908d07746421507241d4905bbdf546e944899fa0f63fa3e3fe086caf1663c83a2624d

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.0.17] - 2021-05-24
+## [2.0.18] - 2021-05-25
+
+### Added
+  - **`-one-off`** option to not having to type the `-api-key` every time you launch one-off scripts
+    - `-api-key` will store the key to the `./.env_one_off` file (supports update and multi-environment)
+
+### Changed
+### Fixed
+  - patched `Exception#patch_full_message` to do not enter into a cyclic error rescue
+  - also rescue on `workflow.rescue`
+
+## [2.0.17] - 2021-05-25
 
 Specific changes due to eP **release `1.5.9.70`** (_Policy Group Abilities_)
   - And some improvements as well as new tools

data/lib/eco-helpers.rb

@@ -1,6 +1,7 @@
 require 'csv'
 require 'json'
 require 'pp'
+require 'dotenv'
 require 'dotenv/load'
 
 

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

@@ -1,9 +1,13 @@
 class ::Exception
   def patch_full_message
-    msg = []
-    msg << "\n#{backtrace.first} \n#{message} (#{self.class.to_s})"
-    backtrace[1..-1].each_with_index {|bt, i| msg << "#{" "*8}#{i+1}: from #{bt}"}
-    msg.join("\n")
+    begin
+      msg = []
+      msg << "\n#{backtrace.first} \n#{message} (#{self.class.to_s})"
+      backtrace[1..-1].each_with_index {|bt, i| msg << "#{" "*8}#{i+1}: from #{bt}"}
+      msg.join("\n")
+    rescue Exception => e
+      puts "Something is wrong with 'patch_full_message': #{e}"
+    end
   end
 end
 

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

@@ -40,20 +40,6 @@ module Eco
             self
           end
 
-          # Method to support CLI one-off API requests
-          def one_off
-            if SCR.get_arg("-api-key")
-              key    = SCR.get_arg("-api-key", with_param: true)
-              enviro = SCR.get_arg("-enviro") ? SCR.get_arg("-enviro", with_param: true) : "live"
-              host   = "#{enviro}.ecoportal.com"
-              org    = SCR.get_arg("-org")    ? SCR.get_arg("-org", with_param: true) : raise("You should specify -org NAME when using -api-key")
-              org    = org.downcase.split(/[^a-z]+/).join("_")
-              org    = org.to_sym
-              add(org, key: key, host: host)
-              return org
-            end
-          end
-
           def active_api
             self["active-api"]
           end
@@ -96,6 +82,86 @@ module Eco
             self["user_key"]
           end
 
+          # Method to support CLI one-off API requests
+          def one_off
+            if one_off?
+              add(one_off_org, key: one_off_key, host: "#{one_off_enviro}.ecoportal.com")
+              return one_off_org
+            end
+          end
+
+          private
+
+          def one_off?
+            @is_one_off ||= SCR.get_arg("-api-key") || SCR.get_arg("-one-off")
+          end
+
+          def one_off_key
+            return @one_off_key if instance_variable_defined?(:@one_off_key)
+            if one_off?
+              Dotenv.load("./.env_one_off")
+              SCR.get_arg("-api-key", with_param: true).yield_self do |key|
+                 one_off_key_env(key)
+              end
+            end
+          end
+
+          def one_off_key_env(key)
+            if one_off?
+              if key
+                env_file_set_var("./.env_one_off", one_off_key_env_var, key)
+                key
+              else
+                Dotenv.load("./.env_one_off")
+                ENV[one_off_key_env_var].tap do |k|
+                  raise "At least the first time, you should provide the -api-key" unless k
+                end
+              end
+            end
+          end
+
+          def one_off_key_env_var
+            @one_off_key_env_var ||= "#{one_off_org}_KEY"
+          end
+
+          def one_off_org
+            return @one_off_org if instance_variable_defined?(:@one_off_org)
+            unless org = SCR.get_arg("-org", with_param: true)
+              raise("You should specify -org NAME when using -api-key or -one-off")
+            end
+            @one_off_org  ||= "#{org.downcase.split(/[^a-z]+/).join("_")}_#{one_off_enviro.gsub(".", "_")}".to_sym
+          end
+
+          def one_off_enviro
+            return @one_off_enviro if instance_variable_defined?(:@one_off_enviro)
+            enviro = SCR.get_arg("-enviro") ? SCR.get_arg("-enviro", with_param: true) : "live"
+            @one_off_enviro ||= enviro.downcase
+          end
+
+          def env_file_set_var(file, var, value)
+            begin
+              pattern = /"#{var}=(?<value>[^ \r\n]+)"/
+              File.open(file, "w+") do |fd|
+                found = false
+                fd.each_line do |line|
+                  if match = line.match(pattern)
+                    found = true
+                    #  IO::SEEK_CUR => Seeks to _amount_ plus current position
+                    fd.seek(-(line.length + 1), IO::SEEK_CUR)
+                    fd.write line.gsub(match[:value], value)
+                  end
+                end
+
+                fd << "#{var}=#{value}" unless found
+              end
+            rescue StandardError => e
+              puts "#{e}"
+              return false
+            end
+            return true
+          end
+
+
         end
       end
     end

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

@@ -106,10 +106,10 @@ class Eco::API::UseCases::DefaultCases::AbstractPolicyGroupAbilities < Eco::API:
 
     # Scope Relevant Raw Data
     case
-    when sp >= 80
+    when sp >= 3 # >= 80
       sing
-    when sp < 15
-      mult
+    #when sp < 15
+    #  mult
     else # combine
       all_abilities = sing[:abilities].keys | mult[:abilities].keys
       data = {count: sing[:count] + mult[:count], abilities: {}}

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

@@ -6,11 +6,15 @@ ASSETS.cli.config do |config|
 
     # default rescue
     wf.rescue do |exception, io|
-      next io if rescued
-      rescued = true
-
-      io.session.logger.debug(exception.patch_full_message)
-      wf.run(:close, io: io)
+      begin
+        next io if rescued
+        rescued = true
+
+        io.session.logger.debug(exception.patch_full_message)
+        wf.run(:close, io: io)
+      rescue Exception => e
+        puts "Some problem in workflow.rescue: #{e}"
+      end
       io
     end
 

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.0.17"
+  VERSION = "2.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.18
 platform: ruby
 authors:
 - Oscar Segura