avm-eac_rails_base0 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d074ad6668fc89f186938aa75f04185a1ca037c9b650748fefa0a4085d589b62
-  data.tar.gz: 27da630bcbb7aa7440ffd927feaefbf4ecf87c115be272fe42beea780075b261
+  metadata.gz: a58380cdb99713ebff2a92c6ef226122dcf8a4150cc618a7ff02e9d25d9d2df2
+  data.tar.gz: 8c1531c58c19033403601f39bc5671dc2714255a19dac34649a8998008adc916
 SHA512:
-  metadata.gz: 53472024551d6d4a3a6c557a10cbae2e51e2ff5a5ad034de0ac1deb3eb434cf769d0a3beeec0a1013640852987232c74a7d31c4512311572a49c159d704d779f
-  data.tar.gz: 3fbad8dbde704a64df80a538de2b68132dae04cf86a12894fd3169b6b791449bb2d9a9ded8a720e1eda5dd5552a12d5ab386d0a1f61cd23c5c622c335ab922f0
+  metadata.gz: d2624ba89ab88b72b17a67db2bea01827280f14c39bd9580945843e450532f8e21940ecef3a4534590f06145057cac6d75f543b8d04b0fe8ba16e30e48e58bf7
+  data.tar.gz: 80a3e9f97086690298ec7480e3aa59f5a39908c369e31c5c4f77387dfb1321e52d5b44d0a4dc2d1e2907bd0dcf5f348fd2741839d0fe2a62d77eb1efa6684a31

data/lib/avm/eac_rails_base0/{apache_host.rb → instances/apache_host.rb}

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

data/lib/avm/eac_rails_base0/instances/apache_path.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_templates/core_ext'
+require 'avm/eac_webapp_base0/instances/apache_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase0
+    module Instances
+      class ApachePath < ::Avm::EacWebappBase0::Instances::ApachePath
+        def document_root
+          ::File.join(super, 'public')
+        end
+
+        def extra_content
+          template.child('extra_content.conf').apply(instance)
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_rails_base0/instances/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_rails_base1/instances/base'
+require 'avm/eac_rails_base0/instances/deploy'
 
 module Avm
   module EacRailsBase0

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'eac_templates/core_ext'
+require 'avm/eac_webapp_base0/instances/deploy'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module EacRailsBase0
+    module Instances
+      class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
+        set_callback :assert_instance_branch, :after do
+          bundle_install
+          assert_database
+          database_migrate
+          compile_assets
+          restart_tasks_scheduler
+          touch_restart_file
+        end
+
+        def assert_database
+          infom 'Asserting database...'
+          instance.pg.assert
+        end
+
+        def bundle_install
+          infom 'Running "bundle install"...'
+          instance.bundle('install').system!
+        end
+
+        def compile_assets
+          infom 'Compiling assets...'
+          instance.rake('assets:clean', 'assets:precompile').system!
+        end
+
+        def database_migrate
+          infom 'Running database migrations...'
+          instance.rake('db:migrate').system!
+        end
+
+        def restart_tasks_scheduler
+          infom 'Restarting Tasks Scheduler\'s daemon...'
+          instance.bundle('exec', 'tasks_scheduler', 'restart').system!
+        end
+
+        def touch_restart_file
+          infom 'Touching restart file...'
+          instance.host_env.command(
+            'touch', ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
+                                 'tmp', 'restart.txt')
+          ).system!
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_rails_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.9.0'
+    VERSION = '0.10.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_rails_base0
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-10 00:00:00.000000000 Z
+date: 2023-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,20 +27,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.109'
+        version: '0.112'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.109'
+        version: '0.112'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -59,17 +65,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/avm/eac_rails_base0.rb
-- lib/avm/eac_rails_base0/apache_host.rb
-- lib/avm/eac_rails_base0/apache_path.rb
-- lib/avm/eac_rails_base0/deploy.rb
 - lib/avm/eac_rails_base0/instances.rb
+- lib/avm/eac_rails_base0/instances/apache_host.rb
+- lib/avm/eac_rails_base0/instances/apache_path.rb
 - lib/avm/eac_rails_base0/instances/base.rb
+- lib/avm/eac_rails_base0/instances/deploy.rb
 - lib/avm/eac_rails_base0/source_generators/base.rb
 - lib/avm/eac_rails_base0/sources/base.rb
 - lib/avm/eac_rails_base0/version.rb
-- template/avm/eac_rails_base0/apache_path/extra_content.conf
-- template/avm/eac_rails_base0/deploy/config/database.yml.template
-- template/avm/eac_rails_base0/deploy/config/envvars.d/email.yml.template
+- template/avm/eac_rails_base0/instances/apache_path/extra_content.conf
+- template/avm/eac_rails_base0/instances/deploy/config/database.yml.template
+- template/avm/eac_rails_base0/instances/deploy/config/envvars.d/email.yml.template
 - template/avm/eac_rails_base0/source_generators/base/Gemfile
 - template/avm/eac_rails_base0/source_generators/base/Rakefile
 - template/avm/eac_rails_base0/source_generators/base/app/assets/config/manifest.js

data/lib/avm/eac_rails_base0/apache_path.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_templates/core_ext'
-require 'avm/eac_webapp_base0/instances/apache_path'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRailsBase0
-    class ApachePath < ::Avm::EacWebappBase0::Instances::ApachePath
-      def document_root
-        ::File.join(super, 'public')
-      end
-
-      def extra_content
-        template.child('extra_content.conf').apply(instance)
-      end
-    end
-  end
-end

data/lib/avm/eac_rails_base0/deploy.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_templates/core_ext'
-require 'avm/eac_webapp_base0/instances/deploy'
-require 'avm/instances/entry_keys'
-
-module Avm
-  module EacRailsBase0
-    class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
-      set_callback :assert_instance_branch, :after do
-        bundle_install
-        assert_database
-        database_migrate
-        compile_assets
-        restart_tasks_scheduler
-        touch_restart_file
-      end
-
-      def assert_database
-        infom 'Asserting database...'
-        instance.pg.assert
-      end
-
-      def bundle_install
-        infom 'Running "bundle install"...'
-        instance.bundle('install').system!
-      end
-
-      def compile_assets
-        infom 'Compiling assets...'
-        instance.rake('assets:clean', 'assets:precompile').system!
-      end
-
-      def database_migrate
-        infom 'Running database migrations...'
-        instance.rake('db:migrate').system!
-      end
-
-      def restart_tasks_scheduler
-        infom 'Restarting Tasks Scheduler\'s daemon...'
-        instance.bundle('exec', 'tasks_scheduler', 'restart').system!
-      end
-
-      def touch_restart_file
-        infom 'Touching restart file...'
-        instance.host_env.command(
-          'touch', ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
-                               'tmp', 'restart.txt')
-        ).system!
-      end
-    end
-  end
-end