zelastic 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 118f50ebd50d4291a03b2274b4129a9d69e15aee8b744ce986524ab3a7496845
-  data.tar.gz: ef294b31041ecf9a0cdae04008950eb76fd2e19c60058db234b19549dd646ea6
+  metadata.gz: 7b45ad7dd15f213cc571c3da4f021ff80129dcccb375ae98aedde7b22b759b05
+  data.tar.gz: '08328c62f6485a0b11300dc9c651ca3e8c99179c84ea2c3f5235a921ca676d9a'
 SHA512:
-  metadata.gz: d22f6e8c566c3e400ab3d02e3a4fe6f6aa114ac00533ca42848058a297e2593450f3cefebb19206d21acaf5d62da74f08ad247be137af07404e9bdc388faf900
-  data.tar.gz: 7e369fe3a13e13289e98ee18e1b55cd83c0034a85ab3e0282a4ab70c302b05b41cbb7a329a69261880285e437f42e654ad332e2143f08babda5efbc5f54e1208
+  metadata.gz: a3e38047bf9f47bc8e7353f8e52387a7bd6722e291f96291d09a50257cd28a43cf7fba2abcd9681abb3797aa5acce67f38b09cabb6ecbaf8e4638b2a7e6e21b6
+  data.tar.gz: 94572581d7fa5f6c6de6485cacd9232a310418379f981d12d0523183f6922f5bcbbeb290605e4452ccb51603f702aa5bf52a9540ed681002a1b2e389a2dff670

data/.circleci/config.yml

@@ -1,88 +1,48 @@
-references:
-  ruby: &ruby
-    image: carwow/ruby-ci:2.4.4
-    environment:
-      ELASTICSEARCH_URL: http://localhost:9200
-
-  elasticsearch_container: &elasticsearch_container
-    image: carwow/elasticsearch-ci:5.5.1
+version: 2.1
 
-  elasticsearch_7_container: &elasticsearch_7_container
-    image: carwow/elasticsearch-ci:7.6.1
-
-version: 2
 jobs:
-  bundle:
-    working_directory: ~/zelastic
-    docker:
-      - *ruby
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - bundle-{{ checksum "Gemfile.lock" }}
-            - bundle-
-      - run: |
-          bundle config --local path vendor/bundle &&
-          bundle check || bundle install --jobs=4 --retry=3
-          bundle clean --force
-      - save_cache:
-          key: bundle-{{ checksum "Gemfile.lock" }}
-          paths: [vendor/bundle]
-
-  rubocop:
-    working_directory: ~/zelastic
-    docker:
-      - *ruby
-    steps:
-      - checkout
-      - restore_cache: { keys: ['bundle-{{ checksum "Gemfile.lock" }}'] }
-      - run: bundle exec rubocop
-
-  tests:
-    working_directory: ~/zelastic
-    docker:
-      - *ruby
-      - *elasticsearch_container
-    steps:
-      - checkout
-      - restore_cache: { keys: ['bundle-{{ checksum "Gemfile.lock" }}'] }
-      - run:
-          name: Wait for ES to be ready
-          command: |
-            until curl $ELASTICSEARCH_URL/_cat/health | egrep '(green|yellow)' 2>&1 > /dev/null; do
-              echo -n .
-              sleep 1
-            done
-      - run: |
-          bundle exec rspec --pattern "**/*_spec.rb" --format "progress"
-
-  tests_7:
-    working_directory: ~/zelastic
+  test:
+    parameters:
+      ruby_version:
+        type: string
+      elasticsearch_version:
+        type: string
+      elasticsearch_gem_version:
+        type: string
     docker:
-      - *ruby
-      - *elasticsearch_7_container
+      - image: "cimg/ruby:<< parameters.ruby_version >>"
+      - image: "elasticsearch:<< parameters.elasticsearch_version >>"
+        environment:
+          "discovery.type": single-node
+          "xpack.security.enabled": false
+    environment:
+      ELASTICSEARCH_GEM_VERSION: "<< parameters.elasticsearch_gem_version >>"
     steps:
       - checkout
-      - restore_cache: { keys: ['bundle-{{ checksum "Gemfile.lock" }}'] }
-      - run:
-          name: Wait for ES to be ready
-          command: |
-            until curl $ELASTICSEARCH_URL/_cat/health | egrep '(green|yellow)' 2>&1 > /dev/null; do
-              echo -n .
-              sleep 1
-            done
-      - run: |
-          bundle exec rspec --pattern "**/*_spec.rb" --format "progress"
+      - run: bin/setup
+      - run: bin/rubocop
+      - run: dockerize -wait http://localhost:9200 -timeout 1m
+      - run: bin/rspec
 
 workflows:
   version: 2
-  build:
+  test:
     jobs:
-      - bundle
-      - rubocop:
-          requires: [bundle]
-      - tests:
-          requires: [bundle]
-      - tests_7:
-          requires: [bundle]
+      - test:
+          name: "test with elasticsearch v8
+            and gem << matrix.elasticsearch_gem_version >>
+            and ruby v<< matrix.ruby_version >>"
+          elasticsearch_version: "8.3.3"
+          matrix:
+            parameters:
+              ruby_version: ["3.1", "2.7"]
+              elasticsearch_gem_version: ["~> 8", "~> 7"]
+      - test:
+          name: "test with elasticsearch v7
+            and gem << matrix.elasticsearch_gem_version >>
+            and ruby v<< matrix.ruby_version >>"
+          elasticsearch_version: "7.17.5"
+          matrix:
+            parameters:
+              ruby_version: ["3.1", "2.7"]
+              elasticsearch_gem_version: ["~> 7"]

data/.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: daily
+      time: '09:00'
+      timezone: 'Europe/London'
+    open-pull-requests-limit: 10

data/.gitignore

@@ -6,6 +6,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+/log/*.log
+/Gemfile.lock
 
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -1,24 +1,13 @@
-inherit_from: .rubocop_todo.yml
+inherit_gem:
+  carwow_rubocop:
+    - config/default.yml
 
-AllCops:
-  TargetRubyVersion: 2.4
+inherit_mode:
+  merge:
+    - Exclude
 
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Exclude:
-    - '*.gemspec'
-    - 'spec/**/*'
+Metrics:
+  Enabled: false
 
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 18
-
-# Offense count: 2
-Style/Documentation:
-  Exclude:
-    - '**/*'
-
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 100
+Gemspec/RequireMFA:
+  Enabled: false

data/CHANGELOG.md

@@ -1,15 +1,47 @@
-v0.5.1 - Aug 8th, 2018
----
+# Changelog
 
-- Fix re-indexing log output upon initial index creation (#7)
+All notable changes to this project will be documented in this file.
 
-v0.5.0 - Aug 3rd, 2018
----
+The format is based on [Keep a Changelog],
+and this project adheres to [Semantic Versioning].
 
-- An _ESTIMATED_ % completion of ES re-indexing is logged, as the new index gets populated (#5)
+[Keep a Changelog]: https://keepachangelog.com/en/1.0.0/
+[Semantic Versioning]: https://semver.org/spec/v2.0.0.html
 
+## How do I make a good changelog?
 
-v0.4.0 - May 29th, 2018
----
+### Guiding Principles
 
-- Warning rather than exception on ignorable version conflicts (#4)
+- Changelogs are for humans, not machines.
+- There should be an entry for every single version.
+- The same types of changes should be grouped.
+- Versions and sections should be linkable.
+- The latest version comes first.
+- The release date of each version is displayed.
+- Keep an `Unreleased` section at the top to track upcoming changes.
+
+### Types of changes
+
+- `Added` for new features.
+- `Changed` for changes in existing functionality.
+- `Deprecated` for soon-to-be removed features.
+- `Removed` for now removed features.
+- `Fixed` for any bug fixes.
+- `Security` in case of vulnerabilities.
+
+## [Unreleased] - XXXX-XX-XX
+
+## [0.8.0] - 2022-08-19
+### Added
+- Support for Ruby 3 (and keep support for 2.7).
+- Support for Elasticsearch v8 (and keep support for v7).
+- Support setting a logger in `Config`.
+- Support refresh on `IndexManager#populate_index`.
+- Support Proc in `Config#data_source` so it can be lazily evaluated.
+
+### Removed
+- Drop support for Ruby 2.6.
+- Drop support for Elasticsearch v5 and v6.
+
+[Unreleased]: https://github.com/carwow/zelastic/compare/v0.8.0...HEAD
+[0.8.0]: https://github.com/carwow/zelastic/releases/tag/v0.8.0

data/Gemfile

@@ -3,3 +3,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'elasticsearch', ENV['ELASTICSEARCH_GEM_VERSION'] if ENV['ELASTICSEARCH_GEM_VERSION']

data/README.md

@@ -1,4 +1,7 @@
-# Zero-downtime indexing from ActiveRecord->Elasticsearch
+# Zelastic
+
+Zero-downtime Elasticsearch tooling for managing indices and indexing from
+ActiveRecord with PostgreSQL to Elasticsearch.
 
 ## Installation
 
@@ -10,13 +13,14 @@ gem 'zelastic'
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 
     $ gem install zelastic
 
 ## Usage
+
 ### Setup
 
 For each ActiveRecord scope you want to index, you'll need a configuration:
@@ -46,7 +50,6 @@ You can also override some defaults, if you wish:
   here
 - `read_alias`: by default this is the table name of the `data_source`
 - `write_alias`: by default this is the `read_alias`, with `_write` appended
-- `type`: by default this is `read_alias.singularize`
 
 If you pass an array to as the `client` argument, all writes will be applied to every client in the
 array.

data/bin/rspec

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+bundle_binstub = File.expand_path('bundle', __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/bin/rubocop

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+bundle_binstub = File.expand_path('bundle', __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rubocop', 'rubocop')

data/lib/zelastic/config.rb

@@ -2,31 +2,36 @@
 
 module Zelastic
   class Config
-    attr_reader :clients, :data_source
+    attr_reader :clients
 
     def initialize(
       client:,
       data_source:,
       mapping:,
+      logger: nil,
       **overrides,
       &index_data
     )
       @clients = Array(client)
       @data_source = data_source
       @mapping = mapping
-      @index_data = index_data
-      @_type = overrides.fetch(:type, true)
+      @logger = logger
       @overrides = overrides
-    end
-
-    def type?
-      @_type
+      @index_data = index_data
     end
 
     def index_data(model)
       @index_data.call(model)
     end
 
+    def data_source
+      if @data_source.respond_to? :call
+        @data_source.call
+      else
+        @data_source
+      end
+    end
+
     def read_alias
       @read_alias ||= overrides.fetch(:read_alias) { data_source.table_name }
     end
@@ -35,20 +40,16 @@ module Zelastic
       @write_alias ||= overrides.fetch(:write_alias) { [read_alias, 'write'].join('_') }
     end
 
-    def type
-      @type ||= overrides.fetch(:type, read_alias.singularize)
-    end
-
     def logger
       return Rails.logger if defined?(Rails)
 
-      @logger ||= Logger.new(STDOUT)
+      @logger ||= Logger.new($stdout)
     end
 
     def index_definition
       {
         settings: overrides.fetch(:index_settings, {}),
-        mappings: type ? { type => mapping } : mapping
+        mappings: mapping
       }
     end
 

data/lib/zelastic/index_manager.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 module Zelastic
-  # rubocop:disable Metrics/AbcSize
-  class IndexManager # rubocop:disable Metrics/ClassLength
+  class IndexManager
     extend Forwardable
 
     def initialize(config, client: nil)
@@ -17,12 +16,12 @@ module Zelastic
       client.indices.put_alias(index: index_name, name: config.write_alias)
     end
 
-    def populate_index(unique_name = nil, batch_size: 3000)
+    def populate_index(unique_name = nil, batch_size: 3000, refresh: false)
       index_name = index_name_from_unique(unique_name)
 
       config.data_source.find_in_batches(batch_size: batch_size).with_index do |batch, i|
         logger.info(populate_index_log(batch_size: batch_size, batch_number: i + 1))
-        indexer.index_batch(batch, client: client, index_name: index_name)
+        indexer.index_batch(batch, client: client, index_name: index_name, refresh: refresh)
       end
     end
 
@@ -37,12 +36,14 @@ module Zelastic
       remove_action =
         ({ remove: { index: old_index, alias: config.read_alias } } if old_index)
 
-      client.indices.update_aliases(body: {
-                                      actions: [
-                                        remove_action,
-                                        { add: { index: new_index, alias: config.read_alias } }
-                                      ].compact
-                                    })
+      client.indices.update_aliases(
+        body: {
+          actions: [
+            remove_action,
+            { add: { index: new_index, alias: config.read_alias } }
+          ].compact
+        }
+      )
     end
 
     def stop_dual_writes
@@ -52,14 +53,15 @@ module Zelastic
       logger.info("Currently used index is #{current_index}")
 
       other_write_indices = client.indices.get_alias(name: config.write_alias).keys
-                                  .reject { |name| name == current_index }
+        .reject { |name| name == current_index }
 
       if other_write_indices.none?
         logger.info("No write indexes that aren't the read index. Nothing to do!")
         return
       end
       logger.info("Stopping writes to #{other_write_indices.count} old ES indices: " \
-                        "#{other_write_indices.join(', ')}")
+                  "#{other_write_indices.join(', ')}"
+                 )
 
       actions = other_write_indices.map do |index|
         { remove: { index: index, alias: config.write_alias } }
@@ -74,11 +76,11 @@ module Zelastic
       logger.info("Currently used index is #{current_index}")
 
       indices_to_delete = client
-                          .cat
-                          .indices(format: :json)
-                          .map { |index| index['index'] }
-                          .select { |name| name.start_with?(config.read_alias) }
-                          .reject { |name| name == current_index }
+        .cat
+        .indices(format: :json)
+        .map { |index| index['index'] }
+        .select { |name| name.start_with?(config.read_alias) }
+        .reject { |name| name == current_index }
 
       if indices_to_delete.none?
         logger.info('Nothing to do: no old indices')
@@ -93,6 +95,7 @@ module Zelastic
     private
 
     attr_reader :config, :client
+
     def_delegators :config, :logger
 
     def indexer
@@ -113,18 +116,11 @@ module Zelastic
                  else
                    'First index'
                  end
-      "ES: (#{progress}) Indexing #{config.type} records"
+      "ES: (#{progress}) Indexing records"
     end
 
     def current_index_size
-      @current_index_size ||= client.count(**count_params)['count']
-    end
-
-    def count_params
-      {
-        index: config.read_alias,
-        type: config.type? ? config.type : nil
-      }.compact
+      @current_index_size ||= client.count(index: config.read_alias)['count']
     end
 
     def indexed_percent(batch_size, batch_number)
@@ -135,5 +131,4 @@ module Zelastic
       client.indices.exists?(index: config.read_alias)
     end
   end
-  # rubocop:enable Metrics/AbcSize
 end

data/lib/zelastic/indexer.rb

@@ -17,19 +17,19 @@ module Zelastic
       @config = config
     end
 
-    def index_batch(batch, client: nil, index_name: nil)
+    def index_batch(batch, client: nil, index_name: nil, refresh: false)
       version = current_version
-      execute_bulk(client: client, index_name: index_name) do |index|
+      execute_bulk(client: client, index_name: index_name, refresh: refresh) do |index|
         batch.map do |record|
           index_command(index: index, version: version, record: record)
         end
       end
     end
 
-    def index_record(record)
+    def index_record(record, refresh: false)
       version = current_version
 
-      execute_bulk do |index_name|
+      execute_bulk(refresh: refresh) do |index_name|
         [index_command(index: index_name, version: version, record: record)]
       end
     end
@@ -43,10 +43,7 @@ module Zelastic
 
       execute_bulk do |index_name|
         ids.map do |id|
-          delete_params = { _index: index_name, _id: id }
-          delete_params[:_type] = config.type if config.type?
-
-          { delete: delete_params }
+          { delete: { _index: index_name, _id: id } }
         end
       end
     end
@@ -62,12 +59,13 @@ module Zelastic
     private
 
     attr_reader :config
+
     def_delegators :config, :logger
 
     def current_version
       config.data_source.connection
-            .select_one('SELECT txid_snapshot_xmax(txid_current_snapshot()) as xmax')
-            .fetch('xmax')
+        .select_one('SELECT txid_snapshot_xmax(txid_current_snapshot()) as xmax')
+        .fetch('xmax')
     end
 
     def write_indices(client)
@@ -75,31 +73,26 @@ module Zelastic
     end
 
     def index_command(index:, version:, record:)
-      version_params =
-        if config.type?
-          { _version: version, _version_type: :external, _type: config.type }
-        else
-          { version: version, version_type: :external }
-        end
-
       {
         index: {
           _index: index,
           _id: record.id,
-          data: config.index_data(record)
-        }.merge(version_params)
+          data: config.index_data(record),
+          version: version,
+          version_type: :external
+        }
       }
     end
 
-    def execute_bulk(client: nil, index_name: nil)
+    def execute_bulk(client: nil, index_name: nil, refresh: false, &block)
       clients = Array(client || config.clients)
 
       clients.map do |current_client|
         indices = Array(index_name || write_indices(current_client))
 
-        commands = indices.flat_map { |index| yield(index) }
+        commands = indices.flat_map(&block)
 
-        current_client.bulk(body: commands).tap do |result|
+        current_client.bulk(body: commands, refresh: refresh).tap do |result|
           check_errors!(result)
         end
       end
@@ -109,11 +102,10 @@ module Zelastic
       return false unless result['errors']
 
       errors = result['items']
-               .map { |item| item['error'] || item.fetch('index', {})['error'] }
-               .compact
+        .filter_map { |item| item['error'] || item.fetch('index', {})['error'] }
 
       ignorable_errors, important_errors = errors
-                                           .partition { |error| ignorable_error?(error) }
+        .partition { |error| ignorable_error?(error) }
 
       logger.warn("Ignoring #{ignorable_errors.count} version conflicts") if ignorable_errors.any?
 
@@ -123,16 +115,11 @@ module Zelastic
     end
 
     def ignorable_error?(error)
-      # rubocop:disable Metrics/LineLength
-      regexp =
-        if config.type?
-          /^\[#{config.type}\]\[\d+\]: version conflict, current version \[\d+\] is higher or equal to the one provided \[\d+\]$/
-        else
-          /^\[\d+\]: version conflict, current version \[\d+\] is higher or equal to the one provided \[\d+\]$/
-        end
-      # rubocop:enable Metrics/LineLength
       error['type'] == 'version_conflict_engine_exception' &&
-        error['reason'] =~ regexp
+        error['reason'] =~ VERSION_CONFLICT_ERROR_REGEXP
     end
+
+    VERSION_CONFLICT_ERROR_REGEXP =
+      /^\[\d+\]: version conflict, current version \[\d+\] is higher or equal to the one provided \[\d+\]$/.freeze
   end
 end

data/lib/zelastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zelastic
-  VERSION = '0.6.1'
+  VERSION = '0.8.0'
 end

data/zelastic.gemspec

@@ -22,13 +22,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'elasticsearch', '>= 7', '< 9'
+
+  spec.add_dependency 'activerecord'
   spec.add_dependency 'activesupport'
 
-  spec.add_development_dependency 'activerecord'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'elasticsearch'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'bundler', '~> 2'
+  spec.add_development_dependency 'carwow_rubocop', '~> 4'
+  spec.add_development_dependency 'pry', '~> 0.14'
+  spec.add_development_dependency 'rake', '~> 13'
+  spec.add_development_dependency 'rspec', '~> 3'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: zelastic
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - carwow Developers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -31,7 +37,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,13 +45,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,75 +59,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: elasticsearch
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: carwow_rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: An index manager for Elasticsearch and ActiveRecord
 email:
 - developers@carwow.co.uk
@@ -130,29 +136,31 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
+- bin/rspec
+- bin/rubocop
 - bin/setup
 - lib/zelastic.rb
 - lib/zelastic/config.rb
 - lib/zelastic/index_manager.rb
 - lib/zelastic/indexer.rb
 - lib/zelastic/version.rb
+- log/.keep
 - zelastic.gemspec
 homepage: https://github.com/carwow/zelastic
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -167,8 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.11
+signing_key:
 specification_version: 4
 summary: Zero-downtime (re-)indexing of ActiveRecord models into Elasticsearch.
 test_files: []

data/.rubocop_todo.yml

@@ -1,32 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2018-05-27 17:11:31 +0100 using RuboCop version 0.52.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-Lint/ShadowingOuterLocalVariable:
-  Exclude:
-    - 'lib/zelastic/indexer.rb'
-
-# Offense count: 1
-Metrics/AbcSize:
-  Max: 17
-
-# Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 83
-
-# Offense count: 4
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 146
-
-# Offense count: 1
-Naming/AccessorMethodName:
-  Exclude:
-    - 'spec/zelastic/indexer_spec.rb'

data/Gemfile.lock

@@ -1,91 +0,0 @@
-PATH
-  remote: .
-  specs:
-    zelastic (0.6.0)
-      activesupport
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activerecord (5.1.4)
-      activemodel (= 5.1.4)
-      activesupport (= 5.1.4)
-      arel (~> 8.0)
-    activesupport (5.1.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (8.0.0)
-    ast (2.3.0)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    elasticsearch (6.0.2)
-      elasticsearch-api (= 6.0.2)
-      elasticsearch-transport (= 6.0.2)
-    elasticsearch-api (6.0.2)
-      multi_json
-    elasticsearch-transport (6.0.2)
-      faraday
-      multi_json
-    faraday (0.15.2)
-      multipart-post (>= 1.2, < 3)
-    i18n (0.9.1)
-      concurrent-ruby (~> 1.0)
-    method_source (0.9.0)
-    minitest (5.11.1)
-    multi_json (1.13.1)
-    multipart-post (2.0.0)
-    parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    powerpack (0.1.1)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rubocop (0.52.1)
-      parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.4)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  bundler
-  elasticsearch
-  pry
-  rake
-  rspec
-  rubocop
-  zelastic!
-
-BUNDLED WITH
-   1.17.2