afterlife 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad1fcadc1d4fa02e309f7fbffe6e10f1538844dd956381aec84dca99c075b336
-  data.tar.gz: 4885395894cd313ddf440595c5c635733ce3a772d80f2d21756d2a15f424a551
+  metadata.gz: ed6b64b46c70114724bb7961af7c384c079bc7917a69e83a3c4f5dce62152ecc
+  data.tar.gz: 8da0219c81a43ac90190721388bc5cc4afc685ec377caebe8a8ab04331fe3df0
 SHA512:
-  metadata.gz: '082b695c397a910107fea5a286e6d6179be4495670a96f550b881e831cee537726d9655be034e77fd4b9f4bb489f071d5974279ac4b80fcdb3aeb905218a98cc'
-  data.tar.gz: 3301a025549f4a02582ac27151a33193447137d80809c90122031cd1f0727d3bf3bb8e197a0bb0480acdee4e8c2900a6bdf409e1efa358f3b6db9d8af9c9f54d
+  metadata.gz: 2fbb65c54f1e464917dab23183f6e376cd594de9de50aa9462225f06285234759cc6ec6092f164a2dc674426ad674938d2d03d958195bc2286de6dad470833d8
+  data.tar.gz: c57a701252b3b7c919a45c4164c26d5ce10086f55f222d66bf0afe8592dacb28875ffadf69d04a10d021b5530c36daf36d5c18a5f309e50e3e24001a8da50cb7

data/lib/afterlife/cli.rb

@@ -22,21 +22,8 @@ module Afterlife
       log_success 'afterlife is ready!'
     end
 
-    desc 'config <path>', 'get config options'
-    def config(path) # rubocop:disable Metrics/MethodLength
-      path = path.split('.').map(&:to_sym)
-      result = repo.conf.dig(*path)
-      case result
-      when Hash
-        say JSON.generate(result)
-      when Array
-        result.each do |item|
-          say item
-        end
-      else
-        say result
-      end
-    end
+    desc 'config', 'Repo configuration options'
+    subcommand 'config', Config::Cli
 
     desc 'cdn', 'CDN stuff'
     subcommand 'cdn', Cdn::Cli
@@ -49,6 +36,8 @@ module Afterlife
     option :yes, type: :boolean
     def deploy(stage)
       invoke Deploy::Cli, :call, [stage], options
+    rescue Deploy::Error
+      fatal!(e.message)
     rescue Interrupt
       log_interrupted
     end

data/lib/afterlife/config/cli.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Afterlife
+  module Config
+    class Cli < Thor
+      include BaseCli
+      def self.exit_on_failure?
+        true
+      end
+
+      desc 'get <path>', 'get config path'
+      def get(path)
+        Repo::Config.read(path) do |value|
+          say value
+        end
+      rescue Repo::Config::Error => e
+        fatal!(e.message)
+      end
+    end
+  end
+end

data/lib/afterlife/config/provider.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+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
+
+      def method_missing(sym, *args, &block)
+        config.key?(sym) ? config[sym] : super
+      end
+
+      def stages
+        @stages ||= config.delete(:stages)&.to_h do |name, val|
+          [name, Stage.new(val.merge(name: name.to_s))]
+        end
+      end
+
+    private
+
+      def config
+        @config ||= YAML.load_file(Provider.file).deep_symbolize_keys
+      end
+    end
+  end
+end

data/lib/afterlife/config.rb

@@ -1,29 +1,6 @@
 # frozen_string_literal: true
 
 module Afterlife
-  class Config
-    def self.file
-      Afterlife.local_path.join('config.yml')
-    end
-
-    def respond_to_missing?(sym, include_all)
-      config.key?(sym) || super
-    end
-
-    def method_missing(sym, *args, &block)
-      config.key?(sym) ? config[sym] : super
-    end
-
-    def stages
-      @stages ||= config.delete(:stages)&.to_h do |name, val|
-        [name, Stage.new(val.merge(name: name.to_s))]
-      end
-    end
-
-  private
-
-    def config
-      @config ||= YAML.load_file(Config.file).deep_symbolize_keys
-    end
+  module Config
   end
 end

data/lib/afterlife/deploy/cdn_deployment.rb

@@ -48,18 +48,23 @@ module Afterlife
             --exclude '*.ts'
             --exclude '*.tsx'
             --size-only
-            --cache-control 'no-cache'
+            --cache-control 'public, max-age=31540000'
         BASH
       end
 
       def revision
         <<-BASH
-          echo "#{repo.current_revision}" | aws s3 cp --content-type text/plain --cache-control 'no-cache' - %<S3_FULL_PATH>s/revision
+          echo "#{repo.current_revision}" |
+            aws s3 cp --content-type text/plain --cache-control 'no-cache' - #{s3_revision_path}
         BASH
       end
 
+      def s3_revision_path
+        "s3://#{Afterlife.current_stage.bucket}/#{repo.full_name}/revision"
+      end
+
       def s3_full_path
-        "s3://#{Afterlife.current_stage.bucket}/#{repo.full_name}"
+        "s3://#{Afterlife.current_stage.bucket}/#{repo.full_name}/#{repo.current_revision}"
       end
     end
   end

data/lib/afterlife/deploy/cdn_stenciljs_deployment.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Afterlife
+  module Deploy
+    class CdnStenciljsDeployment < CdnDeployment
+    private
+
+      def commands
+        [
+          add_revision_command,
+          repo_command || javascripts,
+          revision,
+        ]
+      end
+
+      def add_revision_command
+        Dir["#{repo.dist_path}/*.esm.js"].map do |file|
+          next if file.include?(repo.current_revision)
+
+          new_name = file.gsub('.esm.js', "-#{repo.current_revision}.esm.js")
+          "mv #{file} #{new_name}"
+        end
+      end
+
+      def s3_full_path
+        "s3://#{Afterlife.current_stage.bucket}/#{repo.full_name}"
+      end
+    end
+  end
+end

data/lib/afterlife/deploy/deployment.rb

@@ -8,7 +8,7 @@ module Afterlife
       end
 
       def repo_command
-        Array(repo.conf.dig(:deploy, :command))
+        Array(repo.conf.dig(:deploy, :command)).presence
       end
 
       def setup; end

data/lib/afterlife/deploy.rb

@@ -16,12 +16,10 @@ module Afterlife
     end
 
     def klass
-      case current_type
-      when 'cdn'
-        CdnDeployment
-      else
-        CustomDeployment
-      end
+      klass = "#{current_type.gsub('-', '_')}_deployment".classify
+      fail Error, "deployment type '#{current_type}' is invalid" unless const_defined?(klass)
+
+      const_get(klass)
     end
 
     def current_type
@@ -32,8 +30,9 @@ module Afterlife
 
     def setup_stage(stage)
       unless Afterlife.config.stages.key?(stage.to_sym)
-        fatal!("invalid stage '#{stage}'. Possible values: #{Afterlife.config.stages.keys.map(&:to_s)}")
+        fail Error, "invalid stage '#{stage}'. Possible values: #{Afterlife.config.stages.keys.map(&:to_s)}"
       end
+
       Afterlife.current_stage = Afterlife.config.stages[stage.to_sym]
     end
 

data/lib/afterlife/exec.rb

@@ -12,7 +12,7 @@ module Afterlife
     end
 
     def self.parse(arg, env)
-      Array(arg).map do |command|
+      Array(arg.flatten.compact).flatten.map do |command|
         format(command, env.symbolize_keys)
       end
     end

data/lib/afterlife/repo/config.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Afterlife
+  class Repo
+    class Config
+      Error = Class.new StandardError
+
+      attr_reader :path
+
+      def self.read(path, &block)
+        new(path).read(&block)
+      end
+
+      def initialize(path)
+        @path = path.split('.').map(&:to_sym)
+      end
+
+      def read(&block) # rubocop:disable Metrics/MethodLength
+        case from_yml
+        when Hash
+          yield(JSON.generate(from_yml))
+        when Array
+          from_yml.each(&block)
+        when String, Symbol
+          yield(from_yml)
+        else
+          fail Error, "No config with path '#{path.join('.')}'" unless repo_method?
+
+          yield(repo.public_send(repo_method))
+        end
+      end
+
+    private
+
+      def repo_method?
+        path.count == 1 && repo.public_methods(false).include?(repo_method)
+      end
+
+      def repo_method
+        @repo_method ||= path.first.to_s.gsub('-', '_').to_sym
+      end
+
+      def repo
+        Afterlife.current_repo
+      end
+
+      def from_yml
+        return @from_yml if defined?(@from_yml)
+
+        @from_yml ||= repo.conf.dig(*path)
+      end
+    end
+  end
+end

data/lib/afterlife/repo/provider.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Afterlife
+  class Repo
+    class Provider
+      CONFIG_NAME = '.afterlife.yml'
+
+      attr_reader :full_path
+
+      def initialize(full_path)
+        @full_path = full_path
+      end
+
+      def config
+        return @config if defined?(@config)
+
+        if config_file.exist?
+          @config = base_config
+          @config = parent.deep_merge(base_config) if parent
+        end
+
+        @config ||= {}
+      end
+
+    private
+
+      def parent
+        return @parent if defined?(@parent)
+
+        inherit_from = base_config.delete(:inherit_from)
+        return @parent = nil unless inherit_from
+
+        @parent = Provider.new(full_path.join(inherit_from)).config
+        @parent[:cdn]&.delete(:packages)
+        @parent
+      end
+
+      def base_config
+        @base_config ||= YAML.load_file(config_file).deep_symbolize_keys
+      end
+
+      def config_file
+        @config_file ||= full_path.join(CONFIG_NAME)
+      end
+    end
+  end
+end

data/lib/afterlife/repo.rb

@@ -74,6 +74,10 @@ module Afterlife
       @current_revision ||= `git rev-parse HEAD`.chomp
     end
 
+    def current_revision_short
+      @current_revision_short ||= `git rev-parse --short HEAD`.chomp
+    end
+
     def name
       full_name.split('/').last.gsub('-', '_')
     end
@@ -110,49 +114,7 @@ module Afterlife
     end
 
     def conf
-      @conf ||= Config.new(full_path).config
-    end
-
-    class Config
-      CONFIG_NAME = '.afterlife.yml'
-
-      attr_reader :full_path
-
-      def initialize(full_path)
-        @full_path = full_path
-      end
-
-      def config
-        return @config if defined?(@config)
-
-        if config_file.exist?
-          @config = base_config
-          @config = parent.deep_merge(base_config) if parent
-        end
-
-        @config ||= {}
-      end
-
-    private
-
-      def parent
-        return @parent if defined?(@parent)
-
-        inherit_from = base_config.delete(:inherit_from)
-        return @parent = nil unless inherit_from
-
-        @parent = Config.new(full_path.join(inherit_from)).config
-        @parent[:cdn]&.delete(:packages)
-        @parent
-      end
-
-      def base_config
-        @base_config ||= YAML.load_file(config_file).deep_symbolize_keys
-      end
-
-      def config_file
-        @config_file ||= full_path.join(CONFIG_NAME)
-      end
+      @conf ||= Provider.new(full_path).config
     end
   end
 end

data/lib/afterlife/version.rb

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

data/lib/afterlife.rb

@@ -26,7 +26,7 @@ module Afterlife
   end
 
   def self.config
-    @config ||= Config.new
+    @config ||= Config::Provider.new
   end
 
   def self.current_repo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afterlife
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Genaro Madrid
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,8 +122,11 @@ files:
 - lib/afterlife/cdn/server.rb
 - lib/afterlife/cli.rb
 - lib/afterlife/config.rb
+- lib/afterlife/config/cli.rb
+- lib/afterlife/config/provider.rb
 - lib/afterlife/deploy.rb
 - lib/afterlife/deploy/cdn_deployment.rb
+- lib/afterlife/deploy/cdn_stenciljs_deployment.rb
 - lib/afterlife/deploy/cli.rb
 - lib/afterlife/deploy/custom_deployment.rb
 - lib/afterlife/deploy/deployment.rb
@@ -136,6 +139,8 @@ files:
 - lib/afterlife/release/helper.rb
 - lib/afterlife/release/pre_helper.rb
 - lib/afterlife/repo.rb
+- lib/afterlife/repo/config.rb
+- lib/afterlife/repo/provider.rb
 - lib/afterlife/stage.rb
 - lib/afterlife/version.rb
 - logs/.keep