fleiss 0.4.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a8ecda4ed800fa1d15848bf37c3f7f1a49cba62be614d25eea8725c00baab0d
-  data.tar.gz: fade5ca7d61dad9e7a912b99125b1b43159ab61df2c68b02fb8ed21a73382854
+  metadata.gz: 242a1ac6bbf715ff7850982b3206ab78191520915c7ec7780d4a84bf1390c9bd
+  data.tar.gz: f6ce5dbf58062f847a3213a3a96d5a0909c9ef7f73f93d0bc71012bff5451629
 SHA512:
-  metadata.gz: ee3ee999372b9d214cd7261e115a0a5ceb7b0c3b266dc2924cb6c7f8c888fbd98140fd39a02a75e108af4f541bee564a67cef179ed62e38d4a0ae019f071f182
-  data.tar.gz: 70d922d556feeef102242c726c1812f4f4625ee25f19d01087074aa0725b677d0e74e043097f665b9626f3e16bc5a424f5441e8a3e96088e180cabb9d1a99b45
+  metadata.gz: 512cf207ecac8195420583f622df97ca7d282498941da500b8e56e1de90e8f2e08522497453e28904630fd67b8820b075bc7c1af28d0936daff0a102dae9f070
+  data.tar.gz: 462ec0e4cd5976744c8a8793be2190fb0c1289eb0ab0480ee92359ad8c246c3542c3b9f36810708601060f438088374d0bb45763655259d1e62943a9daf89eeb

data/.github/workflows/test.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["2.6", "2.7", "3.0"]
+        ruby-version: ["2.7", "3.0", "3.1", "3.2"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}

data/.rubocop.yml

@@ -5,7 +5,7 @@ inherit_mode:
   merge:
     - Exclude
 AllCops:
-  TargetRubyVersion: "2.6"
+  TargetRubyVersion: "2.7"
 
 Security/Open:
   Exclude:

data/Gemfile

@@ -1,2 +1,9 @@
 source 'https://rubygems.org'
 gemspec
+
+gem 'mysql2'
+gem 'pg'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop-bsm'
+gem 'sqlite3'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fleiss (0.4.5)
+    fleiss (0.5.1)
       activejob (>= 6.0)
       activerecord (>= 6.0)
       concurrent-ruby
@@ -9,80 +9,84 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activejob (7.0.4.2)
+      activesupport (= 7.0.4.2)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activesupport (6.1.4.1)
+    activemodel (7.0.4.2)
+      activesupport (= 7.0.4.2)
+    activerecord (7.0.4.2)
+      activemodel (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    globalid (0.5.2)
+    concurrent-ruby (1.2.0)
+    diff-lcs (1.5.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
-    i18n (1.8.10)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    mysql2 (0.5.3)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    json (2.6.3)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
+    mysql2 (0.5.5)
+    parallel (1.22.1)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
-    rainbow (3.0.0)
+    pg (1.4.5)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.6.2)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.21.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.44.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.11.0)
-      parser (>= 3.0.1.1)
-    rubocop-bsm (0.6.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
+      parser (>= 3.1.1.0)
+    rubocop-bsm (0.6.1)
       rubocop (~> 1.0)
       rubocop-performance
       rubocop-rake
       rubocop-rspec
-    rubocop-performance (1.11.5)
+    rubocop-capybara (2.17.0)
+      rubocop (~> 1.41)
+    rubocop-performance (1.16.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.4.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.18.1)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
-    sqlite3 (1.4.2)
-    tzinfo (2.0.4)
+    sqlite3 (1.6.0)
+      mini_portile2 (~> 2.8.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -98,4 +102,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.16
+   2.3.16

data/fleiss.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'fleiss'
-  s.version       = '0.4.5'
+  s.version       = '0.5.1'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Minimialist background jobs backed by ActiveJob and ActiveRecord.)
@@ -10,19 +10,13 @@ Gem::Specification.new do |s|
 
   s.executables   = ['fleiss']
   s.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^spec/}) }
-  s.test_files    = `git ls-files -z -- spec/*`.split("\x0")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.6'
+  s.required_ruby_version = '>= 2.7'
 
   s.add_dependency 'activejob', '>= 6.0'
   s.add_dependency 'activerecord', '>= 6.0'
   s.add_dependency 'concurrent-ruby'
 
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'mysql2'
-  s.add_development_dependency 'pg'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop-bsm'
-  s.add_development_dependency 'sqlite3'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/fleiss/cli.rb

@@ -31,7 +31,7 @@ module Fleiss
       return unless opts[:config]
 
       # Load config file
-      conf = YAML.safe_load(ERB.new(IO.read(opts[:config])).result)
+      conf = YAML.safe_load(ERB.new(File.read(opts[:config])).result)
       raise ArgumentError, "File in #{opts[:config]} does not contain a valid configuration" unless conf.is_a?(Hash)
 
       conf.each do |key, value|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleiss
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.1
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -66,90 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-bsm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Run background jobs with your favourite stack.
 email:
 - info@blacksquaremedia.com
@@ -178,15 +94,11 @@ files:
 - lib/fleiss/cli.rb
 - lib/fleiss/executor.rb
 - lib/fleiss/worker.rb
-- spec/fleiss/backend/active_record_spec.rb
-- spec/fleiss/executor_spec.rb
-- spec/fleiss/worker_spec.rb
-- spec/fleiss_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/bsm/fleiss
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -195,20 +107,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Minimialist background jobs backed by ActiveJob and ActiveRecord.
-test_files:
-- spec/fleiss/backend/active_record_spec.rb
-- spec/fleiss/executor_spec.rb
-- spec/fleiss/worker_spec.rb
-- spec/fleiss_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/fleiss/backend/active_record_spec.rb

@@ -1,135 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe Fleiss::Backend::ActiveRecord do
-  def retrieve(job)
-    described_class.find(job.provider_job_id)
-  end
-
-  it 'persists jobs' do
-    job = TestJob.perform_later
-    rec = retrieve(job)
-
-    expect(rec.attributes).to include(
-      'queue_name'  => 'test-queue',
-      'owner'       => nil,
-      'started_at'  => nil,
-      'finished_at' => nil,
-    )
-    expect(rec.scheduled_at).to be_within(2.seconds).of(Time.zone.now)
-    expect(rec.expires_at).to be_within(2.seconds).of(3.days.from_now)
-    expect(rec.job_data).to include(
-      'job_class'       => 'TestJob',
-      'arguments'       => [],
-      'executions'      => 0,
-      'locale'          => 'en',
-      'priority'        => nil,
-      'provider_job_id' => nil,
-      'queue_name'      => 'test-queue',
-    )
-  end
-
-  it 'enqueues with delay' do
-    job = TestJob.set(wait: 1.day).perform_later
-    rec = retrieve(job)
-    expect(rec.scheduled_at).to be_within(2.seconds).of(1.day.from_now)
-  end
-
-  it 'enqueues with priority' do
-    job = TestJob.set(priority: 8).perform_later
-    rec = retrieve(job)
-    expect(rec.priority).to eq(8)
-  end
-
-  it 'exposes active job ID' do
-    job = TestJob.perform_later
-    rec = retrieve(job)
-    expect(rec.job_id.size).to eq(36)
-  end
-
-  it 'scopes pending' do
-    j1 = TestJob.perform_later
-    expect(retrieve(j1).start('owner')).to be_truthy
-    expect(retrieve(j1).finish('owner')).to be_truthy
-
-    j2 = TestJob.perform_later
-    _j3 = TestJob.set(wait: 1.hour).perform_later
-    j4 = TestJob.set(priority: 2).perform_later
-
-    expect(described_class.pending.ids).to eq [j4.provider_job_id, j2.provider_job_id]
-  end
-
-  it 'scopes in_progress' do
-    _j1 = TestJob.perform_later
-    j2 = TestJob.perform_later
-    expect(retrieve(j2).start('owner')).to be_truthy
-
-    j3 = TestJob.perform_later
-    expect(retrieve(j3).start('owner')).to be_truthy
-    expect(described_class.in_progress('owner').ids).to match_array [j2.provider_job_id, j3.provider_job_id]
-    expect(described_class.in_progress('other').ids).to be_empty
-
-    expect(retrieve(j3).finish('owner')).to be_truthy
-    expect(described_class.in_progress('owner').ids).to eq [j2.provider_job_id]
-  end
-
-  it 'scopes by queue' do
-    j1 = TestJob.perform_later
-    j2 = TestJob.set(queue: 'other').perform_later
-    expect(described_class.in_queue('test-queue').ids).to eq [j1.provider_job_id]
-    expect(described_class.in_queue('other').ids).to eq [j2.provider_job_id]
-  end
-
-  it 'starts' do
-    job = TestJob.perform_later
-    rec = retrieve(job)
-    expect(rec.start('owner')).to be_truthy
-    expect(rec.start('other')).to be_falsey
-    expect(rec.reload.owner).to eq('owner')
-    expect(rec.started_at).to be_within(2.seconds).of(Time.zone.now)
-  end
-
-  it 'locks atomically' do
-    24.times do
-      TestJob.perform_later
-    end
-    counts = (1..4).map do |n|
-      Thread.new do
-        described_class.pending.to_a.count {|j| j.start "owner-#{n}" }
-      end
-    end.map(&:value)
-    expect(counts.sum).to eq(24)
-  end
-
-  it 'finishes' do
-    job = TestJob.perform_later
-    rec = retrieve(job)
-    expect(rec.finish('owner')).to be_falsey
-    expect(rec.start('owner')).to be_truthy
-    expect(rec.finish('other')).to be_falsey
-    expect(rec.finish('owner')).to be_truthy
-    expect(rec.reload.owner).to eq('owner')
-    expect(rec.started_at).to be_within(2.seconds).of(Time.zone.now)
-    expect(rec.finished_at).to be_within(2.seconds).of(Time.zone.now)
-  end
-
-  it 'reschedules' do
-    job = TestJob.perform_later
-    rec = retrieve(job)
-    expect(rec.reschedule('owner')).to be_falsey
-    expect(rec.start('owner')).to be_truthy
-    expect(rec.reschedule('other')).to be_falsey
-    expect(rec.reschedule('owner')).to be_truthy
-    expect(rec.reload.owner).to be_nil
-    expect(rec.started_at).to be_nil
-    expect(rec.scheduled_at).to be_within(2.seconds).of(Time.zone.now)
-  end
-
-  it 'reconnects' do
-    expect(::ActiveRecord::Base).to receive(:clear_all_connections!).once.and_return(nil)
-
-    expect do
-      described_class.wrap_perform { raise ::ActiveRecord::StatementInvalid }
-    end
-      .to raise_error(::ActiveRecord::StatementInvalid) # re-raised anyway
-  end
-end

data/spec/fleiss/executor_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-require 'fleiss/executor'
-
-RSpec.describe Fleiss::Executor do
-  subject { described_class.new max_size: 2 }
-
-  after   { subject.kill }
-
-  it 'checks capacity' do
-    expect(described_class.new.capacity).to eq(1)
-
-    expect(subject.capacity).to eq(2)
-    subject.post { sleep(1) }
-    expect(subject.capacity).to eq(1)
-    subject.post { sleep(1) }
-    expect(subject.capacity).to eq(0)
-  end
-
-  it 'discards execution when capacity is reached' do
-    n = Concurrent::AtomicFixnum.new(0)
-    10.times do
-      10.times { subject.post { n.increment } }
-      sleep(0.001)
-    end
-    subject.shutdown
-    subject.wait_for_termination(1)
-    expect(n.value).to be_within(10).of(20)
-  end
-end

data/spec/fleiss/worker_spec.rb

@@ -1,68 +0,0 @@
-require 'spec_helper'
-require 'fleiss/worker'
-
-RSpec.describe Fleiss::Worker do
-  subject do
-    described_class.new queues: TestJob.queue_name, wait_time: 0.01
-  end
-
-  let! :runner do
-    t = Thread.new { subject.run }
-    t.abort_on_exception = true
-    t
-  end
-
-  after do
-    runner.kill
-  end
-
-  around do |example|
-    callback = ->(*args) { notifications.push ActiveSupport::Notifications::Event.new(*args) }
-    ActiveSupport::Notifications.subscribed(callback, 'worker_perform.fleiss') do
-      example.call
-    end
-  end
-
-  def wait_for
-    100.times do
-      break if yield
-
-      sleep(0.1)
-    end
-    expect(yield).to be_truthy
-  end
-
-  it 'runs' do
-    # seed 24 jobs
-    24.times {|n| TestJob.perform_later(n) }
-    wait_for { Fleiss.backend.not_finished.count.positive? }
-
-    # ensure runner processes them all
-    wait_for { Fleiss.backend.not_finished.count.zero? }
-
-    # check what's been performed
-    expect(TestJob.performed.size).to eq(24)
-    expect(Fleiss.backend.finished.count).to eq(24)
-    expect(TestJob.performed).to match_array(0..23)
-  end
-
-  it 'handles failing jobs' do
-    TestJob.perform_later('raise')
-    wait_for { Fleiss.backend.not_finished.count.zero? }
-    expect(Fleiss.backend.finished.count).to eq(1)
-
-    expect(notifications.size).to eq(1)
-    expect(notifications.first.payload).to have_key(:id)
-    expect(notifications.first.payload).to have_key(:uuid)
-    expect(notifications.first.payload).to have_key(:thread_id)
-    expect(notifications.first.payload[:finished]).to be_truthy
-    expect(notifications.first.payload[:exception_object]).to be_an_instance_of(RuntimeError)
-    expect(notifications.first.payload[:exception_object].message).to eq('Failing')
-  end
-
-  private
-
-  def notifications
-    @notifications ||= []
-  end
-end

data/spec/fleiss_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe Fleiss do
-  it 'has a backend' do
-    expect(described_class.backend).to eq(Fleiss::Backend::ActiveRecord)
-  end
-
-  it 'enqueues' do
-    expect do
-      TestJob.set(wait: 1.week).perform_later
-    end.to change { described_class.backend.count }.by(1)
-  end
-end

data/spec/spec_helper.rb

@@ -1,51 +0,0 @@
-ENV['RACK_ENV'] ||= 'test'
-
-require 'rspec'
-require 'fleiss'
-require 'fleiss/backend/active_record/migration'
-require 'active_job'
-require 'active_job/queue_adapters/fleiss_adapter'
-require 'fileutils'
-
-ActiveJob::Base.queue_adapter = :fleiss
-ActiveJob::Base.logger = Logger.new(nil)
-
-Time.zone_default = Time.find_zone!('UTC')
-
-tmpdir = File.expand_path('./tmp', __dir__)
-FileUtils.rm_rf tmpdir
-FileUtils.mkdir_p tmpdir
-
-database_url = ENV['DATABASE_URL'] || "sqlite3://#{tmpdir}/fleiss-test.sqlite3"
-ActiveRecord::Base.configurations = { 'test' => { 'url' => database_url, 'pool' => 20 } }
-
-ActiveRecord::Base.establish_connection :test
-ActiveRecord::Base.connection.drop_table('fleiss_jobs', if_exists: true)
-ActiveRecord::Migration.suppress_messages do
-  Fleiss::Backend::ActiveRecord::Migration.migrate(:up)
-end
-
-class TestJob < ActiveJob::Base
-  queue_as 'test-queue'
-
-  def self.performed
-    @performed ||= []
-  end
-
-  def ttl
-    72.hours
-  end
-
-  def perform(msg = nil)
-    raise 'Failing' if msg == 'raise'
-
-    self.class.performed.push(msg)
-  end
-end
-
-RSpec.configure do |c|
-  c.after do
-    TestJob.performed.clear
-    Fleiss.backend.delete_all
-  end
-end