mimas 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63e189942a8ac6122487ac902f2a3ccf5e353442b2159cd336a0b0b4828d4fb3
-  data.tar.gz: 07250c8fe15deef0ebacd566feeb500efc91a6cf1d77631f63e1ae4c084e7ba0
+  metadata.gz: 8dc43f51b6e12503251f7aae375c26c7231f0ae96549c675bf82b040604560d6
+  data.tar.gz: 03fbdf89bcb00a7f976cb25fe21ae3c662ad0c5abb904509bd986e5743f789bc
 SHA512:
-  metadata.gz: ffc9f5c7c236c550f205376277f591b68af6a4328d1f4e510d2e21f3500aec6aa09a0066ca25f57953b867126dda52594ec7afb5492a5d8353047d722fe24fd4
-  data.tar.gz: e4cbbfe1fd2bdbd973a00116507f0d7b3b47871c7d20acddd9baa9d09827c51c6c85ba3fc8e37d7f5f737a5ff4a1137f2c2f64d751fe24f41e0e494c3a757c32
+  metadata.gz: 02ad0133e8c2d58f3b8b1d2b666da86ce006d6f7fd402e3818478e80f41a6cc226957244fd8ac7b16927b2afb722dd3b143404d597d0694dded2da8fd3e92e0a
+  data.tar.gz: 17a0cfda68a7a0e8f37479435b9efb472043447d09f126d774fd9905d53b94681a87cfcfc55cac7a6a46755d5322c7e97ced66212d11ce22c95b8181d70dfb62

data/lib/mimas/cli.rb

@@ -4,7 +4,7 @@ module Mimas
       extend Dry::CLI::Registry
 
       register "init",                  Init
-      register "install ruby",          Install
+      register "ruby install",          Ruby::Install
       register "provision",             Provision
       register "push",                  Push, aliases: ["deploy"]
       register "console",               Console
@@ -19,9 +19,8 @@ module Mimas
 
     Plugins.fetch.each do |plugin|
       # Register plugin commands
-      plugin.commands.each do |command, target|
-        CLI::Commands.register(command.to_s, target)
-      end if plugin.respond_to?(:commands)
+      plugin.register_commands(Mimas::CLI::Commands) \
+        if plugin.respond_to?(:register_commands)
 
       # Add plugin template paths to lookup array
       Mimas::Template.lookup_paths.unshift(Pathname.new(plugin.templates_dir.to_s)) \

data/lib/mimas/commands/console.rb

@@ -4,12 +4,12 @@ module Mimas
       class Console < BaseCommand
         desc "Run your app's console"
 
-        argument :server_name, required: true,    desc: "The name of the server to run the console on"
         argument :site, default: :default,        desc: "The site to run the console for. Uses the default site if unspecified"
+        argument :server_name, required: true,    desc: "The name of the server to run the console on"
 
-        def call(server_name:, site:, **)
-          server  = Config.current.servers[server_name.to_sym]
+        def call(site:, server_name:, **)
           site    = Config.current.sites[site.to_sym]
+          server  = Config.current.servers[server_name.to_sym]
 
           raise "Please add a `console` directive to your config file" unless site.respond_to?(:console)
 

data/lib/mimas/commands/provision.rb

@@ -40,9 +40,12 @@ module Mimas
           server.install_caddy(sudo_user: sudo_user)
 
           unless skip_ruby
-            server.install_ruby_prerequisites(sudo_user: sudo_user)
+            server.install_server_software(sudo_user: sudo_user)
             server.install_ruby
           end
+
+          say ""
+          say "Your server is provisioned and ready to serve websites."
         end
       end
     end

data/lib/mimas/commands/push.rb

@@ -4,17 +4,24 @@ module Mimas
       class Push < BaseCommand
         desc "Push your Ruby app to the server"
 
-        argument :server_name,  required: true,   desc: "The name of the server to push to"
         argument :site, default: :default,        desc: "The site to push. Uses the default site if unspecified"
+        argument :server_name,  required: true,   desc: "The name of the server to push to"
 
         example [
           "production                         # Push the default site to the production server",
-          "production app                     # Push the `:app` site to the production server"
+          "app production                     # Push the `:app` site to the production server"
         ]
 
-        def call(server_name:, site:, **)
-          server  = Config.current.servers[server_name.to_sym]
+        def call(site:, server_name:, **)
           site    = Config.current.sites[site.to_sym]
+          server  = Config.current.servers[server_name.to_sym]
+
+          unless server && site
+            say "Server or site not found. Please ensure you've invoked the command correctly.".red
+            say ""
+            puts Dry::CLI::Banner.call(self, "mimas push")
+            exit 1
+          end
 
           working_copy = `git status --porcelain`
           unless working_copy == ""

data/lib/mimas/commands/{install.rb → ruby/install.rb}

@@ -1,7 +1,7 @@
 module Mimas
   module CLI
     module Commands
-      class Install < BaseCommand
+      class Ruby::Install < BaseCommand
         desc "Install a new version of Ruby on the server."
 
         argument :ruby_version, required: true,   desc: "The version of Ruby to install."

data/lib/mimas/commands/ruby.rb

@@ -0,0 +1,8 @@
+module Mimas
+  module CLI
+    module Commands
+      class Ruby < BaseCommand
+      end
+    end
+  end
+end

data/lib/mimas/commands/setup/ruby.rb

@@ -2,13 +2,13 @@ module Mimas
   module CLI
     module Commands
       class Setup::Ruby < Setup
-        desc "Install Ruby prerequisites and build a Ruby binary on a server"
+        desc "Install server prerequisites and download a pre-built Ruby binary on a server"
 
         def call(server_name:, **options)
           server = Config.current.servers[server_name.to_sym]
           sudo_user = options[:user]
 
-          server.install_ruby_prerequisites(sudo_user: sudo_user)
+          server.install_server_software(sudo_user: sudo_user)
           server.install_ruby
         end
       end

data/lib/mimas/deployment/ruby_app.rb

@@ -33,7 +33,7 @@ module Mimas
 
             say "Running deploy script"
             session.upload StringIO.new(site.deploy), deploy_script_path
-            session.run "cd #{remote_destination} && /usr/bin/env bash -l #{deploy_script}"
+            session.run "cd #{remote_destination} && ~/.cargo/bin/rv run sh #{deploy_script}"
             session.run "rm #{deploy_script_path}"
 
             say "Setting current symlink"

data/lib/mimas/scripts/configure_ruby.sh

@@ -2,18 +2,17 @@
 
 set -e
 
-cat << STRING >> ~/.profile
+# Install RV
+curl -LsSf https://rv.dev/install | sh
 
-# Use chruby to auto-switch Ruby versions
-source /usr/local/share/chruby/chruby.sh
-source /usr/local/share/chruby/auto.sh
-STRING
-
-source /usr/local/share/chruby/chruby.sh
-source /usr/local/share/chruby/auto.sh
+echo 'eval "$(~/.cargo/bin/rv shell init bash)"' >> ~/.profile
+echo 'eval "$(~/.cargo/bin/rv shell completions bash)"' >> ~/.profile
 
 echo 'gem: --no-document' >> ~/.gemrc
 
-gem update --system
-gem install bundler
-bundle config set --global without 'development test'
+mkdir -p ~/.bundle/
+cat << STRING > ~/.bundle/config
+---
+BUNDLE_WITHOUT: "development:test"
+BUNDLE_FROZEN: "true"
+STRING

data/lib/mimas/scripts/harden.sh

@@ -30,7 +30,7 @@ passwd -ld admin
 rsync --archive --chown=admin:admin ~/.ssh /home/admin
 
 # Allow passwordless sudo for `admin`
-echo "%admin $(cat /etc/hostname)=(root) NOPASSWD:ALL" > /etc/sudoers.d/admin
+echo "%admin $(cat /etc/hostname)=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/admin
 
 # Validate the modified sudoers file
 if ! visudo -c -f /etc/sudoers.d/admin; then

data/lib/mimas/server/console.rb

@@ -3,31 +3,9 @@ module Mimas
     module Console
       def start_console(site)
         console_command = site.console
+        exec_command = "cd #{current_path(site)} && ~/.cargo/bin/rv run #{console_command}"
 
-        system('stty cbreak -echo')
-        Net::SSH.start(host, user) do |session|
-          session.open_channel do |channel|
-            channel.request_pty do
-              channel.exec("cd #{current_path(site)} && /bin/bash -lc '#{console_command}'") do
-                channel.on_data do |_, data|
-                  $stdout.print(data) if data
-                end
-
-                channel.on_extended_data do |_, data|
-                  $stdout.print(data) if data
-                end
-
-                session.listen_to($stdin) do |stdin|
-                  input = stdin.readpartial(1024)
-                  channel.send_data(input) unless input.empty?
-                end
-              end
-            end
-          end
-          session.loop
-        end
-      ensure
-        system('stty sane')
+        interactive_ssh(host, user: user, command: exec_command)
       end
     end
   end

data/lib/mimas/server/ruby.rb

@@ -1,35 +1,27 @@
 module Mimas
   class Server
     module Ruby
-      def install_ruby_prerequisites(sudo_user:)
+      def install_server_software(sudo_user:)
         ssh(self, user: sudo_user) do |session|
-          prerequisites = Prerequisites.for_ruby + Prerequisites.utilities
-          prerequisites = prerequisites.join(" ")
+          software_list = Software.utilities + Software.prerequisites
+          software_list = software_list.join(" ")
 
-          session.script("install_ruby_prerequisites",
-            sudo: true,
-            vars: { PREREQUISITES: "'#{prerequisites}'" }
-          )
+          session.run "sudo apt-get install #{software_list} -y"
         end
       end
 
       def install_ruby(version: Config.current.ruby_version)
         ssh(self) do |session|
-          current_ruby = session.run "/usr/bin/env bash -lc 'which ruby'", capture: true, silent: true
-
-          if current_ruby != ""
-            ruby_grep = session.run "/usr/bin/env bash -lc 'chruby' | grep #{version}", capture: true, silent: true
-            if ruby_grep.size > 0
-              return say "Ruby #{version} is already installed!"
-            end
+          begin
+            session.run "test -d ~/.rubies/ruby-*"
+          rescue SSH::Session::NonZeroExitCode
+            # Install `rv` for fresh installs
+            session.script "configure_ruby"
           end
 
-          session.run "ruby-install --no-install-deps --cleanup #{version} -- --enable-yjit --with-jemalloc --disable-install-rdoc"
+          session.run "~/.cargo/bin/rv ruby install #{version} -i ~/.rubies"
           session.run "echo '#{version}' > ~/.ruby-version"
-
-          if current_ruby == ""
-            session.script("configure_ruby")
-          end
+          session.run "~/.cargo/bin/rv run gem update --system"
         end
       end
     end

data/lib/mimas/server/software.rb

@@ -0,0 +1,21 @@
+module Mimas
+  class Server
+    module Software
+      extend self
+
+      PREREQUISITES = %w[build-essential libyaml-dev libssl-dev libjemalloc-dev]
+      private_constant :PREREQUISITES
+
+      def prerequisites
+        MUTEX.synchronize { @prerequisites ||= PREREQUISITES }
+      end
+
+      UTILITIES = %w[curl jq]
+      private_constant :UTILITIES
+
+      def utilities
+        MUTEX.synchronize { @utilities ||= UTILITIES }
+      end
+    end
+  end
+end

data/lib/mimas/ssh/interactive.rb

@@ -0,0 +1,33 @@
+module Mimas
+  module SSH
+    module Interactive
+      def interactive_ssh(host, user:, command:)
+        system('stty cbreak -echo')
+
+        Net::SSH.start(host, user) do |session|
+          session.open_channel do |channel|
+            channel.request_pty do
+              channel.exec(command) do
+                channel.on_data do |_, data|
+                  $stdout.print(data) if data
+                end
+
+                channel.on_extended_data do |_, data|
+                  $stdout.print(data) if data
+                end
+
+                session.listen_to($stdin) do |stdin|
+                  input = stdin.readpartial(1024)
+                  channel.send_data(input) unless input.empty?
+                end
+              end
+            end
+          end
+          session.loop
+        end
+      ensure
+        system('stty sane')
+      end
+    end
+  end
+end

data/lib/mimas/ssh/session.rb

@@ -0,0 +1,74 @@
+module Mimas
+  module SSH
+    class Session
+      class NonZeroExitCode < StandardError
+        attr_reader :exit_code, :output
+        def initialize(command:, exit_code:, output:)
+          @command = command
+          @exit_code = exit_code
+          @output = output
+        end
+
+        def to_s
+          "'#{@command}' exited with code: #{@exit_code}"
+        end
+      end
+
+      def initialize(server, user:)
+        @server = server
+        @user = user || server.user
+      end
+
+      def perform(&block)
+        @ssh = Net::SSH.start(@server.host, @user, timeout: 60, **@server.ssh_options)
+        @hostname = run("cat /etc/hostname", capture: true).chomp
+        yield(self)
+      ensure
+        @ssh&.close
+      end
+
+      def run(command, capture: false, silent: false)
+        status = {}
+        output = ""
+        @ssh.exec!(command, status: status) do |channel, stream, data|
+          if capture
+            output << data
+          elsif stream == :stderr
+            print "#{data}".bold.red
+          else
+            print "#{data}".white
+          end
+        end
+
+        if status[:exit_code] != 0 && !silent
+          raise NonZeroExitCode.new(command: command, exit_code: status[:exit_code], output: output)
+        end
+
+        return output if capture
+      end
+
+      def upload(source_file, destination_file)
+        @ssh.scp.upload! source_file, destination_file
+      end
+
+      def script(name, sudo: false, vars: {})
+        filename = "#{name}.sh"
+        remote_location = "/tmp/#{filename}"
+
+        source_path = File.expand_path("../scripts/#{filename}", __dir__)
+        upload source_path, remote_location
+        run "chmod +x #{remote_location}"
+
+        vars = vars.to_a.map { it.join("=") }.join(" ")
+
+        exec_command = remote_location
+        exec_command = "#{vars} #{exec_command}".strip
+        exec_command = "sudo #{exec_command}" if sudo
+
+        run exec_command
+
+        run "rm #{remote_location}"
+      end
+    end
+  end
+end

data/lib/mimas/ssh.rb

@@ -4,75 +4,6 @@ module Mimas
       Session.new(server, user: user).perform(&block)
     end
 
-    class Session
-      class NonZeroExitCode < StandardError
-        attr_reader :exit_code, :output
-        def initialize(command:, exit_code:, output:)
-          @command = command
-          @exit_code = exit_code
-          @output = output
-        end
-
-        def to_s
-          "'#{@command}' exited with code: #{@exit_code}"
-        end
-      end
-
-      def initialize(server, user:)
-        @server = server
-        @user = user || server.user
-      end
-
-      def perform(&block)
-        @ssh = Net::SSH.start(@server.host, @user, timeout: 60, **@server.ssh_options)
-        @hostname = run("cat /etc/hostname", capture: true).chomp
-        yield(self)
-      ensure
-        @ssh&.close
-      end
-
-      def run(command, capture: false, silent: false)
-        status = {}
-        output = ""
-        @ssh.exec!(command, status: status) do |channel, stream, data|
-          if capture
-            output << data
-          elsif stream == :stderr
-            print "#{data}".bold.red
-          else
-            print "#{data}".white
-          end
-        end
-
-        if status[:exit_code] != 0 && !silent
-          raise NonZeroExitCode.new(command: command, exit_code: status[:exit_code], output: output)
-        end
-
-        return output if capture
-      end
-
-      def upload(source_file, destination_file)
-        @ssh.scp.upload! source_file, destination_file
-      end
-
-      def script(name, sudo: false, vars: {})
-        filename = "#{name}.sh"
-        remote_location = "/tmp/#{filename}"
-
-        source_path = File.expand_path("./scripts/#{filename}", __dir__)
-        upload source_path, remote_location
-        run "chmod +x #{remote_location}"
-
-        vars = vars.to_a.map { it.join("=") }.join(" ")
-
-        exec_command = remote_location
-        exec_command = "#{vars} #{exec_command}".strip
-        exec_command = "sudo #{exec_command}" if sudo
-
-        run exec_command
-
-        run "rm #{remote_location}"
-      end
-    end
+    include Interactive
   end
 end

data/lib/mimas/template.rb

@@ -20,6 +20,17 @@ module Mimas
       FileUtils.copy(source, File.join(destination, rename || source_file_name))
     end
 
+    def find_files(glob)
+      files = []
+
+      Mimas::Template.lookup_paths.each do |path|
+        found_files = Dir.glob(path.join(glob))
+        files.push(*found_files)
+      end
+
+      files
+    end
+
     BASE_DIRECTORY = Pathname.new(__dir__).join("templates")
     def self.lookup_paths
       MUTEX.synchronize { @lookup_paths ||= [BASE_DIRECTORY] }

data/lib/mimas/templates/mimas.env.erb

@@ -1,3 +1,6 @@
 MIMAS_UNIX_SOCKET=<%= unix_socket %>
 RUBY_YJIT_ENABLE=1
+<%# https://gist.github.com/jjb/9ff0d3f622c8bbe904fe7a82e35152fc %>
+LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so
+MALLOC_CONF='dirty_decay_ms:1000,narenas:2,background_thread:true'
 <%= env %>

data/lib/mimas/templates/systemd.service.erb

@@ -9,7 +9,7 @@ User=<%= user %>
 EnvironmentFile=<%= site_root %>/.env
 EnvironmentFile=<%= site_root %>/mimas/mimas.env
 WorkingDirectory=<%= site_root %>/current
-ExecStart=/usr/bin/env bash -lc '<%= command %>'
+ExecStart=%h/.cargo/bin/rv run <%= command %>
 StandardOutput=append:<%= site_root %>/logs/<%= service_name %>.log
 StandardError=append:<%= site_root %>/logs/<%= service_name %>.log
 KillMode=mixed

data/lib/mimas/version.rb

@@ -1,3 +1,3 @@
 module Mimas
-  VERSION = "0.3.1"
+  VERSION = "0.5.0"
 end

data/lib/mimas.rb

@@ -11,6 +11,8 @@ require_relative "mimas/terminal/printer"
 require_relative "mimas/terminal/ansi"
 require_relative "mimas/template"
 require_relative "mimas/archiver"
+require_relative "mimas/ssh/session"
+require_relative "mimas/ssh/interactive"
 require_relative "mimas/ssh"
 require_relative "mimas/hooks"
 
@@ -19,7 +21,7 @@ require_relative "mimas/config"
 require_relative "mimas/site/archive"
 require_relative "mimas/site"
 
-require_relative "mimas/server/prerequisites"
+require_relative "mimas/server/software"
 require_relative "mimas/server/harden"
 require_relative "mimas/server/deploy_user"
 require_relative "mimas/server/caddy"
@@ -40,9 +42,10 @@ require_relative "mimas/base_command"
 require_relative "mimas/commands/archive"
 require_relative "mimas/commands/console"
 require_relative "mimas/commands/init"
-require_relative "mimas/commands/install"
 require_relative "mimas/commands/provision"
 require_relative "mimas/commands/push"
+require_relative "mimas/commands/ruby"
+require_relative "mimas/commands/ruby/install"
 require_relative "mimas/commands/setup"
 require_relative "mimas/commands/setup/caddy"
 require_relative "mimas/commands/setup/deploy_user"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mimas
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Ayush Newatia
 bindir: bin
 cert_chain: []
-date: 2026-07-31 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -107,9 +107,10 @@ files:
 - lib/mimas/commands/archive.rb
 - lib/mimas/commands/console.rb
 - lib/mimas/commands/init.rb
-- lib/mimas/commands/install.rb
 - lib/mimas/commands/provision.rb
 - lib/mimas/commands/push.rb
+- lib/mimas/commands/ruby.rb
+- lib/mimas/commands/ruby/install.rb
 - lib/mimas/commands/setup.rb
 - lib/mimas/commands/setup/caddy.rb
 - lib/mimas/commands/setup/deploy_user.rb
@@ -127,17 +128,18 @@ files:
 - lib/mimas/scripts/create_deploy_user.sh
 - lib/mimas/scripts/harden.sh
 - lib/mimas/scripts/install_caddy.sh
-- lib/mimas/scripts/install_ruby_prerequisites.sh
 - lib/mimas/server.rb
 - lib/mimas/server/caddy.rb
 - lib/mimas/server/console.rb
 - lib/mimas/server/deploy_user.rb
 - lib/mimas/server/harden.rb
-- lib/mimas/server/prerequisites.rb
 - lib/mimas/server/ruby.rb
+- lib/mimas/server/software.rb
 - lib/mimas/site.rb
 - lib/mimas/site/archive.rb
 - lib/mimas/ssh.rb
+- lib/mimas/ssh/interactive.rb
+- lib/mimas/ssh/session.rb
 - lib/mimas/template.rb
 - lib/mimas/templates/Caddyfile.ruby.erb
 - lib/mimas/templates/Caddyfile.static.erb
@@ -168,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Deploy Ruby apps to a single server using an omakase setup
 test_files: []

data/lib/mimas/scripts/install_ruby_prerequisites.sh

@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-export DEBIAN_FRONTEND=noninteractive
-
-# Install Ruby prerequisites
-sudo apt-get install $PREREQUISITES -y
-
-# Install Ruby Install
-wget https://github.com/postmodern/ruby-install/releases/download/v0.10.2/ruby-install-0.10.2.tar.gz
-tar -xzvf ruby-install-0.10.2.tar.gz
-cd ruby-install-0.10.2/
-sudo make install
-cd ..
-rm ruby-install-0.10.2.tar.gz
-rm -rf ruby-install-0.10.2/
-
-# Install chruby
-wget https://github.com/postmodern/chruby/releases/download/v0.3.9/chruby-0.3.9.tar.gz
-tar -xzvf chruby-0.3.9.tar.gz
-cd chruby-0.3.9/
-sudo make install
-cd ..
-rm chruby-0.3.9.tar.gz
-rm -rf chruby-0.3.9/
-

data/lib/mimas/server/prerequisites.rb

@@ -1,25 +0,0 @@
-module Mimas
-  class Server
-    module Prerequisites
-      extend self
-
-      def for_ruby
-        %w[
-            xz-utils
-            build-essential
-            zlib1g-dev
-            libyaml-dev
-            libssl-dev
-            libncurses-dev
-            libffi-dev
-            rustc
-            libjemalloc-dev
-        ]
-      end
-
-      def utilities
-        %w[curl jq]
-      end
-    end
-  end
-end