sidekiq-redeploy 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b4a9ea82326d3303e7b62977a3a124415b5b763ad3ab12e952fff7464794910
-  data.tar.gz: 9b876740e30131c3c6c4c3da743d04cb5922e616af690b1ad6561bb716e2e973
+  metadata.gz: 4846529f831b6909a77f634fc6d2a6d609f27b76dc246d9bd9b86f672c845473
+  data.tar.gz: 1c6be4dd5ab63bad179a79dc78f2f35b30d0217541dbc8b6ba1628b7b2666530
 SHA512:
-  metadata.gz: 28ac5b4d9853c1538e1db4a98144280d2814d3a3799a3e3e0297db54b470e2cc13b9c721e7d0cf0c8a37cc23b764581fa6206e524eb973b5b3633934b7aff4c1
-  data.tar.gz: a7699606e5abba66b5d2ef82b11317de3ece6042234ab45d1491b61ab8e2ceec1fcfa7c9d71a79c6242405fe773b21e0b16b73e46c221a465b65ace4c296589d
+  metadata.gz: 9b654d56b304df4e9ac06de82eab2a0e6d520117723eedb3963bc78264a29a70e61a0e905dc0bb9de4802c83590fd93dfb23159c9bb7d139fa10d1ea37c0adda
+  data.tar.gz: bde4d63c634473677361bea5ccc8d61765caedea3366fd35b99fc89d889a816e7d68c4eea38e04e6c31677015a648117f733c557eb80c8285d4fc126575b7719

data/.rubocop.yml

@@ -22,7 +22,7 @@ Metrics/ClassLength:
   Max: 140
 
 Metrics/AbcSize:
-  Max: 20
+  Max: 30
 
 RSpec/NestedGroups:
   Max: 4

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v0.2.0
+
+**Fixes and enhancements:**
+
+- Fix the order when running commands to run after unzip archive. Also bump to 0.2.0
+
+## v0.1.10
+
+**Fixes and enhancements:**
+
+- Add support to run commands prior to redeploy using a yaml watch file. This is useful for running a migration or bundle gems.
+
 ## v0.1.9
 
 **Fixes and enhancements:**

data/README.md

@@ -43,9 +43,31 @@ Usage: sidekiq-loader [options]
     -n, --num-procs INTEGER          [Optional] Specify the number of sidekiq processes to create. Defaults to 1.
 ```
 
-For example this will start the launcher using a S3 watch file.
+The watch file can contain an optional list of commands to run and the required archive_location. The archive_location can be a file path or S3 URL
+For example when using a file:
+```yaml
+---
+commands:
+  - bundle 
+archive_location: /app/pkg/test_app_0.0.3.zip
+```
+
+For example when using S3:
+```yaml
+---
+commands:
+  - bundle 
+archive_location: s3://puma-test-app-archives/test_app_0.0.3.zip
+```
+
+For example this will start the launcher using a S3 yaml watch file.
+```shell
+bundle exec sidekiq-loader -a /app -w s3://puma-test-app-archives/watch.yml
+```
+
+For example this will start the launcher using a local yaml watch file.
 ```shell
-bundle exec sidekiq-loader -a /app -w s3://puma-test-app-archives/watch.me
+bundle exec sidekiq-loader -a ./ -s ./lib/sidekiq_server.rb -w build/pkg/watch.yml
 ```
 
 In the example above the `watch.me` contents would look like the following. In this case the `test_app_0.0.3.zip` must exist in the `puma-test-app-archives` S3 bucket.

data/bin/sidekiq-loader

@@ -9,8 +9,12 @@ require 'optparse'
 def run_sidekiq(ops, logger)
   deployer = Puma::Redeploy::DeployerFactory.create(target: ops[:app_dir], watch_file: ops[:watch], logger:)
 
+  watch_file_data = deployer.watch_file_data
+
+  archive_file = deployer.archive_file(watch_file_data[:archive_location])
+
   # Load app archive on launch
-  deployer.deploy(source: deployer.archive_file) if ops[:deploy]
+  deployer.deploy(source: archive_file) if ops[:deploy]
   config = { watch_delay: ops[:watch_delay] }
 
   Sidekiq::Redeploy::Loader.new(deployer:, logger:, sidekiq_app: ops[:sidekiq_app], config:,

data/lib/sidekiq/redeploy/loader.rb

@@ -60,7 +60,17 @@ module Sidekiq
         loop do
           sleep(loop_delay)
           if needs_redeploy?
-            reload_app { deployer.deploy(source: deployer.archive_file) }
+            reload_app do
+              watch_file_data = deployer.watch_file_data
+
+              archive_file = deployer.archive_file(watch_file_data[:archive_location])
+
+              logger.info "Sidekiq restart begin file=#{deployer.watch_file} archive=#{archive_file}"
+
+              deployer.deploy(source: archive_file)
+
+              Puma::Redeploy::CommandRunner.new(commands: watch_file_data[:commands], logger:).run
+            end
           elsif reload_sidekiq
             reload_app
           end

data/lib/sidekiq/redeploy/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Redeploy
-    VERSION = '0.1.9'
+    VERSION = '0.2.0'
   end
 end

data/sidekiq-redeploy.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'bin'
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'puma-redeploy', '~> 0.3.3'
+  spec.add_dependency 'puma-redeploy', '~> 0.4.0'
   spec.add_dependency 'sidekiq', '>= 6', '< 8'
 
   spec.metadata['rubygems_mfa_required'] = 'true'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-redeploy
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - tbeauvais
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma-redeploy
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement