avm-tools 0.61.0 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '039f5b3b40307ddabe21c292a6f2fb1accf902dee691dac160648f9b305d094a'
-  data.tar.gz: f3a4993ab7abf9d0d5ae0a75196532460a4b5c5cd1ad24be2656f19113fd2749
+  metadata.gz: 37ce02b35f53298066d48205ff8442084a1d702baecb901c91ba3dffe5d2cd0d
+  data.tar.gz: f4bf6b545744791267fdbdc0eb47f4dc1f0d6b5c1ebef912dd1cbaa8c06b6bfe
 SHA512:
-  metadata.gz: 4777eeb21d3a8a7feb1bd172f23a5fef179456beb2503f20e855f82bd54c9ac06cff90c7d3319b435d6533123d66f28f72a39fb168f37b9897bf0468dbdecced
-  data.tar.gz: 9c90eac1666e3ff96c0bb58d71928f8fb9283e081f643e80989b19f6e05fe1cde3c86bda6d125a1b4f60c3e1f9b02b83eee17af7a0d91623f0dcacfdc5c023b9
+  metadata.gz: a2c271e9d1e95373e7957b55d26b3ffc87b227e1fe4a4d90d94b686e16d4bbf90e40e9be639ab4ea2063698aa42d5e43284472e5e271e3d8e55d4a68acc2e5e3
+  data.tar.gz: 58d5924ed8c0e329292240d866b7c567bd1eec97f1774d4ef8573fa4d77b09477a07aa6c90e4ae99806f235af4892d752653667d5d9de7dc3806dee507d2a774

data/lib/avm/cached_download.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'avm/fs_cache'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  class CachedDownload
+    attr_reader :url, :fs_cache
+
+    def initialize(url, parent_fs_cache = nil)
+      @url = url
+      @fs_cache = (parent_fs_cache || ::Avm.fs_cache).child(url.parameterize)
+    end
+
+    def assert
+      download unless fs_cache.cached?
+    end
+
+    def download
+      ::EacRubyUtils::Fs::Temp.on_file do |temp|
+        download_to(temp)
+        fs_cache.content_path.to_pathname.dirname.mkpath
+        ::FileUtils.mv(temp.to_path, fs_cache.content_path)
+      end
+    end
+
+    def path
+      @path ||= fs_cache.content_path.to_pathname
+    end
+
+    private
+
+    def download_to(local_file)
+      ::URI.parse(url).open do |remote|
+        local_file.open('wb') { |handle| handle.write(remote.read) }
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/core_update.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/core_update'
+require 'avm/cached_download'
+require 'avm/sync'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    class CoreUpdate
+      enable_console_speaker
+      enable_simple_cache
+      common_constructor :instance, :version, :url
+
+      GITIGNORE_ADD = %w[/public/assets/**/* /config/install.sh /log/**/*].freeze
+      GITIGNORE_DEL = %w[/Gemfile.lock /plugins/* /public/themes/*].freeze
+      TARGET_KEEP = %w[/Gemfile.lock].freeze
+
+      def run
+        ::EacRubyUtils::Fs::Temp.on_directory do |dir|
+          @tempdir = dir
+          assert_source_package
+          extract_package_to_tempdir
+          sync_content
+          change_git_ignore
+          validate_empty_dir
+        end
+        git_commit
+        success 'Done!'
+      end
+
+      def assert_source_package
+        infom 'Asserting source package...'
+        source_package.assert
+        infov 'Package cache path', source_package.path
+        infov 'Package size', source_package.path.size
+      end
+
+      private
+
+      attr_reader :tempdir
+
+      def change_git_ignore
+        file = target_path.join('.gitignore')
+        file.write(
+          (file.read.each_line.map(&:strip).reject { |line| GITIGNORE_DEL.include?(line) } +
+            ['', '#eac_redmine_base0'] + GITIGNORE_ADD).map { |line| "#{line}\n" }.join
+        )
+      end
+
+      def extract_package_to_tempdir
+        infom "Extracting package to tempdir #{tempdir}..."
+        ::EacRubyUtils::Envs.local.command(
+          'tar', '-xf', source_package.path.to_path, '-C', tempdir.to_path,
+          '--strip-components', '1'
+        ).execute!
+      end
+
+      def git_commit
+        if git_repo.dirty?
+          infom 'Git commiting...'
+          git_repo.command('add', '--', target_path).execute!
+          git_repo.command('commit', '-m', git_commit_message, '--', target_path).execute!
+        else
+          infom 'Nothing to commit'
+        end
+      end
+
+      def git_commit_message
+        "Core: update to #{version}."
+      end
+
+      def git_repo_uncached
+        ::EacGit::Local.new(target_path)
+      end
+
+      def sync_content
+        ::Avm::Sync.new(source_path, target_path)
+                   .add_exclude('/*').add_includes(*target_files_to_remove).move_mode(true).run
+      end
+
+      def source_package_uncached
+        ::Avm::CachedDownload.new(url, ::Avm.fs_cache.child('eac_redmine_base0', 'core_update'))
+      end
+
+      def validate_empty_dir
+        if source_path.children.empty?
+          infom 'No content left in source directory'
+        else
+          fatal_error 'Found entries in source directory: ' +
+                      source_path.children.map { |c| c.basename.to_path }.join(', ')
+        end
+      end
+
+      def source_path_uncached
+        ::Pathname.new(tempdir.to_path)
+      end
+
+      def target_files_to_remove
+        git_repo.command('ls-files').execute!
+                .each_line.map { |v| "/#{v.strip}" }
+                .without(*TARGET_KEEP)
+      end
+
+      def target_path_uncached
+        instance.read_entry('fs_path').to_pathname
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/data_unit.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/data/instance/unit'
+require 'eac_ruby_utils/core_ext'
+require 'open-uri'
+
+module Avm
+  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

data/lib/avm/eac_redmine_base0/deploy.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'avm/stereotypes/eac_webapp_base0/deploy'
+require 'eac_ruby_utils/ruby'
+
+module Avm
+  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

data/lib/avm/eac_redmine_base0/instance.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'avm/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 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::EacRedmineBase0::DataUnit.new(self)
+          }
+        )
+      end
+    end
+  end
+end

data/lib/avm/sync.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  class Sync
+    attr_reader :excludes, :includes
+
+    common_constructor :source_path, :target_path do
+      self.source_path = source_path.to_pathname
+      self.target_path = target_path.to_pathname
+      @excludes = []
+      @includes = []
+    end
+
+    def run
+      clear_target
+      copy
+    end
+
+    def add_exclude(exclude)
+      excludes << exclude
+
+      self
+    end
+
+    def add_excludes(*excludes)
+      excludes.each { |exclude| add_exclude(exclude) }
+
+      self
+    end
+
+    def add_include(include)
+      includes << include
+
+      self
+    end
+
+    def add_includes(*includes)
+      includes.each { |include| add_include(include) }
+
+      self
+    end
+
+    def move_mode(value)
+      @move_mode = value
+
+      self
+    end
+
+    def move_mode?
+      @move_mode ? true : false
+    end
+
+    private
+
+    def clear_target
+      target_remove(target_path)
+      target_path.children.each { |tchild| target_remove(tchild) }
+    end
+
+    def copy
+      source_path.children.each do |schild|
+        ::FileUtils.cp_r(schild.to_path, target_path.to_path)
+        schild.rmtree if move_mode?
+      end
+    end
+
+    def source_to_target_path(source_path)
+      source_path.relative_path_from(self.source_path).expand_path(target_path)
+    end
+
+    def target_remove(tpath)
+      return if skip_target_path?(tpath)
+
+      if tpath.directory?
+        tpath.children.each { |tchild| target_remove(tchild) }
+        tpath.rmdir if tpath.children.empty?
+      elsif tpath.file?
+        tpath.unlink
+      end
+    end
+
+    def skip_target_path?(tpath)
+      skip_path?(tpath.relative_path_from(target_path))
+    end
+
+    def skip_path?(relpath)
+      relpath = relpath.expand_path('/')
+      excludes.any? { |exclude| relpath.fnmatch?(exclude) } &&
+        includes.none? { |include| relpath.fnmatch?(include) }
+    end
+  end
+end

data/lib/avm/tools/runner/eac_redmine_base0.rb

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/simple_cache'
-require 'avm/stereotypes/eac_redmine_base0/instance'
+require 'avm/eac_redmine_base0/instance'
 require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
 
@@ -26,7 +26,7 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::Stereotypes::EacRedmineBase0::Instance.by_id(options['<instance_id>'])
+          ::Avm::EacRedmineBase0::Instance.by_id(options['<instance_id>'])
         end
       end
     end

data/lib/avm/tools/runner/eac_redmine_base0/core_update.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/core_update'
+require 'eac_cli/default_runner'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class CoreUpdate < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            arg_opt '-u', '--url', 'Core\'s package URL.'
+            arg_opt '-v', '--version', 'Core\'s version.'
+            desc 'Update instance\' core.'
+          end
+
+          def run
+            start_banner
+            validate
+            update
+          end
+
+          private
+
+          def start_banner
+            infov 'URL', url
+            infov 'Version', version
+          end
+
+          def update
+            ::Avm::EacRedmineBase0::CoreUpdate.new(context(:instance), version, url).run
+          end
+
+          def url
+            options.fetch('--url') || url_by_version
+          end
+
+          def url_by_version
+            options.fetch('--version').if_present do |v|
+              "https://www.redmine.org/releases/redmine-#{v}.tar.gz"
+            end
+          end
+
+          def validate
+            %w[url version].each do |attr|
+              fatal_error "\"#{attr}\" is blank. See avaiable options." if send(attr).blank?
+            end
+          end
+
+          def version
+            options.fetch('--version') || version_by_url
+          end
+
+          def version_by_url
+            options.fetch('--url').if_present do |v|
+              /(\d+.\d+.\d+)/.if_match(v, false) { |m| m[1] }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_redmine_base0/deploy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_redmine_base0/deploy'
+require 'avm/eac_redmine_base0/deploy'
 require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
 
 module Avm

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.61.0'
+    VERSION = '0.62.0'
   end
 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.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2020-07-30 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
@@ -405,9 +410,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 +435,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 +446,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
@@ -966,7 +970,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