capistrano-chewy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b6374523d9371bd4b852392ca60ee9cd55a4af6
-  data.tar.gz: d4823ef99f9c17c9ed9c3cc7037d4823b39914e7
+  metadata.gz: 62184798aa12d2608926e1b7d651656146274e1b
+  data.tar.gz: f0194127c6527aaf28de28272d929a16e62db2cf
 SHA512:
-  metadata.gz: b658bbbe5b8f28656bef50eddd9850fae492d82a82520b3071240ef9d369d736e016f9242272e3c9a0f781de4d56f000e18e4b3ffc32672919b86cd149d613d7
-  data.tar.gz: e39fda7430b47631c38f48880ad0caede6103ac825e718e48f457cece00f9fed7481c56a51d7a39b6e4ea42c4960993759ca730545ae7290f3468d52b10c6a36
+  metadata.gz: 5d79f930792405f66fa87d02b81c52b028939a817908f59f959d23ce49b33251d5a459452161731534bb974fbbf81ea160688f4545bd7af1f788a3199d7ee598
+  data.tar.gz: cdeae3d5cb65947f0f073d72ebdf285d97d4fc6f00553e922475bbdd108234e1efd3788d448a396e09d456079ee7bcdd61f46ef2c115b7d9e5d65c1b3259aa67

data/.rubocop.yml

@@ -10,3 +10,5 @@ Documentation:
   Enabled: false
 Style/EndOfLine:
   Enabled: false
+Metrics/MethodLength:
+  Max: 12

data/.travis.yml

@@ -4,7 +4,8 @@ bundler_args: --without yard guard benchmarks
 script: "rake spec"
 rvm:
   - 2.2.4
-  - 2.3.1
+  - 2.3.3
+  - 2.4.0
   - ruby-head
 matrix:
   allow_failures:

data/README.md

@@ -1,6 +1,8 @@
 # Capistrano::Chewy
 [![Gem Version](https://badge.fury.io/rb/capistrano-chewy.svg)](http://badge.fury.io/rb/capistrano-chewy)
 [![Build Status](https://travis-ci.org/nbulaj/capistrano-chewy.svg?branch=master)](https://travis-ci.org/nbulaj/capistrano-chewy)
+[![Dependency Status](https://gemnasium.com/nbulaj/capistrano-chewy.svg)](https://gemnasium.com/nbulaj/capistrano-chewy)
+[![Code Climate](https://codeclimate.com/github/nbulaj/capistrano-chewy/badges/gpa.svg)](https://codeclimate.com/github/nbulaj/capistrano-chewy)
 
 Manage and continuously rebuild your ElasticSearch indexes with [Chewy](https://github.com/toptal/chewy/) and [Capistrano](https://github.com/capistrano/capistrano) v3.
 
@@ -60,7 +62,7 @@ require 'capistrano/chewy'
 then you can use `cap -T` to list `Capistrano::Chewy` tasks:
 
 ```ruby
-cap chewy:rebuild            # Reset only modified Chewy indexes
+cap chewy:rebuild            # Reset modified and delete removed Chewy indexes
 cap chewy:reset              # Destroy, recreate and import data to all the indexes
 cap chewy:reset[indexes]     # Destroy, recreate and import data to the specified indexes
 cap chewy:update             # Updates data to all the indexes
@@ -72,21 +74,25 @@ If you want to change it, then you need to disable default gem hooks by setting
 
 ## Configuration
 
-You can setup the following:
+You can setup the following options:
 
 ```ruby
 # deploy.rb
-set :chewy_conditionally_reset, false     # Reset only modified Chewy indexes, true by default
-set :chewy_path, 'app/my_indexes'         # Path to Chewy indexes, 'app/chewy' by default
-set :chewy_env, :chewy_production         # Environment variable for Chewy, equal to RAILS_ENV by default
-set :chewy_role, :web                     # Chewy role, :app by default
-set :chewy_default_hooks, false           # Add default capistrano-chewy hooks to your deploy flow, true by default
-set :chewy_delete_removed_indexes, false  # Delete indexes which files have been deleted, true by default
+set :chewy_conditionally_reset, false    # Reset only modified Chewy indexes, true by default
+set :chewy_path, 'app/my_indexes'        # Path to Chewy indexes, 'app/chewy' by default
+set :chewy_env, :chewy_production        # Environment variable for Chewy, equal to RAILS_ENV by default
+set :chewy_role, :web                    # Chewy role, :app by default  
+set :chewy_default_hooks, false          # Add default gem hooks to project deploy flow, true by default
+set :chewy_delete_removed_indexes, false # Delete indexes which files have been deleted, true by default
 ```
 
 ## Contributing
 
-1. Fork it ( http://github.com/nbulaj/capistrano-chewy/fork )
+You are very welcome to help improve `Capistrano:Chewy` if you have suggestions for features that other people can use or some code improvements.
+
+To contribute:
+
+1. Fork the project( http://github.com/nbulaj/capistrano-chewy/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/capistrano-chewy/version.rb

@@ -6,7 +6,7 @@ module CapistranoChewy
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY = 1
+    TINY = 2
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/lib/capistrano/tasks/chewy.rake

@@ -40,46 +40,36 @@ namespace :chewy do
     end
   end
 
-  # Adds default Capistrano::Chewy hooks to the deploy flow
-  task :add_default_hooks do
-    after :'deploy:updated', 'chewy:rebuild'
-    after :'deploy:reverted', 'chewy:rebuild'
-  end
-
-  # Default Chewy rake tasks
-  desc 'Destroy, recreate and import data to all or specified (pass with [one,two]) indexes'
-  task :reset do |_task, args|
-    indexes = args.extras
-
+  def run_default_chewy_task(task_name, indexes)
     on roles fetch(:chewy_role) do
       within release_path do
         with rails_env: fetch(:chewy_env) do
           if indexes.any?
-            execute :rake, "chewy:reset[#{indexes.join(',')}]"
+            execute :rake, "chewy:#{task_name}[#{indexes.join(',')}]"
           else
             # Simply chewy:reset / chewy:update for Chewy > 0.8.4
-            execute :rake, 'chewy:reset:all'
+            execute :rake, "chewy:#{task_name}"
           end
         end
       end
     end
   end
 
+  # Adds default Capistrano::Chewy hooks to the deploy flow
+  task :add_default_hooks do
+    after :'deploy:updated', 'chewy:rebuild'
+    after :'deploy:reverted', 'chewy:rebuild'
+  end
+
+  # Default Chewy rake tasks
+  desc 'Destroy, recreate and import data to all or specified (pass with [one,two]) indexes'
+  task :reset do |_task, args|
+    run_default_chewy_task(:reset, args.extras)
+  end
+
   desc 'Updates data to all or specified (passed with [one,two]) indexes'
   task :update do |_task, args|
-    indexes = args.extras
-
-    on roles fetch(:chewy_role) do
-      within release_path do
-        with rails_env: fetch(:chewy_env) do
-          if indexes.any?
-            execute :rake, "chewy:update[#{indexes.join(',')}]"
-          else
-            execute :rake, 'chewy:update:all'
-          end
-        end
-      end
-    end
+    run_default_chewy_task(:update, args.extras)
   end
 
   # Smart rebuild of modified Chewy indexes
@@ -103,8 +93,8 @@ namespace :chewy do
           exit 1
         end
       else
-        info 'Running chewy:reset:all'
-        invoke :'chewy:reset:all'
+        info 'Running chewy:reset'
+        invoke :'chewy:reset'
       end
     end
   end
@@ -135,9 +125,7 @@ namespace :chewy do
         indexes_to_delete = changes.removed
 
         # Reset indexes which have been modified or added
-        if indexes_to_reset.any?
-          reset_modified_indexes(indexes_to_reset)
-        end
+        reset_modified_indexes(indexes_to_reset) if indexes_to_reset.any?
 
         # Delete indexes which have been removed
         if indexes_to_delete.any? && fetch(:chewy_delete_removed_indexes)

data/spec/diff_parser_spec.rb

@@ -1,24 +1,17 @@
 require 'spec_helper'
 
 describe CapistranoChewy::DiffParser do
-  let(:current_path) { '/project/1/app/chewy' }
-  let(:release_path) { '/project/2/app/chewy' }
-
-  # TODO: make a real diff
-  let(:full_diff) do
-    "Files #{current_path}/accounts_index.rb and #{release_path}/accounts_index.rb differ\n" \
-    "Files #{current_path}/posts_index.rb and #{release_path}/posts_index.rb differ\n" \
-    "Only in #{release_path}: applications_index.rb\n" \
-    "Files #{current_path}/comments_index.rb and #{release_path}/comments_index.rb differ\n" \
-    "Only in #{current_path}: users_index.rb\n"
-  end
+  let(:current_path) { File.expand_path('../stub/chewy_current', __FILE__) }
+  let(:release_path) { File.expand_path('../stub/chewy_release', __FILE__) }
+
+  let(:full_diff) { `diff -qZEB #{current_path} #{release_path}` }
 
   describe '#parse' do
     context 'with difference between directories' do
       it 'returns result object with removed, added and changed files' do
         result = described_class.parse(full_diff, current_path, release_path)
 
-        expect(result.changed).to eq(["#{release_path}/accounts_index.rb", "#{release_path}/posts_index.rb", "#{release_path}/comments_index.rb"])
+        expect(result.changed).to match_array(["#{release_path}/accounts_index.rb", "#{release_path}/posts_index.rb", "#{release_path}/comments_index.rb"])
         expect(result.added).to eq(["#{release_path}/applications_index.rb"])
         expect(result.removed).to eq(["#{current_path}/users_index.rb"])
 

data/spec/stub/chewy_current/accounts_index.rb

@@ -0,0 +1,2 @@
+class AccountsIndex < Chewy::Index
+end

data/spec/stub/chewy_current/comments_index.rb

@@ -0,0 +1,2 @@
+class CommentsIndex < Chewy::Index
+end

data/spec/stub/chewy_current/posts_index.rb

@@ -0,0 +1,2 @@
+class PostsIndex < Chewy::Index
+end

data/spec/stub/chewy_current/users_index.rb

@@ -0,0 +1,2 @@
+class UsersIndex < Chewy::Index
+end

data/spec/stub/chewy_release/accounts_index.rb

@@ -0,0 +1,3 @@
+class AccountsIndex < Chewy::Index
+  field :id
+end

data/spec/stub/chewy_release/applications_index.rb

@@ -0,0 +1,2 @@
+class ApplicationsIndex < Chewy::Index
+end

data/spec/stub/chewy_release/comments_index.rb

@@ -0,0 +1,3 @@
+class CommentsIndex < Chewy::Index
+  field :id
+end

data/spec/stub/chewy_release/posts_index.rb

@@ -0,0 +1,3 @@
+class PostsIndex < Chewy::Index
+  field :id
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-chewy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nikita Bulai
@@ -76,6 +76,14 @@ files:
 - lib/capistrano/tasks/chewy.rake
 - spec/diff_parser_spec.rb
 - spec/spec_helper.rb
+- spec/stub/chewy_current/accounts_index.rb
+- spec/stub/chewy_current/comments_index.rb
+- spec/stub/chewy_current/posts_index.rb
+- spec/stub/chewy_current/users_index.rb
+- spec/stub/chewy_release/accounts_index.rb
+- spec/stub/chewy_release/applications_index.rb
+- spec/stub/chewy_release/comments_index.rb
+- spec/stub/chewy_release/posts_index.rb
 homepage: https://github.com/nbulaj/capistrano-chewy
 licenses:
 - MIT
@@ -104,4 +112,11 @@ summary: Manage and continuously rebuild your ElasticSearch indexes with Chewy a
 test_files:
 - spec/diff_parser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/stub/chewy_current/accounts_index.rb
+- spec/stub/chewy_current/comments_index.rb
+- spec/stub/chewy_current/posts_index.rb
+- spec/stub/chewy_current/users_index.rb
+- spec/stub/chewy_release/accounts_index.rb
+- spec/stub/chewy_release/applications_index.rb
+- spec/stub/chewy_release/comments_index.rb
+- spec/stub/chewy_release/posts_index.rb