avm-tools 0.99.0 → 0.102.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/avm/app_src.rb +12 -11
- data/lib/avm/docker/image.rb +7 -23
- data/lib/avm/docker/registry.rb +2 -11
- data/lib/avm/docker/runner.rb +32 -6
- data/lib/avm/eac_rails_base1/runner/bundle.rb +1 -2
- data/lib/avm/eac_redmine_base0/docker_image.rb +52 -0
- data/lib/avm/eac_redmine_base0/instance.rb +2 -2
- data/lib/avm/eac_webapp_base0/deploy.rb +1 -1
- data/lib/avm/eac_webapp_base0/deploy/git_info.rb +1 -1
- data/lib/avm/git/auto_commit/rules/manual.rb +1 -1
- data/lib/avm/git/commit/file.rb +1 -1
- data/lib/avm/git/issue/complete.rb +3 -3
- data/lib/avm/git/revision_test.rb +9 -6
- data/lib/avm/git/subrepo_check.rb +1 -1
- data/lib/avm/git/subrepo_check/show_result.rb +1 -1
- data/lib/avm/git/subrepo_checks.rb +1 -1
- data/lib/avm/instances/base/dockerizable.rb +1 -0
- data/lib/avm/instances/base/entry_keys.rb +6 -1
- data/lib/avm/instances/docker_image.rb +15 -0
- data/lib/avm/instances/entries.rb +0 -1
- data/lib/avm/instances/entry.rb +3 -2
- data/lib/avm/instances/entry_keys.rb +3 -0
- data/lib/avm/launcher/context.rb +83 -0
- data/lib/avm/launcher/context/instance_discovery.rb +56 -0
- data/lib/avm/launcher/context/instance_manager.rb +3 -3
- data/lib/avm/launcher/context/instance_manager/cached_instance.rb +1 -1
- data/lib/avm/launcher/context/settings.rb +53 -0
- data/lib/avm/launcher/git.rb +7 -0
- data/lib/avm/launcher/git/base.rb +86 -0
- data/lib/avm/launcher/git/base/class_methods.rb +28 -0
- data/lib/avm/launcher/git/base/dirty_files.rb +23 -0
- data/lib/avm/launcher/git/base/remotes.rb +40 -0
- data/lib/avm/launcher/git/base/subrepo.rb +44 -0
- data/lib/avm/launcher/git/base/underlying.rb +63 -0
- data/lib/avm/launcher/git/error.rb +13 -0
- data/lib/avm/launcher/git/mirror_update.rb +38 -0
- data/lib/avm/launcher/git/publish_base.rb +123 -0
- data/lib/avm/launcher/git/remote.rb +55 -0
- data/lib/avm/launcher/git/sub_warp_base.rb +33 -0
- data/lib/avm/launcher/git/warp_base.rb +67 -0
- data/lib/{eac_launcher → avm/launcher}/instances.rb +1 -1
- data/lib/avm/launcher/instances/base.rb +5 -4
- data/lib/avm/launcher/instances/base/cache.rb +1 -1
- data/lib/avm/launcher/instances/error.rb +1 -3
- data/lib/avm/launcher/instances/runner_helper.rb +1 -1
- data/lib/avm/launcher/paths.rb +4 -0
- data/lib/avm/launcher/paths/logical.rb +82 -0
- data/lib/avm/launcher/paths/real.rb +44 -0
- data/lib/avm/launcher/project.rb +18 -0
- data/lib/avm/launcher/publish.rb +4 -0
- data/lib/avm/launcher/publish/base.rb +47 -0
- data/lib/avm/launcher/publish/check_result.rb +67 -0
- data/lib/avm/launcher/ruby.rb +3 -0
- data/lib/avm/launcher/ruby/gem.rb +4 -0
- data/lib/avm/launcher/ruby/gem/build.rb +125 -0
- data/lib/avm/launcher/ruby/gem/specification.rb +63 -0
- data/lib/avm/launcher/vendor.rb +3 -0
- data/lib/avm/launcher/vendor/github.rb +20 -0
- data/lib/avm/projects/stereotype/job_comparator.rb +32 -0
- data/lib/avm/projects/stereotypes/git/publish.rb +2 -2
- data/lib/avm/projects/stereotypes/git/update.rb +1 -2
- data/lib/avm/projects/stereotypes/git/update/subrepo.rb +2 -2
- data/lib/avm/projects/stereotypes/git/warp.rb +2 -2
- data/lib/avm/projects/stereotypes/git_subrepo.rb +2 -2
- data/lib/avm/projects/stereotypes/git_subrepo/publish.rb +2 -2
- data/lib/avm/projects/stereotypes/git_subrepo/warp.rb +11 -11
- data/lib/avm/projects/stereotypes/git_subtree/publish.rb +2 -2
- data/lib/avm/projects/stereotypes/git_subtree/warp.rb +4 -4
- data/lib/avm/projects/stereotypes/ruby_gem.rb +2 -2
- data/lib/avm/projects/stereotypes/ruby_gem/publish.rb +12 -12
- data/lib/avm/projects/stereotypes/ruby_gem/update.rb +4 -0
- data/lib/avm/self.rb +9 -0
- data/lib/avm/tools/runner.rb +4 -0
- data/lib/avm/tools/runner/app_src/version_bump.rb +1 -1
- data/lib/avm/tools/runner/config.rb +17 -0
- data/lib/avm/tools/runner/config/load_path.rb +48 -0
- data/lib/avm/tools/runner/eac_redmine_base0/dev_docker.rb +17 -0
- data/lib/avm/tools/runner/eac_redmine_base0/docker.rb +3 -0
- data/lib/avm/tools/runner/files/format.rb +2 -2
- data/lib/avm/tools/runner/git.rb +2 -2
- data/lib/avm/tools/runner/git/commit.rb +2 -2
- data/lib/avm/tools/runner/git/deploy.rb +4 -3
- data/lib/avm/tools/runner/git/organize.rb +1 -1
- data/lib/avm/tools/runner/launcher/instances.rb +1 -1
- data/lib/avm/tools/runner/launcher/projects.rb +3 -3
- data/lib/avm/tools/runner/launcher/publish.rb +2 -2
- data/lib/avm/tools/version.rb +1 -1
- data/template/avm/eac_redmine_base0/docker_image/Dockerfile.template +47 -0
- data/template/avm/eac_redmine_base0/docker_image/apache_http_virtualhost.conf.template +10 -0
- data/template/avm/eac_redmine_base0/docker_image/apache_https_virtualhost.conf.template +16 -0
- data/template/avm/eac_redmine_base0/docker_image/install_settings.sh.template +29 -0
- data/template/avm/eac_redmine_base0/docker_image/start.sh.template +25 -0
- data/template/avm/eac_ubuntu_base0/docker_image/Dockerfile +1 -1
- data/vendor/avm-apps/avm-apps.gemspec +1 -1
- data/vendor/avm-apps/lib/avm/apps/config.rb +15 -0
- data/vendor/avm-apps/lib/avm/apps/jobs/base.rb +1 -1
- data/vendor/avm-apps/lib/avm/apps/version.rb +1 -1
- data/vendor/eac_cli/eac_cli.gemspec +1 -1
- data/vendor/eac_cli/lib/eac_cli/config.rb +19 -0
- data/vendor/eac_cli/lib/eac_cli/config/entry.rb +48 -0
- data/vendor/eac_cli/lib/eac_cli/config/entry/options.rb +57 -0
- data/vendor/eac_cli/lib/eac_cli/config/entry/undefined.rb +26 -0
- data/vendor/eac_cli/lib/eac_cli/definition/positional_argument.rb +6 -1
- data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder/alternative.rb +3 -1
- data/vendor/eac_cli/lib/eac_cli/docopt_runner.rb +4 -8
- data/vendor/eac_cli/lib/eac_cli/docopt_runner/{_class_methods.rb → class_methods.rb} +5 -3
- data/vendor/eac_cli/lib/eac_cli/docopt_runner/context.rb +18 -0
- data/vendor/eac_cli/lib/eac_cli/old_configs.rb +0 -1
- data/vendor/eac_cli/lib/eac_cli/old_configs/entry_reader.rb +2 -2
- data/vendor/eac_cli/lib/eac_cli/old_configs_bridge.rb +37 -0
- data/vendor/eac_cli/lib/eac_cli/runner/after_class_methods.rb +20 -3
- data/vendor/eac_cli/lib/eac_cli/runner_with/help.rb +6 -2
- data/vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb +5 -1
- data/vendor/eac_cli/lib/eac_cli/speaker.rb +15 -19
- data/vendor/eac_cli/lib/eac_cli/speaker/_constants.rb +1 -1
- data/vendor/eac_cli/lib/eac_cli/speaker/list.rb +1 -1
- data/vendor/eac_cli/lib/eac_cli/speaker/options.rb +38 -0
- data/vendor/eac_cli/lib/eac_cli/version.rb +1 -1
- data/vendor/eac_cli/spec/lib/eac_cli/speaker_spec.rb +5 -9
- data/vendor/eac_config/lib/eac_config/entry.rb +7 -1
- data/vendor/eac_config/lib/eac_config/envvars_node.rb +25 -0
- data/vendor/eac_config/lib/eac_config/envvars_node/entry.rb +54 -0
- data/vendor/eac_config/lib/eac_config/load_path.rb +5 -13
- data/vendor/eac_config/lib/eac_config/node.rb +9 -2
- data/vendor/eac_config/lib/eac_config/node_entry.rb +2 -23
- data/vendor/eac_config/lib/eac_config/node_uri.rb +38 -0
- data/vendor/eac_config/lib/eac_config/old_configs.rb +1 -0
- data/vendor/eac_config/lib/eac_config/version.rb +1 -1
- data/vendor/eac_config/lib/eac_config/yaml_file_node.rb +9 -2
- data/vendor/eac_config/lib/eac_config/yaml_file_node/entry.rb +37 -0
- data/vendor/eac_config/spec/lib/eac_config/envvars_node/entry_spec.rb +14 -0
- data/vendor/eac_config/spec/lib/eac_config/envvars_node_spec.rb +40 -0
- data/vendor/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1.yaml +3 -1
- data/vendor/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1_2.yaml +2 -1
- data/vendor/eac_git/lib/eac_git/executables.rb +4 -0
- data/vendor/eac_git/lib/eac_git/local.rb +5 -1
- data/vendor/eac_git/lib/eac_git/local/commit/archive.rb +19 -0
- data/vendor/eac_git/lib/eac_git/local/subrepo.rb +2 -1
- data/vendor/eac_git/lib/eac_git/version.rb +1 -1
- data/vendor/eac_ruby_base0/eac_ruby_base0.gemspec +2 -2
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb +8 -11
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application_xdg.rb +32 -0
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/jobs_runner.rb +2 -2
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb +13 -6
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb +8 -1
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb +1 -1
- data/vendor/eac_ruby_gems_utils/eac_ruby_gems_utils.gemspec +1 -1
- data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb +2 -0
- data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb +1 -1
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/context.rb +31 -0
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/contextualizable.rb +12 -7
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/context.rb +11 -0
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/speaker.rb +9 -0
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb +10 -2
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker.rb +16 -0
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker/receiver.rb +57 -0
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker/sender.rb +32 -0
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
- data/vendor/{eac_cli/spec/lib → eac_ruby_utils/spec/lib/eac_ruby_utils/patches}/module/speaker_spec.rb +2 -2
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb +18 -0
- metadata +67 -41
- data/lib/avm/configs.rb +0 -22
- data/lib/eac_launcher.rb +0 -13
- data/lib/eac_launcher/context.rb +0 -81
- data/lib/eac_launcher/context/instance_discovery.rb +0 -54
- data/lib/eac_launcher/context/settings.rb +0 -51
- data/lib/eac_launcher/git.rb +0 -7
- data/lib/eac_launcher/git/base.rb +0 -84
- data/lib/eac_launcher/git/base/class_methods.rb +0 -26
- data/lib/eac_launcher/git/base/dirty_files.rb +0 -21
- data/lib/eac_launcher/git/base/remotes.rb +0 -38
- data/lib/eac_launcher/git/base/subrepo.rb +0 -42
- data/lib/eac_launcher/git/base/underlying.rb +0 -61
- data/lib/eac_launcher/git/error.rb +0 -11
- data/lib/eac_launcher/git/mirror_update.rb +0 -36
- data/lib/eac_launcher/git/publish_base.rb +0 -119
- data/lib/eac_launcher/git/remote.rb +0 -53
- data/lib/eac_launcher/git/sub_warp_base.rb +0 -31
- data/lib/eac_launcher/git/warp_base.rb +0 -54
- data/lib/eac_launcher/paths.rb +0 -4
- data/lib/eac_launcher/paths/logical.rb +0 -80
- data/lib/eac_launcher/paths/real.rb +0 -42
- data/lib/eac_launcher/project.rb +0 -16
- data/lib/eac_launcher/publish.rb +0 -4
- data/lib/eac_launcher/publish/base.rb +0 -45
- data/lib/eac_launcher/publish/check_result.rb +0 -65
- data/lib/eac_launcher/ruby.rb +0 -3
- data/lib/eac_launcher/ruby/gem.rb +0 -4
- data/lib/eac_launcher/ruby/gem/build.rb +0 -123
- data/lib/eac_launcher/ruby/gem/specification.rb +0 -61
- data/lib/eac_launcher/vendor.rb +0 -3
- data/lib/eac_launcher/vendor/github.rb +0 -18
- data/lib/eac_launcher/version.rb +0 -5
- data/vendor/eac_cli/lib/eac_cli/patches/module.rb +0 -4
- data/vendor/eac_cli/lib/eac_cli/patches/module/speaker.rb +0 -10
- data/vendor/eac_cli/lib/eac_cli/speaker/_class_methods.rb +0 -37
- data/vendor/eac_cli/lib/eac_cli/speaker/node.rb +0 -24
@@ -0,0 +1,40 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_config/envvars_node'
|
4
|
+
|
5
|
+
RSpec.describe ::EacConfig::EnvvarsNode do
|
6
|
+
let(:instance) { described_class.new }
|
7
|
+
|
8
|
+
before do
|
9
|
+
ENV['COMMON'] = 'AAA'
|
10
|
+
ENV['BLANK'] = ''
|
11
|
+
ENV.delete('NO_EXIST')
|
12
|
+
end
|
13
|
+
|
14
|
+
context 'with common entry' do
|
15
|
+
let(:entry) { instance.entry('common') }
|
16
|
+
|
17
|
+
it { expect(entry).to be_a(::EacConfig::Entry) }
|
18
|
+
it { expect(entry.value).to eq('AAA') }
|
19
|
+
it { expect(entry.found_node).to eq(instance) }
|
20
|
+
it { expect(entry).to be_found }
|
21
|
+
end
|
22
|
+
|
23
|
+
context 'with blank entry' do
|
24
|
+
let(:entry) { instance.entry('blank') }
|
25
|
+
|
26
|
+
it { expect(entry).to be_a(::EacConfig::Entry) }
|
27
|
+
it { expect(entry.value).to eq('') }
|
28
|
+
it { expect(entry.found_node).to eq(instance) }
|
29
|
+
it { expect(entry).to be_found }
|
30
|
+
end
|
31
|
+
|
32
|
+
context 'with not existing entry' do
|
33
|
+
let(:entry) { instance.entry('no.exist') }
|
34
|
+
|
35
|
+
it { expect(entry).to be_a(::EacConfig::Entry) }
|
36
|
+
it { expect(entry.value).to eq(nil) }
|
37
|
+
it { expect(entry.found_node).to eq(nil) }
|
38
|
+
it { expect(entry).not_to be_found }
|
39
|
+
end
|
40
|
+
end
|
@@ -39,13 +39,17 @@ module EacGit
|
|
39
39
|
::EacGit::Executables.git.command('-C', root_path.to_path, *args)
|
40
40
|
end
|
41
41
|
|
42
|
+
def raise_error(message)
|
43
|
+
raise "#{root_path}: #{message}"
|
44
|
+
end
|
45
|
+
|
42
46
|
def rev_parse(ref, required = false)
|
43
47
|
r = command('rev-parse', ref).execute!(exit_outputs: { 128 => nil, 32_768 => nil })
|
44
48
|
r.strip! if r.is_a?(String)
|
45
49
|
return r if r.present?
|
46
50
|
return nil unless required
|
47
51
|
|
48
|
-
|
52
|
+
raise_error "Reference \"#{ref}\" not found"
|
49
53
|
end
|
50
54
|
|
51
55
|
def subrepo(subpath)
|
@@ -0,0 +1,19 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_ruby_utils/core_ext'
|
4
|
+
|
5
|
+
module EacGit
|
6
|
+
class Local
|
7
|
+
class Commit
|
8
|
+
module Archive
|
9
|
+
# @return [EacRubyUtils::Envs::Command]
|
10
|
+
def archive_to_dir(path)
|
11
|
+
path = path.to_pathname
|
12
|
+
repo.command('archive', '--format=tar', hash).pipe(
|
13
|
+
::EacGit::Executables.tar.command('-xC', path)
|
14
|
+
)
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
@@ -12,7 +12,8 @@ module EacGit
|
|
12
12
|
|
13
13
|
common_constructor :local, :subpath do
|
14
14
|
self.subpath = subpath.to_pathname
|
15
|
-
|
15
|
+
local.raise_error "Config file \"#{config_absolute_path}\" not found" unless
|
16
|
+
config_absolute_path.file?
|
16
17
|
end
|
17
18
|
|
18
19
|
def command(subrepo_subcommand, *subrepo_subcommand_args)
|
@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
|
|
12
12
|
|
13
13
|
s.files = Dir['{lib}/**/*']
|
14
14
|
|
15
|
-
s.add_dependency 'eac_cli', '~> 0.
|
15
|
+
s.add_dependency 'eac_cli', '~> 0.20'
|
16
16
|
s.add_dependency 'eac_ruby_gems_utils', '~> 0.8'
|
17
|
-
s.add_dependency 'eac_ruby_utils', '~> 0.
|
17
|
+
s.add_dependency 'eac_ruby_utils', '~> 0.67'
|
18
18
|
|
19
19
|
s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
|
20
20
|
end
|
@@ -1,5 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'eac_ruby_base0/application_xdg'
|
3
4
|
require 'eac_ruby_gems_utils/gem'
|
4
5
|
require 'eac_ruby_utils/core_ext'
|
5
6
|
require 'eac_ruby_utils/filesystem_cache'
|
@@ -21,16 +22,8 @@ module EacRubyBase0
|
|
21
22
|
vendor_gems + [self_gem]
|
22
23
|
end
|
23
24
|
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
define_method xdg_env_method_name do
|
28
|
-
ENV["XDG_#{item.upcase}_HOME"].if_present(&:to_pathname)
|
29
|
-
end
|
30
|
-
|
31
|
-
define_method "#{item}_dir" do
|
32
|
-
(send(xdg_env_method_name) || home_dir.join(subpath)).join(name)
|
33
|
-
end
|
25
|
+
::EacRubyBase0::ApplicationXdg::DIRECTORIES.each_key do |item|
|
26
|
+
delegate "#{item}_xdg_env", "#{item}_dir", to: :app_xdg
|
34
27
|
end
|
35
28
|
|
36
29
|
def fs_cache
|
@@ -40,7 +33,7 @@ module EacRubyBase0
|
|
40
33
|
end
|
41
34
|
|
42
35
|
def home_dir
|
43
|
-
|
36
|
+
app_xdg.user_home_dir
|
44
37
|
end
|
45
38
|
|
46
39
|
def name
|
@@ -53,6 +46,10 @@ module EacRubyBase0
|
|
53
46
|
|
54
47
|
private
|
55
48
|
|
49
|
+
def app_xdg_uncached
|
50
|
+
::EacRubyBase0::ApplicationXdg.new(name, options[OPTION_HOME_DIR])
|
51
|
+
end
|
52
|
+
|
56
53
|
def self_gem_uncached
|
57
54
|
::EacRubyGemsUtils::Gem.new(gemspec_dir)
|
58
55
|
end
|
@@ -0,0 +1,32 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module EacRubyBase0
|
4
|
+
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
5
|
+
class ApplicationXdg
|
6
|
+
class << self
|
7
|
+
# @return [Pathname]
|
8
|
+
def user_home_dir_from_env
|
9
|
+
ENV.fetch('HOME').to_pathname
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
DIRECTORIES = { cache: '.cache', config: '.config', data: '.local/share',
|
14
|
+
state: '.local/state' }.freeze
|
15
|
+
|
16
|
+
common_constructor :app_name, :user_home_dir, default: [nil] do
|
17
|
+
self.user_home_dir ||= self.class.user_home_dir_from_env
|
18
|
+
end
|
19
|
+
|
20
|
+
DIRECTORIES.each do |item, subpath|
|
21
|
+
xdg_env_method_name = "#{item}_xdg_env"
|
22
|
+
|
23
|
+
define_method xdg_env_method_name do
|
24
|
+
ENV["XDG_#{item.upcase}_HOME"].if_present(&:to_pathname)
|
25
|
+
end
|
26
|
+
|
27
|
+
define_method "#{item}_dir" do
|
28
|
+
(send(xdg_env_method_name) || user_home_dir.join(subpath)).join(app_name)
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
@@ -1,12 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require '
|
3
|
+
require 'eac_ruby_utils/core_ext'
|
4
4
|
require 'eac_ruby_utils/settings_provider'
|
5
5
|
|
6
6
|
module EacRubyBase0
|
7
7
|
module JobsRunner
|
8
8
|
common_concern do
|
9
|
-
|
9
|
+
enable_speaker
|
10
10
|
include ::EacRubyUtils::SettingsProvider
|
11
11
|
end
|
12
12
|
|
@@ -1,8 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'eac_cli/
|
4
|
-
require 'eac_cli/
|
5
|
-
require 'eac_ruby_utils/
|
3
|
+
require 'eac_cli/core_ext'
|
4
|
+
require 'eac_cli/speaker'
|
5
|
+
require 'eac_ruby_utils/speaker'
|
6
6
|
|
7
7
|
module EacRubyBase0
|
8
8
|
module Runner
|
@@ -22,9 +22,7 @@ module EacRubyBase0
|
|
22
22
|
end
|
23
23
|
|
24
24
|
def run
|
25
|
-
|
26
|
-
node.stderr = ::StringIO.new if parsed.quiet?
|
27
|
-
node.stdin = FailIfRequestInput.new if parsed.no_input?
|
25
|
+
::EacRubyUtils::Speaker.context.on(build_speaker) do
|
28
26
|
if parsed.version?
|
29
27
|
show_version
|
30
28
|
else
|
@@ -50,5 +48,14 @@ module EacRubyBase0
|
|
50
48
|
end
|
51
49
|
end
|
52
50
|
end
|
51
|
+
|
52
|
+
private
|
53
|
+
|
54
|
+
def build_speaker
|
55
|
+
options = {}
|
56
|
+
options[:err_out] = ::StringIO.new if parsed.quiet?
|
57
|
+
options[:in_in] = FailIfRequestInput.new if parsed.no_input?
|
58
|
+
::EacCli::Speaker.new(options)
|
59
|
+
end
|
53
60
|
end
|
54
61
|
end
|
@@ -12,6 +12,7 @@ module EacRubyBase0
|
|
12
12
|
common_concern do
|
13
13
|
include ::EacCli::Runner
|
14
14
|
enable_settings_provider
|
15
|
+
enable_simple_cache
|
15
16
|
runner_definition do
|
16
17
|
bool_opt '--no', 'Deny confirmation without question.'
|
17
18
|
bool_opt '--yes', 'Accept confirmation without question.'
|
@@ -22,7 +23,7 @@ module EacRubyBase0
|
|
22
23
|
return false if parsed.no?
|
23
24
|
return true if parsed.yes?
|
24
25
|
|
25
|
-
|
26
|
+
input(
|
26
27
|
message || setting_value(:confirm_question_text, default: DEFAULT_CONFIRM_QUESTION_TEXT),
|
27
28
|
bool: true
|
28
29
|
)
|
@@ -31,6 +32,12 @@ module EacRubyBase0
|
|
31
32
|
def run_confirm(message = nil)
|
32
33
|
yield if confirm?(message)
|
33
34
|
end
|
35
|
+
|
36
|
+
private
|
37
|
+
|
38
|
+
def cached_confirm_uncached?(message = nil)
|
39
|
+
confirm?(message)
|
40
|
+
end
|
34
41
|
end
|
35
42
|
end
|
36
43
|
end
|
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
|
|
23
23
|
s.test_files = Dir['{spec}/**/*', '.rspec']
|
24
24
|
|
25
25
|
s.add_dependency 'bundler', '~> 2.2', '>= 2.2.17'
|
26
|
-
s.add_dependency 'eac_ruby_utils', '~> 0.
|
26
|
+
s.add_dependency 'eac_ruby_utils', '~> 0.67'
|
27
27
|
|
28
28
|
# Tests
|
29
29
|
s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
|
@@ -0,0 +1,31 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module EacRubyUtils
|
4
|
+
class Context
|
5
|
+
def current
|
6
|
+
optional_current || raise('No elements in context')
|
7
|
+
end
|
8
|
+
|
9
|
+
def optional_current
|
10
|
+
stack.last
|
11
|
+
end
|
12
|
+
|
13
|
+
delegate :pop, to: :stack
|
14
|
+
delegate :push, to: :stack
|
15
|
+
|
16
|
+
def on(obj)
|
17
|
+
push(obj)
|
18
|
+
begin
|
19
|
+
yield
|
20
|
+
ensure
|
21
|
+
pop
|
22
|
+
end
|
23
|
+
end
|
24
|
+
|
25
|
+
private
|
26
|
+
|
27
|
+
def stack
|
28
|
+
@stack ||= []
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
@@ -1,16 +1,21 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'eac_ruby_utils/context'
|
4
|
+
|
3
5
|
module EacRubyUtils
|
4
|
-
# Provides the method context which search and call a method in self and ancestor objects.
|
5
6
|
module Contextualizable
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
7
|
+
common_concern
|
8
|
+
|
9
|
+
module ClassMethods
|
10
|
+
def context
|
11
|
+
@context ||= ::EacRubyUtils::Context.new
|
12
|
+
end
|
13
|
+
end
|
10
14
|
|
11
|
-
|
15
|
+
module InstanceMethods
|
16
|
+
def context
|
17
|
+
self.class.context
|
12
18
|
end
|
13
|
-
raise "Context method \"#{method}\" not found for #{self.class}"
|
14
19
|
end
|
15
20
|
end
|
16
21
|
end
|
@@ -0,0 +1,11 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_ruby_utils/patch'
|
4
|
+
require 'eac_ruby_utils/contextualizable'
|
5
|
+
|
6
|
+
class Module
|
7
|
+
# Patches module with [EacRubyUtils::Contextualizable].
|
8
|
+
def enable_context
|
9
|
+
::EacRubyUtils.patch(self, ::EacRubyUtils::Contextualizable)
|
10
|
+
end
|
11
|
+
end
|
@@ -3,11 +3,19 @@
|
|
3
3
|
module EacRubyUtils
|
4
4
|
module SimpleCache
|
5
5
|
UNCACHED_METHOD_NAME_SUFFIX = '_uncached'
|
6
|
-
UNCACHED_METHOD_PATTERN =
|
6
|
+
UNCACHED_METHOD_PATTERN = /
|
7
|
+
\A(\s+)_#{::Regexp.quote(UNCACHED_METHOD_NAME_SUFFIX)}([\!\?]?)\z
|
8
|
+
/x.freeze
|
7
9
|
|
8
10
|
class << self
|
9
11
|
def uncached_method_name(method_name)
|
10
|
-
|
12
|
+
method_name = method_name.to_s
|
13
|
+
end_mark = nil
|
14
|
+
if %w[! ?].any? { |mark| method_name.end_with?(mark) }
|
15
|
+
end_mark = method_name[-1]
|
16
|
+
method_name = method_name[0..-2]
|
17
|
+
end
|
18
|
+
"#{method_name}#{UNCACHED_METHOD_NAME_SUFFIX}#{end_mark}"
|
11
19
|
end
|
12
20
|
end
|
13
21
|
|