dcs-best-practices 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65d3640d185d9862b93c349e9dc0348792f66a52210c156659e55e266860ddd3
-  data.tar.gz: 222cb4bd0306524531e8e3be41d5d7ce31d7a00baad00f6a1cc8e0384c65672f
+  metadata.gz: 94702c111325b55e95b70abca84e5eb8b8dd3e5a785de59f44dca319108f9b60
+  data.tar.gz: 94ccec43f7d08bb9691104ac9078bec79444fb97001d62fb47f841f62acbe478
 SHA512:
-  metadata.gz: 890c674b0783ef8bf32d39f27159689a7ed90bb8189f2240b878801ea4499bd5d31010ba2998b950593d504315308394936f66c35c24dccca05486bba7d9d0c5
-  data.tar.gz: 5e9fb115016fe0df91ffbbd624665b4a0224edc2a3750ce6d5ac6d2fdb37fc82e97a7df36bc8526ddd18c8ac0e92c8108b31b4665318ddf8b4197d6c5eb1fba7
+  metadata.gz: 74e6569ce7900907b9dcef60464728f100c393a09cf00dbfbd73f791288104579c1cc459ac3ef5e3126b94fd925eac8865f4beb46a7167e9cee7d70cfb7c8f5a
+  data.tar.gz: b5c15ce312e4225ae367eb68f9b6ab05ec72448bc8c931795224305df1d1545cecfc5b074b93680c66fcf29f8f6d6a218735d97539af8a478d4eceed8bfe6a94

data/dcs-best-practices.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capistrano-rails', '~> 1.4', '>= 1.4.0'
   spec.add_dependency 'capistrano-rails-console', '~> 2.3', '>= 2.3.0'
   spec.add_dependency 'capistrano-rvm', '~> 0.1', '>= 0.1.0'
+  spec.add_dependency 'capistrano-sidekiq', '~> 1.0', '>= 1.0.0'
   spec.add_dependency 'capistrano3-puma', '~> 4.0', '>= 4.0.0'
   spec.add_dependency 'figaro', '~> 1.1', '>= 1.1.1'
   spec.add_dependency 'puma', '~> 4.1', '>= 4.1.0'

data/lib/capistrano/dcs/defaults.rb

@@ -30,10 +30,6 @@ namespace :load do
 
     set :assets_roles,          %i[web app db]
 
-    set :sidekiq_start_cmd,     "cd #{fetch(:deploy_to)}/current; #{fetch(:bundle_cmd)} exec sidekiq " \
-                                '--index 0 -C config/sidekiq.yml --environment production --daemon'
-    set :sidekiq_stop_cmd,      "kill -QUIT `cat #{fetch(:sidekiq_pid)}`"
-
     after 'deploy:publishing',  'puma:restart'
   end
 end

data/lib/dcs_best_practices/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DCSBestPractices
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/generators/dcs/templates/deploy/Capfile.tt

@@ -8,6 +8,7 @@ require 'capistrano/rails/migrations'
 require 'capistrano/rails/assets'
 require 'capistrano/puma'
 require 'capistrano/rails/console'
+require 'capistrano/sidekiq'
 require 'airbrussh/capistrano'
 require 'capistrano/dcs'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dcs-best-practices
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - DarkWater
@@ -190,6 +190,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: capistrano-sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: capistrano3-puma
   requirement: !ruby/object:Gem::Requirement
@@ -333,11 +353,9 @@ files:
 - lib/capistrano/dcs/assets.rb
 - lib/capistrano/dcs/defaults.rb
 - lib/capistrano/dcs/remote.rb
-- lib/capistrano/dcs/sidekiq.rb
 - lib/capistrano/dcs/ssh.rb
 - lib/capistrano/tasks/assets.cap
 - lib/capistrano/tasks/remote.cap
-- lib/capistrano/tasks/sidekiq.cap
 - lib/capistrano/tasks/ssh.cap
 - lib/dcs-best-pratices.rb
 - lib/dcs_best_practices/version.rb

data/lib/capistrano/dcs/sidekiq.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-load File.expand_path('../tasks/sidekiq.cap', __dir__)

data/lib/capistrano/tasks/sidekiq.cap

@@ -1,22 +0,0 @@
-namespace :sidekiq do
-  desc 'Sidekiq start'
-  task :start do
-    on roles(:app, :web) do
-      execute "#{fetch(:sidekiq_start_cmd)}"
-    end
-  end
-
-  desc 'Sidekiq Stop'
-  task :stop do
-    on roles(:app, :web) do
-      execute "#{fetch(:sidekiq_stop_cmd)}"
-    end
-  end
-
-  desc 'Sidekiq restart'
-  task :restart do
-    on roles(:app, :web) do
-      execute "#{fetch(:sidekiq_stop_cmd)}; sleep 5; #{fetch(:sidekiq_start_cmd)}"
-    end
-  end
-end