neptuno 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fae466d455aa821936b90939ba0a855a643ed38a3f04ae348aad5084a222a69
-  data.tar.gz: edb31dfae133228fe6a8e0c67ffdd21e2f2cc6b101e90a3df69fbe35ed24b2be
+  metadata.gz: 4a6835e63059152770ea372ddea2f3ef29432602e945ca066da50395c4619863
+  data.tar.gz: b78fa32b47aab0b82c137244fbe474c187be421747cdf098fd1bbf62553d317a
 SHA512:
-  metadata.gz: 38e0e81a410f573bef3fc80185e3a43f32e927f13d58fb736bd24dc7174e9b4030b9b4f9bfef985555b1af868f81dc52b8f125468019751e887444314734cab2
-  data.tar.gz: e31f2426d4b53f8ea75812e3a87f714fc926ffa7f5b5d69199d5f2301498ddbab1ecfceebbd754083b492e50714eb9c2db9983edc4aad8aa6cf2910635ef780f
+  metadata.gz: c7d8c01bf9e8577226fc496b68856fe6b8d3bfb81efba45e3e9b0a38003af2ccec40476a418fe23a547743b1560dfb6831eed69067777d9a28ddb1a1f3f2d871
+  data.tar.gz: fc11b7c142f119f796ccbb46db0fbe2c80ecc8bcf371d4d73f328f5bf435705e68f8524af0fdd89825ed580428cee9e51424804bc889fb9c019cf676b9a20f07

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neptuno (1.0.4)
+    neptuno (1.0.6)
       dotiw
       dry-cli
       hirb

data/lib/neptuno/cli/activate.rb

@@ -12,7 +12,6 @@ module Neptuno
       argument :services, type: :array, required: false, desc: 'Optional list of services'
 
       def call(services: [], **options)
-        dd = config.fetch('docker_delimiter') || '-'
         multi_spinner = ::TTY::Spinner::Multi.new('[:spinner] Services')
         spinners = {}
         count = 0
@@ -28,7 +27,7 @@ module Neptuno
             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.include?(project.to_s) && s.include?("#{dd}#{service}#{dd}") }
+              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')

data/lib/neptuno/docker/attach.rb

@@ -9,10 +9,13 @@ module Neptuno
       option :up, type: :boolean, default: false, desc: 'Try to start containers before connecting'
 
       def call(**options)
-        dd = config.fetch('docker_delimiter') || '-'
         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)
-          system("cd #{neptuno_path} && docker attach #{project}#{dd}#{service}#{dd}1")
+          success = system("cd #{neptuno_path} && docker attach #{project}_#{service}_1")
+          unless success
+            puts "Trying #{project}-#{services.first}-1"
+            system("cd #{neptuno_path} && docker attach #{project}-#{service}-1")
+          end
         end
       end
     end

data/lib/neptuno/docker/log.rb

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

data/lib/neptuno/docker/up.rb

@@ -11,10 +11,13 @@ module Neptuno
       argument :services, type: :array, required: false, desc: 'Optional list of services'
 
       def call(services: [], **options)
-        dd = config.fetch('docker_delimiter') || '-'
         command_services_to('come up', all: options.fetch(:all), services_as_args: services) do |services, project|
           system("cd #{neptuno_path} && docker compose up -d #{services.join(' ')}")
-          system("cd #{neptuno_path} && docker logs -f #{project}#{dd}#{services.first}#{dd}1") if options.fetch(:log)
+          success = system("cd #{neptuno_path} && docker logs -f #{project}_#{services.first}_1") if options.fetch(:log)
+          unless success
+            puts "Trying #{project}-#{services.first}-1"
+            system("cd #{neptuno_path} && docker logs -f #{project}-#{services.first}-1") if options.fetch(:log)
+          end
         end
       end
     end

data/lib/neptuno/overmind/connect.rb

@@ -15,7 +15,6 @@ module Neptuno
       argument :services, type: :array, required: false, desc: 'Optional list of services'
 
       def call(services: [], **options)
-        dd = config.fetch('docker_delimiter') || '-'
         multi_spinner = ::TTY::Spinner::Multi.new('[:spinner] Services')
         spinners = {}
         count = 0
@@ -31,7 +30,7 @@ module Neptuno
             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.include?(project.to_s) && s.include?("#{dd}#{service}#{dd}") }
+              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')

data/lib/neptuno/overmind/start.rb

@@ -13,7 +13,6 @@ module Neptuno
       argument :services, type: :array, required: false, desc: 'Optional list of services'
 
       def call(services: [], **options)
-        dd = config.fetch('docker_delimiter') || '-'
         multi_spinner = ::TTY::Spinner::Multi.new('[:spinner] Services')
         spinners = {}
         count = 0
@@ -29,7 +28,7 @@ module Neptuno
             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.include?(project.to_s) && s.include?("#{dd}#{service}#{dd}") }
+              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')

data/lib/neptuno/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Neptuno
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neptuno
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Roberto Plancarte
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotiw