avm-eac_webapp_base0 0.18.4 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683ed7baaeb1bcbc7acd8f0c415e34df7dd6b9fdba08e78cc731d694c2b9368b
-  data.tar.gz: 49b75dfb53c30b4cffd79a7be2d1ba3db7cf392975dbdabf7ed17ac6a8a092e1
+  metadata.gz: 53ac5790fcfa2445bf36ae5fe13ca71a821e16fb51973b3213f2e3b745e1d7ce
+  data.tar.gz: 61562bdd43b027d51b7a1d9312b443996109b2528ff8d53e75d5df4ae509e197
 SHA512:
-  metadata.gz: 4379a94365a79d60ab3556923d46a9fbb72a6ebdfd2684bc3c4529652132470f3fb7ce2bc94065d6ddac35af23fae7cc3a9f7319812fefe32ce2d524a250a7d8
-  data.tar.gz: 618d481135df74e371c6f87f257dc312fad4eebe2d5c90cf6bbf046b60c9ac2cc2d278251170841985f26f4c4a60dddf5b532d1dd7646561e25c813e74419643
+  metadata.gz: 88322f8afe6c7a37ffe644b5144bdc7b62abd8832b060ab22df5623e6cbd611f0b4d8e159855221ab06c1e37334a901c98eda615df24b70f0b1cb77443dd179e
+  data.tar.gz: 4acbbe6ef000d0892662ec16cf96321b46f768bc44751373fd5269034a58ccdfbd4bc4266885a8a5b5ec5cd4bb470732b54e02e201834c48cc302b14afe115f3

data/lib/avm/eac_webapp_base0/file_formats/css.rb

@@ -14,7 +14,7 @@ module Avm
 
         def file_apply(file)
           ::Avm::EacWebappBase0::FileFormats::Css::FileApply.new(file).perform
-          super(file)
+          super
         end
       end
     end

data/lib/avm/eac_webapp_base0/file_formats/html.rb

@@ -17,7 +17,7 @@ module Avm
             beautify path, input, output
           end
           ::FileUtils.mv(temppath, path)
-          super(path)
+          super
         end
 
         private

data/lib/avm/eac_webapp_base0/file_formats/javascript.rb

@@ -14,7 +14,7 @@ module Avm
           ::Avm::EacWebappBase0::Executables.js_beautify.command.append(
             ['--indent-size=2', '--end-with-newline', '--replace', *files]
           ).system!
-          super(files)
+          super
         end
       end
     end

data/lib/avm/eac_webapp_base0/file_formats/xml.rb

@@ -12,7 +12,7 @@ module Avm
 
         def internal_apply(files)
           format_command(files).system!
-          super(files)
+          super
         end
 
         def format_command(files)

data/lib/avm/eac_webapp_base0/instances/base/deploy_info.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instances/deploy_info'
+require 'avm/instances/base'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+        module DeployInfo
+          common_concern
+
+          DEPLOY_INFO_SUBPATH = '.deploy.yaml'
+
+          # @return [Avm::EacWebappBase0::Instances::DeployInfo]
+          def deploy_info
+            ::Avm::EacWebappBase0::Instances::DeployInfo.from_string(
+              host_env.command('cat', deploy_info_path).execute!
+            )
+          end
+
+          # @return [Pathname]
+          def deploy_info_path
+            install_path.to_pathname.join(DEPLOY_INFO_SUBPATH)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/instances/deploy/build.rb

@@ -18,7 +18,7 @@ module Avm
             ::Avm::Files::Appender
               .new
               .variables_source_set(variables_source)
-              .append_templatized_directory(template.path)
+              .append_templatized_directory(template)
               .append_templatized_directories(appended_directories)
               .append_file_content(version_target_path, version)
               .write_appended_on(build_dir)

data/lib/avm/eac_webapp_base0/instances/deploy/info.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instances/deploy_info'
+require 'avm/eac_webapp_base0/instances/base/deploy_info'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Deploy
+        module Info
+          # @return [Hash]
+          def deploy_info
+            ::Avm::EacWebappBase0::Instances::DeployInfo.from_hash(
+              {
+                instance_id: instance.id,
+                time: ::Time.now,
+                commit_id: commit_reference,
+                commit_refs: version_git_refs,
+                version: version_number
+              }
+            )
+          end
+
+          # @return [String]
+          def version
+            deploy_info.to_yaml
+          end
+
+          def version_git_refs
+            git_remote_hashs.select { |_name, sha1| sha1 == commit_reference }.keys
+              .map { |ref| ref.gsub(%r{\Arefs/}, '') }.reject { |ref| ref == 'HEAD' }
+          end
+
+          # @return [String, nil]
+          def version_number
+            instance.application.local_source.version.if_present(&:to_s)
+          end
+
+          # @return [String]
+          def version_target_path
+            ::Avm::EacWebappBase0::Instances::Base::DeployInfo::DEPLOY_INFO_SUBPATH
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/instances/deploy/scm.rb

@@ -6,6 +6,8 @@ module Avm
       class Deploy
         module Scm
           DEFAULT_REMOTE_NAME = 'origin'
+          DEFAULT_REMOTE_READ = true
+          DEFAULT_REMOTE_WRITE = true
 
           def commit_reference_uncached
             git_fetch
@@ -16,6 +18,8 @@ module Avm
           end
 
           def git_fetch_uncached
+            return unless remote_read?
+
             infom "Fetching remote \"#{git_remote_name}\" from \"#{git_repository_path}\"..."
             git.remote(git_remote_name).fetch
           end
@@ -33,6 +37,8 @@ module Avm
           end
 
           def git_remote_hashs_uncached
+            return {} unless remote_read?
+
             git.remote(git_remote_name).ls.hashes
           end
 
@@ -61,6 +67,16 @@ module Avm
             remote_branch('master')
           end
 
+          # @return [Boolean]
+          def remote_read?
+            options.if_key(OPTION_REMOTE_READ, DEFAULT_REMOTE_READ).to_bool
+          end
+
+          # @return [Boolean]
+          def remote_write?
+            options.if_key(OPTION_REMOTE_WRITE, DEFAULT_REMOTE_WRITE).to_bool
+          end
+
           # @return [Avm::Scms::Base]
           def scm
             instance.application.local_source.scm

data/lib/avm/eac_webapp_base0/instances/deploy.rb

@@ -20,7 +20,8 @@ module Avm
 
         include ::Avm::Entries::Jobs::Base
 
-        lists.add_symbol :option, :appended_directories, :no_request_test, :reference
+        lists.add_symbol :option, :appended_directories, :no_request_test, :reference,
+                         :remote_read, :remote_write
 
         def option_list
           ::Avm::EacWebappBase0::Instances::Deploy.lists.option
@@ -47,6 +48,8 @@ module Avm
         end
 
         def assert_instance_branch
+          return unless remote_write?
+
           infom 'Setting instance branch...'
           git.command('push', git_remote_name, "#{commit_reference}:refs/heads/#{instance.id}",
                       '-f').execute!

data/lib/avm/eac_webapp_base0/instances/deploy_info.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class DeployInfo
+        class << self
+          # @param hash [Hash]
+          # @return [Avm::EacWebappBase0::Instances::DeployInfo]
+          def from_hash(hash)
+            new(hash)
+          end
+
+          # @return string [String]
+          # @return [Avm::EacWebappBase0::Instances::DeployInfo]
+          def from_string(string)
+            from_hash(::EacRubyUtils::Yaml.load(string))
+          end
+        end
+
+        common_constructor :data do
+          self.data = data.with_indifferent_access
+        end
+
+        # @return [Hash]
+        delegate :to_h, to: :data
+
+        # @return [String]
+        def to_yaml
+          ::EacRubyUtils::Yaml.dump(to_h)
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/instances/runners/deploy.rb

@@ -14,6 +14,9 @@ module Avm
             arg_opt '-r', '--reference', 'Git reference to deploy.'
             arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
             bool_opt '-T', '--no-request-test', 'Do not test web interface after deploy.'
+            bool_opt '--no-remote', 'Shortcut to "--no-remote-read --no-remote-write"'
+            bool_opt '--no-remote-read', 'Do not attempt to read on remote repository.'
+            bool_opt '--no-remote-write', 'Do not attempt to write on remote repository.'
           end
 
           def deploy_class
@@ -34,7 +37,18 @@ module Avm
           def deploy_options
             { reference: parsed.reference,
               appended_directories: ::Avm::PathString.paths(parsed.append_dirs),
-              no_request_test: parsed.no_request_test? }
+              no_request_test: parsed.no_request_test?, remote_read: remote_read?,
+              remote_write: remote_write? }
+          end
+
+          # @return [Boolean]
+          def remote_read?
+            !(parsed.no_remote_read? || parsed.no_remote?)
+          end
+
+          # @return [Boolean]
+          def remote_write?
+            !(parsed.no_remote_write? || parsed.no_remote?)
           end
         end
       end

data/lib/avm/eac_webapp_base0/instances/runners/deploy_info.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/instances/runner'
+require 'avm/path_string'
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class DeployInfo
+          runner_with :help, :output_item do
+            desc 'Fetch instance\'s last deploy information.'
+          end
+
+          def run
+            run_output
+          end
+
+          # @return [Hash]
+          def item_hash
+            instance.deploy_info.to_h
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.18.4'
+    VERSION = '0.20.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_webapp_base0
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: 0.20.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-29 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,40 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.86'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.86.2
+        version: '0.93'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.86'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.86.2
+        version: '0.93'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: avm-eac_postgresql_base0
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +65,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,34 +75,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.121'
+        version: '0.122'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.121'
+        version: '0.122'
 - !ruby/object:Gem::Dependency
   name: htmlbeautifier
   requirement: !ruby/object:Gem::Requirement
@@ -167,14 +161,16 @@ files:
 - lib/avm/eac_webapp_base0/instances/apache_path.rb
 - lib/avm/eac_webapp_base0/instances/base.rb
 - lib/avm/eac_webapp_base0/instances/base/apache.rb
+- lib/avm/eac_webapp_base0/instances/base/deploy_info.rb
 - lib/avm/eac_webapp_base0/instances/base/install.rb
 - lib/avm/eac_webapp_base0/instances/deploy.rb
 - lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb
 - lib/avm/eac_webapp_base0/instances/deploy/build.rb
+- lib/avm/eac_webapp_base0/instances/deploy/info.rb
 - lib/avm/eac_webapp_base0/instances/deploy/scm.rb
 - lib/avm/eac_webapp_base0/instances/deploy/setup_files_unit.rb
-- lib/avm/eac_webapp_base0/instances/deploy/version.rb
 - lib/avm/eac_webapp_base0/instances/deploy/write_on_target.rb
+- lib/avm/eac_webapp_base0/instances/deploy_info.rb
 - lib/avm/eac_webapp_base0/instances/processes.rb
 - lib/avm/eac_webapp_base0/instances/processes/web_server.rb
 - lib/avm/eac_webapp_base0/instances/runners.rb
@@ -182,6 +178,7 @@ files:
 - lib/avm/eac_webapp_base0/instances/runners/apache_path.rb
 - lib/avm/eac_webapp_base0/instances/runners/data/load.rb
 - lib/avm/eac_webapp_base0/instances/runners/deploy.rb
+- lib/avm/eac_webapp_base0/instances/runners/deploy_info.rb
 - lib/avm/eac_webapp_base0/sources.rb
 - lib/avm/eac_webapp_base0/sources/base.rb
 - lib/avm/eac_webapp_base0/version.rb

data/lib/avm/eac_webapp_base0/instances/deploy/version.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module EacWebappBase0
-    module Instances
-      class Deploy
-        module Version
-          VERSION_TARGET_PATH = 'VERSION'
-
-          def version
-            ([::Time.now, commit_reference] + version_git_refs).join('|')
-          end
-
-          def version_git_refs
-            git_remote_hashs.select { |_name, sha1| sha1 == commit_reference }.keys
-              .map { |ref| ref.gsub(%r{\Arefs/}, '') }.reject { |ref| ref == 'HEAD' }
-          end
-
-          def version_target_path
-            VERSION_TARGET_PATH
-          end
-        end
-      end
-    end
-  end
-end