eac_tools 0.29.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 702b93f483faabce748c237dafa2c8cb08d1f1eb4094a93f09166e4e0457c55e
-  data.tar.gz: cd78bbcf11c9da7593068a6667fb2acfdc6c09fa37a6ba7acabd61602915e378
+  metadata.gz: 4ca7fa87db2c97ecf60dc93100760491b936f91d3d979a38953bbf2f1c9c964a
+  data.tar.gz: ce07adf422abd3a143defcd747de05d527a605934dce9300bf8cf48b46195dc8
 SHA512:
-  metadata.gz: 87b38acdc3473f7c62ef5bbf64353fc83daca80c80e9dc8d88ca0d1ddb2225584e57ca81c4bf5a2f9d95abe59ee470da41fb1fc0ac16ff973c7f2e6520d95eb1
-  data.tar.gz: 30edd04c05f07e3d1616321ec2685dc0b00b25d3c165fbbf4fac6c109dc030fc2a7293f084d8229a4b8349e7ed1a8fb10e0ec04e66f00462a1a760ba4ce9ea6f
+  metadata.gz: 813cd67c73235bd826df76db57fc0711fd4a176a2ac601111cd3f5359a68d6c05ceeff179c4311f2ec51d5f8d4b79ce6e6413242e93b44a07507e9f87407f726
+  data.tar.gz: 2e8042ef0bf14c1bc656f9735f978364ad51bf18c0330b0edd73f88ff75f078f37e48d39aeb9a498d72aee87af8e1662aefee29ba98db930a33b37041860b9ee

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.29.0)
+    eac_tools (0.31.0)
       avm (~> 0.43)
       avm-eac_asciidoctor_base0 (~> 0.7)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.2)
       avm-eac_rails_base0 (~> 0.8)
       avm-eac_rails_base1 (~> 0.6)
-      avm-eac_redmine_base0 (~> 0.14)
+      avm-eac_redmine_base0 (~> 0.15)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.20, >= 0.20.1)
+      avm-eac_ruby_base1 (~> 0.21)
       avm-eac_webapp_base0 (~> 0.8)
       avm-eac_wordpress_base0 (~> 0.2)
-      avm-tools (~> 0.136)
+      avm-tools (~> 0.136, >= 0.136.1)
       eac_ruby_utils (~> 0.103)
 
 PATH
@@ -60,15 +60,15 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.14.0)
-      avm (~> 0.41)
+    avm-eac_redmine_base0 (0.15.0)
+      avm (~> 0.43)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_rails_base1 (~> 0.6)
       avm-eac_ubuntu_base0 (~> 0.3)
       curb (~> 0.9, >= 0.9.11)
       eac_fs (~> 0.12, >= 0.12.3)
       eac_rest (~> 0.6, >= 0.6.1)
-      eac_ruby_utils (~> 0.102)
+      eac_ruby_utils (~> 0.103)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
@@ -80,10 +80,10 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.20.1)
+    avm-eac_ruby_base1 (0.21.0)
       avm (~> 0.41, >= 0.41.1)
       avm-eac_generic_base0 (~> 0.5)
-      eac_ruby_utils (~> 0.102)
+      eac_ruby_utils (~> 0.103)
 
 PATH
   remote: sub/avm-eac_webapp_base0
@@ -103,21 +103,31 @@ PATH
       avm-eac_webapp_base0 (~> 0.6)
       eac_ruby_utils (~> 0.102)
 
+PATH
+  remote: sub/avm-files
+  specs:
+    avm-files (0.4.1)
+      avm (~> 0.43)
+      eac_cli (~> 0.28)
+      eac_fs (~> 0.12, >= 0.12.3)
+      eac_ruby_utils (~> 0.103)
+      eac_templates (~> 0.3, >= 0.3.2)
+
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.136.0)
-      aranha-parsers (~> 0.14, >= 0.14.1)
+    avm-tools (0.136.1)
+      aranha-parsers (~> 0.14, >= 0.14.3)
       avm (~> 0.42)
-      avm-eac_ruby_base1 (~> 0.20, >= 0.20.1)
+      avm-eac_ruby_base1 (~> 0.21)
       avm-eac_ubuntu_base0 (~> 0.3)
