eac_tools 0.109.0 → 0.110.0

data/sub/{avm-git/lib/avm/git → avm-eac_rails_base0/lib/avm/eac_rails_base0}/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Avm
-  module Git
-    VERSION = '0.21.2'
+  module EacRailsBase0
+    VERSION = '0.11.2'
   end
 end

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils'
+EacRubyUtils::RootModuleSetup.perform __FILE__
+
+module Avm
+  module EacRailsBase0
+  end
+end
+
+require 'avm/eac_rails_base1'

data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/instances/apache_host_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+RSpec.describe Avm::EacRailsBase0::Instances::ApacheHost do
+  describe '#no_ssl_site_content' do
+    let(:instance) { Avm::EacRailsBase0::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_rails_base0/spec/lib/avm/eac_rails_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_rails_base0/spec/lib/avm/eac_rails_base0/instances/apache_path_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+RSpec.describe Avm::EacRailsBase0::Instances::ApachePath do
+  describe '#no_ssl_site_content' do
+    let(:instance) { Avm::EacRailsBase0::Instances::Base.by_id('stub-app_0') }
+    let(:apache_path) { described_class.new(instance) }
+    let(:fixtures_dir) { Pathname.new('apache_path_spec_files').expand_path(__dir__) }
+    let(:expect_file) { fixtures_dir.join('stub-app_0_apache_path.conf') }
+    let(:expected_content) { expect_file.read }
+
+    before do
+      instance.entry(Avm::Instances::EntryKeys::INSTALL_PATH).write('/path/to/stub-app_0')
+      instance.entry('web.url').write('http://stubapp.net/stub-app_0')
+    end
+
+    it do
+      expect(apache_path.content).to eq(expected_content)
+    end
+  end
+end

data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/instances/apache_path_spec_files/stub-app_0_apache_path.conf

@@ -0,0 +1,12 @@
+Alias "/stub-app_0" "/path/to/stub-app_0/public"
+<Location "/stub-app_0">
+  PassengerBaseURI "/stub-app_0"
+  PassengerAppRoot "/path/to/stub-app_0"
+  PassengerAppEnv production
+</Location>
+
+<Directory "/path/to/stub-app_0/public">
+  Allow from all
+  Options -MultiViews
+  Require all granted
+</Directory>

data/sub/avm-eac_rails_base0/spec/meta/rubocop_spec.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+EacRubyUtils::Rspec.default_setup.describe_rubocop

data/sub/avm-eac_rails_base0/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base0'
+require 'eac_ruby_gem_support'
+EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__))
+EacRubyUtils::Rspec.default_setup.stub_eac_config_node

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/instances/deploy/config/database.yml.template

@@ -0,0 +1,21 @@
+default: &default
+  adapter: %%DATABASE.SYSTEM%%
+  pool: %%DATABASE.LIMIT%%
+  timeout: %%DATABASE.TIMEOUT%%
+  encoding: unicode
+  username: %%DATABASE.USERNAME%%
+  password: %%DATABASE.PASSWORD%%
+  host: %%DATABASE.HOSTNAME%%
+  port: %%DATABASE.PORT%%
+  reconnect: true
+
+development: &development
+  <<: *default
+  database: %%DATABASE.NAME%%
+
+production:
+  <<: *development
+
+test:
+  <<: *default
+  database: %%DATABASE.NAME%%_test

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/instances/deploy/config/envvars.d/email.yml.template

@@ -0,0 +1,11 @@
+---
+action_mailer_smtp_address: '%%MAILER.SMTP.ADDRESS%%'
+action_mailer_smtp_port: '%%MAILER.SMTP.PORT%%'
+action_mailer_smtp_domain: '%%MAILER.SMTP.DOMAIN%%'
+action_mailer_smtp_username: '%%MAILER.SMTP.USERNAME%%'
+action_mailer_smtp_password: '%%MAILER.SMTP.PASSWORD%%'
+action_mailer_smtp_authentication: '%%MAILER.SMTP.AUTHENTICATION%%'
+action_mailer_smtp_enable_starttls_auto: '%%MAILER.SMTP.STARTTLS_AUTO%%'
+action_mailer_default_options_from: '%%MAILER.FROM%%'
+action_mailer_default_options_reply_to: '%%MAILER.REPLY_TO%%'
+action_mailer_default_url_host: '%%WEB.URL%%'

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/Gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'eac_rails_base0'
+gem 'eac_rails_gem_support', group: :development
+
+# Local gems
+::Dir["#{__dir__}/{sub/gems,engines}/*/*.gemspec"].each do |file|
+  gem ::File.basename(::File.dirname(file)), path: ::File.dirname(file)
+end

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/Rakefile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require_relative 'config/application'
+
+Rails.application.load_tasks

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/assets/javascripts/application.js

@@ -0,0 +1 @@
+//= require eac_rails_base0

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/assets/stylesheets/application.scss

@@ -0,0 +1 @@
+@import "eac_rails_base0";

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/controllers/application_controller.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class ApplicationController < ::EacRailsBase0::ApplicationController
+end

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/controllers/welcome_controller.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class WelcomeController < ApplicationController
+  def index; end
+end

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/views/welcome/index.html.erb

@@ -0,0 +1 @@
+<p>Bem-vindo!</p>

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/bin/bundle

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+load Gem.bin_path('bundler', 'bundle')

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/bin/rails

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+begin
+  load File.expand_path('spring', __dir__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/bin/rake

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+begin
+  load File.expand_path('spring', __dir__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/bin/yarn

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
+  exec 'yarnpkg', *ARGV
+rescue Errno::ENOENT
+  warn 'Yarn executable was not detected in the system.'
+  warn 'Download Yarn at https://yarnpkg.com/en/docs/install'
+  exit 1
+end

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/application.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+APP_PATH = ::File.dirname(__dir__) unless defined?(APP_PATH)
+require File.expand_path('boot', __dir__)
+require 'eac_rails_base0/app_base/application'
+
+module EacRailsBase0App
+  class Application
+    config.load_defaults 5.2
+  end
+end

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/boot.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/cable.yml

@@ -0,0 +1,8 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: async

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/credentials.yml.enc

@@ -0,0 +1 @@
+XKDkD3DioFn69hXAhH88mw9ZFRjDdarYU+7htxgTJmBB/vg45Hsb7pBJQaySoc7VD0Vb838ShDeVbhDlSc3PMtIcV6fU/nkYqc+Nu8heKF5mhJmgJmf2Vlp2ZgqVA04PxvmZ/U2FRx40c9welNpABmDn0V33qUsjkrVMqKuyxD9aTpuAFd4SiH7SzA8Is1v7ltr3+Rx0lA/LI2u87uxYBawE7G3sNQA9siEnSPNm24uEK+4GcIuVG0qIvx36uYyBjB8dfn9FaMec/+22EFNKO0JWjIFXRl+TosE3VLFssaMQ2sl0rRkesLzb2DMFO/7kp0T3c1EcvRmy0AJ3UQmKZCtYBzy2a/9rx8sh1a+AUHObSeSeaP4eu+sMnMhSsDhveUiYMnV8viJXj0G0V6UIWP4j+Bv96H/AFgNi--OD4Iuvmt7P3BlyOR--nzDLthG3dBOX14A2J5s4CA==

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/environment.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Load the Rails application.
+require_relative 'application'
+
+# Initialize the Rails application.
+Rails.application.initialize!

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/puma.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers: a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum; this matches the default thread size of Active Record.
+#
+threads_count = ENV.fetch('RAILS_MAX_THREADS', 5)
+threads threads_count, threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+#
+port        ENV.fetch('PORT', 3000)
+
+# Specifies the `environment` that Puma will run in.
+#
+environment ENV.fetch('RAILS_ENV', 'development')
+
+# Specifies the `pidfile` that Puma will use.
+pidfile ENV.fetch('PIDFILE', 'tmp/pids/server.pid')
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked webserver processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory.
+#
+# preload_app!
+
+# Allow puma to be restarted by `rails restart` command.
+plugin :tmp_restart

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/routes.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+::Rails.application.routes.draw do
+  root 'welcome#index'
+end

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/spring.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+%w[
+  .ruby-version
+  .rbenv-vars
+  tmp/restart.txt
+  tmp/caching-dev.txt
+].each { |path| Spring.watch(path) }

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config.ru

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# This file is used by Rack-based servers to start the application.
+
+require_relative 'config/environment'
+
+run Rails.application

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/db/schema.rb

@@ -0,0 +1 @@
+

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/lib/ability.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class Ability < ::EacRailsBase0::AppBase::Ability
+  def initialize(user)
+    super(user)
+    user ||= ::EacUsersSupport::User.new
+    for_all_permissions(user)
+    logged_permissions(user) unless user.new_record?
+  end
+
+  private
+
+  def for_all_permissions(_user)
+    can :read, :welcome
+  end
+
+  def logged_permissions(_user)
+    can :manage, :all
+  end
+end

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/lib/ability_mapping.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/simple_cache'
+
+class AbilityMapping < ::EacRailsBase0::AppBase::AbilityMapping
+  def initialize
+    super
+    map_action 'Welcome', 'index', :read, :welcome
+  end
+end

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/spec/code/rubocop_spec.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
+
+::RSpec.configure do |conf|
+  conf.global_fixtures = :all
+end

data/sub/avm-eac_rails_base1/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/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_rails_base1/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_rails_base1'
+  s.version     = Avm::EacRailsBase1::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib,template}/**/*']
+  s.required_ruby_version = '>= 2.7'
+
+  s.add_dependency 'avm', '~> 0.98', '>= 0.98.4'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.39'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.21', '>= 0.21.4'
+  s.add_dependency 'eac_ruby_utils', '~> 0.129', '>= 0.129.1'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.12', '>= 0.12.1'
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_base.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      module ApacheBase
+        # @return [String]
+        def document_root
+          ::File.join(super, 'public')
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_host.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheHost
+        prepend ::Avm::EacRailsBase1::Instances::ApacheBase
+
+        def extra_content
+          'PassengerEnabled On'
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_path.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      class ApachePath < ::Avm::EacWebappBase0::Instances::ApachePath
+        prepend ::Avm::EacRailsBase1::Instances::ApacheBase
+
+        # @return [String]
+        def extra_content
+          ::Avm::EacRailsBase1::Instances::ApachePath.template.child('extra_content.conf')
+            .apply(variables_source)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      class Base < ::Avm::EacWebappBase0::Instances::Base
+        include ::Avm::EacRubyBase1::Instances::Mixin
+
+        DEFAULT_RAILS_ENVIRONMENT = 'production'
+
+        def bundle(*args)
+          the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', DEFAULT_RAILS_ENVIRONMENT)
+        end
+
+        # @return [Avm::Instances::Data::Package]
+        def data_package_create
+          super.add_unit('database', database_unit)
+        end
+
+        # @return [Addressable::URI]
+        def gemfile_source
+          application.local_source.gemfile_source
+        end
+
+        # @return [Array<Avm::Instances::Process>]
+        def processes
+          super + [::Avm::EacRailsBase1::Instances::Processes::TasksScheduler.new(self)]
+        end
+
+        def rake(*args)
+          bundle('exec', 'rake', *args)
+        end
+
+        def the_gem
+          @the_gem ||= ::Avm::EacRubyBase1::Sources::Base.new(
+            ::File.join(read_entry('install.path'))
+          ).env_set(host_env)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/deploy.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
+        set_callback :write_on_target, :before do
+          check_rubygems_access
+        end
+
+        # @return [void]
+        # @raise [EacEnvs::Http::Error]
+        def check_rubygems_access
+          infom "Checkin access to gems provider (\"#{instance.gemfile_source}\")..."
+          ::EacEnvs::Http::Request.new.url(instance.gemfile_source).response.body_data_or_raise
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/processes/daemon.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      module Processes
+        class Daemon < ::Avm::Instances::Process
+          acts_as_abstract :command_name, :gem_name
+
+          # @return [Boolean]
+          def available?
+            instance.application.local_source.gemfile_lock_gem_version(gem_name).present?
+          end
+
+          def disable
+            daemon_command(:stop).system!
+          end
+
+          def enable
+            daemon_command(:start).system!
+          end
+
+          def enabled?
+            daemon_command(:status).execute.fetch(:exit_code).zero?
+          end
+
+          private
+
+          def daemon_command(action)
+            instance.bundle('exec', command_name, action)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/processes/tasks_scheduler.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      module Processes
+        class TasksScheduler < ::Avm::EacRailsBase1::Instances::Processes::Daemon
+          GEM_NAME = 'tasks_scheduler'
+          COMMAND_NAME = 'tasks_scheduler'
+
+          # @return [String]
+          def command_name
+            COMMAND_NAME
+          end
+
+          # @return [String]
+          def gem_name
+            GEM_NAME
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/runners/bundle.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'shellwords'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      module Runners
+        class Bundle
+          runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle, :help do
+            desc 'Runs "bundle ...".'
+            pos_arg :'bundle-args', repeat: true, optional: true
+          end
+
+          def run
+            bundle_run
+          end
+
+          def bundle_args
+            parsed.bundle_args.reject { |arg| arg == '--' }
+          end
+        end
+      end
+    end
+  end
+end