egads 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8348c5aca63c2325a8095c5fdda6e8c85b44641e04d447554d80a40b566d5101
-  data.tar.gz: 5b55d42a36076dccae4843a921f19f746838ff1803516ce36592321cd537b184
+  metadata.gz: '09258b7cad1e80200b4a8b3d6d47efffb9111f4fbe98ad5891d282db31f80e32'
+  data.tar.gz: ecded76960e9067e64730e6f2289635622a658b13d2ec8cd1c6a61b733882a20
 SHA512:
-  metadata.gz: 36a66fa1bd1420bca04a1ff0863da5cf779f81363131de3c20017c7e12cb8aa19fd4ebfc3167cc7f8abe4a224c76595cbdf7aeb4124641ab1113be235ff53498
-  data.tar.gz: d14ca2674e18202225343602e8efc30164998edfb5a5e2fa8996518624f1ce5a7da03261d0535d3928e6d6ba0bfbb96942ca7c7c0382512fb194ce4d8851a65e
+  metadata.gz: 9493f4ce2b5c34b24f3422a8aa076b7a77816b00db3140de4d0aea6c3f1c8b5e8ba71d349037980b309e530502b55e9211b32fc06275a61bf0bd9fea31eb7468
+  data.tar.gz: e9b3ed9c711f7b0f01e45cc2ffa8310e83a6747b20ab6f3edbdd656c9efba420c19722c9bdd4044531fd24ab39387f0dd923b8cddb00a9ab98b4bffcdf2f0462

data/.github/actions/setup-rubygems/action.yml

@@ -1,19 +1,18 @@
 name: Setup RubyGems
 description: Setup RubyGems credentials
 inputs:
-  rubygems_api_key:
+  api-key:
     description: RubyGems API key
     required: true
 runs:
   using: composite
   steps:
-    - run: mkdir -p ~/.gem
+    - name: setup rubygems
       shell: bash
-    - run: |
+      run: |
+        mkdir -p ~/.gem
         cat <<-YAML > ~/.gem/credentials
         ---
-        :rubygems_api_key: ${{ inputs.rubygems_api_key }}
+        :rubygems_api_key: ${{ inputs.api-key }}
         YAML
-      shell: bash
-    - run: chmod 0600 ~/.gem/credentials
-      shell: bash
+        chmod 0600 ~/.gem/credentials

data/.github/workflows/test-release.yml

@@ -2,6 +2,15 @@ name: Test and Release
 on:
   pull_request:
   push:
+    paths:
+      - .github/**
+      - bin/**
+      - lib/**
+      - spec/**
+      - Gemfile
+      - Guardfile
+      - Rakefile
+      - egads.gemspec
   release:
     types:
       - published
@@ -12,11 +21,10 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - "2.7"
-          - "3.1"
           - "3.2"
+          - "3.3"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
@@ -29,12 +37,12 @@ jobs:
       - test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "3.3"
       - uses: ./.github/actions/setup-rubygems
         with:
-          rubygems_api_key: ${{ secrets.RUBYGEMS_API_KEY }}
+          api-key: ${{ secrets.RUBYGEMS_API_KEY }}
       - run: bundle install
       - run: bundle exec rake gem:push

data/egads.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.rdoc_options      = ["--charset=UTF-8"]
 
   s.add_dependency "aws-sdk-s3", '~> 1.0'
-  s.add_dependency "rexml" # required for Ruby 3+
+  s.add_dependency "rexml", ">= 3.3.4" # required for Ruby 3+
   s.add_dependency "thor"
 
   s.add_development_dependency "rake"

data/lib/egads/command/extract.rb

@@ -3,6 +3,7 @@ module Egads
     include Thor::Actions
 
     desc "[remote, plumbing] Downloads tarball for SHA from S3 and extracts it to the filesystem"
+    class_option :deployment_id, type: :string, default: nil, banner: 'Append suffix to release directory'
     class_option :force, type: :boolean, aliases: '-f', default: false, banner: "Overwrite existing files"
     argument :sha, type: :string, required: true, desc: 'git SHA to download and extract'
 
@@ -89,7 +90,8 @@ module Egads
 
     # Directory created upon successful extraction
     def release_dir
-      RemoteConfig.release_dir(sha)
+      suffix = options[:deployment_id] ? "_#{options[:deployment_id]}" : ''
+      RemoteConfig.release_dir(sha) + suffix
     end
 
     # Directory where in-progress extraction occurs

data/lib/egads/command/release.rb

@@ -3,6 +3,7 @@ module Egads
     include Thor::Actions
 
     desc "[remote] Symlinks SHA to current and restarts services. If needed, stages SHA"
+    class_option :deployment_id, type: :string, default: nil, banner: 'Append suffix to release directory'
     class_option :force, type: :boolean, default: false, banner: "Overwrite existing release"
     argument :sha, type: :string, required: true, desc: 'git SHA to stage'
     def setup_environment
@@ -44,8 +45,10 @@ module Egads
     end
 
     protected
+    
     def dir
-      RemoteConfig.release_dir(sha)
+      suffix = options[:deployment_id] ? "_#{options[:deployment_id]}" : ''
+      RemoteConfig.release_dir(sha) + suffix
     end
 
     def release_to

data/lib/egads/command/stage.rb

@@ -2,8 +2,8 @@ module Egads
   class Stage < Group
     include Thor::Actions
 
-
     desc "[remote] Readies SHA for release. If needed, generates URL for SHA and extracts"
+    class_option :deployment_id, type: :string, default: nil, banner: 'Append suffix to release directory'
     class_option :force, type: :boolean, default: false, banner: "Overwrite existing files"
     argument :sha, type: :string, required: true, desc: 'git SHA to stage'
 
@@ -57,8 +57,10 @@ module Egads
     end
 
     protected
+    
     def dir
-      RemoteConfig.release_dir(sha)
+      suffix = options[:deployment_id] ? "_#{options[:deployment_id]}" : ''
+      RemoteConfig.release_dir(sha) + suffix
     end
 
     def stage_flag_path

data/lib/egads/version.rb

@@ -1,3 +1,3 @@
 module Egads
-  VERSION = '5.1.1'
+  VERSION = '5.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egads
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.4
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +92,6 @@ extra_rdoc_files:
 - README.md
 files:
 - ".github/actions/setup-rubygems/action.yml"
-- ".github/actions/test/action.yml"
 - ".github/workflows/test-release.yml"
 - ".gitignore"
 - Gemfile
@@ -150,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: Extensible Git Archive Deploy Strategy

data/.github/actions/test/action.yml

@@ -1,15 +0,0 @@
-name: Test
-description: Run tests
-inputs:
-  activesupport-version:
-    description: ActiveSupport version constraint
-    required: true
-runs:
-  using: composite
-  steps:
-    - run: bundle add activesupport -v '${{ inputs.activesupport-version }}'
-      shell: bash
-    - run: bundle install
-      shell: bash
-    - run: bundle exec rake
-      shell: bash