mimas 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89a173c94a94713193d4a7c75a56b3aea832ac73d414fece78c19b4a331e4065
-  data.tar.gz: 5cba822934db35c755f15109611c970c9e417309df4888f17a6ec1fc0a485634
+  metadata.gz: 8dc43f51b6e12503251f7aae375c26c7231f0ae96549c675bf82b040604560d6
+  data.tar.gz: 03fbdf89bcb00a7f976cb25fe21ae3c662ad0c5abb904509bd986e5743f789bc
 SHA512:
-  metadata.gz: e8a56d19ff9fa37ed56e486b5cc6caedb172ce9b78e8b9232ef6706fa2ed2daef0bbde3ab5721aee683e3f8a2ed0aef09a8fb60c5449085712aeab2751d9cb90
-  data.tar.gz: 1a02a80c18fb91f212052d6cbe68bf6b418328e5597611ed95659d34df4bf780558bf05d60ebc642fc2a7f79d86767e1a73aee65e8e72b1a65d8266d9fcc4e19
+  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/push.rb

@@ -4,17 +4,17 @@ 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

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/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)} && ~/.cargo/bin/rv run #{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/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,4 +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/version.rb

@@ -1,3 +1,3 @@
 module Mimas
-  VERSION = "0.4.0"
+  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"
 
@@ -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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mimas
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ayush Newatia
@@ -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
@@ -137,6 +138,8 @@ files:
 - 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