avm-eac_ruby_base1 0.39.0 → 0.41.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bfee24e2b105f10cec9124ed52fdaa26d1ed664a9177c3d25440b389aea47552
4
- data.tar.gz: d1d1eb634e24a4bef81ace61663e09bab528ef4bcba2a04cbc20878cf03693c0
3
+ metadata.gz: cc0760a40075e022b6572f704d0f737b5378ce2a7f9d9abcfe143c0049dec2f7
4
+ data.tar.gz: a600be8a5cb7fc810e3810265f9ce8adf1fd15681787a2462ee784293e1e9120
5
5
  SHA512:
6
- metadata.gz: 4305305c2b4d9657defe86cf7dbe1fe0af5e181e635f457da8b26259df0a71c4376ab9ed1f048e0604825fdd37b48466c2506aa2cfd99bfeb8781d1aae554679
7
- data.tar.gz: 1b4a5416d32efc7c3ed5db34d09a414728c2e5dd924b9b53b07f9b520501d30ce0e36388b39cdd131ccb5786c325764f2c62f360e0a133624ca526821b603b6c
6
+ metadata.gz: 904c77984a6f1b39fea07a3dbf80e4a4dc3203f3837a8b4128ce3028bdc0da92893d35b2779bdf7fe8326d0cbcb54361cfc3631876fbf532b2de1bc30c10c92b
7
+ data.tar.gz: 211771153321a5860820d3942e68c5e9891728847b4b5c5e4211e482d3e65d79dc7186bde763caba216b15fb96a51c692a24ee1f72bc36de506467184c6a0982
@@ -26,8 +26,8 @@ module Avm
26
26
  result_from_patterns(LIBRARY_PATTERNS) { |m| m[1].camelize }
27
27
  end
28
28
 
29
- def result_from_patterns(patterns, &block)
30
- file_format.result_from_patterns(patterns, path, &block)
29
+ def result_from_patterns(patterns, &)
30
+ file_format.result_from_patterns(patterns, path, &)
31
31
  end
32
32
 
33
33
  def result_from_spec
@@ -4,7 +4,7 @@ module Avm
4
4
  module EacRubyBase1
5
5
  module Instances
6
6
  module Mixin
7
- DEFAULT_RUBY_VERSION = '2.7.7'
7
+ DEFAULT_RUBY_VERSION = '3.2.9'
8
8
  RUBY_VERSION_KEY = 'ruby.version'
9
9
 
10
10
  class << self
@@ -98,8 +98,8 @@ module Avm
98
98
  end
99
99
  end
100
100
 
101
- def on_clean_ruby(&block)
102
- on_clear_envvars('BUNDLE', 'RUBY', &block)
101
+ def on_clean_ruby(&)
102
+ on_clear_envvars('BUNDLE', 'RUBY', &)
103
103
  end
104
104
 
105
105
  def on_clear_envvars(*start_with_vars)
@@ -18,8 +18,8 @@ module Avm
18
18
 
19
19
  private
20
20
 
21
- def cmd(*args)
22
- ::EacRubyUtils::Envs.local.command(*args)
21
+ def cmd(*)
22
+ ::EacRubyUtils::Envs.local.command(*)
23
23
  end
24
24
 
25
25
  def rubocop_command_uncached
@@ -36,6 +36,8 @@ module Avm
36
36
 
37
37
  def rubocop_version_uncached
38
38
  ::EacRubyUtils::Ruby.on_clean_environment do
39
+ rubocop_command.append(['--ignore-parent-exclusion', '--version']).execute!.strip
40
+ rescue EacRubyUtils::Envs::ExecutionError
39
41
  rubocop_command.append(['--version']).execute!.strip
40
42
  end
41
43
  end
@@ -6,7 +6,7 @@ module Avm
6
6
  class VersionFile
7
7
  common_constructor :path
8
8
 
9
- VERSION_LINE_PATTERN = /\A(\s*)VERSION\s*=\s*['"]([^'"]+)['"](\s*)\z/.freeze
9
+ VERSION_LINE_PATTERN = /\A(\s*)VERSION\s*=\s*['"]([^'"]+)['"](\s*)\z/
10
10
 
11
11
  def value
12
12
  return nil unless path.file?
@@ -5,6 +5,9 @@ module Avm
5
5
  module SourceGenerators
6
6
  class Base < ::Avm::SourceGenerators::Base
7
7
  module Gemspec
8
+ GEMSPEC_TAB = ' '
9
+ GEMSPEC_NEWLINE_TAB = "\n#{GEMSPEC_TAB * 6}".freeze
10
+
8
11
  # @return [String]
9
12
  def gemspec_extra
10
13
  gemspec_extra_lines.map { |line| "\n#{IDENT}#{line}" }.join
@@ -17,13 +20,10 @@ module Avm
17
20
 
18
21
  # @return [String]
19
22
  def gemspec_files_value
20
- "Dir[#{gemspec_files_paths.map { |path| "'#{path}'" }.join(', ')}]"
21
- end
22
-
23
- # @return [Array<String>]
24
- def gemspec_files_paths
25
- ["{#{gemspec_files_directory_paths.sort.join(',')}}/**/*"] +
26
- gemspec_files_file_paths.sort
23
+ (
24
+ gemspec_files_directory_paths_to_string_array +
25
+ gemspec_files_file_paths_to_string_array
26
+ ).join(" +#{GEMSPEC_NEWLINE_TAB}")
27
27
  end
28
28
 
29
29
  # @return [Array<String>]
@@ -50,6 +50,27 @@ module Avm
50
50
 
51
51
  protected
52
52
 
53
+ # @return [Enumerable<String>]
54
+ def gemspec_files_directory_paths_to_string_array
55
+ gemspec_files_directory_paths.then do |v|
56
+ next [] unless v.any?
57
+
58
+ ["Dir.glob('{#{v.sort.join(',')}}/**/*', File::FNM_DOTMATCH)" \
59
+ "#{GEMSPEC_NEWLINE_TAB}#{GEMSPEC_TAB}" \
60
+ ".reject { |f| ['.', '..'].include?(File.basename(f)) }"]
61
+ end
62
+ end
63
+
64
+ # @return [Enumerable<String>]
65
+ def gemspec_files_file_paths_to_string_array
66
+ gemspec_files_file_paths.then do |y|
67
+ next [] unless y.any?
68
+
69
+ r = y.sort.map { |e| "'#{e}'" }.join(', ')
70
+ ["[#{r}]"]
71
+ end
72
+ end
73
+
53
74
  def generate_gemspec
54
75
  template_apply('gemspec', "#{name}.gemspec")
55
76
  end
@@ -9,6 +9,12 @@ module Avm
9
9
  lib_path.camelize
10
10
  end
11
11
 
12
+ # @return [String]
13
+ def root_module_after_close
14
+ s = root_module_requires.map { |e| "require '#{e}'\n" }.join
15
+ s.present? ? "\n#{s}" : ''
16
+ end
17
+
12
18
  def root_module_close
13
19
  root_module_components.count.times.map do |index|
14
20
  "#{IDENT * index}end"
@@ -28,6 +34,11 @@ module Avm
28
34
  def root_module_components
29
35
  root_module.split('::')
30
36
  end
37
+
38
+ # @return [Enumerable<String>]
39
+ def root_module_requires
40
+ []
41
+ end
31
42
  end
32
43
  end
33
44
  end
@@ -11,10 +11,10 @@ module Avm
11
11
  end
12
12
 
13
13
  # @return [Avm::EacRubyBase1::Sources::Base::BundleCommand]
14
- def rake(*args)
14
+ def rake(*)
15
15
  raise "File \"#{rakefile_path}\" does not exist" unless rakefile_path.exist?
16
16
 
17
- bundle('exec', 'rake', '--rakefile', rakefile_path, *args)
17
+ bundle('exec', 'rake', '--rakefile', rakefile_path, *)
18
18
  end
19
19
 
20
20
  # @return [Pathname]
@@ -4,6 +4,8 @@ module Avm
4
4
  module EacRubyBase1
5
5
  module Sources
6
6
  class NamespaceReplacer
7
+ TAB = ' '
8
+
7
9
  common_constructor :from, :to
8
10
 
9
11
  def concat_regex(regexes)
@@ -31,24 +33,33 @@ module Avm
31
33
  "\n\n#{to_open}\\1#{to_close}"
32
34
  end
33
35
 
36
+ # @return [String]
34
37
  def to_open
35
38
  s = ''
36
39
  to.split('::').each_with_index do |part, index|
37
- s += (' ' * index) + "module #{part}\n"
40
+ s += tab(index) + "module #{part}\n"
38
41
  end
39
42
  s
40
43
  end
41
44
 
45
+ # @return [String]
42
46
  def to_close
43
47
  parts = to.split('::')
44
48
  s = ''
45
49
  parts.each_with_index do |_part, index|
46
50
  tabc = (parts.count - 1 - index)
47
- tabc -= 1 if index.zero?
48
- s += "#{' ' * tabc}end\n"
51
+ s += "#{tab(tabc)}end\n"
49
52
  end
50
53
  s
51
54
  end
55
+
56
+ protected
57
+
58
+ # @param count [Integer]
59
+ # @return [String]
60
+ def tab(count)
61
+ TAB * count
62
+ end
52
63
  end
53
64
  end
54
65
  end
@@ -56,8 +56,8 @@ module Avm
56
56
  'Gemfile.lock'
57
57
  end
58
58
 
59
- def bundle_run(*args)
60
- instance.bundle(*args).system!
59
+ def bundle_run(*)
60
+ instance.bundle(*).system!
61
61
  end
62
62
 
63
63
  def conflict?
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRubyBase1
5
- VERSION = '0.39.0'
5
+ VERSION = '0.41.0'
6
6
  end