-      avm-files (~> 0.3, >= 0.3.2)
+      avm-files (~> 0.4)
       avm-git (~> 0.4)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.12, >= 0.12.2)
-      eac_ruby_base0 (~> 0.16, >= 0.16.6)
-      eac_templates (~> 0.3, >= 0.3.1)
+      eac_ruby_base0 (~> 0.17)
+      eac_templates (~> 0.3, >= 0.3.2)
       git (~> 1.12)
       ruby-progressbar (~> 1.11)
 
@@ -138,10 +148,10 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.27.8)
-      colorize (~> 0.8.1)
-      eac_config (~> 0.8)
-      eac_ruby_utils (~> 0.95)
+    eac_cli (0.28.0)
+      colorize (~> 0.8, >= 0.8.1)
+      eac_config (~> 0.11, >= 0.11.1)
+      eac_ruby_utils (~> 0.103)
 
 PATH
   remote: sub/eac_config
@@ -168,11 +178,11 @@ PATH
 PATH
   remote: sub/eac_ruby_base0
   specs:
-    eac_ruby_base0 (0.16.6)
-      avm-eac_ruby_base1 (~> 0.8)
-      eac_cli (~> 0.27, >= 0.27.5)
-      eac_fs (~> 0.10)
-      eac_ruby_utils (~> 0.95, >= 0.95.1)
+    eac_ruby_base0 (0.17.0)
+      avm-eac_ruby_base1 (~> 0.21)
+      eac_cli (~> 0.28)
+      eac_fs (~> 0.12, >= 0.12.3)
+      eac_ruby_utils (~> 0.103)
 
 PATH
   remote: sub/eac_ruby_utils
@@ -213,11 +223,6 @@ GEM
       avm (~> 0.7)
       eac_ruby_utils (~> 0.77, >= 0.77.1)
       eac_templates (~> 0.3)
-    avm-files (0.3.2)
-      avm (~> 0.6)
-      eac_fs (~> 0.5)
-      eac_ruby_utils (~> 0.76)
-      eac_templates (~> 0.2)
     avm-git (0.4.0)
       avm-files (~> 0.1)
       eac_git (~> 0.11)
@@ -351,6 +356,7 @@ DEPENDENCIES
   avm-eac_ruby_base1!
   avm-eac_webapp_base0!
   avm-eac_wordpress_base0!
+  avm-files!
   avm-tools!
   eac_cli!
   eac_config!

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.29.0'
+  VERSION = '0.31.0'
 end

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

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.41'
+  s.add_dependency 'avm', '~> 0.43'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
   s.add_dependency 'avm-eac_rails_base1', '~> 0.6'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
   s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'eac_ruby_utils', '~> 0.103'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/{apache_host.rb → instances/apache_host.rb}

@@ -4,7 +4,9 @@ require 'avm/eac_rails_base1/apache_host'
 
 module Avm
   module EacRedmineBase0
-    class ApacheHost < ::Avm::EacRailsBase1::ApacheHost
+    module Instances
+      class ApacheHost < ::Avm::EacRailsBase1::ApacheHost
+      end
     end
   end
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require 'addressable/uri'
-require 'avm/eac_redmine_base0/data_unit'
+require 'avm/eac_redmine_base0/instances/data_unit'
 require 'avm/eac_redmine_base0/instances/docker_image'
-require 'avm/eac_redmine_base0/rest_api'
+require 'avm/eac_redmine_base0/instances/runners'
+require 'avm/eac_redmine_base0/instances/rest_api'
 require 'avm/eac_rails_base1/instances/base'
 
 module Avm
@@ -32,7 +33,7 @@ module Avm
           @data_package ||= ::Avm::Data::Instance::Package.new(
             self,
             units: {
-              all: ::Avm::EacRedmineBase0::DataUnit.new(self)
+              all: ::Avm::EacRedmineBase0::Instances::DataUnit.new(self)
             }
           )
         end
@@ -46,11 +47,11 @@ module Avm
 
         private
 
-        # @return [Avm::EacRedmineBase0::RestApi]
+        # @return [Avm::EacRedmineBase0::Instances::RestApi]
         def rest_api_uncached
           url = root_url
           url.query_values = { key: read_entry('api.key') }
