eco-helpers 2.7.21 → 2.7.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38343450afa850225b6db642c0a34b5cbe506bc2933f0fe163aa565c35b6cc81
-  data.tar.gz: 129c55a6913e11e3b60ee2164707bd23740fe6dc7c85ec9433d9e3ed88556af8
+  metadata.gz: 1d522c29136b4722235f8dbf8349d7328ba7ebe90f77d5fecf15a03a049cc8fe
+  data.tar.gz: b2529b04d22fcc9f013366c07a5bb7905c8d6154af97c4d235fafc1f0bf6452b
 SHA512:
-  metadata.gz: 4e790a691d39c301a013792b1a4f96e91730928071cfcdcf09519643404113dbaf6b0a6b34179ad2620f757b9a9ddce42f6068303bcfb760cc90eb69c66df326
-  data.tar.gz: 55566a7f6f51164991767429473e3de9306c03bb60f66bf715510916c5e4fc1c61d94b5f559b033788874f4ddf25e3acd3feb216f6dd213b48691dab0d6876b7
+  metadata.gz: 822b1359de0c56118ed2e8e564a54c1119a2bb7597373c029cc72e3f808b3fbd94853a8eced013033613f77b0cfb0c47983e4e03e60e928e30bb6084096d9250
+  data.tar.gz: f32a7ad2a927015c1a2a1b0642f379c1014231db7a2aea00187bf690584a738c7f6770ba361422eeecbf097f2b760c6c6ee502b8c6ca5d790354cef13bf58f26

data/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [2.7.23] - 2024-07-xx
+## [2.7.24] - 2024-07-xx
 
 ### Added
 
@@ -10,14 +10,31 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
-## [2.7.22] - 2024-07-16
+## [2.7.23] - 2024-07-29
+
+### Fixed
+
+- Filename and path scoping
+
+## [2.7.22] - 2024-07-26
 
 ### Added
 
-- Ability to skip GraphQL schema fetch (`GRAPHQL_FETCH_SCHEMA`)
+### Changed
+
+- Patch on exception: to show cause
+- `Eco::Common::Session::FileManager`
+  - `load_json` prevent avoidable memory leaks
+  - `save_json` prevent avoidable memory leaks
+
+### Fixed
 
 ## [2.7.21] - 2024-07-13
 
+### Added
+
+- Ability to skip GraphQL schema fetch (`GRAPHQL_FETCH_SCHEMA`)
+
 ### Changed
 
 - `-clean-unknown-tags` case

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

@@ -3,7 +3,6 @@ module Eco
     module Common
       module Session
         class FileManager
-
           include Eco::Data::Files
 
           attr_reader :dir, :dir_path
@@ -11,18 +10,17 @@ module Eco
 
           def initialize(init = {}, enviro: nil)
             @enviro = enviro
-            init = @enviro.config if @enviro && init.empty?
+            init    = @enviro.config if @enviro && init.empty?
+
             @timestamp_pattern = init.files.timestamp_pattern || DEFAULT_TIMESTAMP_PATTERN
-            self.dir_path = init.working_directory || Dir.pwd
+            self.dir_path      = init.working_directory || Dir.pwd
           end
 
           def dir_path=(value)
-            begin
-              @dir = Eco::Data::Files::Directory.new(value)
-              @dir_path = @dir.create
-            rescue Exception => e
-              logger.error("could not create or make any sense of directory '#{value}': #{e.to_s}")
-            end
+            @dir      = Eco::Data::Files::Directory.new(value)
+            @dir_path = @dir.create
+          rescue StandardError => err
+            logger.error("could not create or make any sense of directory '#{value}': #{err}")
           end
 
           def logger
@@ -40,53 +38,93 @@ module Eco
 
           def file_content(filename, mode: nil)
             file = dir.file(filename, should_exist: true)
-            if !file
+
+            unless file
               logger.error("Can't read from file '#{filename}' because it does not exist.")
               return nil
             end
+
             logger.debug("Reading from file '#{file}'")
             mode ? File.read(file, mode: mode) : File.read(file)
           end
 
           def load_json(filename)
