neptuno 1.0.10 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22b42e801b0beb52e37f1277a186e6ad366b08e8
-  data.tar.gz: d097479c09527b55dcd8093f19bef7f86c8c9fa2
+  metadata.gz: ef3b2c4cec926bee8940257c245948e7b52a7e69
+  data.tar.gz: f6c1a91eb8f8a95ba782a6827c692a4de125ba2e
 SHA512:
-  metadata.gz: 9bc695ea800c5aec954489b269b90f47742be638026cf45cec37d7ffebeacb0f691cb4b41c821208f5953d254b86e1100ae67b4c04dd8f06027e32d68295d628
-  data.tar.gz: 6d6e14c8a10c851a883318bda33c36a31194905a2703701e2534587c4938b2f549e725f23e77da1fabdd4213dc44ace86461ee04652d6d94dc1792af4d8502c1
+  metadata.gz: 386cb5eec9ce1b87aebc94186833740c3ca44d676c62d736f576bf4dc6644a6178a83555cb9161d865ce2f3aed2e131a11c1035e6f6f3fd11899223d28e24251
+  data.tar.gz: 1158f4fc99af42bd9497887ef2511f2630c6ea639d3009f6562358148768e410bcc93a60b521f914c5cc219b02dc58f5eeffd5f85c7df0374ece27452569d254

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neptuno (1.0.10)
+    neptuno (1.2.0)
       dotiw
       dry-cli
       hirb
@@ -17,7 +17,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -25,7 +25,7 @@ GEM
     ansi (1.5.0)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     diff-lcs (1.5.0)
     dotiw (5.3.3)
       activesupport
@@ -90,14 +90,15 @@ GEM
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     tty-which (0.5.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
     wisper (2.0.1)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES

data/Rakefile

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require 'standard/rake'
+require "bundler/gem_tasks"
+require "rake/testtask"
+require "standard/rake"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
 task default: %i[test standard:fix]

data/exe/neptuno

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 # require "bundler/setup"
-require 'neptuno'
+require "neptuno"
 
 cli = Neptuno::CLI
 Dry::CLI.new(cli).call

data/lib/neptuno/cli/activate.rb

@@ -5,34 +5,34 @@ module Neptuno
     # Init Neptuno files
     class Activate < Neptuno::CLI::Base
       include ::Neptuno::TTY::Config
-      desc 'Bring services containers up and start their processes'
+      desc "Bring services containers up and start their processes"
 
-      option :force, type: :boolean, default: false, desc: 'Try to start disrigarding container status'
-      option :all, type: :boolean, default: false, desc: 'Run on all services'
-      argument :services, type: :array, required: false, desc: 'Optional list of services'
+      option :force, type: :boolean, default: false, desc: "Try to start disrigarding container status"
+      option :all, type: :boolean, default: false, desc: "Run on all services"
+      argument :services, type: :array, required: false, desc: "Optional list of services"
 
       def call(services: [], **options)
-        multi_spinner = ::TTY::Spinner::Multi.new('[:spinner] Services')
+        multi_spinner = ::TTY::Spinner::Multi.new("[:spinner] Services")
         spinners = {}
         count = 0
-        command_services_to('activate to services', all: options.fetch(:all), services_as_args: services) do |services|
-          system("cd #{neptuno_path} && docker compose up -d #{services.join(' ')}")
+        command_services_to("activate to services", all: options.fetch(:all), services_as_args: services) do |services|
+          system("cd #{neptuno_path} && docker compose up -d #{services.join(" ")}")
           running_services = ::Neptuno::CLI::List.new.running_services.first.keys
           running_services.sort.each do |service|
             spinners[service] ||= multi_spinner.register("[:spinner] :state #{service}")
-            spinners[service].update(state: '-          ')
+            spinners[service].update(state: "-          ")
             spinners[service].auto_spin
           end
           loop do
             ps = `cd #{neptuno_path} && docker compose ps`.split("\n").compact.select { |x| x.match(/^\s*#{project}/) }
 
             running_services.sort.each do |service|
-              service_ps = ps.find {|s| s =~ /#{project}[-_]#{service}[-_]\d\s/ }
+              service_ps = ps.find { |s| s =~ /#{project}[-_]#{service}[-_]\d\s/ }
 
-              status = :dead if service_ps.to_s.include?('exited')
-              status = :starting if service_ps.to_s.include?('starting')
-              status = :unhealthy if service_ps.to_s.include?('(unhealthy')
-              status = :healthy if service_ps.to_s.include?('(healthy')
+              status = :dead if service_ps.to_s.include?("exited")
+              status = :starting if service_ps.to_s.include?("starting")
+              status = :unhealthy if service_ps.to_s.include?("(unhealthy")
+              status = :healthy if service_ps.to_s.include?("(healthy")
               status = :force if options.fetch(:force)
 
               case status
@@ -40,19 +40,19 @@ module Neptuno
                 spinners[service].success
                 `cd #{neptuno_path}/procfiles/#{service} && overmind start -D -N  > /dev/null 2>&1`
               when :dead
-                spinners[service].update(state: 'dead       ')
+                spinners[service].update(state: "dead       ")
                 spinners[service].error
               when :starting
-                spinners[service].update(state: 'starting   ')
+                spinners[service].update(state: "starting   ")
               when :unhealthy
-                spinners[service].update(state: 'unhealthy  ')
+                spinners[service].update(state: "unhealthy  ")
                 spinners[service].error if spinners[service].instance_variable_get(:@state) == :spinning && count > 50
               when :healthy
-                spinners[service].update(state: 'ready      ')
+                spinners[service].update(state: "ready      ")
                 spinners[service].success
                 `cd #{neptuno_path}/procfiles/#{service} && overmind start -D -N  > /dev/null 2>&1`
               else
-                spinners[service].update(state: 'down       ')
+                spinners[service].update(state: "down       ")
                 spinners[service].error
               end
             end
@@ -61,7 +61,7 @@ module Neptuno
             count += 1
             sleep(5)
           end
-          spinner = ::TTY::Spinner.new('Neptuno: Starting[:spinner]', format: :dots)
+          spinner = ::TTY::Spinner.new("Neptuno: Starting[:spinner]", format: :dots)
           spinner.auto_spin
 
           spinner.stop

data/lib/neptuno/cli/base.rb

@@ -12,13 +12,13 @@ module Neptuno
       ABORT_MESSAGE = "fatal: not a Neptuno repository (or any of the parent directories)"
 
       def initialize
-        abort ABORT_MESSAGE if neptuno_path == "" 
+        abort ABORT_MESSAGE if neptuno_path == ""
         config.append_path(neptuno_path)
         config.read
       end
 
       def command_service_to(request, service_as_args: "")
-        chosen_service ||= service_as_args&.empty? ? nil : service_as_args
+        chosen_service ||= service_as_args.to_a.empty? ? nil : service_as_args
         chosen_service ||= service if in_service?
         chosen_service ||= prompt.select("Command service to #{request}:", services)
         yield chosen_service, project
@@ -26,9 +26,9 @@ module Neptuno
 
       def command_services_to(request, all: nil, services_as_args: [])
         chosen_services = services if all
-        chosen_services ||= services_as_args&.empty? ? nil : services_as_args
+        chosen_services ||= services_as_args.to_a.empty? ? nil : services_as_args
         chosen_services ||= [service] if in_service?
-        chosen_services ||= configured_services.empty? ? nil : configured_services
+        chosen_services ||= configured_services.to_a.empty? ? nil : configured_services
         chosen_services ||= prompt.multi_select("Command services to #{request}:", services)
         yield chosen_services, project
       end

data/lib/neptuno/cli/clone.rb

@@ -5,13 +5,19 @@ module Neptuno
     # Init Neptuno files
 
     class Clone < Dry::CLI::Command
-      desc 'Clone a neptuno compliant project'
+      desc "Clone a neptuno compliant project"
+      option :provision, type: :boolean, default: false, desc: "Build docker images, start containers and run procs"
+
       def call(**options)
         git_url = options[:args].first
         args_path = options[:args].second
-        path = args_path || git_url.split('/').last.split('.').first
+        path = args_path || git_url.split("/").last.split(".").first
         `git clone --recurse-submodules #{git_url} #{path}`
+
         sleep(1)
+
+        return unless options.fetch(:provision)
+
         `cd #{path} && neptuno services update -am`
         puts "Building Docker images"
         `cd #{path} && neptuno build -a`

data/lib/neptuno/cli/configure.rb

@@ -4,11 +4,11 @@ module Neptuno
   module CLI
     # Configure Neptuno defaults
     class Configure < Neptuno::CLI::Base
-      desc 'Configure which services to start by default'
+      desc "Configure which services to start by default"
 
       def call(**)
-        configured_services = config.fetch('configured_services')
-        configured_services = prompt.multi_select('Active services: ', config.fetch('services')) do |menu|
+        configured_services = config.fetch("configured_services")
+        configured_services = prompt.multi_select("Active services: ", config.fetch("services")) do |menu|
           menu.default(*configured_services)
         end
         config.set(:configured_services, value: configured_services)

data/lib/neptuno/cli/execute.rb

@@ -7,17 +7,17 @@ module Neptuno
       include TTY::File
       include TTY::Config
 
-      desc 'Execute service script'
+      desc "Execute service script"
 
       def call(**options)
-        command_service_to('execute', service_as_args: options[:args]&.first) do |service, _project|
-          commands = Dir.glob("#{neptuno_path}/scripts/#{service}/*").map { |x| x.split('/') }.map(&:last)
+        command_service_to("execute", service_as_args: options[:args]&.first) do |service, _project|
+          commands = Dir.glob("#{neptuno_path}/scripts/#{service}/*").map { |x| x.split("/") }.map(&:last)
           command = options[:args].last if commands.include?(options[:args]&.last)
           puts "#{neptuno_path}/scripts/#{service}/*"
           puts service
           puts commands.to_s
           puts Dir.glob("#{neptuno_path}/scripts/#{service}/*").to_s
-          command ||= prompt.select('execute', commands || [])
+          command ||= prompt.select("execute", commands || [])
           `cd #{neptuno_path}/scripts/#{service} && ./#{command}`
         end
       end

data/lib/neptuno/cli/init.rb

@@ -8,19 +8,19 @@ module Neptuno
       include TTY::Config
       include TTY::Which
 
-      desc 'Initializes a Neptuno project folder structure'
+      desc "Initializes a Neptuno project folder structure"
 
-      WORK_TREE = { '.' => [{ 'services' => [], 'dockerfiles' => [], 'procfiles' => [], 'environments' => [] }] }.freeze
+      WORK_TREE = {"." => [{"services" => [], "dockerfiles" => [], "procfiles" => [], "environments" => []}]}.freeze
 
       CONFIG = nil
 
       def call(**)
-        abort 'Neptuno projects can not be nested.' if neptuno_path != ''
+        abort "Neptuno projects can not be nested." if neptuno_path != ""
         ::TTY::File.create_dir(WORK_TREE, Dir.pwd)
-        config.set(:configured_services, value: '')
+        config.set(:configured_services, value: "")
         config.set(:services, value: [])
         config.write(create: true, force: true)
-        `cp #{File.expand_path("../../templates", __FILE__)}/* ./`
+        `cp -r #{File.expand_path("../../templates", __dir__)}/* ./`
       end
     end
   end

data/lib/neptuno/cli/install.rb

@@ -10,20 +10,20 @@ module Neptuno
       include TTY::Config
       include TTY::Which
 
-      desc 'Installs git, docker, tmux, tmuxinator and overmind'
+      desc "Installs git, docker, tmux, tmuxinator and overmind"
 
       CONFIG = nil
 
       def call(**)
-        install 'git'
-        install 'docker'
-        install 'tmux'
-        install 'overmind'
-        install 'tmuxinator'
+        install "git"
+        install "docker"
+        install "tmux"
+        install "overmind"
+        install "tmuxinator"
 
-        if(system("apt-get -v"))
-          system("sudo apt-get update")
-        end
+        return unless system("apt-get -v")
+
+        system("sudo apt-get update")
       end
 
       def install(package)
@@ -31,16 +31,14 @@ module Neptuno
           puts "#{package} is already installed"
         else
           puts "Installing #{package}"
-          if(system("brew -v"))
+          if system("brew -v")
             system("brew install #{package}")
+          elsif package == "overmind"
+            system("go install github.com/DarthSim/overmind/v2@latest")
+          elsif package == "tmuxinator"
+            system("gem install tmuxinator")
           else
-            if(package == 'overmind')
-              system("go install github.com/DarthSim/overmind/v2@latest")
-            elsif(package == 'tmuxinator')
-              system("gem install tmuxinator")
-            else
-              system("sudo apt-get install #{package} -y")
-            end
+            system("sudo apt-get install #{package} -y")
           end
         end
       end

data/lib/neptuno/cli/list.rb

@@ -9,29 +9,24 @@ module Neptuno
       include TTY::Config
       include DOTIW::Methods
 
-      desc 'List containers and their processes'
-      option :relative, aliases: ['r'], type: :boolean, default: true,
-                        desc: "Use relative time in 'last commit date' field"
+      desc "List containers and their processes"
+      option :relative, aliases: ["r"], type: :boolean, default: true,
+        desc: "Use relative time in 'last commit date' field"
 
       STATE_ORDER = %w[on dead off].freeze
 
-      def running_services
-        proc_files = Dir.glob('procfiles/**/Procfile', base: neptuno_path)
-        neptuno_procs = proc_files.map do |f|
-          [f.split("\/")[1], File.read("#{neptuno_path}/#{f}").split("\n").map do |s|
-                               s.split(':').first
-                             end]
-        end.to_h
+      def services_and_procs
+        proc_files = Dir.glob("procfiles/**/Procfile", base: neptuno_path)
+        sap = proc_files.map do |f|
+          [f.split("/")[1], File.read("#{neptuno_path}/#{f}").split("\n").map do |s|
+            next if /^\w*#/.match?(s)
 
-        begin
-          docker_containers = `docker compose ps`.lines[1..]
-          raise if $?.exitstatus != 0
-        rescue RuntimeError
-          exit
-        end
-        docker_procs = docker_containers.map { |service| service.split(/\s\s+/).slice(2, 2) }.to_h
+            s.split(":").first
+          end.compact]
+        end.to_h
 
-        [neptuno_procs, docker_procs]
+        services.each { |s| sap[s] ||= [] }
+        sap
       end
 
       def service_current_branches
@@ -49,30 +44,25 @@ module Neptuno
       end
 
       def get_display_date(date, relative)
-        if date
-          return date unless relative
+        return unless date
+        return date unless relative
 
-          distance_of_time_in_words(Time.now, Time.parse(date), false, highest_measures: 1).concat(' ago')
-        end
+        distance_of_time_in_words(Time.now, Time.parse(date), false, highest_measures: 1).concat(" ago")
       end
 
       def call(**options)
-        neptuno_procs, docker_procs = running_services
+        jss = json_services_status.to_h
         branches = service_current_branches
         dates = last_commit_date
 
-        x = docker_compose_services - neptuno_procs.select{|k,v| v.length > 0}.keys
-        x.each{|y| neptuno_procs[y] = ""}
-
-        procs = neptuno_procs.map do |name, *processes|
+        procs = services_and_procs.map do |name, *processes|
           display_date = get_display_date(dates[name], options.fetch(:relative))
-          state = docker_procs[name]&.match?(/running/) ? 'on' : nil
-          state ||= docker_procs[name]&.match?(/exited/) ? 'dead' : 'off'
-          { state: state, name: name, branch: branches[name], last_commit: display_date, processes: processes }
+          state = jss.to_h[name] || "Off"
+          {state: state, name: name, branch: branches[name], last_commit: display_date, processes: processes}
         end
 
         puts Hirb::Helpers::AutoTable.render(procs.sort do |a, b|
-                                               [STATE_ORDER.index(b[:state]), a[:name]] <=> [STATE_ORDER.index(a[:state]), b[:name]]
+                                               a[:state].split(" ").first <=> b[:state].split(" ").first
                                              end.reverse, fields: %i[state name branch last_commit processes])
       end
     end

data/lib/neptuno/cli/version.rb

@@ -4,7 +4,7 @@ module Neptuno
   module CLI
     # Print Neptuno CLI version
     class Version < Dry::CLI::Command
-      desc 'Print version'
+      desc "Print version"
 
       def call(**)
         puts ::Neptuno::VERSION

data/lib/neptuno/cli.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/cli'
+require "dry/cli"
 
 # Public: Command line interface that allows to install the library, and run
 # simple commands.
@@ -8,32 +8,32 @@ module Neptuno
   module CLI
     extend Dry::CLI::Registry
 
-    register 'version', Version, aliases: ['v', '-v', '--version', 'info']
-    register 'init', Init
-    register 'clone', Clone
-    register 'ls', List, aliases: ['ps']
-    register 'activate', Activate, aliases: ['a']
-    register 'config', Configure, aliases: %w[configure conf cc]
-    register 'execute', Execute, aliases: ['e']
-    register 'build', ::Neptuno::Docker::Build, aliases: ['b']
-    register 'up', Docker::Up, aliases: ['u']
-    register 'down', Docker::Down, aliases: ['d']
-    register 'restart', Docker::Restart, aliases: ['r']
-    register 'attach', Docker::Attach, aliases: ['at']
-    register 'k8s', K8s::Attach, aliases: ['k']
-    register 'log', Docker::Log, aliases: ['l']
-    register 'start', Overmind::Start, aliases: ['s']
-    register 'stop', Overmind::Stop, aliases: ['x']
-    register 'update', Services::Update, aliases: ['su']
-    register 'connect', Overmind::Connect, aliases: ['c']
-    register 'services list', Services::List, aliases: ['ls']
-    register 'services add', Services::Add
-    register 'services destroy', Services::Destroy, aliases: ['rm']
-    register 'services update', Services::Update, aliases: ['su']
-    register 'git stash', ::Neptuno::Git::Stash
-    register 'git pull', ::Neptuno::Git::Pull
-    register 'install', ::Neptuno::CLI::Install
-    register 'environment update', Environment::Update
-    register 'environment config', Environment::Config
+    register "version", Version, aliases: ["v", "-v", "--version", "info"]
+    register "init", Init
+    register "clone", Clone
+    register "ls", List, aliases: ["ps"]
+    register "activate", Activate, aliases: ["a"]
+    register "config", Configure, aliases: %w[configure conf cc]
+    register "execute", Execute, aliases: ["e"]
+    register "build", ::Neptuno::Docker::Build, aliases: ["b"]
+    register "up", Docker::Up, aliases: ["u"]
+    register "down", Docker::Down, aliases: ["d"]
+    register "restart", Docker::Restart, aliases: ["r"]
+    register "attach", Docker::Attach, aliases: ["at"]
+    register "k8s", K8s::Attach, aliases: ["k"]
+    register "log", Docker::Log, aliases: ["l"]
+    register "start", Overmind::Start, aliases: ["s"]
+    register "stop", Overmind::Stop, aliases: ["x"]
+    register "update", Services::Update, aliases: ["su"]
+    register "connect", Overmind::Connect, aliases: ["c"]
+    register "services list", Services::List, aliases: ["ls"]
+    register "services add", Services::Add
+    register "services destroy", Services::Destroy, aliases: ["rm"]
+    register "services update", Services::Update, aliases: ["su"]
+    register "git stash", ::Neptuno::Git::Stash
+    register "git pull", ::Neptuno::Git::Pull
+    register "install", ::Neptuno::CLI::Install
+    register "environment update", Environment::Update
+    register "environment config", Environment::Config
   end
 end

data/lib/neptuno/docker/attach.rb

@@ -6,10 +6,10 @@ module Neptuno
       include ::Neptuno::TTY::Config
       desc "Docker: Attach to a container's command"
 
-      option :up, type: :boolean, default: false, desc: 'Try to start containers before connecting'
+      option :up, type: :boolean, default: false, desc: "Try to start containers before connecting"
 
       def call(**options)
-        command_service_to('attach', service_as_args: options[:args].first) do |service, project|
+        command_service_to("attach", service_as_args: options[:args].first) do |service, project|
           system("cd #{neptuno_path} && docker compose up -d #{service}") if options.fetch(:up)
           success = system("cd #{neptuno_path} && docker attach #{project}_#{service}_1")
           unless success

data/lib/neptuno/docker/build.rb

@@ -4,15 +4,15 @@ module Neptuno
   module Docker
     # Build docker container for Neptuno project
     class Build < Neptuno::CLI::Base
-      desc 'Docker: Build docker containers for project'
+      desc "Docker: Build docker containers for project"
 
-      option :all, type: :boolean, default: false, desc: 'Run on all services'
-      argument :services, type: :array, required: false, desc: 'Optional list of services'
+      option :all, type: :boolean, default: false, desc: "Run on all services"
+      argument :services, type: :array, required: false, desc: "Optional list of services"
 
       def call(services: [], **options)
-        command_services_to('build', all: options.fetch(:all), services_as_args: services) do |services|
+        command_services_to("build", all: options.fetch(:all), services_as_args: services) do |services|
           make_service_files(services)
-          system("cd #{neptuno_path} && docker compose build #{services.join(' ')}")
+          system("cd #{neptuno_path} && docker compose build #{services.join(" ")}")
         end
       end
     end

data/lib/neptuno/docker/down.rb

@@ -4,19 +4,28 @@ module Neptuno
   module Docker
     # Stop docker containers for Neptuno project
     class Down < Neptuno::CLI::Base
-      desc 'Docker: Stop docker containers for current project'
+      desc "Docker: Stop docker containers for current project"
 
-      option :tmux, type: :boolean, default: false, desc: 'Kill tmux session'
-      option :all, type: :boolean, default: false, desc: 'Run on all services'
-      argument :services, type: :array, required: false, desc: 'Optional list of services'
+      option :all, type: :boolean, default: false, desc: "Run on all services"
+      argument :services, type: :array, required: false, desc: "Optional list of services"
 
       def call(services: [], **options)
-        command_services_to('go down', all: options.fetch(:all), services_as_args: services) do |services|
+        command_services_to("go down", all: options.fetch(:all), services_as_args: services) do |services|
           make_service_files(services)
-          system("cd #{neptuno_path} && docker compose stop -t 0 #{services.join(' ')}")
-          system("cd #{neptuno_path} && docker compose rm -f #{services.join(' ')}")
-          system("cd #{neptuno_path} && tmux kill-session -t neptuno") if options.fetch(:tmux)
-          system("cd #{neptuno_path}/procfiles/#{service} && rm .overmind.sock  > /dev/null 2>&1")
+          services_to_stop = services.intersection(services_with_procs).intersection(running_services)
+          system("cd #{neptuno_path} && docker compose stop -t 0 #{services.join(" ")}")
+          system("cd #{neptuno_path} && docker compose rm -f #{services.join(" ")}")
+          if config.fetch("procfile_manager") == "tmux"
+            services_to_stop.each do |service|
+              system("tmux kill-session -t #{service} 2>/dev/null ")
+              puts "Neptuno killed Tmux session for: #{service}" if `echo $TMUX`.strip.empty?
+            end
+          else
+            system("cd #{neptuno_path} && tmux kill-session -t neptuno")
+            services_to_stop.each do
+              system("cd #{neptuno_path}/procfiles/#{service} && rm .overmind.sock  > /dev/null 2>&1")
+            end
+          end
         end
       end
     end

data/lib/neptuno/docker/log.rb

@@ -7,7 +7,7 @@ module Neptuno
       desc "Docker: Show a container's log"
 
       def call(**options)
-        command_service_to('log', service_as_args: options[:args].first) do |service, project|
+        command_service_to("log", service_as_args: options[:args].first) do |service, project|
           success = system("cd #{neptuno_path} && docker logs -f #{project}_#{service}_1")
           unless success
             puts "Trying #{project}-#{services.first}-1"

data/lib/neptuno/docker/restart.rb

@@ -4,18 +4,18 @@ module Neptuno
   module Docker
     # Restart docker containers for Neptuno project
     class Restart < Neptuno::CLI::Base
-      desc 'Docker: Rebuild and restart docker containers for current project'
+      desc "Docker: Rebuild and restart docker containers for current project"
 
-      option :all, type: :boolean, default: false, desc: 'Run on all services'
-      argument :services, type: :array, required: false, desc: 'Optional list of services'
+      option :all, type: :boolean, default: false, desc: "Run on all services"
+      argument :services, type: :array, required: false, desc: "Optional list of services"
 
       def call(services: [], **options)
-        command_services_to('restart', all: options.fetch(:all), services_as_args: services) do |services|
+        command_services_to("restart", all: options.fetch(:all), services_as_args: services) do |services|
           make_service_files(services)
-          system("cd #{neptuno_path} && docker compose stop -t 0 #{services.join(' ')}")
-          system("cd #{neptuno_path} && docker compose rm -f #{services.join(' ')}")
-          system("cd #{neptuno_path} && docker compose build #{services.join(' ')}")
-          system("cd #{neptuno_path} && docker compose up -d #{services.join(' ')}")
+          system("cd #{neptuno_path} && docker compose stop -t 0 #{services.join(" ")}")
+          system("cd #{neptuno_path} && docker compose rm -f #{services.join(" ")}")
+          system("cd #{neptuno_path} && docker compose build #{services.join(" ")}")
+          system("cd #{neptuno_path} && docker compose up -d #{services.join(" ")}")
         end
       end
     end