devup 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99a6b3579f7d44d86a42c61b5d5b55dcd32e8d7aac580c49e5bce9a95500ff02
-  data.tar.gz: 2a73831a4d8d1549d6150050c12d4806ab8cc41089cbb9ce2b81420d09b02c8a
+  metadata.gz: e5744f3c2fd5d14feaa071eb77144c66180cc1788fc072823150e3817bcb13c6
+  data.tar.gz: 4f0c24dc63a0e375bcc740828989e2d3f524444253440945481367c7c781fd2d
 SHA512:
-  metadata.gz: 709e5c38a2786273085eba92ab0fa70f70dd8fbbfe1200b631ab1bd527b072df097fe6b856bab1e57a5790952dd2476665bcca965e302a69fa8ea2d47cb0d2a4
-  data.tar.gz: 5c81a935db87d41f22be697fcce631d9f80262f155bbc5eac146c2782e8d1ff49a4a805a86ad0b2c14b3d91e118807c80e0f857ba8584927a1743eab3fd7d87a
+  metadata.gz: 78b162b5135a393e6647a302cba4748b3f9110e100a5be2ffecc904cc08ffacdd767f0bb6070368d724faa6d0651b5226f629711e62a54a377d14a9e1c4d3981
+  data.tar.gz: cb57eea0871d5740bbdd91d19600ba42fc34399fae4c3ccb4da8fd98b898fe64c0cf7fb2b45f33bb200c8c7a04f246ebc963d6b3892098d89efed9cbd8ae6ac1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devup (0.4.0)
+    devup (0.4.2)
       dotenv
       dry-cli
 

data/lib/devup/boot.rb

@@ -3,13 +3,18 @@ if ENV.fetch("DEVUP_ENABLED", "true") == "true"
     pwd: `pwd`,
     logger: Devup::Logger.build(ENV.fetch("DEVUP_LOG_LEVEL", "info"))
   )
-  devup.up
 
   begin
     require "spring/commands"
 
-    Spring.watch devup.root.join("docker-compose.yml")
+    Spring.after_fork do
+      devup.up
+    end
+
+    Spring.watch devup.root.join("docker-compose.devup.yml")
   rescue LoadError, ArgumentError
     # Spring is not available
+
+    devup.up
   end
 end

data/lib/devup/compose.rb

@@ -29,8 +29,8 @@ module Devup
       config["services"][name]["ports"].map { |el| el.to_s.split(":")[-1].to_i }
     end
 
-    def port_mapping(service, port)
-      exec("port #{service} #{port}").split(":")[-1].strip.to_i
+    def port_mapping(port)
+      ComposeHelpers::Ps.new(exec_ps_cached).port_mapping(port)
     end
 
     def up
@@ -64,7 +64,15 @@ module Devup
     end
 
     def alive?
-      ComposeHelpers::Ps.new(exec("ps")).up?
+      ComposeHelpers::Ps.new(exec_ps).up?
+    end
+
+    def exec_ps
+      @exec_ps_output = exec("ps")
+    end
+
+    def exec_ps_cached
+      @exec_ps_output ||= exec("ps")
     end
 
     def exec(cmd)

data/lib/devup/service.rb

@@ -19,7 +19,7 @@ module Devup
       compose.service_ports(name).map do |from|
         OpenStruct.new(
           from: from,
-          to: compose.port_mapping(name, from)
+          to: compose.port_mapping(from)
         )
       end
     end

data/lib/devup/service_presenter.rb

@@ -31,7 +31,7 @@ module Devup
     def ports_env
       res = []
 
-      res << port_env(to: service.ports.first.to) if service.ports.size == 1
+      res << port_env(to: service.ports.first.to)
 
       service.ports.each do |port|
         res << port_env(from: port.from, to: port.to)

data/lib/devup/version.rb

@@ -1,3 +1,3 @@
 module Devup
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devup
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Sergei O. Udalov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv