avm-tools 0.67.0 → 0.69.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (115) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/eac_rails_base0/apache_host.rb +17 -0
  3. data/lib/avm/eac_rails_base0/deploy.rb +50 -0
  4. data/lib/avm/eac_rails_base0/instance.rb +14 -0
  5. data/lib/avm/eac_redmine_base0/deploy.rb +2 -2
  6. data/lib/avm/eac_redmine_base0/instance.rb +2 -2
  7. data/lib/avm/eac_webapp_base0/apache_host.rb +103 -0
  8. data/lib/avm/eac_webapp_base0/deploy.rb +102 -0
  9. data/lib/avm/eac_webapp_base0/deploy/appended_directories.rb +25 -0
  10. data/lib/avm/eac_webapp_base0/deploy/file_unit.rb +41 -0
  11. data/lib/avm/eac_webapp_base0/deploy/git_info.rb +49 -0
  12. data/lib/avm/eac_webapp_base0/deploy/version.rb +20 -0
  13. data/lib/avm/eac_webapp_base0/instance.rb +50 -0
  14. data/lib/avm/eac_webapp_base0/runner/apache_host.rb +39 -0
  15. data/lib/avm/eac_webapp_base0/runner/data.rb +25 -0
  16. data/lib/avm/eac_webapp_base0/runner/data/dump.rb +69 -0
  17. data/lib/avm/eac_webapp_base0/runner/data/load.rb +66 -0
  18. data/lib/avm/eac_webapp_base0/runner/deploy.rb +59 -0
  19. data/lib/avm/git/issue/complete/_git_subrepos.rb +1 -0
  20. data/lib/avm/local_projects/instance.rb +1 -1
  21. data/lib/avm/projects/stereotypes/git_subrepo/warp.rb +2 -2
  22. data/lib/avm/projects/stereotypes/rails_application.rb +2 -0
  23. data/lib/avm/projects/stereotypes/rails_application/local_project_mixin.rb +18 -0
  24. data/lib/avm/projects/stereotypes/rails_application/update.rb +14 -0
  25. data/lib/avm/stereotypes/eac_wordpress_base0/apache_host.rb +2 -2
  26. data/lib/avm/stereotypes/eac_wordpress_base0/deploy.rb +2 -2
  27. data/lib/avm/stereotypes/eac_wordpress_base0/instance.rb +2 -2
  28. data/lib/avm/tools/runner/eac_rails_base0.rb +2 -2
  29. data/lib/avm/tools/runner/eac_rails_base0/apache_host.rb +3 -26
  30. data/lib/avm/tools/runner/eac_rails_base0/data.rb +2 -2
  31. data/lib/avm/tools/runner/eac_rails_base0/deploy.rb +3 -3
  32. data/lib/avm/tools/runner/eac_redmine_base0/data.rb +1 -1
  33. data/lib/avm/tools/runner/eac_redmine_base0/data/dump.rb +2 -2
  34. data/lib/avm/tools/runner/eac_redmine_base0/deploy.rb +2 -2
  35. data/lib/avm/tools/runner/eac_redmine_base0/project_rename.rb +1 -0
  36. data/lib/avm/tools/runner/eac_wordpress_base0/apache_host.rb +3 -25
  37. data/lib/avm/tools/runner/eac_wordpress_base0/data.rb +2 -2
  38. data/lib/avm/tools/runner/eac_wordpress_base0/deploy.rb +2 -2
  39. data/lib/avm/tools/version.rb +1 -1
  40. data/lib/eac_launcher/git/sub_warp_base.rb +1 -1
  41. data/lib/eac_launcher/publish/base.rb +1 -1
  42. data/template/avm/{stereotypes/eac_rails_base0 → eac_rails_base0}/deploy/config/database.yml.template +0 -0
  43. data/template/avm/{stereotypes/eac_webapp_base0 → eac_webapp_base0}/apache_host/no_ssl.conf +0 -0
  44. data/template/avm/self/docker_image/Dockerfile +1 -1
  45. data/vendor/eac_cli/Gemfile +5 -0
  46. data/vendor/eac_cli/eac_cli.gemspec +18 -0
  47. data/vendor/eac_cli/lib/eac_cli.rb +7 -0
  48. data/vendor/eac_cli/lib/eac_cli/core_ext.rb +4 -0
  49. data/vendor/eac_cli/lib/eac_cli/default_runner.rb +14 -0
  50. data/vendor/eac_cli/lib/eac_cli/definition.rb +72 -0
  51. data/vendor/eac_cli/lib/eac_cli/definition/argument_option.rb +13 -0
  52. data/vendor/eac_cli/lib/eac_cli/definition/base_option.rb +26 -0
  53. data/vendor/eac_cli/lib/eac_cli/definition/boolean_option.rb +13 -0
  54. data/vendor/eac_cli/lib/eac_cli/definition/positional_argument.rb +27 -0
  55. data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb +77 -0
  56. data/vendor/eac_cli/lib/eac_cli/docopt/runner_extension.rb +45 -0
  57. data/vendor/eac_cli/lib/eac_cli/parser.rb +14 -0
  58. data/vendor/eac_cli/lib/eac_cli/parser/collector.rb +56 -0
  59. data/vendor/eac_cli/lib/eac_cli/parser/error.rb +15 -0
  60. data/vendor/eac_cli/lib/eac_cli/parser/options_collection.rb +105 -0
  61. data/vendor/eac_cli/lib/eac_cli/parser/parse_result.rb +21 -0
  62. data/vendor/eac_cli/lib/eac_cli/parser/positional_collection.rb +49 -0
  63. data/vendor/eac_cli/lib/eac_cli/patches.rb +4 -0
  64. data/vendor/eac_cli/lib/eac_cli/patches/object.rb +5 -0
  65. data/vendor/eac_cli/lib/eac_cli/patches/object/runner_with.rb +24 -0
  66. data/vendor/eac_cli/lib/eac_cli/runner.rb +87 -0
  67. data/vendor/eac_cli/lib/eac_cli/runner/context.rb +18 -0
  68. data/vendor/eac_cli/lib/eac_cli/runner_with.rb +9 -0
  69. data/vendor/eac_cli/lib/eac_cli/runner_with/help.rb +19 -0
  70. data/vendor/eac_cli/lib/eac_cli/runner_with/output_file.rb +26 -0
  71. data/vendor/eac_cli/lib/eac_cli/version.rb +5 -0
  72. data/vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb +70 -0
  73. data/vendor/eac_cli/spec/rubocop_spec.rb +7 -0
  74. data/vendor/eac_cli/spec/spec_helper.rb +100 -0
  75. data/vendor/eac_git/lib/eac_git/version.rb +1 -1
  76. data/vendor/eac_git/vendor/git-subrepo/lib/git-subrepo +9 -7
  77. data/vendor/eac_ruby_base0/eac_ruby_base0.gemspec +3 -3
  78. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb +5 -1
  79. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb +1 -1
  80. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem.rb +10 -0
  81. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem/version_file.rb +6 -5
  82. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple.rb +5 -34
  83. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb +42 -0
  84. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/result.rb +25 -0
  85. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb +1 -1
  86. data/vendor/eac_ruby_gems_utils/spec/lib/eac_ruby_gems_utils/gem/version_file_spec.rb +14 -0
  87. data/vendor/eac_ruby_gems_utils/spec/lib/eac_ruby_gems_utils/gem/version_file_spec_files/a_version_file.rb +7 -0
  88. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern.rb +4 -4
  89. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner.rb +6 -0
  90. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_class_methods.rb +1 -1
  91. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_subcommands.rb +8 -2
  92. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/inflector.rb +18 -0
  93. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/value.rb +3 -2
  94. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string.rb +4 -0
  95. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string/inflector.rb +9 -0
  96. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb +6 -2
  97. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/struct.rb +53 -0
  98. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
  99. data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/inflector_spec.rb +15 -0
  100. data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/struct_spec.rb +46 -0
  101. metadata +61 -18
  102. data/lib/avm/stereotypes/eac_rails_base0/apache_host.rb +0 -19
  103. data/lib/avm/stereotypes/eac_rails_base0/deploy.rb +0 -52
  104. data/lib/avm/stereotypes/eac_rails_base0/instance.rb +0 -16
  105. data/lib/avm/stereotypes/eac_webapp_base0/apache_host.rb +0 -97
  106. data/lib/avm/stereotypes/eac_webapp_base0/deploy.rb +0 -104
  107. data/lib/avm/stereotypes/eac_webapp_base0/deploy/appended_directories.rb +0 -27
  108. data/lib/avm/stereotypes/eac_webapp_base0/deploy/file_unit.rb +0 -43
  109. data/lib/avm/stereotypes/eac_webapp_base0/deploy/git_info.rb +0 -51
  110. data/lib/avm/stereotypes/eac_webapp_base0/deploy/version.rb +0 -22
  111. data/lib/avm/stereotypes/eac_webapp_base0/instance.rb +0 -52
  112. data/lib/avm/stereotypes/eac_webapp_base0/runner/data.rb +0 -27
  113. data/lib/avm/stereotypes/eac_webapp_base0/runner/data/dump.rb +0 -71
  114. data/lib/avm/stereotypes/eac_webapp_base0/runner/data/load.rb +0 -68
  115. data/lib/avm/stereotypes/eac_webapp_base0/runner/deploy.rb +0 -61
@@ -0,0 +1,24 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+ require 'eac_cli/runner'
5
+ require 'eac_cli/runner_with'
6
+
7
+ class Object
8
+ def runner_with(*runners)
9
+ include ::EacCli::Runner
10
+ enable_simple_cache
11
+ enable_console_speaker
12
+ runners.each do |runner|
13
+ include runner_with_to_module(runner)
14
+ end
15
+ end
16
+
17
+ private
18
+
19
+ def runner_with_to_module(runner)
20
+ return runner if runner.is_a?(::Module)
21
+
22
+ "EacCli::RunnerWith::#{runner.to_s.camelize}".constantize
23
+ end
24
+ end
@@ -0,0 +1,87 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_cli/definition'
4
+ require 'eac_cli/docopt/runner_extension'
5
+ require 'eac_cli/parser'
6
+ require 'eac_ruby_utils/core_ext'
7
+
8
+ module EacCli
9
+ module Runner
10
+ require_sub __FILE__
11
+ extend ::ActiveSupport::Concern
12
+
13
+ class << self
14
+ def alias_runner_class_methods(klass, from_suffix, to_suffix)
15
+ %i[create run].each do |method|
16
+ alias_class_method(klass, build_method_name(method, from_suffix),
17
+ build_method_name(method, to_suffix))
18
+ end
19
+ end
20
+
21
+ private
22
+
23
+ def alias_class_method(klass, from, to)
24
+ sklass = klass.singleton_class
25
+ return unless sklass.method_defined?(from)
26
+
27
+ sklass.alias_method to, from
28
+ end
29
+
30
+ def build_method_name(name, suffix)
31
+ ss = suffix.if_present('') { |s| "#{s}_" }
32
+ "#{ss}#{name}"
33
+ end
34
+ end
35
+
36
+ the_module = self
37
+ included do
38
+ the_module.alias_runner_class_methods(self, '', 'original')
39
+
40
+ extend AfterClassMethods
41
+ include InstanceMethods
42
+ ::EacCli::Docopt::RunnerExtension.check(self)
43
+ end
44
+
45
+ module AfterClassMethods
46
+ def create(*runner_context_args)
47
+ r = new
48
+ r.runner_context = ::EacCli::Runner::Context.new(*runner_context_args)
49
+ r
50
+ end
51
+
52
+ def run(*runner_context_args)
53
+ r = create(*runner_context_args)
54
+ r.parsed
55
+ r.run
56
+ r
57
+ end
58
+
59
+ def runner_definition(&block)
60
+ @runner_definition ||= super_runner_definition
61
+ @runner_definition.instance_eval(&block) if block
62
+ @runner_definition
63
+ end
64
+
65
+ def super_runner_definition
66
+ superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
67
+ end
68
+ end
69
+
70
+ module InstanceMethods
71
+ def runner_context
72
+ return @runner_context if @runner_context
73
+
74
+ raise 'Context was required, but was not set yet'
75
+ end
76
+
77
+ def runner_context=(new_runner_context)
78
+ @runner_context = new_runner_context
79
+ @parsed = nil
80
+ end
81
+
82
+ def parsed
83
+ @parsed ||= ::EacCli::Parser.new(self.class.runner_definition).parse(runner_context.argv)
84
+ end
85
+ end
86
+ end
87
+ end
@@ -0,0 +1,18 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module EacCli
6
+ module Runner
7
+ class Context
8
+ attr_reader :argv, :parent, :program_name
9
+
10
+ def initialize(*context_args)
11
+ options = context_args.extract_options!
12
+ @argv = (context_args[0] || options.delete(:argv) || ARGV).dup.freeze
13
+ @parent = context_args[1] || options.delete(:parent)
14
+ @program_name = options.delete(:program_name)
15
+ end
16
+ end
17
+ end
18
+ end
@@ -0,0 +1,9 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module EacCli
6
+ module RunnerWith
7
+ require_sub __FILE__
8
+ end
9
+ end
@@ -0,0 +1,19 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_cli/runner'
4
+ require 'eac_ruby_utils/core_ext'
5
+
6
+ module EacCli
7
+ module RunnerWith
8
+ module Help
9
+ common_concern do
10
+ include ::EacCli::Runner
11
+
12
+ runner_definition.alt do
13
+ options_arg false
14
+ bool_opt '-h', '--help', 'Show help.', usage: true
15
+ end
16
+ end
17
+ end
18
+ end
19
+ end
@@ -0,0 +1,26 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_cli/runner'
4
+ require 'eac_ruby_utils/core_ext'
5
+
6
+ module EacCli
7
+ module RunnerWith
8
+ module OutputFile
9
+ common_concern do
10
+ include ::EacCli::Runner
11
+
12
+ runner_definition do
13
+ arg_opt '-o', '--output-file', 'Output to file.'
14
+ end
15
+ end
16
+
17
+ def run_output
18
+ if parsed.output_file.present?
19
+ ::File.write(parsed.output_file, output_content)
20
+ else
21
+ out output_content
22
+ end
23
+ end
24
+ end
25
+ end
26
+ end
@@ -0,0 +1,5 @@
1
+ # frozen_string_literal: true
2
+
3
+ module EacCli
4
+ VERSION = '0.8.0'
5
+ end
@@ -0,0 +1,70 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/console/docopt_runner'
4
+ require 'eac_cli/runner'
5
+
6
+ RSpec.describe ::EacCli::Runner do
7
+ let(:stub_runner) do
8
+ r = Class.new(::EacRubyUtils::Console::DocoptRunner) do
9
+ def run; end
10
+ end
11
+ r.include described_class
12
+ r.runner_definition do
13
+ desc 'A stub runner.'
14
+ arg_opt '-o', '--opt1', 'A argument option'
15
+ pos_arg 'pos1'
16
+ end
17
+ r
18
+ end
19
+
20
+ let(:instance) { stub_runner.new(argv: %w[-o aaa bbb]) }
21
+
22
+ before { instance.run }
23
+
24
+ it { expect(instance.options.fetch('--opt1')).to eq('aaa') }
25
+ it { expect(instance.options.fetch('<pos1>')).to eq('bbb') }
26
+
27
+ context 'without docopt runner' do
28
+ let(:runner_class) do
29
+ the_module = described_class
30
+ ::Class.new do
31
+ include the_module
32
+
33
+ runner_definition do
34
+ arg_opt '-o', '--opt1', 'A arg option.'
35
+ bool_opt '-o', '--opt2', 'A boolean option'
36
+ pos_arg :pos1
37
+ pos_arg :pos2, repeat: true, optional: true
38
+ end
39
+
40
+ def run; end
41
+ end
42
+ end
43
+
44
+ context 'when all args are supplied' do
45
+ let(:instance) { runner_class.create(%w[--opt1 aaa --opt2 bbb ccc ddd]) }
46
+
47
+ it { expect(instance.parsed.opt1).to eq('aaa') }
48
+ it { expect(instance.parsed.opt2?).to eq(true) }
49
+ it { expect(instance.parsed.pos1).to eq('bbb') }
50
+ it { expect(instance.parsed.pos2).to eq(%w[ccc ddd]) }
51
+ end
52
+
53
+ context 'when only required args are supplied' do
54
+ let(:instance) { runner_class.create(%w[bbb]) }
55
+
56
+ it { expect(instance.parsed.opt1).to be_nil }
57
+ it { expect(instance.parsed.opt2?).to eq(false) }
58
+ it { expect(instance.parsed.pos1).to eq('bbb') }
59
+ it { expect(instance.parsed.pos2).to eq([]) }
60
+ end
61
+
62
+ context 'when required args are not supplied' do
63
+ let(:instance) { runner_class.create(%w[]) }
64
+
65
+ it do
66
+ expect { instance.parsed }.to raise_error(::EacCli::Parser::Error)
67
+ end
68
+ end
69
+ end
70
+ end
@@ -0,0 +1,7 @@
1
+ # frozen_string_literal: true
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
@@ -0,0 +1,100 @@
1
+ # frozen_string_literal: true
2
+
3
+ # This file was generated by the `rspec --init` command. Conventionally, all
4
+ # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
5
+ # The generated `.rspec` file contains `--require spec_helper` which will cause
6
+ # this file to always be loaded, without a need to explicitly require it in any
7
+ # files.
8
+ #
9
+ # Given that it is always loaded, you are encouraged to keep this file as
10
+ # light-weight as possible. Requiring heavyweight dependencies from this file
11
+ # will add to the boot time of your test suite on EVERY test run, even for an
12
+ # individual file that may not need all of that loaded. Instead, consider making
13
+ # a separate helper file that requires the additional dependencies and performs
14
+ # the additional setup, and require it from the spec files that actually need
15
+ # it.
16
+ #
17
+ # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
18
+ RSpec.configure do |config|
19
+ # rspec-expectations config goes here. You can use an alternate
20
+ # assertion/expectation library such as wrong or the stdlib/minitest
21
+ # assertions if you prefer.
22
+ config.expect_with :rspec do |expectations|
23
+ # This option will default to `true` in RSpec 4. It makes the `description`
24
+ # and `failure_message` of custom matchers include text for helper methods
25
+ # defined using `chain`, e.g.:
26
+ # be_bigger_than(2).and_smaller_than(4).description
27
+ # # => "be bigger than 2 and smaller than 4"
28
+ # ...rather than:
29
+ # # => "be bigger than 2"
30
+ expectations.include_chain_clauses_in_custom_matcher_descriptions = true
31
+ end
32
+
33
+ # rspec-mocks config goes here. You can use an alternate test double
34
+ # library (such as bogus or mocha) by changing the `mock_with` option here.
35
+ config.mock_with :rspec do |mocks|
36
+ # Prevents you from mocking or stubbing a method that does not exist on
37
+ # a real object. This is generally recommended, and will default to
38
+ # `true` in RSpec 4.
39
+ mocks.verify_partial_doubles = true
40
+ end
41
+
42
+ # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
43
+ # have no way to turn it off -- the option exists only for backwards
44
+ # compatibility in RSpec 3). It causes shared context metadata to be
45
+ # inherited by the metadata hash of host groups and examples, rather than
46
+ # triggering implicit auto-inclusion in groups with matching metadata.
47
+ config.shared_context_metadata_behavior = :apply_to_host_groups
48
+
49
+ # The settings below are suggested to provide a good initial experience
50
+ # with RSpec, but feel free to customize to your heart's content.
51
+ # # This allows you to limit a spec run to individual examples or groups
52
+ # # you care about by tagging them with `:focus` metadata. When nothing
53
+ # # is tagged with `:focus`, all examples get run. RSpec also provides
54
+ # # aliases for `it`, `describe`, and `context` that include `:focus`
55
+ # # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
56
+ # config.filter_run_when_matching :focus
57
+ #
58
+ # # Allows RSpec to persist some state between runs in order to support
59
+ # # the `--only-failures` and `--next-failure` CLI options. We recommend
60
+ # # you configure your source control system to ignore this file.
61
+ # config.example_status_persistence_file_path = "spec/examples.txt"
62
+ #
63
+ # # Limits the available syntax to the non-monkey patched syntax that is
64
+ # # recommended. For more details, see:
65
+ # # - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
66
+ # # - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
67
+ # # - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
68
+ # config.disable_monkey_patching!
69
+ #
70
+ # # This setting enables warnings. It's recommended, but in some cases may
71
+ # # be too noisy due to issues in dependencies.
72
+ # config.warnings = true
73
+ #
74
+ # # Many RSpec users commonly either run the entire suite or an individual
75
+ # # file, and it's useful to allow more verbose output when running an
76
+ # # individual spec file.
77
+ # if config.files_to_run.one?
78
+ # # Use the documentation formatter for detailed output,
79
+ # # unless a formatter has already been configured
80
+ # # (e.g. via a command-line flag).
81
+ # config.default_formatter = "doc"
82
+ # end
83
+ #
84
+ # # Print the 10 slowest examples and example groups at the
85
+ # # end of the spec run, to help surface which specs are running
86
+ # # particularly slow.
87
+ # config.profile_examples = 10
88
+ #
89
+ # # Run specs in random order to surface order dependencies. If you find an
90
+ # # order dependency and want to debug it, you can fix the order by providing
91
+ # # the seed, which is printed after each run.
92
+ # # --seed 1234
93
+ # config.order = :random
94
+ #
95
+ # # Seed global randomization in this process using the `--seed` CLI option.
96
+ # # Setting this allows you to use `--seed` to deterministically reproduce
97
+ # # test failures related to randomization by passing the same `--seed` value
98
+ # # as the one that triggered the failure.
99
+ # Kernel.srand config.seed
100
+ end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacGit
4
- VERSION = '0.3.1'
4
+ VERSION = '0.3.2'
5
5
  end
@@ -8,6 +8,8 @@
8
8
  # Exit on any errors:
9
9
  set -e
10
10
 
11
+ export FILTER_BRANCH_SQUELCH_WARNING=1
12
+
11
13
  # Import Bash+ helper functions:
12
14
  SOURCE="$BASH_SOURCE"
13
15
  while [[ -h $SOURCE ]]; do
@@ -549,7 +551,7 @@ subrepo:pull() {
549
551
  fi
550
552
  else
551
553
  o "Merge in changes from $refs_subrepo_fetch"
552
- FAIL=false OUT=true RUN git merge "$refs_subrepo_fetch"
554
+ FAIL=false RUN git merge "$refs_subrepo_fetch"
553
555
  if ! OK; then
554
556
  say "The \"git merge\" command failed:"
555
557
  say
@@ -765,8 +767,8 @@ subrepo:branch() {
765
767
  o "Create with content"
766
768
  local PREVIOUS_IFS=$IFS
767
769
  IFS=$'\n'
768
- local author_info=( $(git log -1 --format=%ad%n%ae%n%an "$commit") )
769
- local commiter_info=( $(git log -1 --format=%cd%n%ce%n%cn "$commit") )
770
+ local author_info=( $(git log -1 --date=default --format=%ad%n%ae%n%an "$commit") )
771
+ local commiter_info=( $(git log -1 --date=default --format=%cd%n%ce%n%cn "$commit") )
770
772
  IFS=$PREVIOUS_IFS
771
773
 
772
774
  # When we create new commits we leave the author information unchanged
@@ -774,7 +776,7 @@ subrepo:branch() {
774
776
  # This should be analog how cherrypicking is handled allowing git
775
777
  # to store both the original author but also the responsible committer
776
778
  # that created the local version of the commit and pushed it.
777
- prev_commit=$(git log -n 1 --format=%B "$commit" |
779
+ prev_commit=$(git log -n 1 --date=default --format=%B "$commit" |
778
780
  GIT_AUTHOR_DATE="${author_info[0]}" \
779
781
  GIT_AUTHOR_EMAIL="${author_info[1]}" \
780
782
  GIT_AUTHOR_NAME="${author_info[2]}" \
@@ -959,7 +961,7 @@ subrepo:clean() {
959
961
 
960
962
  o "Clean $subdir"
961
963
  git:remove-worktree
962
- if [[ -e .git/$ref ]]; then
964
+ if git:branch-exists "$branch"; then
963
965
  o "Remove branch '$branch'."
964
966
  RUN git update-ref -d "$ref"
965
967
  clean_list+=("branch '$branch'")
@@ -1505,7 +1507,7 @@ assert-subdir-ready-for-init() {
1505
1507
  error "The subdir '$subdir' is already a subrepo."
1506
1508
  fi
1507
1509
  # Check that subdir is part of the repo
1508
- if [[ -z $(git log -1 -- $subdir) ]]; then
1510
+ if [[ -z $(git log -1 --date=default -- $subdir) ]]; then
1509
1511
  error "The subdir '$subdir' is not part of this repo."
1510
1512
  fi
1511
1513
  }
@@ -1535,7 +1537,7 @@ get-all-subrepos() {
1535
1537
  add-subrepo() {
1536
1538
  if ! $ALL_wanted; then
1537
1539
  for path in "${subrepos[@]}"; do
1538
- [[ $1 =~ ^$path ]] && return
1540
+ [[ $1/ =~ ^$path/ ]] && return
1539
1541
  done
1540
1542
  fi
1541
1543
  subrepos+=("$1")