-            content = file_content(filename)
-            begin
-              parsed = content && JSON.parse(content)
-            rescue JSON::ParserError => e
-              pp "Parsing error on file #{filename}"
-              raise e
+            file = dir.file(filename, should_exist: true)
+
+            unless file
+              logger.error("Can't read from file '#{filename}' because it does not exist.")
+              return nil
             end
-            return parsed
+
+            fd = File.open(file)
+            JSON.load fd # rubocop:disable Security/JSONLoad
+          rescue JSON::ParserError => e
+            pp "Parsing error on file #{file}"
+            raise e
+          ensure
+            fd&.close
           end
 
           def touch(filename, modifier = :no_stamp, mode: :string)
             save("", filename, modifier, mode: mode)
           end
 
-          def save(content, filename, modifier = :no_stamp, mode: :string)
-            file = dir.file(filename)
-            file = FileManager.timestamp_file(file) if modifier == :timestamp
-            mode = (mode == :binary) ? 'wb' : 'w'
+          def save_json(data, filename, modifier = :no_stamp)
+            return save(data.to_json, filename, modifier) unless data.is_a?(Array)
 
-            FileManager.create_directory(FileManager.file_fullpath(file))
+            file = filename_for(filename, modifier)
+            FileManager.create_directory(
+              FileManager.file_fullpath(file)
+            )
 
             logger.debug("Writting to file '#{file}'")
-            File.open(file, mode) { |fd| fd << content }
-            return file
+
+            mode = mode == :binary ? 'wb' : 'w'
+
+            File.open(file, mode) do |fd|
+              first = true
+
+              fd << '['
+              data.each do |elem|
+                fd << "," unless first
+                first = false
+
+                fd << elem.to_json
+              end
+              fd << ']'
+            end
+
+            file
           end
 
-          def save_json(data, filename, modifier = :no_stamp)
-            return save(data.to_json, filename, modifier)
+          def save(content, filename, modifier = :no_stamp, mode: :string)
+            file = filename_for(filename, modifier)
+            FileManager.create_directory(
+              FileManager.file_fullpath(file)
+            )
+
+            logger.debug("Writting to file '#{file}'")
+
+            mode = mode == :binary ? 'wb' : 'w'
+            File.open(file, mode) { |fd| fd << content }
+            file
           end
 
           # if the file does not exist, it creates it
           def append(content, filename, mode: :string)
             file = dir.file(filename)
-            mode = (mode == :binary) ? 'ab' : 'a'
 
             logger.debug("Appending to file '#{file}'")
-            File.open(file, mode) { |fd| fd << content + "\n" } # '\n' won't add line
-            return file
+
+            mode = mode == :binary ? 'ab' : 'a'
+            File.open(file, mode) { |fd| fd << "#{content}\n" }
+            file
+          end
+
+          def filename_for(filename, modifier = :no_stamp)
+            file = dir.file(filename)
+            file = FileManager.timestamp_file(file) if modifier == :timestamp
+            file
           end
         end
       end

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

@@ -12,6 +12,11 @@ class ::Exception
       msg << "#{" " * 8}#{i + 1}: from #{bt}"
     end
 
+    unless cause.nil?
+      msg << "\nCAUSE:"
+      msg << cause.patch_full_message(trace_count: trace_count)
+    end
+
     msg.join("\n")
   rescue StandardError => e
     puts "Something is wrong with 'patch_full_message': #{e}"

data/lib/eco/data/files/helpers.rb

@@ -54,19 +54,21 @@ module Eco
         end
 
         def file_name(fullname)
+          return nil unless fullname
+
           File.basename(fullname)
         end
 
         def file_basename(fullname)
-          File.basename(fullname, File.extname(fullname))
-        end
+          return nil unless fullname
 
-        def file_path(fullname)
-          File.dirname(fullname)
+          File.basename(fullname, File.extname(fullname))
         end
 
         def file_fullpath(fullname)
-          file_path(File.expand_path(fullname))
+          return nil unless fullname
+
+          File.dirname(File.expand_path(fullname))
         end
 
         def file_exists?(file)

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '2.7.21'.freeze
+  VERSION = '2.7.23'.freeze
 end

metadata

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