eac_tools 0.95.0 → 0.96.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a124b9d5d4a885d3d505b8fc99ece9ff1efc29abdef44b0b26eafff061b5b744
4
- data.tar.gz: b3ec5c4b38557617a6b83f72315bd7a9ef37a528694d05928cb7f778bedaa6ec
3
+ metadata.gz: 194395a1e093f372c5c1cc9d839494745705412fb56e662256a51b22da74d0da
4
+ data.tar.gz: fcd99ef1c6da1fff0822f3d9f4a1665bb4624bd0e18f2428797654c1c38ed4c5
5
5
  SHA512:
6
- metadata.gz: 76bc38b3f70c766bf0cf236518c897e0fe25fe53c6a0e80b5a020c013e5a1ee68ab722c620356ba16b308f648e71c56a330554bc35d883249a0ee0e763288d69
7
- data.tar.gz: 61abdd5b8b306e7218164a2e008cb9d5be0915471fd8d1c6fa40860d9c8659f4f5875b337d7080ec47b0763ee05ef38ac24cf584424322d1b225e8bb3fcda85d
6
+ metadata.gz: aef95411c2e9650c6512a966bf0b3256149195966afc08b9654e09a617450314d01976656ac5fa91f3bf1e79eac75a32977ff3ebb1d127f1b0f5f3072d140f53
7
+ data.tar.gz: a603b730da95fc9dbb7c5fcd9d29d82552823ed2eb970492b8d1eb5d4ce643713a6186634a643cef03e3b2111661f99f13dc0864013efbaa42a6b7fc269335f1
data/Gemfile.lock CHANGED
@@ -1,9 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- eac_tools (0.95.0)
4
+ eac_tools (0.96.1)
5
5
  avm (~> 0.94)
6
- avm-eac_asciidoctor_base0 (~> 0.23)
6
+ avm-eac_asciidoctor_base0 (~> 0.24)
7
7
  avm-eac_generic_base0 (~> 0.13)
8
8
  avm-eac_github_base0 (~> 0.3)
9
9
  avm-eac_gitlab_base0 (~> 0.4)
@@ -16,22 +16,20 @@ PATH
16
16
  avm-eac_redmine_base0 (~> 0.22, >= 0.22.3)
17
17
  avm-eac_redmine_plugin_base0 (~> 0.4, >= 0.4.1)
18
18
  avm-eac_ruby_base0 (~> 0.1)
19
- avm-eac_ruby_base1 (~> 0.35)
19
+ avm-eac_ruby_base1 (~> 0.35, >= 0.35.1)
20
20
  avm-eac_webapp_base0 (~> 0.20, >= 0.20.1)
21
21
  avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
22
22
  avm-git (~> 0.18)
23
23
  avm-tools (~> 0.162)
24
- eac_ruby_gem_support (~> 0.10)
25
24
  eac_ruby_utils (~> 0.122)
26
25
 
27
26
  PATH
28
27
  remote: sub/avm-eac_ruby_base1
29
28
  specs:
30
- avm-eac_ruby_base1 (0.35.0)
29
+ avm-eac_ruby_base1 (0.35.1)
31
30
  avm (~> 0.94)
32
31
  avm-eac_generic_base0 (~> 0.13)
33
32
  eac_envs-http (~> 0.5, >= 0.5.1)
34
- eac_ruby_gem_support (~> 0.10)
35
33
  eac_ruby_utils (~> 0.122)
36
34
 
37
35
  GEM
@@ -56,10 +54,12 @@ GEM
56
54
  eac_templates (~> 0.7, >= 0.7.1)
57
55
  minitar (~> 0.9)
58
56
  ruby-progressbar (~> 1.13)
59
- avm-eac_asciidoctor_base0 (0.23.0)
60
- asciidoctor (~> 2.0, >= 2.0.22)
61
- avm-eac_webapp_base0 (~> 0.19)
62
- eac_ruby_utils (~> 0.121)
57
+ avm-eac_asciidoctor_base0 (0.24.0)
58
+ asciidoctor (~> 2.0, >= 2.0.23)
59
+ avm-eac_webapp_base0 (~> 0.20, >= 0.20.1)
60
+ eac_fs (~> 0.18)
61
+ eac_ruby_gem_support (~> 0.10)
62
+ eac_ruby_utils (~> 0.122)
63
63
  os (~> 1.1, >= 1.1.4)
64
64
  rouge (~> 3.30)
65
65
  avm-eac_generic_base0 (0.13.0)
@@ -219,7 +219,7 @@ GEM
219
219
  addressable (~> 2.8)
