eac_tools 0.46.0 → 0.47.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d2af3ec5802d3d4deaef86b0e225332d92bb079767121a8601d0d7a9765418
-  data.tar.gz: 062b466f4a749f6094769ede0583d1bd574f73ae05ffa30e0aeaa8a167e6ea2b
+  metadata.gz: 24f75dde80d4c4479e5f7bdd1203f9aa4fdd06dda99579b0c5212e24a9959c87
+  data.tar.gz: a3ea613d10868c65c5801a1876f043e7bc0512459d458f0f278c425ce13974be
 SHA512:
-  metadata.gz: ae897ed254a4902dd543c1644015ee6f4ed269bd401949594cd8c5bfc764d9abce299cdbe4a9c6a04de72ec8f0870c93e617d36b39e7c83b202058970dd5f94b
-  data.tar.gz: 349afc035604be730dec4bc4a1ebf9ef670dc15c27364f2abe4a752d853c8a2f4a689493f087f86598434d886900d0d81cb26409970dba895f8e7028c92d7869
+  metadata.gz: ca9448f7b5e0b23dc4df3bbd8efdba689a2741c672720971728c897e4c84296fb1a63d8b1b81f8dc629dc61f977e18333bca4d45f89cea40b08dc6c9d153fcb5
+  data.tar.gz: 304b367004e5d00ffb9efeb8a4fcf1151a6976dc525d6c1271115e539fa9b2eb91b1ba4b5c302e9660ae7e60ba3a47bd19fcfe51eca2fcf117ab370973705584

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.46.0)
+    eac_tools (0.47.1)
       avm (~> 0.57)
       avm-eac_asciidoctor_base0 (~> 0.12)
       avm-eac_generic_base0 (~> 0.8)
       avm-eac_latex_base0 (~> 0.3)
-      avm-eac_php_base0 (~> 0.3)
+      avm-eac_php_base0 (~> 0.4)
+      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.2)
       avm-eac_rails_base0 (~> 0.8, >= 0.8.1)
       avm-eac_rails_base1 (~> 0.7, >= 0.7.1)
       avm-eac_redmine_base0 (~> 0.17)
@@ -14,8 +15,8 @@ PATH
       avm-eac_ruby_base1 (~> 0.27, >= 0.27.1)
       avm-eac_webapp_base0 (~> 0.12, >= 0.12.3)
       avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
-      avm-tools (~> 0.142, >= 0.142.6)
-      eac_ruby_utils (~> 0.107, >= 0.107.1)
+      avm-tools (~> 0.142, >= 0.142.7)
+      eac_ruby_utils (~> 0.109)
 
 PATH
   remote: sub/aranha-parsers
@@ -58,16 +59,17 @@ PATH
 PATH
   remote: sub/avm-eac_php_base0
   specs:
-    avm-eac_php_base0 (0.3.0)
-      avm-eac_generic_base0 (~> 0.7)
-      eac_ruby_utils (~> 0.106)
+    avm-eac_php_base0 (0.4.0)
+      avm-eac_generic_base0 (~> 0.8)
+      avm-eac_webapp_base0 (~> 0.12, >= 0.12.3)
+      eac_ruby_utils (~> 0.108)
 
 PATH
   remote: sub/avm-eac_postgresql_base0
   specs:
-    avm-eac_postgresql_base0 (0.2.1)
-      avm (~> 0.56, >= 0.56.1)
-      eac_ruby_utils (~> 0.107, >= 0.107.1)
+    avm-eac_postgresql_base0 (0.2.2)
+      avm (~> 0.57)
+      eac_ruby_utils (~> 0.108)
 
 PATH
   remote: sub/avm-eac_python_base0
@@ -152,23 +154,23 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.10.0)
-      avm (~> 0.54)
+    avm-git (0.10.1)
+      avm (~> 0.57)
       avm-files (~> 0.6)
-      eac_git (~> 0.13)
-      eac_ruby_utils (~> 0.106, >= 0.106.1)
+      eac_git (~> 0.14)
+      eac_ruby_utils (~> 0.108)
       git (~> 1.12)
 
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.142.6)
+    avm-tools (0.142.7)
       aranha-parsers (~> 0.14, >= 0.14.4)
-      avm (~> 0.56)
+      avm (~> 0.57)
       avm-eac_ruby_base1 (~> 0.27, >= 0.27.1)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.6)
-      avm-git (~> 0.10)
+      avm-git (~> 0.10, >= 0.10.1)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.14)
@@ -218,7 +220,7 @@ PATH
 PATH
   remote: sub/eac_fs
   specs:
-    eac_fs (0.15.0)
+    eac_fs (0.16.0)
       content-type (~> 0.0, >= 0.0.2)
       eac_ruby_utils (~> 0.107, >= 0.107.1)
       ruby-filemagic (~> 0.7, >= 0.7.3)
@@ -242,7 +244,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.107.1)
+    eac_ruby_utils (0.109.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.1)
       bundler
@@ -337,7 +339,7 @@ GEM
     parslet (2.0.0)
     public_suffix (5.0.0)
     racc (1.6.0)
-    rack (3.0.0)
+    rack (3.0.1)
     rainbow (3.1.1)
     rchardet (1.8.0)
     rexml (3.2.5)
@@ -410,4 +412,4 @@ DEPENDENCIES
   eac_tools!
 
 BUNDLED WITH
-   2.3.20
+   2.3.26

data/lib/eac_tools/version.rb

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

data/sub/avm-eac_php_base0/avm-eac_php_base0.gemspec

@@ -12,8 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.7'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.12', '>= 0.12.3'
+  s.add_dependency 'eac_ruby_utils', '~> 0.108'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module Instances
+      class Base < ::Avm::EacWebappBase0::Instances::Base
+        FILES_UNITS = {}.freeze
+      end
+    end
+  end
+end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/instances.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module Instances
+      require_sub __FILE__
+    end
+  end
+end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/source_generators/base.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/source_generators/base'
+require 'eac_templates/core_ext'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module SourceGenerators
+      class Base < ::Avm::SourceGenerators::Base
+        OPTIONS = {}.freeze
+
+        enable_speaker
+        enable_simple_cache
+
+        class << self
+          def option_list
+            OPTIONS.inject(super) { |a, e| a.option(*e) }
+          end
+        end
+
+        def perform
+          template.apply(self, target_path)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/source_generators.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module SourceGenerators
+      require_sub __FILE__
+    end
+  end
+end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/sources/base.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module Sources
+      class Base < ::Avm::EacWebappBase0::Sources::Base
+        # @return [Boolean]
+        def valid?
+          path.glob('*.php').any?(&:file?)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/sources.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module Sources
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPhpBase0
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/source_generators/base_spec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'avm/eac_php_base0/source_generators/base'
+require 'avm/source_generators/runner'
+
+RSpec.describe ::Avm::EacPhpBase0::SourceGenerators::Base do
+  include_examples 'avm_source_generated', __FILE__, 'EacPhpBase0'
+end

data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/sources/base_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/eac_php_base0/sources/base'
+
+::RSpec.describe ::Avm::EacPhpBase0::Sources::Base do
+  include_examples 'in_avm_registry', 'sources'
+end

data/sub/avm-eac_postgresql_base0/avm-eac_postgresql_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.56', '>= 0.56.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
+  s.add_dependency 'avm', '~> 0.57'
+  s.add_dependency 'eac_ruby_utils', '~> 0.108'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
 end

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

@@ -27,12 +27,18 @@ module Avm
            .envvar('PGPASSWORD', password)
       end
 
+      # @return [EacRubyUtils::Envs::Command]
       def dump_gzip_command
-        dump_command.append(['@ESC_|', 'gzip', '-9', '-c'])
+        dump_command.pipe(env.command('gzip', '-9', '-c'))
+      end
+
+      # @return [String]
+      def password_command_argument
+        "@ESC_PGPASSWORD=#{password}"
       end
 
       def psql_command(database = true)
-        env.command("@ESC_PGPASSWORD=#{password}", 'psql', *common_command_args(database))
+        env.command(password_command_argument, 'psql', *common_command_args(database))
       end
 
       def psql_command_command(sql, database = true)

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

@@ -8,9 +8,11 @@ module Avm
     module InstanceWith
       def pg
         @pg ||= ::Avm::EacPostgresqlBase0::Instance.new(
-          host_env, user: read_entry(::Avm::Instances::EntryKeys::DATABASE_USERNAME),
-                    password: read_entry(::Avm::Instances::EntryKeys::DATABASE_PASSWORD),
-                    name: read_entry(::Avm::Instances::EntryKeys::DATABASE_NAME)
+          host_env, host: database_hostname,
+                    port: database_port,
+                    user: database_username,
+                    password: database_password,
+                    name: database_name
         )
       end
     end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/sub/avm-git/avm-git.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.54'
+  s.add_dependency 'avm', '~> 0.57'
   s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'eac_git', '~> 0.13'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
+  s.add_dependency 'eac_git', '~> 0.14'
+  s.add_dependency 'eac_ruby_utils', '~> 0.108'
   s.add_dependency 'git', '~> 1.12'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'

data/sub/avm-git/lib/avm/git/launcher/base/underlying.rb

@@ -23,7 +23,7 @@ module Avm
             define_method exec_type do |*args|
               begin
                 command(*args).send(exec_type)
-              rescue ::EacRubyUtils::Envs::Command::ExecError
+              rescue ::EacRubyUtils::Envs::ExecutionError
                 raise ::Avm::Git::Launcher::Error
               end
             end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.10.0'
+    VERSION = '0.10.1'
   end
 end

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

@@ -15,11 +15,11 @@ 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.4'
-  s.add_dependency 'avm', '~> 0.56'
+  s.add_dependency 'avm', '~> 0.57'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.27', '>= 0.27.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'avm-git', '~> 0.10'
+  s.add_dependency 'avm-git', '~> 0.10', '>= 0.10.1'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_git', '~> 0.14'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.142.6'
+    VERSION = '0.142.7'
   end
 end

data/sub/eac_fs/lib/eac_fs/storage_tree.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/yaml'
 require 'fileutils'
 
 module EacFs
@@ -33,12 +34,30 @@ module EacFs
       read
     end
 
+    # @return [Object]
+    def read_or_store_yaml(use_cache = true)
+      write_yaml(yield) unless stored? && use_cache
+
+      read_yaml
+    end
+
+    # @return [Object, nil]
+    def read_yaml
+      r = read
+      r.nil? ? nil : ::EacRubyUtils::Yaml.load(r)
+    end
+
     def write(value)
       assert_directory_on_path
       ::File.write(content_path, value)
       value
     end
 
+    def write_yaml(object)
+      write(::EacRubyUtils::Yaml.dump(object))
+      object
+    end
+
     def child(*child_path_parts)
       self.class.new(path, *child_path_parts)
     end

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

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

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/base_command/append_command_options.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'shellwords'
+
+module EacRubyUtils
+  module Envs
+    module BaseCommand
+      class AppendCommandOptions
+        enable_method_class
+        common_constructor :command, :command_line, :options
+
+        def result
+          r = command_line
+          r = input.command + ' | ' + r if input
+          r = "cat #{Shellwords.escape(input_file)} | #{r}" if input_file
+          r += ' > ' + Shellwords.escape(output_file) if output_file
+          r
+        end
+
+        # @return [EacRubyUtils::Envs::Command, nil]
+        def input
+          options[:input]
+        end
+
+        # @return [Pathname,  nil]
+        def input_file
+          options[:input_file].if_present(&:to_pathname)
+        end
+
+        # @return [Pathname, nil]
+        def output_file
+          options[:output_file].if_present(&:to_pathname)
+        end
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/base_command/concat.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/struct'
+
+module EacRubyUtils
+  module Envs
+    module BaseCommand
+      module Concat
+        AND_OPERATOR = '&&'
+        BEFORE_OPERATOR = ';'
+        OR_OPERATOR = '||'
+        PIPE_OPERATOR = '|'
+
+        # @param operator [Symbol]
+        # @return [EacRubyUtils::Envs::CompositeCommand]
+        def concat(operator, other_command)
+          require 'eac_ruby_utils/envs/composite_command'
+          ::EacRubyUtils::Envs::CompositeCommand.new(operator, self, other_command)
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def and(other_command)
+          concat(AND_OPERATOR, other_command)
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def before(other_command)
+          concat(BEFORE_OPERATOR, other_command)
+        end
+
+        def or(other_command)
+          concat(OR_OPERATOR, other_command)
+        end
+
+        def pipe(other_command)
+          concat(PIPE_OPERATOR, other_command)
+        end
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/base_command/debugging.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  module Envs
+    module BaseCommand
+      module Debugging
+        def debug?
+          ENV['DEBUG'].to_s.strip != ''
+        end
+
+        # Print a message if debugging is enabled.
+        def debug_print(message)
+          message = message.to_s
+          puts message.if_respond(:light_red, message) if debug?
+        end
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/base_command/execution.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/envs/execution_error'
+require 'eac_ruby_utils/envs/execution_result'
+require 'eac_ruby_utils/envs/process'
+require 'eac_ruby_utils/envs/spawn'
+require 'pp'
+
+module EacRubyUtils
+  module Envs
+    module BaseCommand
+      module Execution
+        def execute!(options = {})
+          options[:exit_outputs] = status_results.merge(options[:exit_outputs].presence || {})
+          er = ::EacRubyUtils::Envs::ExecutionResult.new(execute(options), options)
+          return er.result if er.success?
+
+          raise ::EacRubyUtils::Envs::ExecutionError,
+                "execute! command failed: #{self}\n#{er.r.pretty_inspect}"
+        end
+
+        def execute(options = {})
+          c = command(options)
+          debug_print("BEFORE: #{c}")
+          t1 = Time.now
+          r = ::EacRubyUtils::Envs::Process.new(c).to_h
+          i = Time.now - t1
+          debug_print("AFTER [#{i}]: #{c}")
+          r
+        end
+
+        def spawn(options = {})
+          c = command(options)
+          debug_print("SPAWN: #{c}")
+          ::EacRubyUtils::Envs::Spawn.new(c)
+        end
+
+        def system!(options = {})
+          return if system(options)
+
+          raise ::EacRubyUtils::Envs::ExecutionError, "system! command failed: #{self}"
+        end
+
+        def system(options = {})
+          c = command(options)
+          debug_print(c)
+          Kernel.system(c)
+        end
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/base_command/extra_options.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/object/blank'
+require 'shellwords'
+
+module EacRubyUtils
+  module Envs
+    module BaseCommand
+      module ExtraOptions
+        # @return [ActiveSupport::HashWithIndifferentAccess]
+        def extra_options
+          @extra_options ||= {}.with_indifferent_access
+        end
+
+        def status_result(status_code, result)
+          duplicate_by_extra_options(status_results: status_results.merge(status_code => result))
+        end
+
+        private
+
+        def status_results
+          extra_options[:status_results] ||= {}.with_indifferent_access
+        end
+      end
+    end
+  end
+end