avm-tools 0.114.0 → 0.115.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab94e9f5fae951a039dc33fadb807fa8331899a843526fa957beeb05193a8419
-  data.tar.gz: ebb72038ffaa5b8c9c37d20e8b7a6de6b6303886665940474c36318804cdc600
+  metadata.gz: bf0d93631b14929c6e271ba0dd835f75a9633a961b3f870daa5c64eb467e0ef2
+  data.tar.gz: '0281c164c78506d7fe5ac8f601ce4380661f835a3c4e0ebe7c48c60334419565'
 SHA512:
-  metadata.gz: b25329ca5da5c3aeda2bd26b9f2cf91edadfe965e3eba3e891eb590a3b7a9483870b80e45b2e804eb44d56877445c1da00a98b75b9c8feac81fb44165020e21a
-  data.tar.gz: bf211cebb15418b176c681020f825e64ba8d12cecd3d2022b3026326fcc3d062e846c763143b75cf17a2d38f7c71b244b4748166deb3cc873fe61eac319afc3b
+  metadata.gz: bcbb490835a6f843cb9179effd073b661e7d4c7d1006ae4a135744d692203425ab8c4f9dbd18d55af1b1744655ec216c3feaf23470c1df691788eb3d94030a9d
+  data.tar.gz: 2e647b2157fe2c3bdf9ea51ebaac0809e4299af1bb13c96b73bae51c68e9876ba37347a9a85f3e15b8eede0c837546edf05079b116abf67081ecbe28062092b3

data/lib/avm/launcher/git/publish_base.rb

@@ -86,6 +86,8 @@ module Avm
         end
 
         def local_following_check_result
+          return nil unless local_following?
+
           ::Avm::Launcher::Publish::CheckResult.pending('Local following')
         end
 

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.114.0'
+    VERSION = '0.115.0'
   end
 end

data/sub/avm/lib/avm/instances/base/auto_values/database.rb

@@ -37,7 +37,7 @@ module Avm
           end
 
           def auto_database_password
-            database_auto_common('password')
+            database_auto_common('password') || id
           end
 
           def auto_database_port
@@ -45,7 +45,7 @@ module Avm
           end
 
           def auto_database_username
-            database_auto_common('username')
+            database_auto_common('username') || id
           end
 
           def auto_database_system

data/sub/avm/lib/avm/instances/entry_keys.rb

@@ -47,7 +47,8 @@ module Avm
         docker: %w[registry],
         mailer: {
           '' => %w[id from reply_to],
-          smtp: %w[address port domain username password authentication starttls_auto]
+          smtp: %w[address port domain username password authentication openssl_verify_mode
+                   starttls_auto tls]
         },
         ssh: %w[hostname port url username],
         web: %w[authority hostname path port scheme url userinfo]

data/sub/avm/lib/avm/self/instance.rb

@@ -3,7 +3,6 @@
 require 'avm/instances/base'
 require 'avm/self/docker_image'
 require 'avm/self/instance/entry_keys'
-require 'avm/eac_ubuntu_base0/docker_image'
 
 module Avm
   module Self

data/sub/avm/lib/avm/sources/base/instance.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/instances/application'
+require 'avm/instances/base'
+
+module Avm
+  module Sources
+    class Base
+      module Instance
+        DEFAULT_INSTANCE_SUFFIX = 'dev'
+
+        def instance_suffix
+          DEFAULT_INSTANCE_SUFFIX
+        end
+
+        private
+
+        def application_uncached
+          ::Avm::Instances::Application.new(path.basename)
+        end
+
+        def instance_uncached
+          ::Avm::Instances::Base.new(application, DEFAULT_INSTANCE_SUFFIX)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.14.0'
+  VERSION = '0.17.0'
 end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/assert.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPostgresqlBase0
+    class Instance
+      class Assert
+        common_constructor :instance
+        delegate :name, :password, :user, to: :instance
+
+        def perform
+          create_user unless user_exist?
+          change_password unless password_ok?
+          create_database unless database_exist?
+          change_owner unless user_owner?
+        end
+
+        def change_owner
+          root_execute("ALTER DaTABASE \"#{name}\" OWNER TO \"#{user}\"")
+        end
+
+        def change_password
+          root_execute("ALTER USER \"#{user}\" WITH PASSWORD '#{password}'")
+        end
+
+        def create_user
+          root_execute("CREATE USER \"#{user}\" WITH PASSWORD '#{password}'")
+        end
+
+        def current_owner
+          root_query(<<~SQL
+            SELECT pg_catalog.pg_get_userbyid(datdba)
+            FROM pg_catalog.pg_database
+            WHERE datname = '#{name}'
+          SQL
+                    )
+        end
+
+        def database_exist?
+          root_boolean_query("FROM pg_database WHERE datname='#{name}'")
+        end
+
+        def password_ok?
+          instance.psql_command_command('SELECT 1', false)
+                  .execute!(exit_outputs: { 512 => 'login_failed' }).strip == '1'
+        end
+
+        def user_exist?
+          root_boolean_query("FROM pg_roles WHERE rolname='#{user}'")
+        end
+
+        def user_owner?
+          user == current_owner
+        end
+
+        def create_database
+          root_execute("CREATE DATABASE \"#{name}\" WITH OWNER \"#{user}\"")
+        end
+
+        private
+
+        def root_boolean_query(sql_after_projection)
+          root_query("SELECT 1 #{sql_after_projection}") == '1'
+        end
+
+        def root_execute(sql)
+          instance.root_psql_command(sql).execute!
+        end
+
+        def root_query(sql)
+          root_execute(sql).strip
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance.rb

@@ -1,13 +1,21 @@
 # frozen_string_literal: true
 
 require 'avm/eac_postgresql_base0/instance/data_unit'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacPostgresqlBase0
     class Instance
-      def initialize(env, connection_params)
-        @env = env
-        @connection_params = connection_params.with_indifferent_access
+      require_sub __FILE__
+
+      MAINTENANCE_DATABASE = 'postgres'
+
+      common_constructor :env, :connection_params do
+        self.connection_params = connection_params.with_indifferent_access
+      end
+
+      def assert
+        ::Avm::EacPostgresqlBase0::Instance::Assert.new(self).perform
       end
 
       def data_unit
@@ -23,20 +31,23 @@ module Avm
         dump_command.append(['@ESC_|', 'gzip', '-9', '-c'])
       end
 
-      def psql_command
-        env.command("@ESC_PGPASSWORD=#{password}", 'psql', *common_command_args)
+      def psql_command(database = true)
+        env.command("@ESC_PGPASSWORD=#{password}", 'psql', *common_command_args(database))
       end
 
-      def psql_command_command(sql)
-        psql_command.append(['--quiet', '--tuples-only', '--command', sql])
+      def psql_command_command(sql, database = true)
+        psql_command(database).append(['--quiet', '--tuples-only', '--command', sql])
       end
 
-      private
-
-      attr_reader :env, :connection_params
+      def root_psql_command(sql = nil)
+        args = ['sudo', '-u', 'postgres', 'psql']
+        args += ['--quiet', '--tuples-only', '--command', sql] if sql.present?
+        env.command(*args)
+      end
 
-      def common_command_args
-        ['--host', host, '--username', user, '--port', port, name]
+      def common_command_args(database = true)
+        ['--host', host, '--username', user, '--port', port,
+         (database ? name : MAINTENANCE_DATABASE)]
       end
 
       def host

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/deploy.rb

@@ -18,7 +18,7 @@ module Avm
 
       def assert_database
         infom 'Asserting database...'
-        instance.rake('db:create').system!
+        instance.pg.assert
       end
 
       def bundle_install

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.1.3'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.2'
   s.add_dependency 'curb', '~> 0.9.10'
   s.add_dependency 'eac_fs', '~> 0.4'
+  s.add_dependency 'eac_rest', '~> 0.4'
   s.add_dependency 'eac_ruby_utils', '~> 0.68'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/data_unit.rb

@@ -10,11 +10,13 @@ module Avm
     class DataUnit < ::Avm::Data::Instance::Unit
       common_constructor :instance
 
+      EXPORT_PATH = '/backup/export'
       EXTENSION = '.tar'
+      IMPORT_PATH = '/backup/import.json'
 
       def do_dump(data_path)
         ::File.open(data_path, 'wb') do |file|
-          file << URI.parse(export_url).read
+          file << export_request.response.body_data_or_raise
         end
       end
 
@@ -37,18 +39,12 @@ module Avm
         true
       end
 
-      def export_url
-        url('/backup/export')
+      def export_request
+        instance.rest_api.request(EXPORT_PATH)
       end
 
       def import_url
-        url('/backup/import.json')
-      end
-
-      def url(path)
-        uri = ::Addressable::URI.parse(instance.read_entry('web.url')) + path
-        uri.query_values = { key: instance.read_entry('admin.api_key') }
-        uri.to_s
+        instance.rest_api.build_service_url(IMPORT_PATH).to_s
       end
     end
   end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instance.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
+require 'addressable/uri'
 require 'avm/eac_redmine_base0/data_unit'
 require 'avm/eac_redmine_base0/instances/docker_image'
+require 'avm/eac_redmine_base0/rest_api'
 require 'avm/eac_webapp_base0/instance'
 require 'avm/eac_rails_base1/instance'
 
 module Avm
   module EacRedmineBase0
     class Instance < ::Avm::EacRailsBase1::Instance
+      enable_simple_cache
+
       FILES_UNITS = { files: 'files' }.freeze
 
       def docker_image_class
@@ -32,6 +36,22 @@ module Avm
           }
         )
       end
+
+      # @return [Addressable::URI]
+      def root_url
+        r = ::Addressable::URI.parse(read_entry(::Avm::Instances::EntryKeys::WEB_URL))
+        r.query_values = nil
+        r
+      end
+
+      private
+
+      # @return [Avm::EacRedmineBase0::RestApi]
+      def rest_api_uncached
+        url = root_url
+        url.query_values = { key: read_entry('api.key') }
+        ::Avm::EacRedmineBase0::RestApi.new(url)
+      end
     end
   end
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/rest_api.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_rest/api'
+
+module Avm
+  module EacRedmineBase0
+    class RestApi < ::EacRest::Api
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.3.1'
+    VERSION = '0.4.1'
   end
 end

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/deploy/config/install.sh.template

@@ -18,9 +18,9 @@ export git_repositories_hierarchical_organisation=false
 export smtp_server='%%MAILER.SMTP.ADDRESS%%'
 export smtp_port='%%MAILER.SMTP.PORT%%'
 export smtp_domain='%%MAILER.SMTP.DOMAIN%%'
-export smtp_tls='%%MAILER_SMTP_TLS%%'
-export smtp_enable_starttls_auto='%%MAILER_SMTP_STARTTLS_AUTO%%'
-export smtp_openssl_verify_mode='%%MAILER_SMTP_OPENSSL_VERIFY_MODE%%'
+export smtp_tls='%%MAILER.SMTP.TLS%%'
+export smtp_enable_starttls_auto='%%MAILER.SMTP.STARTTLS_AUTO%%'
+export smtp_openssl_verify_mode='%%MAILER.SMTP.OPENSSL_VERIFY_MODE%%'
 export smtp_authentication='%%MAILER.SMTP.AUTHENTICATION%%'
 export smtp_username='%%MAILER.SMTP.USERNAME%%'
 export smtp_password='%%MAILER.SMTP.PASSWORD%%'

data/sub/avm-files/lib/avm/files/formatter/formats/generic_plain.rb

@@ -7,8 +7,8 @@ module Avm
     class Formatter
       module Formats
         class GenericPlain < ::Avm::Files::Formatter::Formats::Base
-          VALID_BASENAMES = %w[*.bat *.css.coffee *.java *.js *.rb *.scss *.sql *.tex *.url *.yml
-                               *.yaml].freeze
+          VALID_BASENAMES = %w[*.asm *.bat *.css.coffee *.java *.js *.rb *.s *.scss *.sql *.tex
+                               *.url *.yml *.yaml].freeze
 
           VALID_TYPES = %w[plain x-shellscript].freeze
 

data/sub/avm-files/lib/avm/files/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

data/sub/eac_cli/lib/eac_cli/runner/context.rb

@@ -23,6 +23,10 @@ module EacCli
         raise ::NameError, "No method \"#{method_name}\" found in #{runner} or in its ancestors"
       end
 
+      def respond_to_call?((method_name))
+        parent.respond_to?(:runner_context) && parent.runner_context.respond_to_call?(method_name)
+      end
+
       protected
 
       def parent_call(method_name, *args)

data/sub/eac_cli/lib/eac_cli/runner/instance_methods.rb

@@ -37,6 +37,16 @@ module EacCli
       def program_name
         runner_context.if_present(&:program_name) || $PROGRAM_NAME
       end
+
+      def respond_to_missing?(method, include_all = false)
+        runner_context.respond_to_call?(method) || super
+      end
+
+      def method_missing(method, *args, &block)
+        return super unless runner_context.respond_to_call?(method)
+
+        runner_context.call(method, *args, &block)
+      end
     end
   end
 end

data/sub/eac_cli/lib/eac_cli/speaker.rb

@@ -23,9 +23,8 @@ module EacCli
       out_out.write(string.to_s)
     end
 
-    def fatal_error(string)
+    def error(string)
       puts "ERROR: #{string}".white.on_red
-      Kernel.exit 1
     end
 
     def title(string)

data/sub/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.26.1'
+  VERSION = '0.27.1'
 end

data/sub/eac_fs/lib/eac_fs/cached_download.rb

@@ -3,13 +3,13 @@
 require 'eac_fs/patches'
 require 'eac_ruby_utils/fs/temp'
 
-module Avm
+module EacFs
   class CachedDownload
     attr_reader :url, :fs_cache
 
     def initialize(url, parent_fs_cache = nil)
       @url = url
-      @fs_cache = (parent_fs_cache || fs_cache).child(url.parameterize)
+      @fs_cache = (parent_fs_cache || fs_cache).child(url.to_s.parameterize)
     end
 
     def assert

data/sub/eac_fs/lib/eac_fs/patches/object/fs_cache.rb

@@ -10,7 +10,12 @@ class Object
       def fs_#{type}
         oid = fs_object_id_by_type(:'#{type}')
         oid = [oid.to_s] unless oid.is_a?(::Enumerable)
-        oid.inject(self.class.fs_#{type}) { |a, e| a.child(e.to_s) }
+        oid.inject(fs_#{type}_parent) { |a, e| a.child(e.to_s) }
+      end
+
+      # @return [EacFs::StorageTree]
+      def fs_#{type}_parent
+        self.class.fs_#{type}
       end
     CODE
   end

data/sub/eac_fs/lib/eac_fs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacFs
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/sub/eac_rest/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/sub/eac_rest/eac_rest.gemspec

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_rest/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_rest'
+  s.version     = EacRest::VERSION
+  s.authors     = ['Eduardo H. Bogoni']
+  s.summary     = 'A REST helper for Ruby.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'eac_ruby_utils', '~> 0.70'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
+end

data/sub/eac_rest/lib/eac_rest/api.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_rest/request'
+require 'eac_ruby_utils/core_ext'
+
+module EacRest
+  # Abstract methods
+  #   * self.issue_get_url_suffix(provider_issue_id)
+  class Api
+    require_sub __FILE__, include_modules: true
+    common_constructor :root_url, :username, :password, default: [nil, nil]
+
+    def request(service_url_suffix, headers = {}, &body_data_proc)
+      r = ::EacRest::Request.new(build_service_url(service_url_suffix),
+                                 body_data_proc)
+      headers.each { |name, value| r = r.header(name, value) }
+      r = r.autenticate(username, password) if username.present?
+      r
+    end
+
+    def request_json(service_url_suffix, headers = {}, &body_data_proc)
+      request(service_url_suffix, headers.merge('Accept' => 'application/json')) do |body_data|
+        r = ::JSON.parse(body_data)
+        r = body_data_proc.call(r) if body_data_proc
+        r
+      end
+    end
+
+    # @return [Addressable::URI]
+    def build_service_url(suffix)
+      s = ::Addressable::URI.parse(suffix)
+      r = ::Addressable::URI.parse(root_url)
+      r.path += s.path
+      r.query_values = r.query_values(::Array).if_present([]) +
+                       s.query_values(::Array).if_present([])
+      r
+    end
+  end
+end

data/sub/eac_rest/lib/eac_rest/entity.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRest
+  class Entity
+    enable_simple_cache
+    common_constructor :api, :data
+
+    class << self
+      def from_array_data(api, array_data, *args)
+        array_data.map { |item_data| new(api, item_data, *args) }
+      end
+    end
+  end
+end