220
220
  rchardet (~> 1.8)
221
221
  htmlbeautifier (1.4.3)
222
- i18n (1.14.5)
222
+ i18n (1.14.6)
223
223
  concurrent-ruby (~> 1.0)
224
224
  json (2.7.2)
225
225
  language_server-protocol (3.17.0.3)
@@ -230,7 +230,7 @@ GEM
230
230
  os (1.1.4)
231
231
  parallel (1.26.3)
232
232
  parseconfig (1.1.2)
233
- parser (3.3.4.2)
233
+ parser (3.3.5.0)
234
234
  ast (~> 2.4.1)
235
235
  racc
236
236
  parslet (2.0.0)
@@ -242,43 +242,40 @@ GEM
242
242
  rainbow (3.1.1)
243
243
  rchardet (1.8.0)
244
244
  regexp_parser (2.9.2)
245
- rexml (3.3.6)
246
- strscan
247
245
  rouge (3.30.0)
248
246
  rspec (3.13.0)
249
247
  rspec-core (~> 3.13.0)
250
248
  rspec-expectations (~> 3.13.0)
251
249
  rspec-mocks (~> 3.13.0)
252
- rspec-core (3.13.0)
250
+ rspec-core (3.13.1)
253
251
  rspec-support (~> 3.13.0)
254
- rspec-expectations (3.13.2)
252
+ rspec-expectations (3.13.3)
255
253
  diff-lcs (>= 1.2.0, < 2.0)
256
254
  rspec-support (~> 3.13.0)
257
255
  rspec-mocks (3.13.1)
258
256
  diff-lcs (>= 1.2.0, < 2.0)
259
257
  rspec-support (~> 3.13.0)
260
258
  rspec-support (3.13.1)
261
- rubocop (1.65.1)
259
+ rubocop (1.66.1)
262
260
  json (~> 2.3)
263
261
  language_server-protocol (>= 3.17.0)
264
262
  parallel (~> 1.10)
265
263
  parser (>= 3.3.0.2)
266
264
  rainbow (>= 2.2.2, < 4.0)
267
265
  regexp_parser (>= 2.4, < 3.0)
268
- rexml (>= 3.2.5, < 4.0)
269
- rubocop-ast (>= 1.31.1, < 2.0)
266
+ rubocop-ast (>= 1.32.2, < 2.0)
270
267
  ruby-progressbar (~> 1.7)
271
268
  unicode-display_width (>= 2.4.0, < 3.0)
272
- rubocop-ast (1.32.1)
269
+ rubocop-ast (1.32.3)
273
270
  parser (>= 3.3.1.0)
274
271
  rubocop-capybara (2.21.0)
275
272
  rubocop (~> 1.41)
276
273
  rubocop-factory_bot (2.26.1)
277
274
  rubocop (~> 1.61)
278
- rubocop-rails (2.25.1)
275
+ rubocop-rails (2.26.1)
279
276
  activesupport (>= 4.2.0)
280
277
  rack (>= 1.1)
281
- rubocop (>= 1.33.0, < 2.0)
278
+ rubocop (>= 1.52.0, < 2.0)
282
279
  rubocop-ast (>= 1.31.1, < 2.0)
283
280
  rubocop-rspec (2.31.0)
284
281
  rubocop (~> 1.40)
@@ -295,7 +292,6 @@ GEM
295
292
  unicode-display_width (>= 1.5, < 3.0)
296
293
  unicode_utils (~> 1.4)
297
294
  strings-ansi (0.2.0)
298
- strscan (3.1.0)
299
295
  tty-color (0.6.0)
300
296
  tty-screen (0.8.2)
301
297
  tty-table (0.12.0)
@@ -304,9 +300,9 @@ GEM
304
300
  tty-screen (~> 0.8)
305
301
  tzinfo (2.0.6)
306
302
  concurrent-ruby (~> 1.0)
307
- unicode-display_width (2.5.0)
303
+ unicode-display_width (2.6.0)
308
304
  unicode_utils (1.4.0)
309
- zeitwerk (2.6.17)
305
+ zeitwerk (2.6.18)
310
306
  zlib (2.1.1)
311
307
 
312
308
  PLATFORMS
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacTools
4
- VERSION = '0.95.0'
4
+ VERSION = '0.96.1'
5
5
  end
@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
16
16
  s.add_dependency 'avm', '~> 0.94'
17
17
  s.add_dependency 'avm-eac_generic_base0', '~> 0.13'
18
18
  s.add_dependency 'eac_envs-http', '~> 0.5', '>= 0.5.1'
19
- s.add_dependency 'eac_ruby_gem_support', '~> 0.10'
20
19
  s.add_dependency 'eac_ruby_utils', '~> 0.122'
21
20
 
22
21
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.10'
@@ -8,13 +8,20 @@ module Avm
8
8
  class Gemspec
9
9
  class AddOrReplaceGemLine
10
10
  enable_method_class
11
- common_constructor :sender, :gem_name, :gem_specs
11
+ common_constructor :sender, :gem_name, :gem_specs, :dependency_type do
12
+ self.dependency_type = ::Avm::EacRubyBase1::Rubygems::Gemspec::Dependency.lists.type
13
+ .value_validate!(dependency_type)
14
+ end
12
15
  delegate :lines, to: :sender
13
16
 
14
- DEPENDENCY_PREFIX = ' s.add_dependency'
17
+ DEPENDENCY_PREFIX = ' s.add%<dependency_type>s_dependency \'%<gem_name>s\''
15
18
 
19
+ # @return [Integer]
16
20
  def existing_gem_line_index
17
- lines.index { |line| line.start_with?(gem_line_prefix) }
21
+ lines.index do |line|
22
+ ::Avm::EacRubyBase1::Rubygems::Gemspec::DEPENDENCY_LINE_PARSER.parse(line)
23
+ .if_present(&:first) == gem_name
24
+ end
18
25
  end
19
26
 
20
27
  def result
@@ -36,16 +43,18 @@ module Avm
36
43
  lines.count
37
44
  end
38
45
 
46
+ # @return [Integer]
39
47
  def gems_lines_start_index
40
- lines.index { |line| line.start_with?(DEPENDENCY_PREFIX) } || lines.count
48
+ existing_gem_line_index || (lines.count - 1)
41
49
  end
42
50
 
43
51
  def new_gem_line
44
52
  ([gem_line_prefix] + quoted_gem_specs).join(', ')
45
53
  end
46
54
 
55
+ # @return [String]
47
56
  def gem_line_prefix
48
- "#{DEPENDENCY_PREFIX} '#{gem_name}'"
57
+ format(DEPENDENCY_PREFIX, { dependency_type: dependency_type, gem_name: gem_name })
49
58
  end
50
59
 
51
60
  def replace_line
@@ -16,7 +16,7 @@ module Avm
16
16
  end
17
17
 
18
18
  def version_specs=(version_specs)
19
- gemspec.add_or_replace_gem_line(gem_name, version_specs)
19
+ gemspec.add_or_replace_gem_line(gem_name, version_specs, type)
20
20
  end
21
21
  end
22
22
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRubyBase1
5
- VERSION = '0.35.0'
5
+ VERSION = '0.35.1'
6
6
  end
7
7
  end
@@ -0,0 +1,37 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/eac_ruby_base1/rubygems/gemspec'
4
+
5
+ RSpec.describe Avm::EacRubyBase1::Rubygems::Gemspec do
6
+ let(:gemspec_path) { fixtures_directory.join('the_gem.gemspec') }
7
+
8
+ include_examples 'source_target_fixtures', __FILE__
9
+
10
+ # @return [Avm::EacRubyBase1::Rubygems::Gemspec]
11
+ def new_gemspec
12
+ described_class.from_file(gemspec_path)
13
+ end
14
+
15
+ # @return [String]
16
+ def source_data(file)
17
+ EacRubyUtils::Yaml.load_file(file).each_with_object(new_gemspec) do |e, a|
18
+ a.dependency(e.fetch(0)).version_specs = e.fetch(1)
19
+ end.to_text
20
+ end
21
+
22
+ # @return [String]
23
+ def target_data(target_file)
24
+ target_file.to_pathname.read
25
+ end
26
+
27
+ # @param data [String]
28
+ # @return [String]
29
+ def target_content(data)
30
+ data
31
+ end
32
+
33
+ # @return [String]
34
+ def target_file_extname
35
+ '.txt'
36
+ end
37
+ end
@@ -0,0 +1,5 @@
1
+ ---
2
+ avm: ['~> 1.0', '>= 1.0.5']
3
+ eac_envs-http: ['~> 0.5', '>= 0.5.1']
4
+ eac_ruby_gem_support: ['> 0.5']
5
+ avm-eac_generic_base0: ['1.0.0']
@@ -0,0 +1,15 @@
1
+ # frozen_string_literal: true
2
+
3
+ Gem::Specification.new do |s|
4
+ s.name = 'the_gem'
5
+ s.version = '0.0.0'
6
+
7
+ s.required_ruby_version = '>= 2.7'
8
+
9
+ s.add_dependency 'avm', '~> 1.0', '>= 1.0.5'
10
+ s.add_dependency 'avm-eac_generic_base0', '1.0.0'
11
+ s.add_dependency 'eac_envs-http', '~> 0.5', '>= 0.5.1'
12
+ s.add_dependency 'eac_ruby_utils', '~> 0.122'
13
+
14
+ s.add_development_dependency 'eac_ruby_gem_support', '> 0.5'
15
+ end
@@ -0,0 +1,15 @@
1
+ # frozen_string_literal: true
2
+
3
+ Gem::Specification.new do |s|
4
+ s.name = 'the_gem'
5
+ s.version = '0.0.0'
6
+
7
+ s.required_ruby_version = '>= 2.7'
8
+
9
+ s.add_dependency 'avm', '~> 0.94'
10
+ s.add_dependency 'avm-eac_generic_base0', '~> 0.13'
11
+ s.add_dependency 'eac_envs-http', '~> 0.5', '>= 0.5.1'
12
+ s.add_dependency 'eac_ruby_utils', '~> 0.122'
13
+
14
+ s.add_development_dependency 'eac_ruby_gem_support', '~> 0.10'
15
+ end
@@ -3,8 +3,9 @@
3
3
  require 'avm/eac_ruby_base1/rubygems/version_file'
4
4
 
5
5
  RSpec.describe Avm::EacRubyBase1::Rubygems::VersionFile do
6
- let(:stubs_dir) { Pathname.new(__dir__).join('version_file_spec_files') }
7
- let(:stub_file) { stubs_dir.join('a_version_file.rb') }
6
+ include_context 'spec_paths', __FILE__
7
+
8
+ let(:stub_file) { fixtures_directory.join('a_version_file.rb') }
8
9
  let(:instance) { described_class.new(stub_file) }
9
10
  let(:target_version) { Gem::Version.new('0.69.1') }
10
11
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: eac_tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.95.0
4
+ version: 0.96.1
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: 2024-08-25 00:00:00.000000000 Z
11
+ date: 2024-09-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: avm
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '0.23'
33
+ version: '0.24'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '0.23'
40
+ version: '0.24'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: avm-eac_generic_base0
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -249,6 +249,9 @@ dependencies:
249
249
  - - "~>"
250
250
  - !ruby/object:Gem::Version
251
251
  version: '0.35'
252
+ - - ">="
253
+ - !ruby/object:Gem::Version
254
+ version: 0.35.1
252
255
  type: :runtime
253
256
  prerelease: false
254
257
  version_requirements: !ruby/object:Gem::Requirement
@@ -256,6 +259,9 @@ dependencies:
256
259
  - - "~>"
257
260
  - !ruby/object:Gem::Version
258
261
  version: '0.35'
262
+ - - ">="
263
+ - !ruby/object:Gem::Version
264
+ version: 0.35.1
259
265
  - !ruby/object:Gem::Dependency
260
266
  name: avm-eac_webapp_base0
261
267
  requirement: !ruby/object:Gem::Requirement
@@ -324,20 +330,6 @@ dependencies:
324
330
  - - "~>"
325
331
  - !ruby/object:Gem::Version
326
332
  version: '0.162'
327
- - !ruby/object:Gem::Dependency
328
- name: eac_ruby_gem_support
329
- requirement: !ruby/object:Gem::Requirement
330
- requirements:
331
- - - "~>"
332
- - !ruby/object:Gem::Version
333
- version: '0.10'
334
- type: :runtime
335
- prerelease: false
336
- version_requirements: !ruby/object:Gem::Requirement
337
- requirements:
338
- - - "~>"
339
- - !ruby/object:Gem::Version
340
- version: '0.10'
341
333
  - !ruby/object:Gem::Dependency
342
334
  name: eac_ruby_utils
343
335
  requirement: !ruby/object:Gem::Requirement
@@ -481,6 +473,10 @@ files:
481
473
  - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/launcher_stereotypes/base/publish_spec.rb
482
474
  - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/launcher_stereotypes/base_spec.rb
483
475
  - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/preferred_version_requirements_spec.rb
476
+ - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/gemspec_spec.rb
477
+ - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/gemspec_spec_files/changes1.source.yaml
478
+ - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/gemspec_spec_files/changes1.target.txt
479
+ - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/gemspec_spec_files/the_gem.gemspec
484
480
  - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/version_file_spec.rb
485
481
  - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/version_file_spec_files/a_version_file.rb
486
482
  - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec.rb