afterlife 1.6.1 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39b1dc76a5dcf45f83fcde8b8d8198b0d8d9849915f7e80cab37f82fbc6621b6
-  data.tar.gz: 806c05f05b5c7729bd765b1f66757a45daa3f17e425a2a1aecb6d951d62e8813
+  metadata.gz: 93343bbd5356717804af9a955b10546a438184610540ec7b369e4f2f60877e53
+  data.tar.gz: 2c15bb65c5b9d901e9be8e0697bffcc7d8892145f1bf61150bad66701ea68a9c
 SHA512:
-  metadata.gz: 2d57810ac8356dd463d272ece6bf10dc06c2cefd47ec0d1248d0799a9dd95048dc665bdd2b49f38e3efeefe28955671dbb3f5266fed965869be8024a42924c5c
-  data.tar.gz: '0393f5f21e8fc2a6e79f8c345f803579681f3aa07a796a280ee7ac1267eb7ccef19dd506bdfcccdc2e6f985057a82514c151b967ca60549763e97a81d792fd83'
+  metadata.gz: 493574dee7d741117ee555c34e49779d550895607bf05e41f678c22a59dabd6a51214b317c3a9e39347fb5e37ef663ab5755e225f63de7d90ba6dbd0db8d4aa0
+  data.tar.gz: b1f8c99175ecf36c13785cfa8e59cbe4541d726dfc3dde667cbb80fbda8db8a1adf530f4f1ce3d1f11a55cd32e4a14643d493f3dcefcdcb92eebdf46b08f4c4c

data/README.md

@@ -7,14 +7,15 @@ TODO: Delete this and the text abovxe, and describe your gem
 ## Installation
 
 1. Execute `bin/install` in the repository root
-2. Put a `env.yml` on ~/.afterlife/env.yml based on the AWS credentials found on mifiel's bitwarden vault
+2. Put a `config.yml` on ~/.afterlife/config.yml based on the AWS credentials found on mifiel's bitwarden vault
 3. Install AWS CLI following the [official guide](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html).
 
 ## Usage
-Run `afterlife help` for a list of all available commands
 
+Run `afterlife help` for a list of all available commands
 
 ## About CDN
+
 Logs can be found on `~/.afterlife/logs/cdn.log`
 
 Running `afterlife cdn start` will run the CDN web server in the background. Running in foreground using `afterlife cdn start --foreground` will display errors and content normally found in logs in console instead.

data/afterlife.gemspec

@@ -28,10 +28,6 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport'
-  spec.add_dependency 'git'
-  spec.add_dependency 'puma'
-  spec.add_dependency 'rackup'
   spec.add_dependency 'thor'
   spec.add_dependency 'zeitwerk'
 

data/lib/afterlife/cdn/cli.rb

@@ -20,9 +20,10 @@ module Afterlife
              aliases: '-f'
       option 'no-link', type: :boolean
       def start
+        assert_rackup_dependency
         Cdn.link unless options['no-link']
         say_status 'Starting', "http://localhost:#{options[:port]}"
-        Cdn::Server.start(options.symbolize_keys.slice(:port, :foreground))
+        Cdn::Server.start(options.slice('port', 'foreground'))
         log_success "The server started at http://localhost:#{options[:port]}"
       rescue Afterlife::Error => e
         log_error(e)
@@ -54,6 +55,18 @@ module Afterlife
         Cdn.link
         log_success('Repos successfully linked to local CDN path')
       end
+
+    private
+
+      def assert_rackup_dependency
+        require 'rackup'
+      rescue LoadError
+        fatal!(
+          'rackup is not installed: In order to use the `afterlife cdn` ' \
+          'you need to install rackup: `gem install rackup`. ' |
+          'Aditionaly, for improved logging, you may want to install puma.',
+        )
+      end
     end
   end
 end

data/lib/afterlife/cdn/server.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'rackup'
-
 module Afterlife
   module Cdn
     class Server
@@ -31,10 +29,10 @@ module Afterlife
         @instance = Rackup::Server.new(
           environment: ENV['RACK_ENV'] || 'development',
           quiet: true, # we setup log in config.ru
-          Port: args[:port],
+          Port: args['port'],
           config: Afterlife.root.join('config.ru').to_s,
           pid: Server.pid_file.to_s,
-          daemonize: !args[:foreground],
+          daemonize: !args['foreground'],
         )
       end
 

data/lib/afterlife/config/provider.rb

@@ -3,6 +3,18 @@
 module Afterlife
   module Config
     class Provider
+      PROFILES = [
+        PROFILE_PRODUCTION = 'mifiel-production',
+        PROFILE_TESTING = 'mifiel-sandbox',
+      ].freeze
+      # {stage} => {profile}
+      CLOUD_PROFILES = {
+        staging: PROFILE_TESTING,
+        qa: PROFILE_TESTING,
+        sandbox: PROFILE_PRODUCTION,
+        production: PROFILE_PRODUCTION,
+      }.freeze
+
       def respond_to_missing?(sym, include_all)
         config.key?(sym) || super
       end
@@ -31,16 +43,11 @@ module Afterlife
 
       def config
         @config ||= !file_exist? && default_config
-        @config ||= YAML.load_file(file).deep_symbolize_keys
+        @config ||= YAML.load_file(file, symbolize_names: true)
       end
 
       def default_config
         {
-          credentials: {
-            aws: {
-              profile: ENV.fetch('AWS_PROFILE', nil),
-            },
-          },
           stages: {},
         }
       end

data/lib/afterlife/deploy/cdn_deployment.rb

@@ -11,13 +11,14 @@ module Afterlife
         Cdn.url(repo)
       end
 
-      def setup
+      def setup # rubocop:disable Mitrics/AbcSize
         # 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,
         )
+        # IN CI we dont need an AWS_PROFILE and setting it causes aws s3 sync to fail
+        repo.env.set('AWS_PROFILE' => Afterlife.current_stage.profile) unless ENV['CI']
         # in nested deployments we need the current path, not the parent's
         repo.env.set!('S3_FULL_PATH' => s3_full_path)
       end

data/lib/afterlife/deploy/deployment.rb

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

data/lib/afterlife/deploy/kubernetes_deployment.rb

@@ -75,11 +75,26 @@ module Afterlife
       def apply_kubernetes_settings
         return if options['no-apply']
 
+        assert_correct_context unless ENV['CI']
         <<-BASH
           kubectl apply -k #{kubelocation}
         BASH
       end
 
+      def assert_correct_context
+        return if current_context == expected_context
+
+        fail Error, "kubectl context should be '#{expected_context}' but you are in '#{current_context}'"
+      end
+
+      def expected_context
+        "aws-#{Afterlife.current_stage.profile}"
+      end
+
+      def current_context
+        @current_context ||= Exec.result('kubectl config current-context')
+      end
+
       # utils
 
       def local_stage?

data/lib/afterlife/deploy.rb

@@ -4,6 +4,13 @@ module Afterlife
   module Deploy
   module_function
 
+    DEPLOYMENTS = {
+      cdn: 'CdnDeployment',
+      cdn_stenciljs: 'CdnStenciljsDeployment',
+      custom: 'CustomDeployment',
+      kubernetes: 'KubernetesDeployment',
+    }.freeze
+
     def call(stage, options)
       deployment = klass.new(options)
       Afterlife.current_stage = stage
@@ -14,8 +21,8 @@ module Afterlife
     end
 
     def klass
-      klass = "#{current_type.gsub('-', '_')}_deployment".classify
-      fail Error, "deployment type '#{current_type}' is invalid" unless const_defined?(klass)
+      klass = DEPLOYMENTS[current_type.gsub('-', '_').to_sym]
+      fail Error, "deployment type '#{current_type}' is invalid" unless klass
 
       const_get(klass)
     end

data/lib/afterlife/exec.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-# adds String#squish and others
-require 'active_support/core_ext/string'
-
 module Afterlife
   class Exec
     def self.result(arg)
@@ -17,7 +14,7 @@ module Afterlife
 
     def self.parse(arg, env)
       Array(arg.flatten.compact).flatten.map do |command|
-        format(command, env.symbolize_keys)
+        format(command, env.transform_keys(&:to_sym))
       end
     end
 
@@ -31,9 +28,9 @@ module Afterlife
       parsed_commands.map do |command|
         Afterlife.cli.log_info(command) if Afterlife.cli.options['verbose']
         next if Afterlife.cli.options['dry-run']
-        next `#{command}`.squish if result
+        next squish(`#{command}`) if result
 
-        system(env_hash, command.squish, exception: true)
+        system(env_hash, squish(command), exception: true)
       end.compact
     rescue RuntimeError => e
       raise Error, e
@@ -50,5 +47,11 @@ module Afterlife
     def env_hash
       repo.env.env
     end
+
+  private
+
+    def squish(str)
+      str.gsub(/[[:space:]]+/, ' ').strip
+    end
   end
 end

data/lib/afterlife/release/change_version.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'git'
-
 module Afterlife
   module Release
     class ChangeVersion

data/lib/afterlife/release/cli.rb

@@ -23,6 +23,7 @@ module Afterlife
              default: CreateHelper::DEFAULT_BASE_BRANCH,
              desc: 'Base branch'
       def create(part)
+        assert_git_dependency
         fatal! "Part '#{part}' is not allowed" unless CreateHelper::PARTS.include?(part.to_sym)
 
         CreateHelper.call(self, options.merge(part: part))
@@ -30,6 +31,7 @@ module Afterlife
 
       desc 'hotfix', 'create a hotfix branch'
       def hotfix
+        assert_git_dependency
         args = options.merge(part: :patch, from: :master, prefix: :hotfix)
         CreateHelper.call(self, args)
       end
@@ -37,8 +39,20 @@ module Afterlife
       desc 'pre', 'create a prerelease tag'
       option :push, type: :boolean, default: true
       def pre
+        assert_git_dependency
         PreHelper.call(self, options)
       end
+
+    private
+
+      def assert_git_dependency
+        require 'git'
+      rescue LoadError
+        fatal!(
+          'Git is not installed: In order to use the `afterlife release` ' \
+          'you need to install git: `gem install git`',
+        )
+      end
     end
   end
 end

data/lib/afterlife/release/create_helper.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'git'
-
 module Afterlife
   module Release
     class CreateHelper < Helper

data/lib/afterlife/repo/provider.rb

@@ -17,7 +17,7 @@ module Afterlife
 
         if config_file.exist?
           @config = base_config
-          @config = parent.deep_merge(base_config) if parent
+          @config = deep_merge(parent, base_config) if parent
         end
 
         @config ||= {}
@@ -37,12 +37,24 @@ module Afterlife
       end
 
       def base_config
-        @base_config ||= YAML.load_file(config_file).deep_symbolize_keys
+        @base_config ||= YAML.load_file(config_file, symbolize_names: true)
       end
 
       def config_file
         @config_file ||= full_path.join(CONFIG_NAME)
       end
+
+      # teken from
+      # https://github.com/rails/rails/blob/main/activesupport/lib/active_support/deep_mergeable.rb#L34
+      def deep_merge(one, two)
+        one.merge(two) do |_key, this_val, other_val|
+          if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+            deep_merge(this_val, other_val)
+          else
+            other_val
+          end
+        end
+      end
     end
   end
 end

data/lib/afterlife/repo.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/hash'
-
 module Afterlife
   class Repo
     DEFAULT_DIST = 'dist'

data/lib/afterlife/stage.rb

@@ -28,5 +28,9 @@ module Afterlife
 
       Afterlife.config.stages[stage.to_sym]
     end
+
+    def profile
+      @profile ||= Afterlife::Config::Provider::CLOUD_PROFILES[name.to_sym]
+    end
   end
 end

data/lib/afterlife/version.rb

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

data/lib/afterlife.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 require 'zeitwerk'
-require 'git'
 require 'yaml'
 require 'pathname'
-require 'active_support'
 require_relative 'afterlife/version'
 
 module Afterlife

metadata

@@ -1,71 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: afterlife
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.1
 platform: ruby
 authors:
 - Genaro Madrid
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rackup
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement