avm-tools 0.94.1 → 0.97.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (149) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/app_src.rb +60 -0
  3. data/lib/avm/core_ext.rb +4 -0
  4. data/lib/avm/eac_asciidoctor_base0/deploy.rb +5 -5
  5. data/lib/avm/eac_webapp_base0/instance.rb +5 -2
  6. data/lib/avm/eac_webapp_base0/instance/subcommand_parent.rb +24 -0
  7. data/lib/avm/eac_webapp_base0/runner/data.rb +1 -0
  8. data/lib/avm/eac_webapp_base0/runner/data/dump.rb +1 -1
  9. data/lib/avm/eac_webapp_base0/runner/data/load.rb +1 -1
  10. data/lib/avm/git/issue/complete/_test.rb +2 -2
  11. data/lib/avm/instances/base.rb +6 -12
  12. data/lib/avm/instances/base/entry_keys.rb +17 -0
  13. data/lib/{eac_launcher → avm/launcher}/instances/error.rb +0 -0
  14. data/lib/avm/launcher/instances/runner_helper.rb +42 -0
  15. data/lib/avm/patches/class.rb +4 -0
  16. data/lib/avm/patches/eac_ruby_gems_utils.rb +4 -0
  17. data/lib/avm/patches/eac_ruby_gems_utils/gem.rb +2 -2
  18. data/lib/avm/patches/object.rb +4 -0
  19. data/lib/avm/patches/object/fs_cache.rb +16 -0
  20. data/lib/avm/ruby/bundler.rb +11 -0
  21. data/lib/avm/ruby/bundler/incompatible_parser.rb +25 -0
  22. data/lib/avm/ruby/bundler/incompatible_parser/depends_on.rb +25 -0
  23. data/lib/avm/ruby/bundler/incompatible_parser/gem_conflict.rb +39 -0
  24. data/lib/avm/ruby/bundler/incompatible_parser/in_gemfile.rb +19 -0
  25. data/lib/avm/ruby/bundler/incompatible_parser/line_buffer.rb +73 -0
  26. data/lib/avm/ruby/bundler/incompatible_parser/line_factory.rb +31 -0
  27. data/lib/avm/ruby/bundler/incompatible_parser/line_parser_base.rb +19 -0
  28. data/lib/avm/ruby/bundler/incompatible_parser/version_requirement.rb +26 -0
  29. data/lib/avm/ruby/gems/generator.rb +1 -5
  30. data/lib/avm/ruby/rubocop/_configured.rb +2 -2
  31. data/lib/avm/tools/runner/{local_project.rb → app_src.rb} +3 -3
  32. data/lib/avm/tools/runner/{local_project → app_src}/eac_asciidoctor_base0.rb +1 -1
  33. data/lib/avm/tools/runner/{local_project → app_src}/eac_asciidoctor_base0/build.rb +19 -7
  34. data/lib/avm/tools/runner/{local_project → app_src}/eac_writings_base0.rb +1 -1
  35. data/lib/avm/tools/runner/{local_project → app_src}/eac_writings_base0/build_chapters.rb +1 -1
  36. data/lib/avm/tools/runner/{local_project → app_src}/eac_writings_base0/build_single.rb +1 -1
  37. data/lib/avm/tools/runner/{local_project → app_src}/eac_writings_base0/info.rb +1 -1
  38. data/lib/avm/tools/runner/{local_project → app_src}/info.rb +1 -1
  39. data/lib/avm/tools/runner/{local_project → app_src}/ruby.rb +1 -1
  40. data/lib/avm/tools/runner/{local_project → app_src}/ruby/bundler.rb +4 -8
  41. data/lib/avm/tools/runner/{local_project → app_src}/ruby/bundler/gemfile_lock.rb +11 -14
  42. data/lib/avm/tools/runner/app_src/ruby/bundler/incompatible.rb +84 -0
  43. data/lib/avm/tools/runner/{local_project → app_src}/test.rb +1 -1
  44. data/lib/avm/tools/runner/{local_project → app_src}/update.rb +1 -1
  45. data/lib/avm/tools/runner/{local_project → app_src}/version_bump.rb +1 -1
  46. data/lib/avm/tools/runner/launcher.rb +3 -6
  47. data/lib/avm/tools/runner/launcher/instances.rb +10 -21
  48. data/lib/avm/tools/runner/launcher/projects.rb +10 -18
  49. data/lib/avm/tools/runner/launcher/publish.rb +18 -26
  50. data/lib/avm/tools/runner/ruby/rubocop.rb +9 -25
  51. data/lib/avm/tools/runner/self.rb +7 -15
  52. data/lib/avm/tools/runner/self/docker.rb +1 -1
  53. data/lib/avm/tools/version.rb +1 -1
  54. data/lib/eac_launcher/instances.rb +1 -1
  55. data/template/avm/ruby/gems/generator/static/spec/rubocop_spec.rb +1 -5
  56. data/template/avm/ruby/gems/generator/static/spec/spec_helper.rb +2 -0
  57. data/vendor/avm-apps/avm-apps.gemspec +1 -1
  58. data/vendor/avm-apps/lib/avm/apps/sources/configuration.rb +57 -0
  59. data/vendor/avm-apps/lib/avm/apps/sources/configuration/_locale.rb +18 -0
  60. data/vendor/avm-apps/lib/avm/apps/sources/configuration/_rubocop.rb +26 -0
  61. data/vendor/avm-apps/lib/avm/apps/sources/configuration/_tests.rb +29 -0
  62. data/vendor/avm-apps/lib/avm/apps/version.rb +1 -1
  63. data/vendor/avm-apps/spec/rubocop_spec.rb +1 -5
  64. data/vendor/avm-apps/spec/spec_helper.rb +3 -0
  65. data/vendor/avm-eac_asciidoctor_base0/Gemfile +5 -0
  66. data/vendor/avm-eac_asciidoctor_base0/avm-eac_asciidoctor_base0.gemspec +19 -0
  67. data/{lib/avm/local_projects.rb → vendor/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0.rb} +1 -1
  68. data/{lib/avm/eac_asciidoctor_base0/project.rb → vendor/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources.rb} +2 -4
  69. data/vendor/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/base.rb +15 -0
  70. data/vendor/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build.rb +49 -0
  71. data/vendor/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build/file.rb +30 -0
  72. data/vendor/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/version.rb +7 -0
  73. data/vendor/avm-eac_asciidoctor_base0/spec/rubocop_spec.rb +3 -0
  74. data/vendor/avm-eac_asciidoctor_base0/spec/spec_helper.rb +102 -0
  75. data/vendor/eac_cli/eac_cli.gemspec +1 -1
  76. data/vendor/eac_cli/lib/eac_cli/definition/base_option.rb +5 -1
  77. data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb +3 -1
  78. data/vendor/eac_cli/lib/eac_cli/runner/context.rb +2 -1
  79. data/vendor/eac_cli/lib/eac_cli/runner/instance_methods.rb +8 -1
  80. data/vendor/eac_cli/lib/eac_cli/version.rb +1 -1
  81. data/vendor/eac_cli/spec/rubocop_spec.rb +1 -5
  82. data/vendor/eac_cli/spec/spec_helper.rb +3 -0
  83. data/vendor/eac_docker/eac_docker.gemspec +1 -1
  84. data/vendor/eac_docker/lib/eac_docker/version.rb +1 -1
  85. data/vendor/eac_docker/spec/rubocop_spec.rb +1 -5
  86. data/vendor/eac_docker/spec/spec_helper.rb +3 -0
  87. data/vendor/eac_git/eac_git.gemspec +2 -1
  88. data/vendor/eac_git/lib/eac_git/local.rb +4 -0
  89. data/vendor/eac_git/lib/eac_git/local/commit.rb +53 -0
  90. data/vendor/eac_git/lib/eac_git/local/commit/changed_file.rb +46 -0
  91. data/vendor/eac_git/lib/eac_git/local/commit/diff_tree_line.rb +32 -0
  92. data/vendor/eac_git/lib/eac_git/rspec.rb +6 -1
  93. data/{lib/avm/git/spec_helper.rb → vendor/eac_git/lib/eac_git/rspec/stubbed_git_local_repo.rb} +16 -13
  94. data/vendor/eac_git/lib/eac_git/version.rb +1 -1
  95. data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec.rb +13 -0
  96. data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/add.source.out +1 -0
  97. data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/add.target.yaml +7 -0
  98. data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/modify.source.out +1 -0
  99. data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/modify.target.yaml +7 -0
  100. data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/remove.source.out +1 -0
  101. data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/remove.target.yaml +7 -0
  102. data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename.source.out +2 -0
  103. data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename.target.yaml +13 -0
  104. data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename_modify.source.out +2 -0
  105. data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename_modify.target.yaml +13 -0
  106. data/vendor/eac_git/spec/lib/eac_git/local/commit_spec.rb +58 -0
  107. data/vendor/eac_git/spec/rubocop_spec.rb +1 -5
  108. data/vendor/eac_git/spec/spec_helper.rb +3 -0
  109. data/vendor/eac_ruby_base0/eac_ruby_base0.gemspec +4 -4
  110. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/input.rb +36 -0
  111. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/output.rb +58 -0
  112. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb +1 -1
  113. data/vendor/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/output_spec.rb +81 -0
  114. data/vendor/eac_ruby_base0/spec/rubocop_spec.rb +1 -5
  115. data/vendor/eac_ruby_base0/spec/spec_helper.rb +3 -0
  116. data/vendor/eac_ruby_gems_utils/eac_ruby_gems_utils.gemspec +4 -3
  117. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/base.rb +7 -10
  118. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple.rb +9 -2
  119. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb +1 -1
  120. data/vendor/eac_ruby_gems_utils/spec/code/rubocop_check_spec.rb +1 -5
  121. data/vendor/eac_ruby_gems_utils/spec/spec_helper.rb +3 -0
  122. data/vendor/eac_ruby_utils/eac_ruby_utils.gemspec +2 -1
  123. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/filesystem_cache.rb +6 -0
  124. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/logs.rb +63 -0
  125. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/inflector.rb +9 -1
  126. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/list.rb +3 -2
  127. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/kernel/nyi.rb +4 -2
  128. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/to_parser.rb +10 -0
  129. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string/inflector.rb +4 -2
  130. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/regexp_parser.rb +34 -0
  131. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb +10 -29
  132. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider/setting_value.rb +69 -0
  133. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb +18 -5
  134. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
  135. data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb +8 -0
  136. data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb +9 -0
  137. data/vendor/eac_ruby_utils/spec/rubocop_check_spec.rb +1 -5
  138. data/vendor/eac_ruby_utils/spec/spec_helper.rb +3 -0
  139. metadata +90 -39
  140. data/lib/avm/eac_asciidoctor_base0/build.rb +0 -47
  141. data/lib/avm/eac_asciidoctor_base0/build/file.rb +0 -28
  142. data/lib/avm/instances/configuration.rb +0 -55
  143. data/lib/avm/instances/configuration/_locale.rb +0 -16
  144. data/lib/avm/instances/configuration/_rubocop.rb +0 -24
  145. data/lib/avm/instances/configuration/_tests.rb +0 -27
  146. data/lib/avm/local_projects/instance.rb +0 -62
  147. data/lib/eac_launcher/instances/runner_helper.rb +0 -42
  148. data/vendor/eac_cli/lib/eac_cli/runner_with/output_file.rb +0 -30
  149. data/vendor/eac_cli/spec/lib/eac_cli/runner_with/output_file_spec.rb +0 -53
@@ -36,7 +36,9 @@ module EacCli
36
36
  end
37
37
 
38
38
  def option_definition(option)
39
- self.class.option_usage_full(option) + OPTION_DESC_SEP + option.description
39
+ self.class.option_usage_full(option) + option.description.if_present('') do |v|
40
+ OPTION_DESC_SEP + v
41
+ end
40
42
  end
41
43
 
42
44
  def section(header, include_header = true)
@@ -27,8 +27,9 @@ module EacCli
27
27
 
28
28
  def parent_call(method_name, *args)
29
29
  return parent.context(method_name, *args) if parent.respond_to?(:context)
30
+ return parent.runner_context.call(method_name, *args) if parent.respond_to?(:runner_context)
30
31
 
31
- parent.runner_context.call(method_name, *args)
32
+ raise "Parent #{parent} do not respond to .context or .runner_context (Runner: #{runner})"
32
33
  end
33
34
  end
34
35
  end
@@ -3,15 +3,22 @@
3
3
  module EacCli
4
4
  module Runner
5
5
  module InstanceMethods
6
+ PARSER_ERROR_EXIT_CODE = 1
7
+
6
8
  def run_run
7
9
  parsed
8
10
  run_callbacks(:run) { run }
9
11
  rescue ::EacCli::Parser::Error => e
10
- $stderr.write("#{e}\n")
12
+ run_parser_error(e)
11
13
  rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
12
14
  # Do nothing
13
15
  end
14
16
 
17
+ def run_parser_error(error)
18
+ $stderr.write("#{error}\n")
19
+ ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
20
+ end
21
+
15
22
  def runner_context
16
23
  return @runner_context if @runner_context
17
24
 
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacCli
4
- VERSION = '0.15.1'
4
+ VERSION = '0.16.3'
5
5
  end
@@ -1,7 +1,3 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_gem_support/spec/examples/rubocop_check'
4
-
5
- RSpec.describe ::RuboCop, slow: true do
6
- include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
7
- end
3
+ ::EacRubyGemSupport::Rspec.default.describe_rubocop
@@ -97,4 +97,7 @@ RSpec.configure do |config|
97
97
  # # test failures related to randomization by passing the same `--seed` value
98
98
  # # as the one that triggered the failure.
99
99
  # Kernel.srand config.seed
100
+
101
+ require 'eac_ruby_gem_support/rspec'
102
+ ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__), config)
100
103
  end
@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
14
14
 
15
15
  s.add_dependency 'eac_ruby_utils', '~> 0.36'
16
16
 
17
- s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.1'
17
+ s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
18
18
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacDocker
4
- VERSION = '0.2.0'
4
+ VERSION = '0.2.1'
5
5
  end
@@ -1,7 +1,3 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_gem_support/spec/examples/rubocop_check'
4
-
5
- RSpec.describe ::RuboCop, slow: true do
6
- include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
7
- end
3
+ ::EacRubyGemSupport::Rspec.default.describe_rubocop
@@ -97,6 +97,9 @@ RSpec.configure do |config|
97
97
  # # test failures related to randomization by passing the same `--seed` value
98
98
  # # as the one that triggered the failure.
99
99
  # Kernel.srand config.seed
100
+
101
+ require 'eac_ruby_gem_support/rspec'
102
+ ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__), config)
100
103
  end
101
104
 
102
105
  require 'eac_docker/rspec'
@@ -15,5 +15,6 @@ Gem::Specification.new do |s|
15
15
  s.add_dependency 'eac_ruby_utils', '~> 0.37'
16
16
  s.add_dependency 'parseconfig', '~> 1.0', '>= 1.0.8'
17
17
 
18
- s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
18
+ s.add_development_dependency 'aranha-parsers', '~> 0.7'
19
+ s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
19
20
  end
@@ -12,6 +12,10 @@ module EacGit
12
12
  self.root_path = root_path.to_pathname
13
13
  end
14
14
 
15
+ def commit(ref, required = false)
16
+ rev_parse(ref, required).if_present { |v| ::EacGit::Local::Commit.new(self, v) }
17
+ end
18
+
15
19
  def descendant?(descendant, ancestor)
16
20
  base = merge_base(descendant, ancestor)
17
21
  return false if base.blank?
@@ -0,0 +1,53 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module EacGit
6
+ class Local
7
+ class Commit
8
+ require_sub __FILE__, include_modules: true
9
+ enable_simple_cache
10
+
11
+ FIELDS = {
12
+ author_name: '%an', author_email: '%ae', author_date: '%ai',
13
+ subject: '%s',
14
+ author_all: '%an <%ae>, %ai',
15
+ commiter_name: '%cn', commiter_email: '%ce', commiter_date: '%ci',
16
+ commiter_all: '%cn <%ce>, %ci'
17
+ }.freeze
18
+
19
+ common_constructor :repo, :hash
20
+
21
+ def format(format)
22
+ repo.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", hash).execute!.strip
23
+ end
24
+
25
+ FIELDS.each do |field, format|
26
+ define_method(field) { format(format) }
27
+ end
28
+
29
+ def changed_files_uncached
30
+ diff_tree_execute.each_line.map do |line|
31
+ ::EacGit::Local::Commit::ChangedFile.new(self, line)
32
+ end
33
+ end
34
+
35
+ def changed_files_size_uncached
36
+ changed_files.inject(0) { |a, e| a + e.dst_size }
37
+ end
38
+
39
+ def root_child?
40
+ format('%P').blank?
41
+ end
42
+
43
+ private
44
+
45
+ def diff_tree_execute
46
+ args = []
47
+ args << '--root' if root_child?
48
+ args << hash
49
+ repo.command(*::EacGit::Local::Commit::DiffTreeLine::GIT_COMMAND_ARGS, *args).execute!
50
+ end
51
+ end
52
+ end
53
+ end
@@ -0,0 +1,46 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+ require 'eac_git/local/commit/diff_tree_line'
5
+
6
+ module EacGit
7
+ class Local
8
+ class Commit
9
+ class ChangedFile
10
+ enable_simple_cache
11
+
12
+ attr_reader :commit, :diff_tree
13
+
14
+ # @param commit [EacGit::Local::Commit]
15
+ # @param diff_tree_line [String] A line from command "repo diff-tree --no-commit-id -r
16
+ # --full-index"'s output.
17
+ def initialize(commit, diff_tree_line)
18
+ @commit = commit
19
+ @diff_tree = ::EacGit::Local::Commit::DiffTreeLine.new(diff_tree_line)
20
+ end
21
+
22
+ delegate(*::EacGit::Local::Commit::DiffTreeLine::FIELDS, to: :diff_tree)
23
+
24
+ def to_s
25
+ "#{path}|#{status}"
26
+ end
27
+
28
+ def src_size_uncached
29
+ size(src_sha1)
30
+ end
31
+
32
+ def dst_size_uncached
33
+ size(dst_sha1)
34
+ end
35
+
36
+ private
37
+
38
+ def size(id)
39
+ return 0 if /\A0+\z/.match(id)
40
+
41
+ commit.repo.command('cat-file', '-s', id).execute!.strip.to_i
42
+ end
43
+ end
44
+ end
45
+ end
46
+ end
@@ -0,0 +1,32 @@
1
+ # frozen_string_literal: true
2
+
3
+ module EacGit
4
+ class Local
5
+ class Commit
6
+ class DiffTreeLine
7
+ DIFF_TREE_PATTERN = /\A:(\d{6}) (\d{6}) (\S+) (\S+) (\S+)\t(\S.*)\z/.freeze
8
+ FIELDS = %w[src_mode dst_mode src_sha1 dst_sha1 status path].freeze
9
+ GIT_COMMAND_ARGS = %w[-c core.quotepath=off diff-tree --no-commit-id -r --full-index].freeze
10
+
11
+ attr_reader(*FIELDS)
12
+
13
+ # line: a line of command "git [GIT_COMMAND_ARGS]"'s output.
14
+ # Reference: https://git-scm.com/docs/git-diff-tree
15
+ def initialize(line)
16
+ m = DIFF_TREE_PATTERN.match(line.strip)
17
+ raise "\"#{line}\" did not match pattern" unless m
18
+
19
+ FIELDS.count.times { |i| send("#{FIELDS[i]}=", m[i + 1]) }
20
+ end
21
+
22
+ def fields
23
+ FIELDS.map { |field| [field, send(field)] }.to_h
24
+ end
25
+
26
+ private
27
+
28
+ attr_writer(*FIELDS)
29
+ end
30
+ end
31
+ end
32
+ end
@@ -5,12 +5,17 @@ require 'eac_git/executables'
5
5
 
6
6
  module EacGit
7
7
  module Rspec
8
+ require_sub __FILE__
9
+
8
10
  class << self
9
11
  def configure
10
12
  ::EacRubyUtils::Rspec::Conditional.default.add(:git) do
11
13
  ::EacGit::Executables.git.validate
12
14
  end
13
- RSpec.configure { |config| ::EacRubyUtils::Rspec::Conditional.default.configure(config) }
15
+ RSpec.configure do |config|
16
+ ::EacRubyUtils::Rspec::Conditional.default.configure(config)
17
+ config.include ::EacGit::Rspec::StubbedGitLocalRepo
18
+ end
14
19
  end
15
20
  end
16
21
  end
@@ -1,28 +1,31 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'eac_git/local'
3
4
  require 'eac_ruby_utils/envs'
4
- require 'eac_launcher/git/base'
5
5
  require 'fileutils'
6
6
  require 'tmpdir'
7
7
 
8
- module Avm
9
- module Git
10
- module SpecHelper
11
- def stubbed_git_repository(bare = false)
8
+ module EacGit
9
+ module Rspec
10
+ module StubbedGitLocalRepo
11
+ def stubbed_git_local_repo(bare = false)
12
12
  path = ::Dir.mktmpdir
13
- ::EacRubyUtils::Envs.local.command(stubbed_git_repository_args(path, bare)).execute!
14
- StubbedGitRepository.new(path)
13
+ ::EacRubyUtils::Envs.local.command(stubbed_git_local_repo_args(path, bare)).execute!
14
+ repo = StubbedGitRepository.new(path)
15
+ repo.command('config', 'user.email', 'theuser@example.net').execute!
16
+ repo.command('config', 'user.name', 'The User').execute!
17
+ repo
15
18
  end
16
19
 
17
20
  private
18
21
 
19
- def stubbed_git_repository_args(path, bare)
22
+ def stubbed_git_local_repo_args(path, bare)
20
23
  r = %w[git init]
21
24
  r << '--bare' if bare
22
25
  r + [path]
23
26
  end
24
27
 
25
- class StubbedGitRepository < ::EacLauncher::Git::Base
28
+ class StubbedGitRepository < ::EacGit::Local
26
29
  def file(*subpath)
27
30
  StubbedGitRepositoryFile.new(self, subpath)
28
31
  end
@@ -37,19 +40,19 @@ module Avm
37
40
  end
38
41
 
39
42
  def path
40
- ::File.join(git, *subpath)
43
+ git.root_path.join(*subpath)
41
44
  end
42
45
 
43
46
  def touch
44
- ::FileUtils.touch(path)
47
+ ::FileUtils.touch(path.to_path)
45
48
  end
46
49
 
47
50
  def delete
48
- ::File.unlink(path)
51
+ path.unlink
49
52
  end
50
53
 
51
54
  def write(content)
52
- ::File.write(path, content)
55
+ path.write(content)
53
56
  end
54
57
  end
55
58
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacGit
4
- VERSION = '0.3.3'
4
+ VERSION = '0.4.2'
5
5
  end
@@ -0,0 +1,13 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_git/local/commit/diff_tree_line'
4
+
5
+ RSpec.describe ::EacGit::Local::Commit::DiffTreeLine, git: true do
6
+ include_examples 'source_target_fixtures', __FILE__ do
7
+ def source_data(source_file)
8
+ ::File.read(source_file).each_line.map do |line|
9
+ described_class.new(line).fields
10
+ end
11
+ end
12
+ end
13
+ end
@@ -0,0 +1 @@
1
+ :000000 100644 0000000000000000000000000000000000000000 f380aec0bd8dd777edac43b11636e46cad04273a A nomes.txt
@@ -0,0 +1,7 @@
1
+ ---
2
+ - src_mode: '000000'
3
+ dst_mode: '100644'
4
+ src_sha1: '0000000000000000000000000000000000000000'
5
+ dst_sha1: f380aec0bd8dd777edac43b11636e46cad04273a
6
+ status: A
7
+ path: nomes.txt
@@ -0,0 +1 @@
1
+ :100644 100644 40bcdecb4214cd8a3fcf96cd25a2beb87e7e7cd8 4a30dfae816b984f05cfb594e0d5958bb8c387ae M nomes.txt
@@ -0,0 +1,7 @@
1
+ ---
2
+ - src_mode: '100644'
3
+ dst_mode: '100644'
4
+ src_sha1: 40bcdecb4214cd8a3fcf96cd25a2beb87e7e7cd8
5
+ dst_sha1: 4a30dfae816b984f05cfb594e0d5958bb8c387ae
6
+ status: M
7
+ path: nomes.txt
@@ -0,0 +1 @@
1
+ :100644 000000 10728718a2915256ab162f1e05178ebff9efa6ce 0000000000000000000000000000000000000000 D nomes3.txt
@@ -0,0 +1,7 @@
1
+ ---
2
+ - src_mode: '100644'
3
+ dst_mode: '000000'
4
+ src_sha1: 10728718a2915256ab162f1e05178ebff9efa6ce
5
+ dst_sha1: '0000000000000000000000000000000000000000'
6
+ status: D
7
+ path: nomes3.txt
@@ -0,0 +1,2 @@
1
+ :100644 000000 4a30dfae816b984f05cfb594e0d5958bb8c387ae 0000000000000000000000000000000000000000 D nomes.txt
2
+ :000000 100644 0000000000000000000000000000000000000000 4a30dfae816b984f05cfb594e0d5958bb8c387ae A nomes2.txt
@@ -0,0 +1,13 @@
1
+ ---
2
+ - src_mode: '100644'
3
+ dst_mode: '000000'
4
+ src_sha1: 4a30dfae816b984f05cfb594e0d5958bb8c387ae
5
+ dst_sha1: '0000000000000000000000000000000000000000'
6
+ status: D
7
+ path: nomes.txt
8
+ - src_mode: '000000'
9
+ dst_mode: '100644'
10
+ src_sha1: '0000000000000000000000000000000000000000'
11
+ dst_sha1: 4a30dfae816b984f05cfb594e0d5958bb8c387ae
12
+ status: A
13
+ path: nomes2.txt
@@ -0,0 +1,2 @@
1
+ :100644 000000 4a30dfae816b984f05cfb594e0d5958bb8c387ae 0000000000000000000000000000000000000000 D nomes2.txt
2
+ :000000 100644 0000000000000000000000000000000000000000 10728718a2915256ab162f1e05178ebff9efa6ce A nomes3.txt
@@ -0,0 +1,13 @@
1
+ ---
2
+ - src_mode: '100644'
3
+ dst_mode: '000000'
4
+ src_sha1: 4a30dfae816b984f05cfb594e0d5958bb8c387ae
5
+ dst_sha1: '0000000000000000000000000000000000000000'
6
+ status: D
7
+ path: nomes2.txt
8
+ - src_mode: '000000'
9
+ dst_mode: '100644'
10
+ src_sha1: '0000000000000000000000000000000000000000'
11
+ dst_sha1: 10728718a2915256ab162f1e05178ebff9efa6ce
12
+ status: A
13
+ path: nomes3.txt