eco-rake 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a95738d0726a071fd9302ea5644ae019f0417577e0b9df2debf9d8e1c06b94f
-  data.tar.gz: eb1655d1f8cbc09ca84bc22be350170b122958a37bbbb70a969f038ee5e2afee
+  metadata.gz: 628181cc7bb3f65177780f0ce04dba3e16ce33256bd708c1619a214699622fc5
+  data.tar.gz: d70cadf71bcc60f3578993ef16d10300f938bce65ae325faf2e3a9ae86e82c23
 SHA512:
-  metadata.gz: 6cb03e0ca5be560bd0e579851eb4476175e56eff2db1c37f41d2f9b07dfd536284c9cce1bf9ab06ff5b9a70d3f4ad3083f6b8ba81b7cfe0d764f00a7317dd23b
-  data.tar.gz: 85c9dda526770a38a72512a593e4d883895056a06073a79fb9f7bd3a4176fada22b98da712636f13ec3f95e5b1d07e47e00b0bce0f713b3eb33631944473a84c
+  metadata.gz: 46504cb702b95c53a542a93cb749951a31093cdd7191f6364c100e58f70c62646448b3341cd4a87c979b4c4c15f2ab2d926f28852191fe92d32ed76e99694ccf
+  data.tar.gz: dc9bb1377d36e0bcca062d85cfe90305167771210095563b3fe122a52a06f1d57153cf4d2723b61ec18e9e285add8915f297ca6cc0b1f3253a344d7f871060bc

data/.markdownlint.json

@@ -0,0 +1,4 @@
+{
+  "MD013": false,
+  "MD024": false
+}

data/.rubocop.yml

@@ -1,90 +1,93 @@
 AllCops:
-  TargetRubyVersion: 2.7.2
-  Exclude:
-    - 'config/routes.rb'
+  TargetRubyVersion: 3.2.2
+  NewCops: enable
 
-Naming/VariableNumber:
-  EnforcedStyle: snake_case
-Naming/FileName:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-Metrics/BlockLength:
-  ExcludedMethods: [context, describe]
-  Max: 50
-Metrics/MethodLength:
-  Max: 50
 Metrics/ClassLength:
-  Max: 200
+  Max: 500
 Metrics/ModuleLength:
-  Max: 200
+  Max: 300
+Metrics/MethodLength:
+  Max: 50
 Metrics/AbcSize:
+  Max: 30
+Metrics/ParameterLists:
+  Max: 5
+  CountKeywordArgs: false
+Metrics/BlockLength:
+  CountAsOne: ['array', 'heredoc', 'method_call']
   Max: 50
-  Exclude:
-    - 'lib/eco-rake/base/method_helpers.rb'
 Metrics/CyclomaticComplexity:
-  Max: 10
-  Exclude:
-    - 'lib/eco-rake/base/method_helpers.rb'
+  Max: 30
 Metrics/PerceivedComplexity:
-  Max: 10
-  Exclude:
-    - 'lib/eco-rake/base/method_helpers.rb'
+  Max: 30
 
-ParameterLists:
-  Max: 5
-  CountKeywordArgs: false
-
-Style/Alias:
-  EnforcedStyle: prefer_alias_method
-Style/StringLiterals:
+Style/AccessorGrouping:
   Enabled: false
-Style/FrozenStringLiteralComment:
+Style/ConditionalAssignment:
   Enabled: false
-Style/CommentedKeyword:
+Style/BlockDelimiters:
+  BracesRequiredMethods: ['log']
+  AllowedPatterns: ['proc', 'new']
+Style/ClassAndModuleChildren:
   Enabled: false
-Style/MultilineBlockChain:
+Style/FrozenStringLiteralComment:
   Enabled: false
-Style/Documentation:
+Style/StringLiterals:
   Enabled: false
 Style/StringLiteralsInInterpolation:
   Enabled: false
-Style/AndOr:
+Style/Documentation:
   Enabled: false
-Style/SlicingWithRange:
+Style/CommentedKeyword:
   Enabled: false
-Style/ClassAndModuleChildren:
+Style/MultilineBlockChain:
   Enabled: false
-Style/OptionalBooleanParameter:
+Style/AndOr:
+  Enabled: false
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+Style/FetchEnvVar:
   Enabled: false
+Style/RegexpLiteral:
+  EnforcedStyle: mixed
+  AllowInnerSlashes: true
 
 Layout/HashAlignment:
   EnforcedColonStyle: table
-Layout/ArgumentAlignment:
-  EnforcedStyle: with_fixed_indentation
+  EnforcedHashRocketStyle: table
+Layout/LeadingCommentSpace:
+  Enabled: false
+  AllowGemfileRubyComment: true
+Layout/ParameterAlignment:
+  Enabled: false
+Layout/MultilineMethodDefinitionBraceLayout:
+  EnforcedStyle: symmetrical
+Layout/LineLength:
+  Enabled: true
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: false
+Layout/SpaceInsideBlockBraces:
+  Enabled: false
+Layout/SpaceAroundOperators:
+  Enabled: false
 Layout/ExtraSpacing:
   AllowForAlignment: true
+  AllowBeforeTrailingComments: true
 Layout/AccessModifierIndentation:
   EnforcedStyle: indent
 Layout/DotPosition:
   EnforcedStyle: trailing
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: false
-Layout/SpaceInsideBlockBraces:
-  Enabled: false
-Layout/SpaceAroundOperators:
-  Enabled: false
 Layout/FirstHashElementIndentation:
   Enabled: false
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
-Layout/LeadingCommentSpace:
-  Enabled: false
 
-Lint/AssignmentInCondition:
-  Enabled: false
-Lint/UnderscorePrefixedVariableName:
+Naming/VariableNumber:
+  EnforcedStyle: snake_case
+  CheckSymbols: false
+Naming/MethodParameterName:
+  AllowedNames: ['x', 'y', 'i', 'j', 'id', 'io', 'to']
+Naming/RescuedExceptionsVariableName:
   Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+3.2.2

data/CHANGELOG.md

@@ -1,32 +1,52 @@
 # Change Log
+
 All notable changes to this project will be documented in this file.
 
-## [0.1.6] - 2024-02-xx
+## [0.2.1] - 2024-08-xx
 
 ### Added
+
 ### Fixed
+
 ### Changed
 
-## [0.1.5] - 2024-02-xx
+## [0.2.0] - 2024-08-01
 
-### Added
-  - new options for file pattern const and remote subfolder for the SFTP task
+### Changed
+
+- require `ruby 3`
+
+## [0.1.6] - 2024-02-03
 
 ### Fixed
 
+- Compatibility with `ruby 3`
+  - call to `super` with no args where method on parent class doesn't match parameters.
+
 ### Changed
 
+- upgrade dependencies
+
+## [0.1.5] - 2024-02-01
+
+### Added
+
+- new options for file pattern const and remote subfolder for the SFTP task
+
 ## [0.1.4] - 2023-07-23
 
 ### Fixed
-  - Type in `EcoRake::Utils::Mailing#email`
+
+- Type in `EcoRake::Utils::Mailing#email`
 
 ## [0.1.2] - 2023-06-09
 
 ### Changed
-  - Notify when file decryption fails
+
+- Notify when file decryption fails
 
 ## [0.1.1] - 2023-06-06
 
 ### Added
-  - Very first version, with support to migrate all the rake integrations.
+
+- Very first version, with support to migrate all the rake integrations.

data/README.md

@@ -1,6 +1,6 @@
 # EcoRake
 
-A set of helpers to build re-usable `rake` integration helpers. 
+A set of helpers to build re-usable `rake` integration helpers.
 
 ## Installation
 
@@ -18,8 +18,9 @@ Or install it yourself as:
 
     $ gem install eco-rake
 
-## Usage
+## Changelog
 
+See {file:CHANGELOG.md} for a list of changes.
 
 ## Development
 

data/eco-rake.gemspec

@@ -19,16 +19,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.7.2'
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
+  spec.required_ruby_version = '>= 3.2.2'
 
-  spec.add_development_dependency "bundler",   ">= 2.4.9",  "< 3"
   spec.add_development_dependency "rake",      ">= 13.0.6", "< 14"
-  spec.add_development_dependency "redcarpet", ">= 3.6.0",  "< 4"
   spec.add_development_dependency "rspec",     ">= 3.10.0", "< 4"
   spec.add_development_dependency "yard",      ">= 0.9.34", "< 1"
+  spec.add_development_dependency "redcarpet", ">= 3.6.0",  "< 4"
 
-  #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',  '< 3'
-  spec.add_dependency 'rake-commander', '>= 0.3.6', "< 0.4"
+  #spec.add_dependency 'aws-sdk-s3',    '>= 1.142.0', '< 2'
+  spec.add_dependency 'aws-sdk-ses',    '~> 1', '>= 1.58.0'
+  spec.add_dependency 'dotenv',         '~> 3'
+  spec.add_dependency 'rake-commander', '~> 0.4'
 end

data/lib/eco-rake/lib/files/decrypt.rb

@@ -16,10 +16,10 @@ class EcoRake
           target_files.each do |file|
             delete_file(gpg_to_csv_filename(file))
             stat   = sh_continue(decrypt_command(file, ignore_mdc_error: ignore_mdc_error))
-            status = stat unless stat == 0
+            status = stat unless stat.zero?
           end
           delete_file(*target_files, message: "Deleting files from '#{source_folder}'") unless options[:simulate]
-          exit status unless status == 0
+          exit status unless status.zero?
         end
 
         def display_target_files

data/lib/eco-rake/lib/files/sftp.rb

@@ -39,7 +39,7 @@ class EcoRake
           cmd  = [base_command]
           cmd << forward_option(:folder)
           cmd << forward_options(:list, :get_last, :get, :archive).compact.first || '-list'
-          cmd.push(*forward_options(:remote_subfolder, :file_pattern).compact)
+          cmd.push(*forward_options(:remote_subfolder, :file_pattern))
           cmd << '-no-people'
           cmd = yield(cmd) if block_given?
           string_cmd(*cmd)

data/lib/eco-rake/lib/people/sync_options.rb

@@ -9,7 +9,6 @@ class EcoRake
         option '-o', '--only-stats', TrueClass, desc: 'To display only stats in the feedback'
         option '-b', '--no-policy', FalseClass, desc: 'To skip the batch policy'
         option '-n', '--no-get', FalseClass, desc: 'Skip get people step'
-        option '-p', '--file-pattern', TrueClass, desc: "Specifies the target file pattern (can use a const)"
       end
     end
   end

data/lib/eco-rake/lib/people/sync_process.rb

@@ -18,9 +18,8 @@ class EcoRake
         def task(*_args)
           upsert_local_dir(options[:folder])
           sh_continue pull_file
-          if do_decrypt
-            failed_decryption_notify unless 0 == sh_continue(rake_decrypt)
-          end
+          failed_decryption_notify if do_decrypt && !sh_continue(rake_decrypt).zero?
+
           sh_continue rake_sync_command
           return if options[:simulate]
           sh_continue rake_sftp_archive if pull_driver == 'sftp'

data/lib/eco-rake/lib/people/sync_rely.rb

@@ -38,7 +38,7 @@ class EcoRake
         def namespaced_task(task_name = target_task)
           ns             = self.class.namespace || ''
           ns_with_enviro = ns.split(':').any? {|s| s == options[:enviro]}
-          ns = ns_with_enviro ? ns : "#{ns}:#{options[:enviro]}"
+          ns             = "#{ns}:#{options[:enviro]}" unless ns_with_enviro
           "#{ns}:#{task_name || self.class.task}"
         end
       end

data/lib/eco-rake/option/mirror.rb

@@ -13,7 +13,7 @@ class EcoRake
         raise ArgumentError, msg if missing && argument_required? && raise
         return nil               if missing && argument_required?
 
-        value = value == :not_used ? default : value
+        value = default if value == :not_used
         "#{opt} \"#{value}\""
       end
 
@@ -22,12 +22,12 @@ class EcoRake
       # Implements the mirror of Boolean options/switches.
       def boolean_mirror(value = :not_used)
         opt = name_hyphened
-        puts "boolean_mirror (#{value}): #{opt}" if name == :no_get
+        # puts "boolean_mirror (#{value}): #{opt}" if name == :no_get
 
         return nil unless [TrueClass, NilClass, FalseClass].any? {|klass| type_coercion == klass}
         enabled_value = !boolean_name? || [TrueClass, NilClass].any? {|klass| type_coercion == klass}
-        return opt              if value == enabled_value
-        return name_false_hypen if boolean_name? && value == !enabled_value
+        return opt       if value == enabled_value
+        name_false_hypen if boolean_name? && value == !enabled_value
       end
     end
   end

data/lib/eco-rake/options/parental.rb

@@ -11,7 +11,7 @@ class EcoRake
       module ClassMethods
         private
 
-        def add_to_options(opt, *args)
+        def add_to_options(opt, **kargs)
           super.tap do |out|
             next unless opt.respond_to?(:parent=)
             opt.parent = self if opt == out

data/lib/eco-rake/shell/gpg.rb

@@ -44,7 +44,8 @@ class EcoRake
       # @return [Boolean]
       def gpg_version_gte?(major:, minor:)
         result = shell_gpg_version
-        return false unless match = result.match(GPG_VERSION_REGEX)
+        return false unless (match = result.match(GPG_VERSION_REGEX))
+
         maj = match[:maj].to_i
         min = match[:min].to_i
         (maj >= major) && (min >= minor)

data/lib/eco-rake/version.rb

@@ -1,5 +1,5 @@
 require 'rake-commander'
 
 class EcoRake < RakeCommander
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: eco-rake
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Oscar Segura Samper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-31 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.9
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.9
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -51,12 +31,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '14'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.10.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -66,108 +46,96 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.10.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 0.9.34
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 0.9.34
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.34
+        version: 3.6.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.34
+        version: 3.6.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ses
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.36.0
-    - - "<"
+        version: '1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.58.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.36.0
-    - - "<"
+        version: '1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.58.0
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: rake-commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 description:
@@ -179,8 +147,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".markdownlint.json"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -248,7 +218,8 @@ files:
 homepage: https://www.ecoportal.com
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -257,14 +228,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.2
+      version: 3.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: A set of helpers to build re-usable `rake` integration helpers.