mimas 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 465b5f5dab298e62003b3d43b417dcc13d2c6836cba3ade389fe487d3ee59c9d
-  data.tar.gz: 3bd799075d78069a206a2cafd8b4d4abc3f7b040aa737e42c864704eb041c1ff
+  metadata.gz: a200733060462cb02f5bb316922a18a44f2c02631707ded251f42f25fd4ea0ac
+  data.tar.gz: ddd5a59c92ae52c85312a92698e3d8f2b7ca85f53c7333bc82376d9bf4b47742
 SHA512:
-  metadata.gz: 4a0da3d7890be014ee7709a47a1ef8c9cba601b55e45fcf9d978f9787e560f4f4aab837f54483801dcc902ce8688d804e7a03484625d1149221a5475ddfbc1dc
-  data.tar.gz: 5d82db21fab21f4146480c509864360396679031b4ec191a43c37bde4d08c2ed8f84f9bbed492acb5a14d3aa984dc005464ca8f68141dfe8c79022bdf526652d
+  metadata.gz: 05d4669a9e1122b00de75885ad66734ca6b19da728e5b7b5df02e8a68d46dc2cf3d0bc01155ba88c41949c41534c71d8750608fb688e4c14b340aeca08acfc79
+  data.tar.gz: 632f575040f53862208831bef4f743ee9960f1a47a56023b15c0b2c49a5767e70a8e14fac0a22c030cd15373f7d168659f6d8f478dc1d2e506ea6b9114c5f08a

data/lib/mimas/config.rb

@@ -37,6 +37,17 @@ module Mimas
       end
     end
 
+    class InvalidConfiguration < StandardError
+      attr_reader :message
+      def initialize(message)
+        @message = message
+      end
+
+      def to_s
+        @message.to_s
+      end
+    end
+
     private
 
       class DSL
@@ -56,12 +67,14 @@ module Mimas
           name = name.to_sym
           args = Site.evaluate(&block)
           @config.sites[name] = Mimas::Site.new(name, args)
+          @config.sites[name].validate!
         end
 
         def server(name, &block)
           name = name.to_sym
           args = Options.evaluate(&block)
           @config.servers[name] = Mimas::Server.new(name, args)
+          @config.servers[name].validate!
         end
 
         def hooks(&block)

data/lib/mimas/deployment/ruby_app.rb

@@ -7,24 +7,11 @@ module Mimas
         archive(output: archive_path, files: site.files)
 
         ssh(server) do |session|
-          begin
-            session.run "test -d ~/.rubies/ruby-#{ruby_version}"
-            say "Ruby #{ruby_version} found on the server..."
-          rescue SSH::Session::NonZeroExitCode
-            raise "Ruby version not installed on server"
-          end
+          validate_server_ruby_version(session)
 
-          # Create the release folder
-          session.run "mkdir -p #{releases_path}"
+          create_directory_skeleton(session)
 
-          # Get expired releases. Mimas will only retain the last 5 releases.
-          releases = session.run "ls #{releases_path}", capture: true
-          expired_releases = releases.split("\n").sort.reverse.drop(5)
-
-          if expired_releases.any?
-            say "Deleting versions: #{expired_releases.join(", ")}"
-            session.run "cd #{releases_path} && rm -rf #{expired_releases.join(" ")}"
-          end
+          expire_old_releases(session)
 
           # Check `current` symlink to get currently live version
           remote_current_path = session.run("readlink #{current_path}", capture: true, silent: true).chomp
@@ -32,12 +19,9 @@ module Mimas
 
           say "Current live version is #{remote_current_version}" if remote_current_version.size > 0
 
-          # Make systemd path and the site's mimas folder
-          session.run "mkdir -p #{server.user_systemd_path}"
-          session.run "mkdir -p #{mimas_path}"
-
           refreshing_caddy(session) do
             # Upload the mimas.env and touch an `.env` file in the site's root
+            session.run "cp #{mimas_path.join("mimas.env")} #{mimas_path.join("mimas.env.backup")}"
             session.upload StringIO.new(mimas_env), mimas_path.join("mimas.env")
             session.run "touch #{site_root.join(".env")}"
 
@@ -78,30 +62,40 @@ module Mimas
           rescue Exception => e
             say "Error raised during deploy: #{e}".red.bold
 
-            # Revert symlink if there's an existing live release, otherwise delete it
-            if remote_current_path.size > 0
-              say "Reverting symlink ..."
-              session.run "ln -sfn #{remote_current_path} #{current_path}"
-            else
-              say "Deleting symlink ..."
-              session.run "rm -f #{current_path}"
-            end
+            revert_files_after_failed_deployment(session, remote_current_path: remote_current_path)
+            exit 1
+          end
 
-            say "Deleting released files ..."
 
-            site.services.each do |_, service|
-              systemd_service_name = systemd_service_name(service)
-              session.run "systemctl --user stop #{systemd_service_name}", silent: true, capture: true
-              session.run "systemctl --user disable #{systemd_service_name}", silent: true, capture: true
-              session.run "rm #{server.user_systemd_path.join("#{systemd_service_name}.service")}", silent: true
-            end
+          cleanup_successful_deployment(session, remote_current_version: remote_current_version)
+          say "\n"
+          say "Deployment complete! #{version} is now live.".bold.white
+        end
+      end
 
-            session.run "rm -f #{unix_socket(version: version)}"
-            session.run "rm -f #{site_root.join("Caddyfile.new")}"
-            session.run "rm -rf #{remote_destination}"
+      private
 
-            exit 1
-          end
+        def validate_server_ruby_version(session)
+          session.run "test -d ~/.rubies/ruby-#{ruby_version}"
+          say "Ruby #{ruby_version} found on the server..."
+        rescue SSH::Session::NonZeroExitCode
+          raise "Ruby version not installed on server"
+        end
+
+        def create_directory_skeleton(session)
+          # Create the release folder
+          session.run "mkdir -p #{releases_path}"
+
+          # Make systemd path and the site's mimas folder
+          session.run "mkdir -p #{server.user_systemd_path}"
+          session.run "mkdir -p #{mimas_path}"
+
+          # Create empty .env file
+          session.run "touch #{mimas_path.join("mimas.env")}"
+        end
+
+        def cleanup_successful_deployment(session, remote_current_version:)
+          session.run "rm -f #{mimas_path.join("mimas.env.backup")}"
 
           # Delete the old service if one exists, and the new service started up
           if remote_current_version.size > 0
@@ -109,18 +103,52 @@ module Mimas
               systemd_service_name = systemd_service_name(service, version: remote_current_version)
 
               say "Stopping old service: #{systemd_service_name}"
-              session.run "systemctl --user stop #{systemd_service_name}"
-              session.run "systemctl --user disable #{systemd_service_name}"
+              session.run "systemctl --user stop #{systemd_service_name}", capture: true, silent: true
+              session.run "systemctl --user disable #{systemd_service_name}", capture: true, silent: true
               session.run "rm #{server.user_systemd_path.join("#{systemd_service_name}.service")}"
               say "#{systemd_service_name} stopped and deleted."
               session.run "rm -f #{unix_socket(version: remote_current_version)}"
             end
           end
+        end
 
-          say "\n"
-          say "Deployment complete! #{version} is now live.".bold.white
+        def revert_files_after_failed_deployment(session, remote_current_path:)
+          # Revert symlink if there's an existing live release, otherwise delete it
+          if remote_current_path.size > 0
+            say "Reverting symlink ..."
+            session.run "ln -sfn #{remote_current_path} #{current_path}"
+          else
+            say "Deleting symlink ..."
+            session.run "rm -f #{current_path}"
+          end
+
+          # Restore the previous mimas environment
+          session.run "mv #{mimas_path.join("mimas.env.backup")} #{mimas_path.join("mimas.env")}"
+
+          say "Deleting released files ..."
+
+          site.services.each do |_, service|
+            systemd_service_name = systemd_service_name(service)
+            session.run "systemctl --user stop #{systemd_service_name}", capture: true, silent: true
+            session.run "systemctl --user disable #{systemd_service_name}", capture: true, silent: true
+            session.run "rm #{server.user_systemd_path.join("#{systemd_service_name}.service")}", silent: true
+          end
+
+          session.run "rm -f #{unix_socket(version: version)}"
+          session.run "rm -f #{site_root.join("Caddyfile.new")}"
+          session.run "rm -rf #{remote_destination}"
+        end
+
+        def expire_old_releases(session)
+          # Get expired releases. Mimas will only retain the last 5 releases.
+          releases = session.run "ls #{releases_path}", capture: true
+          expired_releases = releases.split("\n").sort.reverse.drop(5)
+
+          if expired_releases.any?
+            say "Deleting versions: #{expired_releases.join(", ")}"
+            session.run "cd #{releases_path} && rm -rf #{expired_releases.join(" ")}"
+          end
         end
-      end
     end
   end
 end

data/lib/mimas/scripts/create_deploy_user.sh

@@ -7,7 +7,9 @@ DEPLOY_USER="${DEPLOY_USER:-deploy}"
 
 if ! id $DEPLOY_USER >/dev/null 2>&1; then
   printf "Creating the $DEPLOY_USER user\n\n"
-  useradd $DEPLOY_USER -s /bin/bash -m
+  getent group $DEPLOY_USER >/dev/null || groupadd $DEPLOY_USER
+  useradd $DEPLOY_USER -g $DEPLOY_USER -s /bin/bash -m
+
   printf "$DEPLOY_USER user created\n\n"
 else
   printf "$DEPLOY_USER user exists. Configuring the user..."

data/lib/mimas/scripts/harden.sh

@@ -18,8 +18,10 @@ printf "UFW enabled\n\n"
 printf "Creating the admin user\n\n"
 
 if ! id admin >/dev/null 2>&1; then
+  # Create an admin group
+  getent group admin >/dev/null || groupadd admin
   # Add a new user, set the default shell, and create a home directory
-  useradd admin -s /bin/bash -m
+  useradd admin -g admin -s /bin/bash -m
 fi
 
 # Disable password login

data/lib/mimas/server.rb

@@ -33,5 +33,15 @@ module Mimas
     def current_path(site)
       site_root(site).join("current")
     end
+
+    def validate!
+      raise Config::InvalidConfiguration.new("`server` requires a `host`") \
+        unless self.host && self.host.size > 0
+
+      raise Config::InvalidConfiguration.new("`server` requires a `user`") \
+        unless self.user && self.user.size > 0
+
+      true
+    end
   end
 end

data/lib/mimas/site.rb

@@ -20,5 +20,25 @@ module Mimas
     def ruby_app?
       services.any?
     end
+
+    def validate!
+      raise Config::InvalidConfiguration.new("`site` requires a `domain`") \
+        unless self.respond_to?(:domain)
+
+      if ruby_app?
+        raise Config::InvalidConfiguration.new("`site` requires a `files` directive") \
+          unless self.respond_to?(:files)
+
+        services.values.each do |service|
+          raise Config::InvalidConfiguration.new("#{service[:name]} service requires a `command` directive") \
+            unless service[:command]
+        end
+      else
+        raise Config::InvalidConfiguration.new("`site` requires a `root_dir` and `glob` directive") \
+          unless self.respond_to?(:root_dir) && self.respond_to?(:glob)
+      end
+
+      true
+    end
   end
 end

data/lib/mimas/version.rb

@@ -1,3 +1,3 @@
 module Mimas
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mimas
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ayush Newatia
 bindir: bin
 cert_chain: []
-date: 2026-07-23 00:00:00.000000000 Z
+date: 2026-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli