puma-redeploy 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ed0d1a89c2ce26afe253893f3a716e346edb7b7bfe109c0acf6c1cc2599db23
-  data.tar.gz: 39a7a76965ca098d9dcfb0586d5d96f3c47326fafd4aa22b3a6a9f68d7358e4b
+  metadata.gz: 438b5a1a33d18652f621427ffcee0dab9a5ed4a867786e3a36300bf573441d0c
+  data.tar.gz: 477f2d13c06ec397c884714756154d23585f97fb5612d2105fb4f700b2c1a9de
 SHA512:
-  metadata.gz: dfd1f53e8d88ea177310c7797428f924ac4b865dcce699a6f299be86510a6d1b702b86fbc934cba9c727f3df6a2834194c6ecfde4b113b7a0ebf845b264989fc
-  data.tar.gz: c9bd80080b88819fbd3a03ec49cd8649fa80dbc6b10d15d2a2f063b97ed74aabb276aac02df48a6a1744033af0240be17ca95ef6b85a88626ff65f306e638575
+  metadata.gz: 00df55137d4a94b9dde2c1b59060fb2a2e3fed0a07f281fe2fc323c878d79a24026ddec962110c42f15372b991b81d10953145948e16102e3eaf260f6348a503
+  data.tar.gz: 457965823bad1a219663774a4ad9dfb16e91993e86a744c768c3eeb90b5b0d2af438d17837c6cf58d216e15b77803e653d4fc6bd6c6c6eb625f56406e8b4c3ef

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 
-## v0.3.x (NEXT)
+## v0.3.2
+
+**Fixes and enhancements:**
+
+- Improve s3 error handling
+
+## v0.3.1
+
+**Fixes and enhancements:**
+
+- Allow watch file to not exist
 
 
 ## v0.3.0

data/Gemfile

@@ -4,3 +4,12 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in puma-redeploy.gemspec
 gemspec
+
+gem 'rake', '~> 13.0.6'
+gem 'rspec', '~> 3.12.0'
+gem 'rubocop', '~> 1.43'
+gem 'rubocop-performance', '~> 1.15'
+gem 'rubocop-rake', '~> 0.6.0'
+gem 'rubocop-rspec', '~> 2.17'
+gem 'rubocop-thread_safety', '~> 0.4.4'
+gem 'timecop', '~> 0.9.6'

data/README.md

@@ -16,6 +16,7 @@ Key Points:
 
 Example application can be found [here](https://github.com/tbeauvais/puma-redeploy-test-app)
 
+Also see the [sidekiq-redeploy](https://github.com/tbeauvais/sidekiq-redeploy) gem.
 
 ## Installation
 
@@ -75,7 +76,7 @@ Usage: archive-loader [options]. Used to load the archive prior to starting the
 
 For example this will fetch and unzip the application archive and then start puma.
 ```shell
-archive-loader /app /app/pkg/watch.me && bundle exec puma -C config/puma.rb
+archive-loader -a /app -w /app/pkg/watch.me && bundle exec puma -C config/puma.rb
 ```
 
 ## Development

data/lib/puma/redeploy/s3_handler.rb

@@ -18,6 +18,8 @@ module Puma
 
       def archive_file
         s3_url = read_watch_object
+        return unless s3_url
+
         archive_bucket_name, archive_object_key = s3_object_reference(s3_url)
 
         response = s3_client.get_object(bucket: archive_bucket_name, key: archive_object_key)
@@ -26,6 +28,8 @@ module Puma
         # Write the object data to a local file
         File.binwrite(file_name, response.body.read)
         file_name
+      rescue StandardError => e
+        logger.warn "Error reading fetching archive file for #{s3_url}. Error:#{e.message}"
       end
 
       private
@@ -44,6 +48,8 @@ module Puma
         object = s3_client.get_object(bucket: bucket_name, key: object_key)
 
         object.body.read.strip
+      rescue StandardError => e
+        logger.warn "Error reading url from  watch file #{bucket_name}/#{object_key}. Error:#{e.message}"
       end
 
       def touched_at
@@ -55,6 +61,9 @@ module Puma
           logger.info "The S3 object #{bucket_name}/#{object_key} does not exist"
           0
         end
+      rescue StandardError => e
+        logger.warn "Error accessing the S3 object #{bucket_name}/#{object_key}. Error:#{e.message}"
+        0
       end
     end
   end

data/lib/puma/redeploy/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module Redeploy
-    VERSION = '0.3.0'
+    VERSION = '0.3.2'
   end
 end

data/lib/puma/redeploy/zip_deployer.rb

@@ -12,6 +12,8 @@ module Puma
       end
 
       def deploy(source:)
+        return unless source
+
         Dir.chdir(@target) do
           stdout, stderr, status = Open3.capture3("unzip -o -K #{source}")
           @logger.info "stdout: #{stdout}"

data/puma-redeploy.gemspec

@@ -32,13 +32,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'aws-sdk-s3', '~> 1.120.0'
 
-  spec.add_development_dependency 'rake', '~> 13.0.6'
-  spec.add_development_dependency 'rspec', '~> 3.12.0'
-  spec.add_development_dependency 'rubocop', '~> 1.43'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.15'
-  spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.17'
-  spec.add_development_dependency 'rubocop-thread_safety', '~> 0.4.4'
-  spec.add_development_dependency 'timecop', '~> 0.9.6'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-redeploy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - tbeauvais
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -24,118 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.120.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.6
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.12.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.43'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.43'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.17'
-- !ruby/object:Gem::Dependency
-  name: rubocop-thread_safety
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.4
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.6
 description: Puma plugin to redeploy and reload app from a remote artifact. This will
   detect app changes, once detected a new artifact will be pulled and the app will
   be reloaded.