contained 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0cb59a30f87b9f812ea82750eaf3ec2aa709646117f2bd3cd267b74a0a93f4b
-  data.tar.gz: 3f0de08deaa75360d26125eaf1c3e82a1c068a2357eb93d69f9bb15ebe9b7ac8
+  metadata.gz: 4175520c4ec751558d7d28563a476fcc23eb3f46ee06bac71580fb77312aaae4
+  data.tar.gz: b30a71a1728939c95220ddcd62f037051451d76b8d9bb201d18824ff4dd14b38
 SHA512:
-  metadata.gz: 20db27de1725d9aceffaa923e919315b12beb3f1ec7bedc969af903da579f491fd087ce90fa4c86edbf40a88f4898537f9b3419649159a2c3a17ab739edcc6b5
-  data.tar.gz: 3781c551e71dd8ae8e0fd81bf38d07c9e75b64d1f08eb8371359a409575c86636383fc0ec7428f1fe6fb29a41079fb315ff0aee050e5ca71acb1d593dfa561c6
+  metadata.gz: 3828f26f88c6de1cfb04973053ea874ed3d2d26697bad3196fbcd65c164bc2d0c2e0ae67f3fd64053d1694acc3dcd5481e12f00862a14aa62e8d666a8613b1b4
+  data.tar.gz: 2243642c5d055fce876311a111945cc75895f2d6f924c3c20c2b46b79d1499b05152cb5f40f96eb7e0e2317c49478a6cceac55fd300085fc34d4227f2622b861

data/README.md

@@ -8,14 +8,12 @@
 stack: example
 
 environments:
-  production:
-    servers:
-      - 1.2.3.4
-      - 5.6.7.8
-  test:
-    servers:
-      - 4.3.2.1
-      - 8.7.6.5
+  production: hosts
+    - 1.2.3.4
+    - 5.6.7.8
+  test: hosts
+    - 4.3.2.1
+    - 8.7.6.5
 
 config:
   services:

data/lib/contained/cli/init.rb

@@ -34,11 +34,11 @@ module Contained
 
         environments:
           production:
-            servers:
+            hosts
               - 1.2.3.4
               - 5.6.7.8
           test:
-            servers:
+            hosts
               - 4.3.2.1
               - 8.7.6.5
       YAML

data/lib/contained/command/base.rb

@@ -29,8 +29,11 @@ module Contained
 
     protected
 
-      def servers
-        @config.dig("environments", @environment, "servers")
+      # @return [Array<Hash>]
+      def hosts
+        @config.dig("environments", @environment, "hosts").map do |hostname|
+          @config.fetch("ssh", {}).merge({ hostname: })
+        end
       end
     end
   end

data/lib/contained/command/deploy.rb

@@ -12,7 +12,7 @@ module Contained
 
         @stdout.puts("[deploying] stack=#{stack} environment=#{@environment}")
 
-        on servers, in: :sequence do |host|
+        on hosts, in: :sequence do |host|
           puts("[starting] host=#{host.hostname}")
           execute(<<~BASH)
             source ./.contained/#{stack}/.env

data/lib/contained/command/setup.rb

@@ -9,11 +9,11 @@ module Contained
         stack = @config.fetch("stack")
 
         deploy_compose_yml = File.open("./config/deploy/compose.yml")
-        deploy_env = File.open("./config/deploy/.#{@environment}.env")
+        deploy_env = File.open("./config/deploy/.env.#{@environment}")
 
-        @stdout.puts("[setup] stack=#{stack} environment=#{@environment} servers=#{servers}")
+        @stdout.puts("[setup] stack=#{stack} environment=#{@environment} hosts=#{hosts}")
 
-        on servers, in: :sequence do |host|
+        on hosts, in: :sequence do |host|
           puts("[starting] host=#{host.hostname}")
 
           execute("mkdir -p ./.contained/#{stack}")

data/lib/contained/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Contained
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contained
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Kevin Sylvestre