mimas 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63e189942a8ac6122487ac902f2a3ccf5e353442b2159cd336a0b0b4828d4fb3
-  data.tar.gz: 07250c8fe15deef0ebacd566feeb500efc91a6cf1d77631f63e1ae4c084e7ba0
+  metadata.gz: 89a173c94a94713193d4a7c75a56b3aea832ac73d414fece78c19b4a331e4065
+  data.tar.gz: 5cba822934db35c755f15109611c970c9e417309df4888f17a6ec1fc0a485634
 SHA512:
-  metadata.gz: ffc9f5c7c236c550f205376277f591b68af6a4328d1f4e510d2e21f3500aec6aa09a0066ca25f57953b867126dda52594ec7afb5492a5d8353047d722fe24fd4
-  data.tar.gz: e4cbbfe1fd2bdbd973a00116507f0d7b3b47871c7d20acddd9baa9d09827c51c6c85ba3fc8e37d7f5f737a5ff4a1137f2c2f64d751fe24f41e0e494c3a757c32
+  metadata.gz: e8a56d19ff9fa37ed56e486b5cc6caedb172ce9b78e8b9232ef6706fa2ed2daef0bbde3ab5721aee683e3f8a2ed0aef09a8fb60c5449085712aeab2751d9cb90
+  data.tar.gz: 1a02a80c18fb91f212052d6cbe68bf6b418328e5597611ed95659d34df4bf780558bf05d60ebc642fc2a7f79d86767e1a73aee65e8e72b1a65d8266d9fcc4e19

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

@@ -16,6 +16,13 @@ module Mimas
           server  = Config.current.servers[server_name.to_sym]
           site    = Config.current.sites[site.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 == ""
             confirm = ask "You have modified files in your working copy, would you like to continue with deployment? (y|n)"

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/server/console.rb

@@ -8,7 +8,7 @@ module Mimas
         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.exec("cd #{current_path(site)} && ~/.cargo/bin/rv run #{console_command}") do
                 channel.on_data do |_, data|
                   $stdout.print(data) if data
                 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/templates/mimas.env.erb

@@ -1,3 +1,4 @@
 MIMAS_UNIX_SOCKET=<%= unix_socket %>
 RUBY_YJIT_ENABLE=1
+LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so
 <%= 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.4.0"
 end

data/lib/mimas.rb

@@ -19,7 +19,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"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mimas
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.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
@@ -127,14 +127,13 @@ 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
@@ -168,7 +167,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