eac_tools 0.30.0 → 0.31.1

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-files/lib/avm/files/text_replacer.rb

@@ -25,7 +25,7 @@ module Avm
       end
 
       def gsub(from, to)
-        replacement(::Avm::TextReplacer::Gsub.new(from, to))
+        replacement(::Avm::Files::TextReplacer::Gsub.new(from, to))
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/sub/avm-tools/avm-tools.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.3'
-  s.add_dependency 'avm', '~> 0.42'
+  s.add_dependency 'avm', '~> 0.44'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.21'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
-  s.add_dependency 'avm-files', '~> 0.4'
+  s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'avm-git', '~> 0.4'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.136.1'
+    VERSION = '0.136.2'
   end
 end

data/sub/eac_git/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/eac_git/eac_git.gemspec

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_git/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_git'
+  s.version     = EacGit::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib,vendor}/**/*']
+
+  s.add_dependency 'eac_ruby_utils', '~> 0.103'
+  s.add_dependency 'parseconfig', '~> 1.1', '>= 1.1.2'
+
+  s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.2'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
+end

data/sub/eac_git/lib/eac_git/executables.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/envs'
+
+module EacGit
+  module Executables
+    class << self
+      include ::EacRubyUtils::SimpleCache
+
+      def env
+        ::EacRubyUtils::Envs.local
+      end
+
+      private
+
+      def git_uncached
+        r = env.executable('git', '--version')
+        r.extend(GitCommandExtensions)
+        r
+      end
+
+      def tar_uncached
+        env.executable('tar', '--version')
+      end
+
+      module GitCommandExtensions
+        def command(*args)
+          super(*args).envvar('PATH', path_with_git_subrepo)
+        end
+
+        def gem_root
+          '../..'.to_pathname.expand_path(__dir__)
+        end
+
+        def git_subrepo_root
+          gem_root.join('vendor', 'git-subrepo')
+        end
+
+        def path_with_git_subrepo
+          ([git_subrepo_root.join('lib').to_path] +
+              ENV['PATH'].if_present('').split(::File::PATH_SEPARATOR))
+            .join(::File::PATH_SEPARATOR)
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/branch.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    class Branch
+      REFS_PREFIX = 'refs/heads/'
+
+      common_constructor :local, :name
+
+      # @return [String]
+      def current_commit_id
+        local.rev_parse(full_ref_name, true)
+      end
+
+      # @return [Boolean]
+      def exist?
+        local.command('show-ref', '--quiet', full_ref_name).execute.fetch(:exit_code).zero?
+      end
+
+      def full_ref_name
+        "#{REFS_PREFIX}#{name}"
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/commit/archive.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    class Commit
+      module Archive
+        # @return [EacRubyUtils::Envs::Command]
+        def archive_to_dir(path)
+          path = path.to_pathname
+          repo.command('archive', '--format=tar', id).pipe(
+            ::EacGit::Executables.tar.command('-xC', path)
+          )
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/commit/changed_file.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_git/local/commit/diff_tree_line'
+
+module EacGit
+  class Local
+    class Commit
+      class ChangedFile
+        enable_simple_cache
+
+        attr_reader :commit, :diff_tree
+
+        # @param commit [EacGit::Local::Commit]
+        # @param diff_tree_line [String] A line from command "repo diff-tree --no-commit-id -r
+        #   --full-index"'s output.
+        def initialize(commit, diff_tree_line)
+          @commit = commit
+          @diff_tree = ::EacGit::Local::Commit::DiffTreeLine.new(diff_tree_line)
+        end
+
+        delegate(*::EacGit::Local::Commit::DiffTreeLine::FIELDS, to: :diff_tree)
+
+        def to_s
+          "#{path}|#{status}"
+        end
+
+        def src_size_uncached
+          size(src_sha1)
+        end
+
+        def dst_size_uncached
+          size(dst_sha1)
+        end
+
+        private
+
+        def size(id)
+          return 0 if /\A0+\z/.match(id)
+
+          commit.repo.command('cat-file', '-s', id).execute!.strip.to_i
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/commit/diff_tree_line.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    class Commit
+      class DiffTreeLine
+        DIFF_TREE_PATTERN = /\A:(\d{6}) (\d{6}) (\S+) (\S+) (\S+)\t(\S.*)\z/.freeze
+        FIELDS = %w[src_mode dst_mode src_sha1 dst_sha1 status path].freeze
+        GIT_COMMAND_ARGS = %w[-c core.quotepath=off diff-tree --no-commit-id -r --full-index].freeze
+
+        attr_reader(*FIELDS)
+
+        # line: a line of command "git [GIT_COMMAND_ARGS]"'s output.
+        # Reference: https://git-scm.com/docs/git-diff-tree
+        def initialize(line)
+          m = DIFF_TREE_PATTERN.match(line.strip)
+          raise "\"#{line}\" did not match pattern" unless m
+
+          FIELDS.count.times { |i| send("#{FIELDS[i]}=", m[i + 1]) }
+        end
+
+        def fields
+          FIELDS.map { |field| [field, send(field)] }.to_h
+        end
+
+        private
+
+        attr_writer(*FIELDS)
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/commit.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    class Commit
+      require_sub __FILE__, include_modules: true
+      enable_simple_cache
+      include ::Comparable
+
+      FIELDS = {
+        author_name: '%an', author_email: '%ae', author_date: '%ai',
+        subject: '%s',
+        author_all: '%an <%ae>, %ai',
+        commit_hash: '%H', abbreviated_commit_hash: '%h',
+        commiter_name: '%cn', commiter_email: '%ce', commiter_date: '%ci',
+        commiter_all: '%cn <%ce>, %ci',
+        raw_body: '%B'
+      }.freeze
+
+      common_constructor :repo, :id
+
+      def <=>(other)
+        [repo, id] <=> [other.repo, other.id]
+      end
+
+      def format(format)
+        repo.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", id).execute!.strip
+      end
+
+      FIELDS.each do |field, format|
+        define_method(field) { format(format) }
+      end
+
+      def changed_files_uncached
+        diff_tree_execute.each_line.map do |line|
+          ::EacGit::Local::Commit::ChangedFile.new(self, line)
+        end
+      end
+
+      def changed_files_size_uncached
+        changed_files.inject(0) { |a, e| a + e.dst_size }
+      end
+
+      # @return [EacGit::Local::Commit, nil]
+      def parent
+        ps = parents
+        raise "#{self} has more than one parent" if ps.count > 2
+
+        ps.empty? ? nil : ps.first
+      end
+
+      # @return [Array<EacGit::Local::Commit>]
+      def parents
+        format('%P').each_line.map { |line| repo.commitize(line) }
+      end
+
+      def root_child?
+        parents.empty?
+      end
+
+      private
+
+      def diff_tree_execute
+        args = []
+        args << '--root' if root_child?
+        args << id
+        repo.command(*::EacGit::Local::Commit::DiffTreeLine::GIT_COMMAND_ARGS, *args).execute!
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/dirty_files.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'ostruct'
+
+module EacGit
+  class Local
+    module DirtyFiles
+      STATUS_LINE_PATTERN = /\A(.)(.)\s(.+)\z/.freeze
+
+      def dirty?
+        dirty_files.any?
+      end
+
+      def dirty_file?(path)
+        absolute_path = path.to_pathname.expand_path(root_path)
+        dirty_files.any? do |df|
+          df.absolute_path == absolute_path
+        end
+      end
+
+      def dirty_files
+        command('status', '--porcelain=v1', '--untracked-files', '--no-renames')
+          .execute!.each_line.map { |line| parse_status_line(line.gsub(/\n\z/, '')) }
+      end
+
+      private
+
+      def parse_status_line(line)
+        STATUS_LINE_PATTERN.if_match(line) do |m|
+          ::OpenStruct.new(index: m[1], worktree: m[2], path: m[3].to_pathname,
+                           absolute_path: m[3].to_pathname.expand_path(root_path))
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/log.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_git/remote'
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    module Log
+      def log(until_commit = nil, from_commit = nil)
+        until_commit, from_commit = [until_commit, from_commit].map { |c| commitize(c) }
+        from_commit ||= head
+        command('log', '--format=%H', "#{until_commit.id}..#{from_commit.id}")
+          .execute!.each_line.map { |line| commitize(line.strip) }
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/remote.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_git/remote'
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    class Remote
+      NO_SUCH_REMOTE_CODE = 128
+
+      enable_simple_cache
+
+      common_constructor :local, :name
+
+      def exist?
+        url
+      end
+
+      # @return [String, nil]
+      def url
+        local.command('remote', 'get-url', name)
+          .execute!(exit_outputs: { NO_SUCH_REMOTE_CODE => nil })
+          .if_present(nil, &:strip)
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/remotes.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_git/local/remote'
+
+module EacGit
+  class Local
+    module Remotes
+      def remote(name)
+        ::EacGit::Local::Remote.new(self, name)
+      end
+
+      def remotes
+        command('remote').execute!.each_line.map(&:strip).reject(&:blank?).map do |name|
+          remote(name)
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/subrepo/config.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'parseconfig'
+
+module EacGit
+  class Local
+    class Subrepo
+      class Config
+        MAPPING = {
+          command_version: :cmdver, commit_id: :commit, join_method: :method,
+          parent_commit_id: :parent, remote_branch: :branch, remote_uri: :remote
+        }.freeze
+
+        class << self
+          def from_file(file_path)
+            new(
+              ::ParseConfig.new(file_path.to_pathname)['subrepo']
+            )
+          end
+        end
+
+        common_constructor :values do
+          self.values = values.with_indifferent_access
+        end
+
+        MAPPING.each do |method_name, _config_key|
+          define_method(method_name) do
+            values[MAPPING.fetch(method_name)]
+          end
+
+          define_method("#{method_name}=") do |value|
+            values[MAPPING.fetch(method_name)] = value
+          end
+        end
+
+        def to_content
+          "[subrepo]\n" + MAPPING.map { |k, v| "  #{v} = #{send(k)}\n" }.join
+        end
+      end
+    end
+  end
+end