-          ::Avm::EacRedmineBase0::RestApi.new(url)
+          ::Avm::EacRedmineBase0::Instances::RestApi.new(url)
         end
       end
     end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'avm/data/instance/unit'
+require 'eac_ruby_utils/core_ext'
+require 'curb'
+require 'open-uri'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      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 << export_request.response.body_data_or_raise
+          end
+        end
+
+        def do_load(data_path)
+          do_load_by_web(data_path) || do_load_by_rake(data_path) || raise('Failed to load')
+        end
+
+        def do_load_by_web(data_path)
+          c = Curl::Easy.new(import_url)
+          c.multipart_form_post = true
+          c.http_post(Curl::PostField.file('redmine_with_git_tableless_load[path]', data_path))
+          c.perform
+          true
+        rescue Curl::Err::ConnectionFailedError
+          false
+        end
+
+        def do_load_by_rake(data_path)
+          instance.bundle('exec', 'rake', "redmine_with_git:load:all[#{data_path}]").system
+          true
+        end
+
+        def export_request
+          instance.rest_api.request(EXPORT_PATH)
+        end
+
+        def import_url
+          instance.rest_api.build_service_url(IMPORT_PATH).to_s
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/{rest_api.rb → instances/rest_api.rb}

@@ -5,7 +5,9 @@ require 'eac_rest/api'
 
 module Avm
   module EacRedmineBase0
-    class RestApi < ::EacRest::Api
+    module Instances
+      class RestApi < ::EacRest::Api
+      end
     end
   end
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners/project_rename.rb

@@ -8,7 +8,7 @@ module Avm
     module Instances
       module Runners
         class ProjectRename
-          runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle do
+          runner_with :help, ::Avm::EacRailsBase1::RunnerWith::Bundle do
             pos_arg :from
             pos_arg :to
           end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/runners/base.rb

@@ -2,7 +2,7 @@
 
 require 'avm/eac_redmine_base0/instances/base'
 require 'avm/eac_redmine_base0/instances/deploy'
-require 'avm/eac_redmine_base0/apache_host'
+require 'avm/eac_redmine_base0/instances/apache_host'
 require 'avm/eac_rails_base1/runner'
 require 'eac_ruby_utils/core_ext'
 

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/core_update.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/sources/core_update'
+require 'avm/sources/base/configuration'
+require 'avm/sync'
+require 'eac_fs/cached_download'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      class CoreUpdate
+        enable_speaker
+        enable_simple_cache
+        common_constructor :source, :version, :url
+
+        GITIGNORE_ADD = %w[/public/assets/**/* /config/install.sh /config/secrets_key.txt
+                           /log/**/*].freeze
+        GITIGNORE_DEL = %w[/Gemfile.lock /plugins/* /public/themes/*].freeze
+        TARGET_KEEP = ::Avm::Sources::Base::Configuration::CONFIGURATION_FILENAMES
+                        .map { |b| "/#{b}" } + %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
+
+        def fs_object_id
+          [source.path, version].join('_').variableize
+        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
+          i18n_translate(__method__, version: version, __locale: source.locale)
+        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
+
+        # @return [EacFs::CachedDownload]
+        def source_package_uncached
+          ::EacFs::CachedDownload.new(url, fs_cache)
+        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
+          source.path
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/runners/core_update.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_rails_base1/sources/base'
-require 'avm/eac_redmine_base0/core_update'
+require 'avm/eac_redmine_base0/sources/core_update'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -29,7 +29,8 @@ module Avm
           end
 
           def update
-            ::Avm::EacRedmineBase0::CoreUpdate.new(runner_context.call(:subject), version, url).run
+            ::Avm::EacRedmineBase0::Sources::CoreUpdate
+              .new(runner_context.call(:subject), version, url).run
           end
 
           def url

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.14.0'
+    VERSION = '0.15.0'
   end
 end

data/sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/apache_host_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/instances/apache_host'
+require 'avm/eac_redmine_base0/instances/base'
+
+RSpec.describe ::Avm::EacRedmineBase0::Instances::ApacheHost do
+  describe '#no_ssl_site_content' do
+    let(:instance) { ::Avm::EacRedmineBase0::Instances::Base.by_id('stub-app_0') }
+    let(:apache_host) { described_class.new(instance) }
+    let(:fixtures_dir) { ::Pathname.new('apache_host_spec_files').expand_path(__dir__) }
+    let(:expected_content) { fixtures_dir.join('apache_host_spec_no_ssl_content.conf').read }
+
+    before do
+      instance.entry('install.path').write('/path/to/stub-app_0')
+      instance.entry('web.url').write('http://stubapp.net')
+    end
+
+    it do
+      expect(apache_host.no_ssl_site_content).to eq(expected_content)
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/apache_host_spec_files/apache_host_spec_no_ssl_content.conf

@@ -0,0 +1,11 @@
+<VirtualHost *:80>
+  ServerName "stubapp.net"
+  DocumentRoot "/path/to/stub-app_0/public"
+  PassengerEnabled On
+
+  <Directory "/path/to/stub-app_0/public">
+    Allow from all
+    Options -MultiViews
+    Require all granted
+  </Directory>
+</VirtualHost>

data/sub/avm-eac_redmine_base0/spec/spec_helper.rb

@@ -2,3 +2,4 @@
 
 require 'eac_ruby_utils/rspec/default_setup'
 ::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
+::EacRubyUtils::Rspec.default_setup.stub_eac_config_node

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'avm', '~> 0.41', '>= 0.41.1'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'eac_ruby_utils', '~> 0.103'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/runners/base/lib_rename.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'avm/eac_ruby_base1/sources/namespace_replacer'
+
+module Avm
+  module EacRubyBase1
+    module Runners
+      class Base
+        class LibRename
+          runner_with :help, :file_replacer do
+            desc 'Rename Ruby modules classes Ruby.'
+            arg_opt '-f', '--from', 'Rename "from".'
+            arg_opt '-t', '--to', 'Rename "to".'
+          end
+
+          def run
+            start_banner
+            validate
+            replacements_banner
+            run_filesystem_traverser
+            success 'Done!'
+          end
+
+          def validate
+            %w[from to].each do |opt|
+              fatal_error "No \"#{opt}\" option" if send(opt).blank?
+            end
+          end
+
+          def start_banner
+            infov 'From', from
+            infov 'To', to
+          end
+
+          private
+
+          def namespace_replacer_uncached
+            ::Avm::EacRubyBase1::Sources::NamespaceReplacer.new(from, to)
+          end
+
+          def text_replacer
+            @text_replacer ||= super.gsub(from, to).gsub(from_path, to_path)
+                                 .gsub(namespace_replacer.from_result, namespace_replacer.to_result)
+          end
+
+          def replace_file?(file)
+            file.extname == '.rb'
+          end
+
+          def replacements_banner
+            infov 'Replacements', text_replacer.replacements.count
+            text_replacer.replacements.each do |rep|
+              infov '  * ', rep
+            end
+          end
+
+          def from
+            parsed.from.to_s
+          end
+
+          def to
+            parsed.to.to_s
+          end
+
+          def from_path
+            from.underscore
+          end
+
+          def to_path
+            to.underscore
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/namespace_replacer.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class NamespaceReplacer
+        common_constructor :from, :to
+
+        def concat_regex(regexes)
+          r = regexes.first
+          regexes[1..-1].each do |x|
+            r = ::Regexp.new(r.source + x.source)
+          end
+          r
+        end
+
+        def from_result
+          /\n#{from_open.source}(.+)#{from_close.source}/m
+        end
+
+        def from_open
+          concat_regex(from.split('::')
+            .map { |v| / *(?:class|module) +#{::Regexp.quote(v)} *\n/m })
+        end
+
+        def from_close
+          concat_regex(from.split('::').count.times.map { / *end *\n/m })
+        end
+
+        def to_result
+          "\n\n#{to_open}\\1#{to_close}"
+        end
+
+        def to_open
+          s = ''
+          to.split('::').each_with_index do |part, index|
+            s += ('  ' * index) + "module #{part}\n"
+          end
+          s
+        end
+
+        def to_close
+          parts = to.split('::')
+          s = ''
+          parts.each_with_index do |_part, index|
+            tabc = (parts.count - 1 - index)
+            tabc -= 1 if index.zero?
+            s += ('  ' * tabc) + "end\n"
+          end
+          s
+        end
+      end
+    end
+  end
+end