avm-eac_webapp_base0 0.9.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8160f18a91511594f958abcaeb4678a0ff97e535274a2ca6b19953163824b1e8
-  data.tar.gz: 77f5414962ca18876a58dbb98cc9700812c45dec665d676ea81a5111d17a7282
+  metadata.gz: e4f5048d43c599391f0cfedc58311f00e158bca25e9cc577fe144bbc77a91ea0
+  data.tar.gz: 8a15030ad33dccc81583db298e75b02ffb4074eeac004bc9ffea7fddab4ad9ff
 SHA512:
-  metadata.gz: e5d02a3733618c182298866db7c870723bb42b4b651873b4529b79b5e44ce535e91cb11a8f16dde5e9de92922bdd2d91ef5b50ff8602ab16ebb1b57518d8ff20
-  data.tar.gz: f1eae5b74c7477f70835b90a0e30eef37fc748f1fd26a747b80848e47867d9db457e93ae922fb363b3979c3c12368284c9a10a70515c044904365d994381d52c
+  metadata.gz: '079dd0246ecbf55073c241931a2be2e53bb920fe87c94b0a07285624d3bc0cce03ba0e6e4b5c0f192f4dfec4f1de60c380d0a11fc25ec507862792b5e52b8bec'
+  data.tar.gz: 7ca127278989ce771aac952b8378aed9b51033c467f292b9abe5565523f1c3189d9c120d2d43b1f08178288d14d2eae97787f285cfb66c89685f04b792fc8428

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'htmlbeautifier'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Html < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.html *.html.erb].freeze
+        VALID_TYPES = [].freeze
+
+        def file_apply(path)
+          input = ::File.read(path)
+          temppath = tempfile_path
+          ::File.open(temppath, 'w') do |output|
+            beautify path, input, output
+          end
+          ::FileUtils.mv(temppath, path)
+          super(path)
+        end
+
+        private
+
+        def beautify(name, input, output)
+          output.puts ::HtmlBeautifier.beautify(input, htmlbeautify_options)
+        rescue StandardError => e
+          raise "Error parsing #{name}: #{e}"
+        end
+
+        def htmlbeautify_options
+          @htmlbeautify_options ||= { indent: '  ' }
+        end
+
+        def tempfile_path
+          tempfile = ::Tempfile.new
+          tempfile.close
+          tempfile.path
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/executables'
+require 'avm/eac_generic_base0/file_formats/base'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Javascript < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.js].freeze
+        VALID_TYPES = [].freeze
+
+        def internal_apply(files)
+          ::Avm::Executables.js_beautify.command.append(
+            ['--indent-size=2', '--end-with-newline', '--replace', *files]
+          ).system!
+          super(files)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Json < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.json].freeze
+        VALID_TYPES = [].freeze
+
+        def file_apply(file)
+          ::File.write(file, ::JSON.pretty_generate(::JSON.parse(::File.read(file))))
+        end
+
+        def json_file?(file)
+          ::JSON.parse(::File.read(file))
+          true
+        rescue JSON::ParserError
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/file_formats/html'
+require 'avm/eac_webapp_base0/file_formats/javascript'
+require 'avm/eac_webapp_base0/file_formats/json'
+require 'avm/eac_webapp_base0/file_formats/xml'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Provider
+        ALL_NAMES = %w[html javascript json xml].freeze
+
+        def all
+          @all ||= ALL_NAMES.map do |name|
+            ::Avm::EacWebappBase0::FileFormats.const_get(name.camelize).freeze
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/executables'
+require 'avm/eac_generic_base0/file_formats/base'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Xml < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.xml].freeze
+        VALID_TYPES = ['xml'].freeze
+
+        def internal_apply(files)
+          format_command(files).system!
+          super(files)
+        end
+
+        def format_command(files)
+          ::Avm::Executables.tidy.command.append(
+            %w[-xml -modify --indent auto --indent-spaces 2 --wrap 100] + files
+          )
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/file_formats.rb

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

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

@@ -38,7 +38,7 @@ module Avm
 
           def build_content
             infom 'Writing Git source code...'
-            ::Avm::Git::Commit.new(git, commit_sha1).deploy_to_env_path(
+            scm.commit(commit_reference).deploy_to_env_path(
               build_dir_env,
               build_dir
             ).variables_source_set(variables_source).run

data/lib/avm/eac_webapp_base0/instances/deploy/{git_info.rb → scm.rb}

@@ -4,8 +4,8 @@ module Avm
   module EacWebappBase0
     module Instances
       class Deploy
-        module GitInfo
-          def commit_sha1_uncached
+        module Scm
+          def commit_reference_uncached
             git_fetch
             r = git.rev_parse(git_reference_found)
             return r if r
@@ -15,7 +15,7 @@ module Avm
 
           def git_fetch_uncached
             infom "Fetching remote \"#{git_remote_name}\" from \"#{git_repository_path}\"..."
-            git.fetch(git_remote_name)
+            git.remote(git_remote_name).fetch
           end
 
           def git_reference
@@ -31,7 +31,7 @@ module Avm
           end
 
           def git_remote_hashs_uncached
-            git.remote_hashs(git_remote_name)
+            git.remote(git_remote_name).ls.hashes
           end
 
           def git_remote_name
@@ -44,7 +44,7 @@ module Avm
 
           # @return [EacGit::Local]
           def git_uncached
-            instance.application.local_source.scm.git_repo
+            scm.git_repo
           end
 
           def instance_branch
@@ -58,6 +58,11 @@ module Avm
           def master_branch
             remote_branch('master')
           end
+
+          # @return [Avm::Scms::Base]
+          def scm
+            instance.application.local_source.scm
+          end
         end
       end
     end

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

@@ -8,11 +8,11 @@ module Avm
           VERSION_TARGET_PATH = 'VERSION'
 
           def version
-            ([::Time.now, commit_sha1] + version_git_refs).join('|')
+            ([::Time.now, commit_reference] + version_git_refs).join('|')
           end
 
           def version_git_refs
-            git_remote_hashs.select { |_name, sha1| sha1 == commit_sha1 }.keys
+            git_remote_hashs.select { |_name, sha1| sha1 == commit_reference }.keys
                             .map { |ref| ref.gsub(%r{\Arefs/}, '') }.reject { |ref| ref == 'HEAD' }
           end
 

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

@@ -38,7 +38,7 @@ module Avm
           infov 'Git reference (User)', git_reference.if_present('- BLANK -')
           infov 'Git remote name', git_remote_name
           infov 'Git reference (Found)', git_reference_found
-          infov 'Git commit SHA1', commit_sha1
+          infov 'Git commit SHA1', commit_reference
           infov 'Appended directories', appended_directories
         end
 
@@ -50,7 +50,8 @@ module Avm
 
         def assert_instance_branch
           infom 'Setting instance branch...'
-          git.execute!('push', git_remote_name, "#{commit_sha1}:refs/heads/#{instance.id}", '-f')
+          git.command('push', git_remote_name, "#{commit_reference}:refs/heads/#{instance.id}",
+                      '-f').execute!
         end
 
         def request_test

data/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.9.2'
+    VERSION = '0.11.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_webapp_base0
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.51'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.51'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: avm-eac_postgresql_base0
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.104'
+        version: '0.105'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.104'
+        version: '0.105'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/avm/eac_webapp_base0.rb
+- lib/avm/eac_webapp_base0/file_formats.rb
+- lib/avm/eac_webapp_base0/file_formats/html.rb
+- lib/avm/eac_webapp_base0/file_formats/javascript.rb
+- lib/avm/eac_webapp_base0/file_formats/json.rb
+- lib/avm/eac_webapp_base0/file_formats/provider.rb
+- lib/avm/eac_webapp_base0/file_formats/xml.rb
 - lib/avm/eac_webapp_base0/instances/apache_host.rb
 - lib/avm/eac_webapp_base0/instances/apache_path.rb
 - lib/avm/eac_webapp_base0/instances/base.rb
@@ -109,7 +115,7 @@ files:
 - 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/file_unit.rb
-- lib/avm/eac_webapp_base0/instances/deploy/git_info.rb
+- lib/avm/eac_webapp_base0/instances/deploy/scm.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/runners.rb