afterlife 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a748ce7d12a9ee07b9811468a33b25852ab857dc26e35af99ace77826f150c3
-  data.tar.gz: d969d2522b6cf783cb43426d3f8556ac5049f009fad5fba08b16065a91fd15cc
+  metadata.gz: 785bb4c634a1b73338a56cb64b6119389ca07904457159b14af3a00ad48869f0
+  data.tar.gz: 0f24b2547eb32ab72ae1807f2c5bcb813a5cc09f9dee589f6343bbd047c32c26
 SHA512:
-  metadata.gz: 873c5cfa91704940ccbc7fff7a70d339c9f73271c63ba60e2f2b7011e61d58b601595982027f26e94f006ece37f2abd4061ac05179ba0a0f7ed444ce21dfc735
-  data.tar.gz: 1e064e211cd77e8ae137e047eaa877b9174ba6098296c8723aa05d2a9f6bf7bc9268ffa8e43ea877e25b05613499588548e3ee09120e5702133ba380c1e04156
+  metadata.gz: 3ff42032daec81547cc0075ab8ed71d250b2cec8ac677383f6a9702e75124ebb27d173c085c8e5d155cfd9c0b63f49e79c3a7f35630de88424127816f3de4593
+  data.tar.gz: 48d016ace44ecc8f285eee917e6493766bc914adc324cc582f0e7a7c495fdc9ede0548f5c3529fb6ac296a2e529ed8b83a0208c5f9ae87e5d6d43eafad540afc

data/lib/afterlife/config/provider.rb

@@ -3,10 +3,6 @@
 module Afterlife
   module Config
     class Provider
-      def self.file
-        Afterlife.local_path.join('config.yml')
-      end
-
       def respond_to_missing?(sym, include_all)
         config.key?(sym) || super
       end
@@ -15,6 +11,12 @@ module Afterlife
         config.key?(sym) ? config[sym] : super
       end
 
+      def file_exist?
+        return @file_exist if defined?(@file_exist)
+
+        @file_exist ||= file.exist?
+      end
+
       def stages
         @stages ||= config.delete(:stages)&.to_h do |name, val|
           [name, Stage.new(val.merge(name: name.to_s))]
@@ -24,7 +26,28 @@ module Afterlife
     private
 
       def config
-        @config ||= YAML.load_file(Provider.file).deep_symbolize_keys
+        @config ||= !file_exist? && default_config
+        @config ||= YAML.load_file(file).deep_symbolize_keys
+      end
+
+      def default_config
+        {
+          credentials: {
+            aws: {
+              profile: ENV.fetch('AWS_PROFILE', nil),
+            },
+          },
+          stages: {},
+        }
+      end
+
+      def file
+        Pathname(
+          ENV.fetch(
+            'AFTERLIFE_CONFIG_PATH',
+            Afterlife.local_path.join('config.yml'),
+          ),
+        )
       end
     end
   end

data/lib/afterlife/deploy/cdn_deployment.rb

@@ -12,12 +12,14 @@ module Afterlife
       end
 
       def setup
-        repo.env.merge!(
-          'AWS_PROFILE' => Afterlife.config.credentials.dig(:aws, :profile),
+        # only use the defined AWS_PROFILE if its not already been defined
+        repo.env.set(
+          'AWS_PROFILE' => Afterlife.config&.credentials&.dig(:aws, :profile),
           'AWS_BUCKET' => Afterlife.current_stage.bucket,
           'AWS_REGION' => Afterlife.current_stage.region,
-          'S3_FULL_PATH' => s3_full_path,
         )
+        # in nested deployments we need the current path, not the parent's
+        repo.env.set!('S3_FULL_PATH' => s3_full_path)
       end
 
       def initial_message
@@ -33,14 +35,12 @@ module Afterlife
 
       def commands
         [
-          repo_command || javascripts,
-          revision,
-        ].flatten
+          repo_command || upload_javascripts,
+          upload_revision,
+        ]
       end
 
-      def javascripts
-        # by default we use no-cache, if something else is needed
-        # do it in the deploy.command option
+      def upload_javascripts
         <<-BASH
           aws s3 sync
             %<DIST_PATH>s
@@ -52,7 +52,7 @@ module Afterlife
         BASH
       end
 
-      def revision
+      def upload_revision
         <<-BASH
           echo "#{repo.current_revision}" |
             aws s3 cp --content-type text/plain --cache-control 'no-cache' - #{s3_revision_path}

data/lib/afterlife/deploy/cdn_stenciljs_deployment.rb

@@ -7,19 +7,31 @@ module Afterlife
 
       def commands
         [
-          add_revision_command,
-          repo_command || javascripts,
-          revision,
+          repo_command || [upload_parts, upload_esm],
+          upload_revision,
         ]
       end
 
-      def add_revision_command
-        Dir["#{repo.dist_path}/*.esm.js"].map do |file|
-          next if file.include?(repo.current_revision)
+      def upload_parts
+        <<-BASH
+          aws s3 sync
+            %<DIST_PATH>s
+            %<S3_FULL_PATH>s
+            --exclude '*.ts'
+            --exclude '*.tsx'
+            --exclude '*.esm.js'
+            --size-only
+            --cache-control 'public, max-age=31540000'
+        BASH
+      end
 
-          new_name = file.gsub('.esm.js', "-#{repo.current_revision}.esm.js")
-          "mv #{file} #{new_name}"
-        end
+      def upload_esm
+        <<-BASH
+          aws s3 cp
+            --cache-control 'public, max-age=31540000'
+            #{repo.dist_path}/#{repo.name}.esm.js
+            #{s3_full_path}/#{repo.name}-#{repo.current_revision}.esm.js
+        BASH
       end
 
       def s3_full_path

data/lib/afterlife/deploy/cli.rb

@@ -18,7 +18,7 @@ module Afterlife
           say_status 'Deployed', deployment.output
           run_after_hooks
         end
-      rescue Deploy::Error => e
+      rescue Deploy::Error, Afterlife::Error => e
         fatal!(e.message)
       end
 

data/lib/afterlife/deploy.rb

@@ -8,7 +8,7 @@ module Afterlife
 
     def call(stage)
       deployment = klass.new
-      setup_stage(stage)
+      Afterlife.current_stage = find_stage(stage)
       fill_env
       deployment.setup
       yield deployment
@@ -28,16 +28,19 @@ module Afterlife
       end
     end
 
-    def setup_stage(stage)
+    def find_stage(stage)
+      return Stage.build(stage) unless Afterlife.config.file_exist?
+
       unless Afterlife.config.stages.key?(stage.to_sym)
         fail Error, "invalid stage '#{stage}'. Possible values: #{Afterlife.config.stages.keys.map(&:to_s)}"
       end
 
-      Afterlife.current_stage = Afterlife.config.stages[stage.to_sym]
+      Afterlife.config.stages[stage.to_sym]
     end
 
     def fill_env
-      Afterlife.current_repo.env.merge!(
+      # in nested deployments we need the current definition, not the parent's
+      Afterlife.current_repo.env.set!(
         'DIST_PATH' => Afterlife.current_repo.dist_path.to_s,
         'CURRENT_BRANCH' => Afterlife.current_repo.current_branch,
         'AFTERLIFE_STAGE' => Afterlife.current_stage.name,

data/lib/afterlife/environment.rb

@@ -5,7 +5,7 @@ module Afterlife
     attr_reader :repo, :env
 
     def self.from(repo)
-      env = new(repo).tap(&:call).env
+      env = new(repo).tap(&:call)
       yield env if block_given?
       env
     end
@@ -33,6 +33,20 @@ module Afterlife
       @env_hash ||= repo.conf.dig(:deploy, :env)
     end
 
+    # soft set, do not override existent ENVs
+    def set(arg)
+      arg.each do |k, v|
+        @env[k] ||= ENV.fetch(k, v)
+      end
+    end
+
+    # forces to be exactly dthe value
+    def set!(arg)
+      arg.each do |k, v|
+        @env[k] = v
+      end
+    end
+
   private
 
     def from_flat_envs

data/lib/afterlife/exec.rb

@@ -26,18 +26,22 @@ module Afterlife
     def run
       parsed_commands.each do |command|
         Afterlife.cli.log_info(command) if Afterlife.cli.options['verbose']
-        system(repo.env, command.squish, exception: true) unless Afterlife.cli.options['dry-run']
+        system(env_hash, command.squish, exception: true) unless Afterlife.cli.options['dry-run']
       end
     rescue RuntimeError => e
       raise Error, e
     end
 
     def parsed_commands
-      Exec.parse(commands, repo.env)
+      Exec.parse(commands, env_hash)
     end
 
     def repo
       Afterlife.current_repo
     end
+
+    def env_hash
+      repo.env.env
+    end
   end
 end

data/lib/afterlife/repo.rb

@@ -79,7 +79,7 @@ module Afterlife
     end
 
     def name
-      full_name.split('/').last.gsub('-', '_')
+      full_name.split('/').last
     end
 
     def full_name

data/lib/afterlife/stage.rb

@@ -7,5 +7,14 @@ module Afterlife
     :region,
     :cdn_url,
     keyword_init: true,
-  )
+  ) do
+    def self.build(name = nil)
+      Stage.new(
+        name: ENV.fetch('AFTERLIFE_STAGE', name),
+        bucket: ENV.fetch('AWS_BUCKET', nil),
+        region: ENV.fetch('AWS_REGION'),
+        cdn_url: ENV.fetch('AWS_BUCKET', nil),
+      )
+    end
+  end
 end

data/lib/afterlife/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Afterlife
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afterlife
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Genaro Madrid
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-16 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport