avm-tools 0.61.0 → 0.62.4

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.61.0'
+    VERSION = '0.62.4'
   end
 end

data/lib/eac_launcher/context.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/hash/indifferent_access'
+require 'avm/launcher/context/instance_manager'
 require 'eac_ruby_utils/simple_cache'
 require 'eac_ruby_utils/console/speaker'
 require 'eac_launcher/context/instance_discovery'
-require 'eac_launcher/context/instance_manager'
 require 'eac_launcher/context/settings'
 require 'eac_launcher/paths/logical'
 require 'eac_launcher/project'
@@ -39,7 +39,7 @@ module EacLauncher
       @settings = ::EacLauncher::Context::Settings.new(build_option(:settings_file))
       @cache_root = build_option(:cache_root)
       @publish_options = { new: false, confirm: false, stereotype: nil }
-      @instance_manager = ::EacLauncher::Context::InstanceManager.new(self)
+      @instance_manager = ::Avm::Launcher::Context::InstanceManager.new(self)
       @recache = false
     end
 

data/lib/eac_launcher/context/instance_discovery.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'ruby-progressbar'
-require 'eac_launcher/instances/base'
+require 'avm/launcher/instances/base'
 
 module EacLauncher
   class Context
@@ -22,7 +22,7 @@ module EacLauncher
         update_progress_format(path)
         on_rescued_path_instances(path) do |r|
           if path.project?
-            parent_instance = ::EacLauncher::Instances::Base.instanciate(path, parent_instance)
+            parent_instance = ::Avm::Launcher::Instances::Base.instanciate(path, parent_instance)
             r << path
           end
           children = path.children

data/lib/eac_launcher/git/base/dirty_files.rb

@@ -6,7 +6,7 @@ module EacLauncher
   module Git
     class Base < ::EacLauncher::Paths::Real
       module DirtyFiles
-        delegate :dirty, to: :eac_git
+        delegate :dirty?, to: :eac_git
 
         def dirty_files
           eac_git.dirty_files.map do |df|

data/lib/eac_launcher/git/sub_warp_base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/error'
+require 'avm/projects/stereotype'
+require 'avm/launcher/errors/base'
 
 module EacLauncher
   module Git
@@ -11,7 +12,7 @@ module EacLauncher
         r = find_parent_instance(instance.parent)
         return r if r
 
-        ::EacLauncher::Instances::Error.new('Git parent not found')
+        ::EacLauncher::Instances::Errors::Base.new('Git parent not found')
       end
 
       def find_parent_instance(current)

data/lib/eac_launcher/instances.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/base'
-require 'eac_launcher/instances/error'
+require 'avm/launcher/errors/base'
+require 'avm/launcher/instances/base'
 require 'eac_launcher/instances/runner_helper'
 require 'eac_launcher/instances/settings'

data/lib/eac_launcher/instances/error.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
-module EacLauncher
-  module Instances
-    class Error < StandardError
+module Avm
+  module Launcher
+    module Instances
+      module Errors
+        class Error < StandardError
+        end
+      end
     end
   end
 end

data/lib/eac_launcher/paths/logical.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes'
+require 'avm/projects/stereotypes'
 require 'eac_launcher/paths/real'
 
 module EacLauncher
@@ -68,7 +68,7 @@ module EacLauncher
       end
 
       def warped_uncached
-        if is_a?(::EacLauncher::Instances::Base)
+        if is_a?(::Avm::Launcher::Instances::Base)
           stereotypes.each do |s|
             return s.warp_class.new(self) if s.warp_class
           end

data/lib/eac_launcher/publish/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/error'
+require 'avm/launcher/errors/base'
 
 module EacLauncher
   module Publish
@@ -35,7 +35,7 @@ module EacLauncher
 
       def check_with_rescue
         internal_check
-      rescue ::EacLauncher::Instances::Error => e
+      rescue ::EacLauncher::Instances::Errors::Base => e
         ::EacLauncher::Publish::CheckResult.blocked("Error: #{e}")
       rescue ::EacLauncher::Git::Error => e
         ::EacLauncher::Publish::CheckResult.blocked("Git error: #{e}")

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem.rb

@@ -64,7 +64,7 @@ module EacRubyGemsUtils
     end
 
     def gemfile_lock_path_uncached
-      root.join('Gemfile.lock')
+      gemfile_path.basename_sub { |b| "#{b}.lock" }
     end
 
     def gemspec_path_uncached

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyGemsUtils
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.61.0
+  version: 0.62.4
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -274,6 +274,7 @@ files:
 - Gemfile
 - exe/avm
 - lib/avm.rb
+- lib/avm/cached_download.rb
 - lib/avm/configs.rb
 - lib/avm/data.rb
 - lib/avm/data/instance.rb
@@ -289,6 +290,10 @@ files:
 - lib/avm/docker/image.rb
 - lib/avm/docker/registry.rb
 - lib/avm/docker/runner.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/executables.rb
 - lib/avm/files.rb
 - lib/avm/files/formatter.rb
@@ -358,10 +363,18 @@ files:
 - lib/avm/instances/entries.rb
 - lib/avm/instances/entries/entry_reader.rb
 - lib/avm/instances/entry_keys.rb
+- lib/avm/launcher/context/instance_manager.rb
+- lib/avm/launcher/context/instance_manager/cached_instance.rb
+- lib/avm/launcher/context/instance_manager/cached_instances.rb
+- lib/avm/launcher/errors/base.rb
+- lib/avm/launcher/errors/non_project.rb
+- lib/avm/launcher/instances/base.rb
+- lib/avm/launcher/instances/base/cache.rb
 - lib/avm/local_projects.rb
 - lib/avm/local_projects/instance.rb
 - lib/avm/local_projects/jobs/update.rb
 - lib/avm/patches.rb
+- lib/avm/patches/eac_ruby_gems_utils/gem.rb
 - lib/avm/patches/object/template.rb
 - lib/avm/path_string.rb
 - lib/avm/projects.rb
@@ -405,9 +418,6 @@ files:
 - 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_redmine_base0/data_unit.rb
-- lib/avm/stereotypes/eac_redmine_base0/deploy.rb
-- lib/avm/stereotypes/eac_redmine_base0/instance.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
@@ -433,6 +443,7 @@ files:
 - lib/avm/stereotypes/postgresql/instance_with.rb
 - lib/avm/stereotypes/rails.rb
 - lib/avm/stereotypes/rails/instance.rb
+- lib/avm/sync.rb
 - lib/avm/tools.rb
 - lib/avm/tools/runner.rb
 - lib/avm/tools/runner/eac_rails_base0.rb
@@ -443,6 +454,7 @@ files:
 - lib/avm/tools/runner/eac_rails_base0/runner.rb
 - lib/avm/tools/runner/eac_redmine_base0.rb
 - lib/avm/tools/runner/eac_redmine_base0/bundle.rb
+- lib/avm/tools/runner/eac_redmine_base0/core_update.rb
 - lib/avm/tools/runner/eac_redmine_base0/data.rb
 - lib/avm/tools/runner/eac_redmine_base0/data/dump.rb
 - lib/avm/tools/runner/eac_redmine_base0/deploy.rb
@@ -483,7 +495,6 @@ files:
 - lib/eac_launcher.rb
 - lib/eac_launcher/context.rb
 - lib/eac_launcher/context/instance_discovery.rb
-- lib/eac_launcher/context/instance_manager.rb
 - lib/eac_launcher/context/settings.rb
 - lib/eac_launcher/git.rb
 - lib/eac_launcher/git/base.rb
@@ -499,8 +510,6 @@ files:
 - lib/eac_launcher/git/sub_warp_base.rb
 - lib/eac_launcher/git/warp_base.rb
 - lib/eac_launcher/instances.rb
-- lib/eac_launcher/instances/base.rb
-- lib/eac_launcher/instances/base/cache.rb
 - lib/eac_launcher/instances/error.rb
 - lib/eac_launcher/instances/runner_helper.rb
 - lib/eac_launcher/instances/settings.rb
@@ -518,6 +527,8 @@ files:
 - lib/eac_launcher/vendor.rb
 - lib/eac_launcher/vendor/github.rb
 - lib/eac_launcher/version.rb
+- template/avm/eac_redmine_base0/deploy/config/install.sh.template
+- template/avm/eac_redmine_base0/deploy/config/secrets.yml
 - template/avm/ruby/gems/generator/gemspec.template
 - template/avm/ruby/gems/generator/root_lib.template
 - template/avm/ruby/gems/generator/static/Gemfile
@@ -527,8 +538,6 @@ files:
 - 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_redmine_base0/deploy/config/install.sh.template
-- template/avm/stereotypes/eac_redmine_base0/deploy/config/secrets.yml
 - 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
@@ -966,7 +975,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Tools for AVM.

data/lib/avm/stereotypes/eac_redmine_base0/data_unit.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/data/instance/unit'
-require 'eac_ruby_utils/core_ext'
-require 'open-uri'
-
-module Avm
-  module Stereotypes
-    module EacRedmineBase0
-      class DataUnit < ::Avm::Data::Instance::Unit
-        common_constructor :instance
-
-        EXTENSION = '.tar'
-
-        def do_dump(data_path)
-          ::File.open(data_path, 'wb') do |file|
-            file << URI.parse(export_url).read
-          end
-        end
-
-        def export_url
-          uri = ::Addressable::URI.parse(instance.read_entry('web.url')) + '/backup/export'
-          uri.query_values = { key: instance.read_entry('admin.api_key') }
-          uri.to_s
-        end
-      end
-    end
-  end
-end

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

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/stereotypes/eac_webapp_base0/deploy'
-require 'eac_ruby_utils/ruby'
-
-module Avm
-  module Stereotypes
-    module EacRedmineBase0
-      class Deploy < ::Avm::Stereotypes::EacWebappBase0::Deploy
-        set_callback :assert_instance_branch, :after, :run_installer
-
-        def run_installer
-          infom 'Running installer'
-          ::EacRubyUtils::Ruby.on_clean_environment do
-            installer_command.system!
-          end
-        end
-
-        def installer_command
-          instance.host_env.command(installer_path, install_task)
-        end
-
-        def installer_path
-          ::File.join(instance.read_entry(:fs_path), 'plugins', 'redmine_installer', 'installer',
-                      'run.sh')
-        end
-
-        def install_task
-          if instance.read_entry_optional('web.path').present?
-            'redmine_as_apache_path'
-          else
-            'redmine_as_apache_base'
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/stereotypes/eac_redmine_base0/data_unit'
-require 'avm/stereotypes/eac_ubuntu_base0/docker_image'
-require 'avm/stereotypes/eac_webapp_base0/instance'
-require 'avm/stereotypes/rails/instance'
-
-module Avm
-  module Stereotypes
-    module EacRedmineBase0
-      class Instance < ::Avm::Stereotypes::EacWebappBase0::Instance
-        include ::Avm::Stereotypes::Rails::Instance
-
-        FILES_UNITS = { files: 'files' }.freeze
-
-        def docker_image_class
-          ::Avm::Stereotypes::EacUbuntuBase0::DockerImage
-        end
-
-        def docker_run_arguments
-          [
-            '--volume', "#{read_entry(:fs_path)}:/home/myuser/eac_redmine_base0",
-            '--publish', "#{read_entry(:ssh_port)}:22",
-            '--publish', "#{read_entry(:http_port)}:80",
-            '--publish', "#{read_entry(:https_port)}:443"
-          ]
-        end
-
-        def data_package
-          @data_package ||= ::Avm::Data::Instance::Package.new(
-            self,
-            units: {
-              all: ::Avm::Stereotypes::EacRedmineBase0::DataUnit.new(self)
-            }
-          )
-        end
-      end
-    end
-  end
-end

data/lib/eac_launcher/context/instance_manager.rb

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_launcher/publish/check_result'
-require('yaml')
-
-module EacLauncher
-  class Context
-    class InstanceManager
-      include ::EacRubyUtils::SimpleCache
-
-      def initialize(context)
-        @context = context
-      end
-
-      def publish_state_set(instance, stereotype_name, check_status)
-        data = cached_instances_file_content_uncached
-        data[instance.logical] ||= {}
-        data[instance.logical][:publish_state] ||= {}
-        data[instance.logical][:publish_state][stereotype_name] = check_status
-        write_cache_file(data)
-      end
-
-      def pending_instances
-        instances.select { |instance| pending_instance?(instance) }
-      end
-
-      private
-
-      def instances_uncached
-        (cached_instances || search_instances).select(&:included?)
-      end
-
-      def search_instances
-        cache_instances(::EacLauncher::Context::InstanceDiscovery.new(@context).instances)
-      end
-
-      def cached_instances
-        return nil if @context.recache
-        return nil unless cached_instances_file_content
-
-        CachedInstances.new(cached_instances_file_content).instances
-      end
-
-      def cached_instances_file_content_uncached
-        r = YAML.load_file(cache_file_path)
-        r.is_a?(::Hash) ? r : nil
-      rescue Errno::ENOENT
-        nil
-      end
-
-      def cache_instances(instances)
-        write_cache_file(Hash[instances.map { |i| [i.logical, i.to_h] }])
-        instances
-      end
-
-      def write_cache_file(data)
-        ::File.write(cache_file_path, data.to_yaml)
-      end
-
-      def cache_file_path
-        ::File.join(@context.cache_root, 'instances.yml')
-      end
-
-      def pending_instance?(instance)
-        data = cached_instances_file_content
-        return false unless data[instance.logical]
-        return false unless data[instance.logical][:publish_state].is_a?(Hash)
-
-        data[instance.logical][:publish_state].any? do |_k, v|
-          ::EacLauncher::Publish::CheckResult.pending_status?(v)
-        end
-      end
-
-      class CachedInstances
-        def initialize(content)
-          @content = content
-          @instances = {}
-        end
-
-        def instances
-          @content.keys.map { |k| by_logical_path(k) }
-        end
-
-        def by_logical_path(key)
-          return @instances[key] if @instances.key?(key)
-
-          h = @content[key]
-          parent_instance = h[:parent] ? by_logical_path(h[:parent]) : nil
-          path = ::EacLauncher::Paths::Logical.from_h(@context, h)
-          @instances[key] = ::EacLauncher::Instances::Base.instanciate(path, parent_instance)
-        end
-      end
-    end
-  end
-end