avm-tools 0.68.0 → 0.69.0

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.44.0'
+  VERSION = '0.45.2'
 end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/inflector_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/inflector'
+
+RSpec.describe ::EacRubyUtils::Inflector do
+  describe '#variableize' do
+    {
+      '_A_variableName' => 'a_variablename'
+    }.each do |source, expected|
+      context "when source is \"#{source}\"" do
+        it { expect(described_class.variableize(source)).to eq(expected) }
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/struct_spec.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/struct'
+
+RSpec.describe ::EacRubyUtils::Struct do
+  let(:instance) { described_class.new(a: 1, b: '') }
+
+  describe '#[]' do
+    it { expect(instance[:a]).to eq(1) }
+    it { expect(instance['a']).to eq(1) }
+    it { expect(instance[:a?]).to eq(true) }
+    it { expect(instance['a?']).to eq(true) }
+    it { expect(instance[:b]).to eq('') }
+    it { expect(instance['b']).to eq('') }
+    it { expect(instance[:b?]).to eq(false) }
+    it { expect(instance['b?']).to eq(false) }
+    it { expect(instance[:c]).to eq(nil) }
+    it { expect(instance['c']).to eq(nil) }
+    it { expect(instance[:c?]).to eq(false) }
+    it { expect(instance['c?']).to eq(false) }
+  end
+
+  describe '#fetch' do
+    it { expect(instance.fetch(:a)).to eq(1) }
+    it { expect(instance.fetch('a')).to eq(1) }
+    it { expect(instance.fetch(:a?)).to eq(true) }
+    it { expect(instance.fetch('a?')).to eq(true) }
+    it { expect(instance.fetch(:b)).to eq('') }
+    it { expect(instance.fetch('b')).to eq('') }
+    it { expect(instance.fetch(:b?)).to eq(false) }
+    it { expect(instance.fetch('b?')).to eq(false) }
+    it { expect { instance.fetch(:c) }.to raise_error(::KeyError) }
+    it { expect { instance.fetch('c') }.to raise_error(::KeyError) }
+    it { expect { instance.fetch(:c?) }.to raise_error(::KeyError) }
+    it { expect { instance.fetch('c?') }.to raise_error(::KeyError) }
+  end
+
+  describe '#property_method' do
+    it { expect(instance.a).to eq(1) }
+    it { expect(instance.a?).to eq(true) }
+    it { expect(instance.b).to eq('') }
+    it { expect(instance.b?).to eq(false) }
+    it { expect { instance.c }.to raise_error(::NoMethodError) }
+    it { expect { instance.c? }.to raise_error(::NoMethodError) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.68.0
+  version: 0.69.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -290,10 +290,25 @@ files:
 - lib/avm/docker/image.rb
 - lib/avm/docker/registry.rb
 - lib/avm/docker/runner.rb
+- lib/avm/eac_rails_base0/apache_host.rb
+- lib/avm/eac_rails_base0/deploy.rb
+- lib/avm/eac_rails_base0/instance.rb
 - lib/avm/eac_redmine_base0/core_update.rb
 - lib/avm/eac_redmine_base0/data_unit.rb
 - lib/avm/eac_redmine_base0/deploy.rb
 - lib/avm/eac_redmine_base0/instance.rb
+- lib/avm/eac_webapp_base0/apache_host.rb
+- lib/avm/eac_webapp_base0/deploy.rb
+- lib/avm/eac_webapp_base0/deploy/appended_directories.rb
+- lib/avm/eac_webapp_base0/deploy/file_unit.rb
+- lib/avm/eac_webapp_base0/deploy/git_info.rb
+- lib/avm/eac_webapp_base0/deploy/version.rb
+- lib/avm/eac_webapp_base0/instance.rb
+- lib/avm/eac_webapp_base0/runner/apache_host.rb
+- lib/avm/eac_webapp_base0/runner/data.rb
+- lib/avm/eac_webapp_base0/runner/data/dump.rb
+- lib/avm/eac_webapp_base0/runner/data/load.rb
+- lib/avm/eac_webapp_base0/runner/deploy.rb
 - lib/avm/executables.rb
 - lib/avm/files.rb
 - lib/avm/files/formatter.rb
@@ -423,26 +438,12 @@ files:
 - lib/avm/self/instance/entry_keys.rb
 - lib/avm/stereotypes.rb
 - lib/avm/stereotypes/eac_rails_base0.rb
-- lib/avm/stereotypes/eac_rails_base0/apache_host.rb
-- lib/avm/stereotypes/eac_rails_base0/deploy.rb
-- lib/avm/stereotypes/eac_rails_base0/instance.rb
 - lib/avm/stereotypes/eac_redmine_base0.rb
 - lib/avm/stereotypes/eac_ubuntu_base0.rb
 - lib/avm/stereotypes/eac_ubuntu_base0/apache.rb
 - lib/avm/stereotypes/eac_ubuntu_base0/apache/site.rb
 - lib/avm/stereotypes/eac_ubuntu_base0/docker_image.rb
 - lib/avm/stereotypes/eac_webapp_base0.rb
-- lib/avm/stereotypes/eac_webapp_base0/apache_host.rb
-- lib/avm/stereotypes/eac_webapp_base0/deploy.rb
-- lib/avm/stereotypes/eac_webapp_base0/deploy/appended_directories.rb
-- lib/avm/stereotypes/eac_webapp_base0/deploy/file_unit.rb
-- lib/avm/stereotypes/eac_webapp_base0/deploy/git_info.rb
-- lib/avm/stereotypes/eac_webapp_base0/deploy/version.rb
-- lib/avm/stereotypes/eac_webapp_base0/instance.rb
-- lib/avm/stereotypes/eac_webapp_base0/runner/data.rb
-- lib/avm/stereotypes/eac_webapp_base0/runner/data/dump.rb
-- lib/avm/stereotypes/eac_webapp_base0/runner/data/load.rb
-- lib/avm/stereotypes/eac_webapp_base0/runner/deploy.rb
 - lib/avm/stereotypes/eac_wordpress_base0/apache_host.rb
 - lib/avm/stereotypes/eac_wordpress_base0/deploy.rb
 - lib/avm/stereotypes/eac_wordpress_base0/instance.rb
@@ -542,8 +543,10 @@ files:
 - lib/eac_launcher/vendor.rb
 - lib/eac_launcher/vendor/github.rb
 - lib/eac_launcher/version.rb
+- template/avm/eac_rails_base0/deploy/config/database.yml.template
 - template/avm/eac_redmine_base0/deploy/config/install.sh.template
 - template/avm/eac_redmine_base0/deploy/config/secrets.yml
+- template/avm/eac_webapp_base0/apache_host/no_ssl.conf
 - template/avm/ruby/gems/generator/gemspec.template
 - template/avm/ruby/gems/generator/root_lib.template
 - template/avm/ruby/gems/generator/static/Gemfile
@@ -552,10 +555,31 @@ files:
 - template/avm/ruby/gems/generator/version.template
 - template/avm/self/docker_image/Dockerfile
 - template/avm/self/docker_image/entrypoint.sh
-- template/avm/stereotypes/eac_rails_base0/deploy/config/database.yml.template
 - template/avm/stereotypes/eac_ubuntu_base0/docker_image/Dockerfile
-- template/avm/stereotypes/eac_webapp_base0/apache_host/no_ssl.conf
 - template/avm/stereotypes/eac_wordpress_base0/deploy/wp-config.php.template
+- vendor/eac_cli/Gemfile
+- vendor/eac_cli/eac_cli.gemspec
+- vendor/eac_cli/lib/eac_cli.rb
+- vendor/eac_cli/lib/eac_cli/default_runner.rb
+- vendor/eac_cli/lib/eac_cli/definition.rb
+- vendor/eac_cli/lib/eac_cli/definition/argument_option.rb
+- vendor/eac_cli/lib/eac_cli/definition/base_option.rb
+- vendor/eac_cli/lib/eac_cli/definition/boolean_option.rb
+- vendor/eac_cli/lib/eac_cli/definition/positional_argument.rb
+- vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb
+- vendor/eac_cli/lib/eac_cli/docopt/runner_extension.rb
+- vendor/eac_cli/lib/eac_cli/parser.rb
+- vendor/eac_cli/lib/eac_cli/parser/collector.rb
+- vendor/eac_cli/lib/eac_cli/parser/error.rb
+- vendor/eac_cli/lib/eac_cli/parser/options_collection.rb
+- vendor/eac_cli/lib/eac_cli/parser/parse_result.rb
+- vendor/eac_cli/lib/eac_cli/parser/positional_collection.rb
+- vendor/eac_cli/lib/eac_cli/runner.rb
+- vendor/eac_cli/lib/eac_cli/runner/context.rb
+- vendor/eac_cli/lib/eac_cli/version.rb
+- vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb
+- vendor/eac_cli/spec/rubocop_spec.rb
+- vendor/eac_cli/spec/spec_helper.rb
 - vendor/eac_docker/Gemfile
 - vendor/eac_docker/eac_docker.gemspec
 - vendor/eac_docker/lib/eac_docker.rb
@@ -797,6 +821,8 @@ files:
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/base.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/minitest.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple.rb
+- vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb
+- vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/result.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/rspec.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb
 - vendor/eac_ruby_gems_utils/spec/lib/eac_ruby_gems_utils/gem_spec.rb
@@ -867,6 +893,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/immutable/common_accessor.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/immutable/hash_accessor.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/immutable/instance_methods.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/inflector.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/listable.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/class_methods.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/instance_methods.rb
@@ -905,6 +932,8 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_sub.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/if_match.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string/inflector.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time/default_time_zone_set.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time/local_time_zone.rb
@@ -918,6 +947,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/struct.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/templates.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/directory.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/file.rb
@@ -944,6 +974,7 @@ files:
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/extname_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp/temp_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp_spec.rb
+- vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/inflector_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/listable_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/options_consumer_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/enumerable/boolean_combinations_spec.rb
@@ -963,6 +994,7 @@ files:
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/ruby_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb
+- vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/struct_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec_files/expected_content
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec_files/source.template

data/lib/avm/stereotypes/eac_rails_base0/apache_host.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/stereotypes/eac_webapp_base0/apache_host'
-
-module Avm
-  module Stereotypes
-    module EacRailsBase0
-      class ApacheHost < ::Avm::Stereotypes::EacWebappBase0::ApacheHost
-        def document_root
-          "#{instance.read_entry(:fs_path)}/public"
-        end
-
-        def extra_content
-          'PassengerEnabled On'
-        end
-      end
-    end
-  end
-end

data/lib/avm/stereotypes/eac_rails_base0/deploy.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/stereotypes/eac_webapp_base0/deploy'
-
-module Avm
-  module Stereotypes
-    module EacRailsBase0
-      class Deploy < ::Avm::Stereotypes::EacWebappBase0::Deploy
-        set_callback :assert_instance_branch, :after do
-          bundle_install
-          assert_database
-          database_migrate
-          compile_assets
-          restart_tasks_scheduler
-          touch_restart_file
-        end
-
-        def assert_database
-          infom 'Asserting database...'
-          instance.rake('db:create').system!
-        end
-
-        def bundle_install
-          infom 'Running "bundle install"...'
-          instance.bundle('install').system!
-        end
-
-        def compile_assets
-          infom 'Compiling assets...'
-          instance.rake('assets:clean', 'assets:precompile').system!
-        end
-
-        def database_migrate
-          infom 'Running database migrations...'
-          instance.rake('db:migrate').system!
-        end
-
-        def restart_tasks_scheduler
-          infom 'Restarting Tasks Scheduler\'s daemon...'
-          instance.bundle('exec', 'tasks_scheduler', 'restart').system!
-        end
-
-        def touch_restart_file
-          infom 'Touching restart file...'
-          instance.host_env.command(
-            'touch', ::File.join(instance.read_entry(:fs_path), 'tmp', 'restart.txt')
-          ).system!
-        end
-      end
-    end
-  end
-end

data/lib/avm/stereotypes/eac_rails_base0/instance.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/stereotypes/eac_webapp_base0/instance'
-require 'avm/stereotypes/rails/instance'
-
-module Avm
-  module Stereotypes
-    module EacRailsBase0
-      class Instance < ::Avm::Stereotypes::EacWebappBase0::Instance
-        include ::Avm::Stereotypes::Rails::Instance
-
-        FILES_UNITS = { uploads: 'public/uploads' }.freeze
-      end
-    end
-  end
-end

data/lib/avm/stereotypes/eac_webapp_base0/apache_host.rb

@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'avm/patches/object/template'
-require 'avm/stereotypes/eac_ubuntu_base0/apache'
-require 'avm/patches/object/template'
-
-module Avm
-  module Stereotypes
-    module EacWebappBase0
-      class ApacheHost
-        enable_console_speaker
-        enable_simple_cache
-        common_constructor :instance
-
-        def run
-          write_available_no_ssl_site
-          enable_no_ssl_site
-          remove_ssl_site
-          reload_apache
-          run_certbot
-          enable_ssl_site
-          reload_apache
-          ::Avm::Result.success('Done')
-        end
-
-        def no_ssl_site_content
-          ::Avm::Stereotypes::EacWebappBase0::ApacheHost.template.child('no_ssl.conf')
-                                                        .apply(EntriesReader.new(self, instance))
-        end
-
-        private
-
-        def apache_uncached
-          ::Avm::Stereotypes::EacUbuntuBase0::Apache.new(instance.host_env)
-        end
-
-        def enable_no_ssl_site
-          infom 'Enabling no SSL site...'
-          no_ssl_site.enable
-        end
-
-        def enable_ssl_site
-          infom 'Enabling SSL site...'
-          ssl_site.enable
-        end
-
-        def no_ssl_site_uncached
-          apache.site(instance.id)
-        end
-
-        def reload_apache
-          infom 'Reloading Apache...'
-          apache.service('reload')
-        end
-
-        def remove_ssl_site
-          infom 'Removing SSL site...'
-          ssl_site.remove
-        end
-
-        def run_certbot
-          infom 'Running Certbot...'
-          instance.host_env.command(
-            'sudo', 'certbot', '--apache', '--domain', instance.read_entry('web.hostname'),
-            '--redirect', '--non-interactive', '--agree-tos',
-            '--email', instance.read_entry('admin.email')
-          ).system!
-        end
-
-        def ssl_site_uncached
-          apache.site(no_ssl_site.name + '-le-ssl')
-        end
-
-        def write_available_no_ssl_site
-          infom 'Writing no SSL site conf...'
-          no_ssl_site.write(no_ssl_site_content)
-        end
-
-        class EntriesReader
-          common_constructor :job, :instance
-
-          def read_entry(path, options = {})
-            entry_from_job(path) || instance.read_entry(path, options)
-          end
-
-          private
-
-          def entry_from_job(path)
-            method = path.gsub('.', '_').underscore
-            return job.send(method) if job.respond_to?(method, true)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/stereotypes/eac_webapp_base0/deploy.rb

@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/callbacks'
-require 'delegate'
-require 'eac_ruby_utils/core_ext'
-require 'eac_launcher/git/base'
-require 'avm/git'
-require 'avm/patches/object/template'
-require 'net/http'
-
-module Avm
-  module Stereotypes
-    module EacWebappBase0
-      class Deploy
-        require_sub __FILE__, include_modules: true
-        include ::ActiveSupport::Callbacks
-
-        DEFAULT_REFERENCE = 'HEAD'
-
-        enable_console_speaker
-        enable_simple_cache
-
-        JOBS = %w[git_deploy setup_files_units assert_instance_branch request_test].freeze
-        define_callbacks(*JOBS)
-
-        attr_reader :instance, :options
-
-        def initialize(instance, options = {})
-          @instance = instance
-          @options = options
-        end
-
-        def build_git_commit
-          ::Avm::Git::Commit.new(git, commit_sha1).deploy_to_env_path(
-            instance.host_env,
-            instance.read_entry(:fs_path)
-          ).variables_source_set(instance)
-        end
-
-        def run
-          start_banner
-          JOBS.each do |job|
-            run_callbacks job do
-              send(job)
-            end
-          end
-          ::Avm::Result.success('Deployed')
-        rescue ::Avm::Result::Error => e
-          e.to_result
-        end
-
-        def start_banner
-          infov 'Instance', instance
-          infov 'Git reference (User)', git_reference.if_present('- BLANK -')
-          infov 'Git remote name', git_remote_name
-          infov 'Git reference (Found)', git_reference_found
-          infov 'Git commit SHA1', commit_sha1
-          infov 'Appended directories', appended_directories
-        end
-
-        def git_deploy
-          infom 'Deploying source code and appended content...'
-          build_git_commit
-            .append_directory(template.path)
-            .append_directories(appended_directories)
-            .append_file_content(VERSION_TARGET_PATH, version)
-            .run
-        end
-
-        def setup_files_units
-          instance.class.const_get('FILES_UNITS').each do |data_key, fs_path_subpath|
-            FileUnit.new(self, data_key, fs_path_subpath).run
-          end
-        end
-
-        def assert_instance_branch
-          infom 'Setting instance branch...'
-          git.execute!('push', git_remote_name, "#{commit_sha1}:refs/heads/#{instance.id}", '-f')
-        end
-
-        def request_test
-          infom 'Requesting web interface...'
-          uri = URI(instance.read_entry('web.url'))
-          response = ::Net::HTTP.get_response(uri)
-          infov 'Response status', response.code
-          fatal_error "Request to #{uri} failed" unless response.code.to_i == 200
-        end
-
-        def git_uncached
-          ::EacLauncher::Git::Base.new(git_repository_path)
-        end
-
-        def git_fetch_uncached
-          infom "Fetching remote \"#{git_remote_name}\" from \"#{git_repository_path}\"..."
-          git.fetch(git_remote_name)
-        end
-
-        def git_repository_path
-          instance.source_instance.read_entry(:fs_path)
-        end
-      end
-    end
-  end
-end