7
7
  end
@@ -5,3 +5,4 @@ EacRubyUtils::RootModuleSetup.perform __FILE__
5
5
 
6
6
  %%ROOT_MODULE_OPEN%%
7
7
  %%ROOT_MODULE_CLOSE%%
8
+ %%ROOT_MODULE_AFTER_CLOSE%%
@@ -0,0 +1,2 @@
1
+ /Gemfile.local
2
+ /Gemfile.lock
@@ -0,0 +1 @@
1
+ --require spec_helper
@@ -0,0 +1,3 @@
1
+ ---
2
+ inherit_gem:
3
+ eac_ruby_gem_support: ".rubocop.yml"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: avm-eac_ruby_base1
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.39.0
4
+ version: 0.41.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Put here the authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2026-02-10 00:00:00.000000000 Z
11
+ date: 2026-05-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aranha-parsers
@@ -16,40 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.26'
20
- - - ">="
21
- - !ruby/object:Gem::Version
22
- version: 0.26.2
19
+ version: '0.27'
23
20
  type: :runtime
24
21
  prerelease: false
25
22
  version_requirements: !ruby/object:Gem::Requirement
26
23
  requirements:
27
24
  - - "~>"
28
25
  - !ruby/object:Gem::Version
29
- version: '0.26'
30
- - - ">="
31
- - !ruby/object:Gem::Version
32
- version: 0.26.2
26
+ version: '0.27'
33
27
  - !ruby/object:Gem::Dependency
34
28
  name: avm
35
29
  requirement: !ruby/object:Gem::Requirement
36
30
  requirements:
37
31
  - - "~>"
38
32
  - !ruby/object:Gem::Version
39
- version: '0.98'
40
- - - ">="
41
- - !ruby/object:Gem::Version
42
- version: 0.98.4
33
+ version: '0.100'
43
34
  type: :runtime
44
35
  prerelease: false
45
36
  version_requirements: !ruby/object:Gem::Requirement
46
37
  requirements:
47
38
  - - "~>"
48
39
  - !ruby/object:Gem::Version
49
- version: '0.98'
50
- - - ">="
51
- - !ruby/object:Gem::Version
52
- version: 0.98.4
40
+ version: '0.100'
53
41
  - !ruby/object:Gem::Dependency
54
42
  name: avm-eac_generic_base0
55
43
  requirement: !ruby/object:Gem::Requirement
@@ -96,34 +84,28 @@ dependencies:
96
84
  requirements:
97
85
  - - "~>"
98
86
  - !ruby/object:Gem::Version
99
- version: '0.129'
87
+ version: '0.131'
100
88
  type: :runtime
101
89
  prerelease: false
102
90
  version_requirements: !ruby/object:Gem::Requirement
103
91
  requirements:
104
92
  - - "~>"
105
93
  - !ruby/object:Gem::Version
106
- version: '0.129'
94
+ version: '0.131'
107
95
  - !ruby/object:Gem::Dependency
108
96
  name: eac_ruby_gem_support
109
97
  requirement: !ruby/object:Gem::Requirement
110
98
  requirements:
111
99
  - - "~>"
112
100
  - !ruby/object:Gem::Version
113
- version: '0.12'
114
- - - ">="
115
- - !ruby/object:Gem::Version
116
- version: 0.12.1
101
+ version: '0.13'
117
102
  type: :development
118
103
  prerelease: false
119
104
  version_requirements: !ruby/object:Gem::Requirement
120
105
  requirements:
121
106
  - - "~>"
122
107
  - !ruby/object:Gem::Version
123
- version: '0.12'
124
- - - ">="
125
- - !ruby/object:Gem::Version
126
- version: 0.12.1
108
+ version: '0.13'
127
109
  description:
128
110
  email:
129
111
  executables: []
@@ -216,6 +198,9 @@ files:
216
198
  - locale/pt-BR.yml
217
199
  - template/avm/eac_ruby_base1/source_generators/base/gemspec.template
218
200
  - template/avm/eac_ruby_base1/source_generators/base/root_lib.template
201
+ - template/avm/eac_ruby_base1/source_generators/base/static/.gitignore
202
+ - template/avm/eac_ruby_base1/source_generators/base/static/.rspec
203
+ - template/avm/eac_ruby_base1/source_generators/base/static/.rubocop.yml
219
204
  - template/avm/eac_ruby_base1/source_generators/base/static/Gemfile
220
205
  - template/avm/eac_ruby_base1/source_generators/base/static/spec/meta/rubocop_spec.rb
221
206
  - template/avm/eac_ruby_base1/source_generators/base/static/spec/spec_helper.rb.template
@@ -231,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
231
216
  requirements:
232
217
  - - ">="
233
218
  - !ruby/object:Gem::Version
234
- version: '2.7'
219
+ version: '3.2'
235
220
  required_rubygems_version: !ruby/object:Gem::Requirement
236
221
  requirements:
237
222
  - - ">="