eac_tools 0.37.0 → 0.37.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +51 -42
- data/lib/eac_tools/version.rb +1 -1
- data/sub/avm/avm.gemspec +4 -2
- data/sub/avm/lib/avm/file_formats/base.rb +60 -0
- data/sub/avm/lib/avm/file_formats.rb +9 -0
- data/sub/avm/lib/avm/launcher/context.rb +6 -3
- data/sub/avm/lib/avm/launcher/paths/logical.rb +0 -1
- data/sub/avm/lib/avm/launcher/stereotype.rb +4 -4
- data/sub/avm/lib/avm/registry/file_formats.rb +10 -0
- data/sub/avm/lib/avm/registry.rb +2 -2
- data/sub/avm/lib/avm/rspec/setup/launcher.rb +19 -0
- data/sub/avm/lib/avm/rspec/setup.rb +2 -0
- data/sub/avm/lib/avm/rspec/source_generator.rb +3 -3
- data/sub/avm/lib/avm/version.rb +1 -1
- data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec +2 -2
- data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base.rb +32 -0
- data/sub/{avm-files/lib/avm/files/formatter/formats.rb → avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats.rb} +3 -5
- data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/version.rb +1 -1
- data/sub/avm-eac_php_base0/avm-eac_php_base0.gemspec +2 -1
- data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/file_formats/base.rb +20 -0
- data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/file_formats.rb +11 -0
- data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/version.rb +1 -1
- data/sub/avm-eac_python_base0/Gemfile +8 -0
- data/sub/avm-eac_python_base0/avm-eac_python_base0.gemspec +19 -0
- data/sub/avm-eac_python_base0/lib/avm/eac_python_base0/file_formats/base.rb +20 -0
- data/sub/avm-eac_python_base0/lib/avm/eac_python_base0/file_formats.rb +11 -0
- data/sub/avm-eac_python_base0/lib/avm/eac_python_base0/version.rb +7 -0
- data/sub/avm-eac_python_base0/lib/avm/eac_python_base0.rb +9 -0
- data/sub/avm-eac_python_base0/spec/rubocop_spec.rb +3 -0
- data/sub/avm-eac_python_base0/spec/spec_helper.rb +4 -0
- data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec +3 -3
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base.rb +20 -0
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats.rb +11 -0
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher/gem/build.rb +1 -0
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rspec/setup.rb +16 -0
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rspec/source_generator.rb +22 -0
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rspec.rb +11 -0
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb +1 -1
- data/sub/{avm-tools → avm-eac_ruby_base1}/spec/lib/avm/eac_ruby_base1/launcher/gem/build_spec.rb +5 -2
- data/sub/{avm-tools → avm-eac_ruby_base1}/spec/lib/avm/eac_ruby_base1/launcher/gem/specification_spec.rb +11 -2
- data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/launcher_stereotypes/base/publish_spec.rb +24 -0
- data/sub/{avm-tools → avm-eac_ruby_base1}/spec/lib/avm/eac_ruby_base1/launcher_stereotypes/base_spec.rb +5 -4
- data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/sources/base_spec.rb +1 -1
- data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec +3 -3
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/html.rb +43 -0
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/javascript.rb +22 -0
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/json.rb +25 -0
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/provider.rb +23 -0
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/xml.rb +26 -0
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats.rb +11 -0
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/build.rb +1 -1
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/{git_info.rb → scm.rb} +10 -5
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/version.rb +2 -2
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy.rb +3 -2
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/version.rb +1 -1
- data/sub/avm-files/avm-files.gemspec +2 -2
- data/sub/avm-files/lib/avm/files/formatter.rb +6 -5
- data/sub/avm-files/lib/avm/files/version.rb +1 -1
- data/sub/avm-git/avm-git.gemspec +3 -3
- data/sub/avm-git/lib/avm/git/launcher/base/underlying.rb +8 -10
- data/sub/avm-git/lib/avm/git/version.rb +1 -1
- data/sub/avm-tools/avm-tools.gemspec +8 -5
- data/sub/avm-tools/lib/avm/tools/version.rb +1 -1
- data/sub/eac_git/eac_git.gemspec +1 -1
- data/sub/eac_git/lib/eac_git/local/remote.rb +12 -1
- data/sub/eac_git/lib/eac_git/remote.rb +10 -5
- data/sub/eac_git/lib/eac_git/{remote → remote_like}/ls_result.rb +1 -1
- data/sub/eac_git/lib/eac_git/remote_like.rb +32 -0
- data/sub/eac_git/lib/eac_git/version.rb +1 -1
- data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/exec_error.rb +10 -0
- data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/execute_result.rb +47 -0
- data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command.rb +3 -40
- data/sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/setup/setup_manager.rb +17 -0
- data/sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/setup.rb +8 -2
- data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
- data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/rspec/setup/setup_manager_spec.rb +17 -0
- metadata +58 -36
- data/sub/avm-files/lib/avm/files/formatter/formats/base.rb +0 -62
- data/sub/avm-files/lib/avm/files/formatter/formats/generic_plain.rb +0 -34
- data/sub/avm-files/lib/avm/files/formatter/formats/html.rb +0 -45
- data/sub/avm-files/lib/avm/files/formatter/formats/javascript.rb +0 -24
- data/sub/avm-files/lib/avm/files/formatter/formats/json.rb +0 -27
- data/sub/avm-files/lib/avm/files/formatter/formats/php.rb +0 -22
- data/sub/avm-files/lib/avm/files/formatter/formats/python.rb +0 -22
- data/sub/avm-files/lib/avm/files/formatter/formats/ruby.rb +0 -22
- data/sub/avm-files/lib/avm/files/formatter/formats/xml.rb +0 -28
- data/sub/avm-tools/spec/lib/avm/eac_ruby_base1/launcher_stereotypes/base/publish_spec.rb +0 -19
@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
|
|
12
12
|
|
13
13
|
s.files = Dir['{lib,locale,template}/**/*']
|
14
14
|
|
15
|
-
s.add_dependency 'avm', '~> 0.
|
16
|
-
s.add_dependency 'avm-eac_generic_base0', '~> 0.
|
17
|
-
s.add_dependency 'eac_ruby_utils', '~> 0.
|
15
|
+
s.add_dependency 'avm', '~> 0.51'
|
16
|
+
s.add_dependency 'avm-eac_generic_base0', '~> 0.6'
|
17
|
+
s.add_dependency 'eac_ruby_utils', '~> 0.105'
|
18
18
|
|
19
19
|
s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
|
20
20
|
s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
|
@@ -0,0 +1,20 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/eac_generic_base0/file_formats/base'
|
4
|
+
require 'avm/eac_ruby_base1/rubocop'
|
5
|
+
|
6
|
+
module Avm
|
7
|
+
module EacRubyBase1
|
8
|
+
module FileFormats
|
9
|
+
class Base < ::Avm::EacGenericBase0::FileFormats::Base
|
10
|
+
VALID_BASENAMES = %w[*.gemspec *.rake *.rb Gemfile Rakefile].freeze
|
11
|
+
VALID_TYPES = ['x-ruby'].freeze
|
12
|
+
|
13
|
+
def internal_apply(files)
|
14
|
+
::Avm::EacRubyBase1::Rubocop.new('.', ['-a', '--ignore-parent-exclusion'] + files).run
|
15
|
+
super(files)
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
@@ -0,0 +1,16 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/eac_ruby_base1/rspec/source_generator'
|
4
|
+
require 'eac_ruby_utils/core_ext'
|
5
|
+
|
6
|
+
module Avm
|
7
|
+
module EacRubyBase1
|
8
|
+
module Rspec
|
9
|
+
module Setup
|
10
|
+
def self.extended(obj)
|
11
|
+
obj.rspec_config.include(::Avm::EacRubyBase1::Rspec::SourceGenerator)
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_ruby_utils/core_ext'
|
4
|
+
|
5
|
+
module Avm
|
6
|
+
module EacRubyBase1
|
7
|
+
module Rspec
|
8
|
+
module SourceGenerator
|
9
|
+
APPLICATION_STEREOTYPE = 'EacRubyBase1'
|
10
|
+
DEFAULT_EAC_RUBY_GEM_SUPPORT_VERSION = '0.5.1'
|
11
|
+
DEFAULT_EAC_RUBY_UTILS_VERSION = '0.104.0'
|
12
|
+
|
13
|
+
# @return [Avm::EacRubyBase1::Sources::Base]
|
14
|
+
def avm_eac_ruby_base1_source(options = {})
|
15
|
+
options['eac-ruby-utils-version'] ||= DEFAULT_EAC_RUBY_UTILS_VERSION
|
16
|
+
options['eac-ruby-gem-support-version'] ||= DEFAULT_EAC_RUBY_GEM_SUPPORT_VERSION
|
17
|
+
avm_source(APPLICATION_STEREOTYPE, options)
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
data/sub/{avm-tools → avm-eac_ruby_base1}/spec/lib/avm/eac_ruby_base1/launcher/gem/build_spec.rb
RENAMED
@@ -5,7 +5,10 @@ require 'avm/eac_ruby_base1/launcher/gem/build'
|
|
5
5
|
|
6
6
|
RSpec.describe ::Avm::EacRubyBase1::Launcher::Gem::Build do
|
7
7
|
describe '#output_file' do
|
8
|
-
let(:gem_dir)
|
8
|
+
let(:gem_dir) do
|
9
|
+
avm_eac_ruby_base1_source(target_path: temp_dir.join('ruby_gem_stub'))
|
10
|
+
.path.to_path
|
11
|
+
end
|
9
12
|
|
10
13
|
it 'builds .gem file' do # rubocop:disable RSpec/ExampleLength
|
11
14
|
expect(::File.directory?(gem_dir)).to eq true
|
@@ -37,7 +40,7 @@ RSpec.describe ::Avm::EacRubyBase1::Launcher::Gem::Build do
|
|
37
40
|
expect(build.builded?).to eq true
|
38
41
|
expect(::File.exist?(build.output_file)).to eq true
|
39
42
|
expect(::File.size(build.output_file)).to be_positive
|
40
|
-
expect(::File.basename(build.output_file)).to eq('ruby_gem_stub-
|
43
|
+
expect(::File.basename(build.output_file)).to eq('ruby_gem_stub-0.0.0.gem')
|
41
44
|
end
|
42
45
|
end
|
43
46
|
end
|
@@ -1,12 +1,21 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'avm/eac_ruby_base1/launcher/gem/specification'
|
4
|
+
|
3
5
|
RSpec.describe ::Avm::EacRubyBase1::Launcher::Gem::Specification do
|
4
|
-
let(:
|
6
|
+
let(:source_version) { '1.0.0.pre.stub' }
|
7
|
+
let(:source) do
|
8
|
+
r = avm_eac_ruby_base1_source(target_path: temp_dir.join('ruby_gem_stub'))
|
9
|
+
r.version = source_version
|
10
|
+
r
|
11
|
+
end
|
12
|
+
let(:gemspec_file) { source.gemspec_path.to_path }
|
13
|
+
let(:version_file) { source.version_file.path.to_path }
|
5
14
|
let(:instance) { described_class.new(gemspec_file) }
|
6
15
|
|
7
16
|
describe '#parse_version_file' do
|
8
17
|
it 'parses valid version file' do # rubocop:disable RSpec/MultipleExpectations
|
9
|
-
file =
|
18
|
+
file = version_file
|
10
19
|
expect(::File.exist?(file)).to eq true
|
11
20
|
version = described_class.parse_version_file(file)
|
12
21
|
expect(version).to eq('1.0.0.pre.stub')
|
data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/launcher_stereotypes/base/publish_spec.rb
ADDED
@@ -0,0 +1,24 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/launcher/context'
|
4
|
+
require 'avm/launcher/instances/base'
|
5
|
+
require 'avm/eac_ruby_base1/launcher_stereotypes/base/publish'
|
6
|
+
|
7
|
+
RSpec.describe ::Avm::EacRubyBase1::LauncherStereotypes::Base::Publish do
|
8
|
+
let(:context) do
|
9
|
+
r = temp_launcher_context
|
10
|
+
avm_eac_ruby_base1_source(target_path: r.root.real.to_pathname.join('ruby_gem_stub'))
|
11
|
+
r
|
12
|
+
end
|
13
|
+
|
14
|
+
describe '#publish' do
|
15
|
+
let(:instance) { context.instance('/ruby_gem_stub') }
|
16
|
+
|
17
|
+
it 'dries run publish for Ruby Gems' do
|
18
|
+
allow_any_instance_of(described_class).to receive(:gem_versions_uncached).and_return([]) # rubocop:disable RSpec/AnyInstance
|
19
|
+
expect(instance).to be_a ::Avm::Launcher::Instances::Base
|
20
|
+
context.publish_options = { confirm: false, new: true, stereotype: 'RubyGem' }
|
21
|
+
described_class.new(instance).run
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
@@ -4,10 +4,11 @@ require 'avm/eac_ruby_base1/launcher_stereotypes/base'
|
|
4
4
|
|
5
5
|
RSpec.describe ::Avm::EacRubyBase1::LauncherStereotypes::Base do
|
6
6
|
describe '#load_gemspec' do
|
7
|
-
let(:
|
8
|
-
let(:
|
9
|
-
let(:
|
10
|
-
let(:
|
7
|
+
let(:dummy_dir) { avm_eac_ruby_base1_source(target_path: temp_dir.join(gemname)).path }
|
8
|
+
let(:gemname) { 'avm-eac_ruby_base1' }
|
9
|
+
let(:self_gemspec) { ::File.join(app_root_path, "#{gemname}.gemspec") }
|
10
|
+
let(:stub_gemspec) { ::File.join(dummy_dir, "#{gemname}.gemspec") }
|
11
|
+
let(:stub_expected_version) { '0.0.0' }
|
11
12
|
|
12
13
|
it 'does not return same version for different gemspecs with same name' do # rubocop:disable RSpec/ExampleLength, RSpec/MultipleExpectations
|
13
14
|
stub_spec = described_class.load_gemspec(stub_gemspec)
|
@@ -4,7 +4,7 @@ require 'avm/eac_ruby_base1/sources/base'
|
|
4
4
|
require 'avm/version_number'
|
5
5
|
|
6
6
|
::RSpec.describe ::Avm::EacRubyBase1::Sources::Base do
|
7
|
-
let(:instance) {
|
7
|
+
let(:instance) { avm_eac_ruby_base1_source }
|
8
8
|
|
9
9
|
include_examples 'in_avm_registry', 'sources'
|
10
10
|
|
@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
|
|
12
12
|
|
13
13
|
s.files = Dir['{lib,template}/**/*']
|
14
14
|
|
15
|
-
s.add_dependency 'avm', '~> 0.
|
16
|
-
s.add_dependency 'avm-eac_generic_base0', '~> 0.
|
15
|
+
s.add_dependency 'avm', '~> 0.51'
|
16
|
+
s.add_dependency 'avm-eac_generic_base0', '~> 0.6'
|
17
17
|
s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2'
|
18
18
|
s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
|
19
|
-
s.add_dependency 'eac_ruby_utils', '~> 0.
|
19
|
+
s.add_dependency 'eac_ruby_utils', '~> 0.105'
|
20
20
|
|
21
21
|
s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
|
22
22
|
end
|
@@ -0,0 +1,43 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/eac_generic_base0/file_formats/base'
|
4
|
+
require 'htmlbeautifier'
|
5
|
+
|
6
|
+
module Avm
|
7
|
+
module EacWebappBase0
|
8
|
+
module FileFormats
|
9
|
+
class Html < ::Avm::EacGenericBase0::FileFormats::Base
|
10
|
+
VALID_BASENAMES = %w[*.html *.html.erb].freeze
|
11
|
+
VALID_TYPES = [].freeze
|
12
|
+
|
13
|
+
def file_apply(path)
|
14
|
+
input = ::File.read(path)
|
15
|
+
temppath = tempfile_path
|
16
|
+
::File.open(temppath, 'w') do |output|
|
17
|
+
beautify path, input, output
|
18
|
+
end
|
19
|
+
::FileUtils.mv(temppath, path)
|
20
|
+
super(path)
|
21
|
+
end
|
22
|
+
|
23
|
+
private
|
24
|
+
|
25
|
+
def beautify(name, input, output)
|
26
|
+
output.puts ::HtmlBeautifier.beautify(input, htmlbeautify_options)
|
27
|
+
rescue StandardError => e
|
28
|
+
raise "Error parsing #{name}: #{e}"
|
29
|
+
end
|
30
|
+
|
31
|
+
def htmlbeautify_options
|
32
|
+
@htmlbeautify_options ||= { indent: ' ' }
|
33
|
+
end
|
34
|
+
|
35
|
+
def tempfile_path
|
36
|
+
tempfile = ::Tempfile.new
|
37
|
+
tempfile.close
|
38
|
+
tempfile.path
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/executables'
|
4
|
+
require 'avm/eac_generic_base0/file_formats/base'
|
5
|
+
|
6
|
+
module Avm
|
7
|
+
module EacWebappBase0
|
8
|
+
module FileFormats
|
9
|
+
class Javascript < ::Avm::EacGenericBase0::FileFormats::Base
|
10
|
+
VALID_BASENAMES = %w[*.js].freeze
|
11
|
+
VALID_TYPES = [].freeze
|
12
|
+
|
13
|
+
def internal_apply(files)
|
14
|
+
::Avm::Executables.js_beautify.command.append(
|
15
|
+
['--indent-size=2', '--end-with-newline', '--replace', *files]
|
16
|
+
).system!
|
17
|
+
super(files)
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
@@ -0,0 +1,25 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/eac_generic_base0/file_formats/base'
|
4
|
+
|
5
|
+
module Avm
|
6
|
+
module EacWebappBase0
|
7
|
+
module FileFormats
|
8
|
+
class Json < ::Avm::EacGenericBase0::FileFormats::Base
|
9
|
+
VALID_BASENAMES = %w[*.json].freeze
|
10
|
+
VALID_TYPES = [].freeze
|
11
|
+
|
12
|
+
def file_apply(file)
|
13
|
+
::File.write(file, ::JSON.pretty_generate(::JSON.parse(::File.read(file))))
|
14
|
+
end
|
15
|
+
|
16
|
+
def json_file?(file)
|
17
|
+
::JSON.parse(::File.read(file))
|
18
|
+
true
|
19
|
+
rescue JSON::ParserError
|
20
|
+
false
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/eac_webapp_base0/file_formats/html'
|
4
|
+
require 'avm/eac_webapp_base0/file_formats/javascript'
|
5
|
+
require 'avm/eac_webapp_base0/file_formats/json'
|
6
|
+
require 'avm/eac_webapp_base0/file_formats/xml'
|
7
|
+
require 'eac_ruby_utils/core_ext'
|
8
|
+
|
9
|
+
module Avm
|
10
|
+
module EacWebappBase0
|
11
|
+
module FileFormats
|
12
|
+
class Provider
|
13
|
+
ALL_NAMES = %w[html javascript json xml].freeze
|
14
|
+
|
15
|
+
def all
|
16
|
+
@all ||= ALL_NAMES.map do |name|
|
17
|
+
::Avm::EacWebappBase0::FileFormats.const_get(name.camelize).freeze
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -0,0 +1,26 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/executables'
|
4
|
+
require 'avm/eac_generic_base0/file_formats/base'
|
5
|
+
|
6
|
+
module Avm
|
7
|
+
module EacWebappBase0
|
8
|
+
module FileFormats
|
9
|
+
class Xml < ::Avm::EacGenericBase0::FileFormats::Base
|
10
|
+
VALID_BASENAMES = %w[*.xml].freeze
|
11
|
+
VALID_TYPES = ['xml'].freeze
|
12
|
+
|
13
|
+
def internal_apply(files)
|
14
|
+
format_command(files).system!
|
15
|
+
super(files)
|
16
|
+
end
|
17
|
+
|
18
|
+
def format_command(files)
|
19
|
+
::Avm::Executables.tidy.command.append(
|
20
|
+
%w[-xml -modify --indent auto --indent-spaces 2 --wrap 100] + files
|
21
|
+
)
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
@@ -38,7 +38,7 @@ module Avm
|
|
38
38
|
|
39
39
|
def build_content
|
40
40
|
infom 'Writing Git source code...'
|
41
|
-
|
41
|
+
scm.commit(commit_reference).deploy_to_env_path(
|
42
42
|
build_dir_env,
|
43
43
|
build_dir
|
44
44
|
).variables_source_set(variables_source).run
|
data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/{git_info.rb → scm.rb}
RENAMED
@@ -4,8 +4,8 @@ module Avm
|
|
4
4
|
module EacWebappBase0
|
5
5
|
module Instances
|
6
6
|
class Deploy
|
7
|
-
module
|
8
|
-
def
|
7
|
+
module Scm
|
8
|
+
def commit_reference_uncached
|
9
9
|
git_fetch
|
10
10
|
r = git.rev_parse(git_reference_found)
|
11
11
|
return r if r
|
@@ -15,7 +15,7 @@ module Avm
|
|
15
15
|
|
16
16
|
def git_fetch_uncached
|
17
17
|
infom "Fetching remote \"#{git_remote_name}\" from \"#{git_repository_path}\"..."
|
18
|
-
git.
|
18
|
+
git.remote(git_remote_name).fetch
|
19
19
|
end
|
20
20
|
|
21
21
|
def git_reference
|
@@ -31,7 +31,7 @@ module Avm
|
|
31
31
|
end
|
32
32
|
|
33
33
|
def git_remote_hashs_uncached
|
34
|
-
git.
|
34
|
+
git.remote(git_remote_name).ls.hashes
|
35
35
|
end
|
36
36
|
|
37
37
|
def git_remote_name
|
@@ -44,7 +44,7 @@ module Avm
|
|
44
44
|
|
45
45
|
# @return [EacGit::Local]
|
46
46
|
def git_uncached
|
47
|
-
|
47
|
+
scm.git_repo
|
48
48
|
end
|
49
49
|
|
50
50
|
def instance_branch
|
@@ -58,6 +58,11 @@ module Avm
|
|
58
58
|
def master_branch
|
59
59
|
remote_branch('master')
|
60
60
|
end
|
61
|
+
|
62
|
+
# @return [Avm::Scms::Base]
|
63
|
+
def scm
|
64
|
+
instance.application.local_source.scm
|
65
|
+
end
|
61
66
|
end
|
62
67
|
end
|
63
68
|
end
|
@@ -8,11 +8,11 @@ module Avm
|
|
8
8
|
VERSION_TARGET_PATH = 'VERSION'
|
9
9
|
|
10
10
|
def version
|
11
|
-
([::Time.now,
|
11
|
+
([::Time.now, commit_reference] + version_git_refs).join('|')
|
12
12
|
end
|
13
13
|
|
14
14
|
def version_git_refs
|
15
|
-
git_remote_hashs.select { |_name, sha1| sha1 ==
|
15
|
+
git_remote_hashs.select { |_name, sha1| sha1 == commit_reference }.keys
|
16
16
|
.map { |ref| ref.gsub(%r{\Arefs/}, '') }.reject { |ref| ref == 'HEAD' }
|
17
17
|
end
|
18
18
|
|
@@ -38,7 +38,7 @@ module Avm
|
|
38
38
|
infov 'Git reference (User)', git_reference.if_present('- BLANK -')
|
39
39
|
infov 'Git remote name', git_remote_name
|
40
40
|
infov 'Git reference (Found)', git_reference_found
|
41
|
-
infov 'Git commit SHA1',
|
41
|
+
infov 'Git commit SHA1', commit_reference
|
42
42
|
infov 'Appended directories', appended_directories
|
43
43
|
end
|
44
44
|
|
@@ -50,7 +50,8 @@ module Avm
|
|
50
50
|
|
51
51
|
def assert_instance_branch
|
52
52
|
infom 'Setting instance branch...'
|
53
|
-
git.
|
53
|
+
git.command('push', git_remote_name, "#{commit_reference}:refs/heads/#{instance.id}",
|
54
|
+
'-f').execute!
|
54
55
|
end
|
55
56
|
|
56
57
|
def request_test
|
@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
|
|
12
12
|
|
13
13
|
s.files = Dir['{lib}/**/*']
|
14
14
|
|
15
|
-
s.add_dependency 'avm', '~> 0.
|
15
|
+
s.add_dependency 'avm', '~> 0.51'
|
16
16
|
s.add_dependency 'eac_cli', '~> 0.28'
|
17
17
|
s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
|
18
|
-
s.add_dependency 'eac_ruby_utils', '~> 0.
|
18
|
+
s.add_dependency 'eac_ruby_utils', '~> 0.105'
|
19
19
|
s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
|
20
20
|
|
21
21
|
s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
|
@@ -1,5 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'avm/registry'
|
3
4
|
require 'eac_ruby_utils/core_ext'
|
4
5
|
require 'eac_fs/traversable'
|
5
6
|
|
@@ -16,8 +17,6 @@ module Avm
|
|
16
17
|
options.assert_valid_keys(self.class.lists.option.values)
|
17
18
|
end
|
18
19
|
|
19
|
-
FORMATS = %w[ruby php html python xml javascript json generic_plain].freeze
|
20
|
-
|
21
20
|
def run
|
22
21
|
clear
|
23
22
|
search_files
|
@@ -59,9 +58,11 @@ module Avm
|
|
59
58
|
end
|
60
59
|
|
61
60
|
def formats_uncached
|
62
|
-
|
63
|
-
|
64
|
-
|
61
|
+
formats_from_registry
|
62
|
+
end
|
63
|
+
|
64
|
+
def formats_from_registry
|
65
|
+
::Avm::Registry.file_formats.available.reverse.map(&:new)
|
65
66
|
end
|
66
67
|
|
67
68
|
def search_files
|
data/sub/avm-git/avm-git.gemspec
CHANGED
@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
|
|
12
12
|
|
13
13
|
s.files = Dir['{lib}/**/*']
|
14
14
|
|
15
|
-
s.add_dependency 'avm', '~> 0.
|
15
|
+
s.add_dependency 'avm', '~> 0.50'
|
16
16
|
s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
|
17
|
-
s.add_dependency 'eac_git', '~> 0.
|
18
|
-
s.add_dependency 'eac_ruby_utils', '~> 0.
|
17
|
+
s.add_dependency 'eac_git', '~> 0.13'
|
18
|
+
s.add_dependency 'eac_ruby_utils', '~> 0.105'
|
19
19
|
s.add_dependency 'git', '~> 1.12'
|
20
20
|
|
21
21
|
s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'
|
@@ -19,16 +19,14 @@ module Avm
|
|
19
19
|
r
|
20
20
|
end
|
21
21
|
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
def system!(*args)
|
31
|
-
command(*args).system!
|
22
|
+
%w[execute execute! system system!].each do |exec_type|
|
23
|
+
define_method exec_type do |*args|
|
24
|
+
begin
|
25
|
+
command(*args).send(exec_type)
|
26
|
+
rescue ::EacRubyUtils::Envs::Command::ExecError
|
27
|
+
raise ::Avm::Git::Launcher::Error
|
28
|
+
end
|
29
|
+
end
|
32
30
|
end
|
33
31
|
|
34
32
|
def init
|
@@ -15,18 +15,21 @@ Gem::Specification.new do |s|
|
|
15
15
|
s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
16
16
|
|
17
17
|
s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.3'
|
18
|
-
s.add_dependency 'avm', '~> 0.
|
19
|
-
s.add_dependency 'avm-eac_ruby_base1', '~> 0.
|
18
|
+
s.add_dependency 'avm', '~> 0.51'
|
19
|
+
s.add_dependency 'avm-eac_ruby_base1', '~> 0.26'
|
20
20
|
s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
|
21
|
-
s.add_dependency 'avm-files', '~> 0.
|
22
|
-
s.add_dependency 'avm-git', '~> 0.
|
21
|
+
s.add_dependency 'avm-files', '~> 0.5'
|
22
|
+
s.add_dependency 'avm-git', '~> 0.8'
|
23
23
|
s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
|
24
24
|
s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
|
25
|
-
s.add_dependency 'eac_git', '~> 0.
|
25
|
+
s.add_dependency 'eac_git', '~> 0.13'
|
26
26
|
s.add_dependency 'eac_ruby_base0', '~> 0.17'
|
27
27
|
s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
|
28
28
|
s.add_dependency 'git', '~> 1.12'
|
29
29
|
s.add_dependency 'ruby-progressbar', '~> 1.11'
|
30
30
|
|
31
|
+
s.add_development_dependency 'avm-eac_php_base0', '~> 0.2'
|
32
|
+
s.add_development_dependency 'avm-eac_python_base0', '~> 0.1'
|
33
|
+
s.add_development_dependency 'avm-eac_webapp_base0', '~> 0.11'
|
31
34
|
s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
|
32
35
|
end
|
data/sub/eac_git/eac_git.gemspec
CHANGED
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
12
12
|
|
13
13
|
s.files = Dir['{lib,vendor}/**/*']
|
14
14
|
|
15
|
-
s.add_dependency 'eac_ruby_utils', '~> 0.
|
15
|
+
s.add_dependency 'eac_ruby_utils', '~> 0.105'
|
16
16
|
s.add_dependency 'parseconfig', '~> 1.1', '>= 1.1.2'
|
17
17
|
|
18
18
|
s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.2'
|