contained 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25079cf5b856681f7a7c5ab9118cbe7a8249857b156dc8b201521abcb1613465
-  data.tar.gz: f2f555e13d1b9d9828c0d9b54289a06e141ba5a5b15f91774dcb5d6678f8e3ad
+  metadata.gz: 527971bc3fd7a83ceb0cffc2bf5b50ed59e49a3a5b43c4d7068f11194c36e554
+  data.tar.gz: 289aa2ca3ae5d3a9b121c186a12302b6a38cc5196fc3fd6c4bb8af94c143cb02
 SHA512:
-  metadata.gz: ff042e1bbb56c069d3fc1b55cd8f97ca68fab3d24ab8d731d3e2d90b50f2b9a1c2bc5192edef5a764c89726e8b6e8716c978ffe22feb9ea8546da9dfedd0e23e
-  data.tar.gz: 0aa327a38c19aaa4b1c91cd890f7e1db2a2fc6615223fa882ef46c6426607553aefbc3136c33fe6232003c28bc4547912d0e7879725e950c99a277bcf5023ca0
+  metadata.gz: bf6504165dc79786708c23074deb59f7007a233a43eaf3bbf8ae671ba6774b0e534691c5949a787a877a733460567430b5ba79cf741e3a12514ec9ed38e09566
+  data.tar.gz: d9b6657138f0d35a9538e3595ee3ef65648ea0a3da8dc61ed4720273a1059adc4169d9830374d4de01f1356bb3598d8e3607292e94febd7602830f37a26e0b13

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "fileutils"
+
 module Contained
   class CLI
     # @example
@@ -7,7 +9,20 @@ module Contained
     class Init < Base
       Arguments = Data.define(:image, :stack)
 
-      TEMPLATE = <<~YAML
+      CONFIG_DEPLOY_COMPOSE_YML = <<~YAML
+        services:
+          app:
+            image: example/app
+            ports:
+              - "80:80"
+            healthcheck:
+              test: ["CMD", "curl", "-f", "http://localhost/up"]
+              interval: 30s
+              timeout: 10s
+              retries: 3
+      YAML
+
+      CONFIG_DEPLOY_YML = <<~YAML
         stack: example
 
         registry:
@@ -19,44 +34,53 @@ 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
-
-        config:
-          services:
-            app:
-              image: example/app
-              ports:
-                - "80:80"
-              healthcheck:
-                test: ["CMD", "curl", "-f", "http://localhost/up"]
-                interval: 30s
-                timeout: 10s
-                retries: 3
       YAML
 
       def handle!
-        if File.exist?("./config/deploy.yml")
-          @stdout.puts("overwrite 'config/deploy.yml' (yes/no)?")
+        arguments = arguments!
+        path = arguments.fetch(:path)
+
+        setup_config_dir(path:)
+        setup_config_deploy_yml(path:)
+        setup_config_deploy_compose_yml(path:)
+      end
+
+    private
+
+      def setup_config_dir(path:)
+        FileUtils.mkdir_p("#{path}/config/deploy")
+      end
+
+      def setup_config_deploy_yml(path:)
+        if File.exist?("#{path}/config/deploy.yml")
+          @stdout.puts("overwrite '#{path}/config/deploy.yml' (yes/no)?")
           @stdin.gets { |response| return unless response.strip.eql?("yes") }
         end
 
-        Dir.mkdir("./config") unless Dir.exist?("./config")
-        File.write("./config/deploy.yml", TEMPLATE)
-
-        @stdout.puts("setup 'config/deploy.yml'")
+        File.write("#{path}/config/deploy.yml", CONFIG_DEPLOY_YML)
+        @stdout.puts("setup '#{path}/config/deploy.yml'")
       end
 
-    private
+      def setup_config_deploy_compose_yml(path:)
+        if File.exist?("#{path}/config/deploy/compose.yml")
+          @stdout.puts("overwrite '#{path}/config/deploy/compose.yml' (yes/no)?")
+          @stdin.gets { |response| return unless response.strip.eql?("yes") }
+        end
+
+        File.write("#{path}/config/deploy/compose.yml", CONFIG_DEPLOY_COMPOSE_YML)
+        @stdout.puts("setup '#{path}/config/deploy/compose.yml'")
+      end
 
       # @return [Arguments]
       def arguments!
-        Arguments.new(DEFAULT_IMAGE, DEFAULT_STACK).tap do |arguments|
+        { path: "." }.tap do |arguments|
           parser(into: arguments).parse!(@argv)
         end
       end
@@ -67,6 +91,10 @@ module Contained
         OptionParser.new do |options|
           options.banner = "usage: contained init [options]"
 
+          options.on("-p", "--path=PATH", "path") do |path|
+            into[:path] = path
+          end
+
           options.on("-h", "--help", "help") do
             @stdout.puts(options)
             exit

data/lib/contained/cli/setup.rb

@@ -1,5 +1,48 @@
-class Contained::CLI::Deploy Contained::CLI::Base
-  def handle!
-    # TODO
+# frozen_string_literal: true
+
+module Contained
+  class CLI
+    # @example
+    #   Contained::CLI::Setup.handle!(stdout: $stdout, stderr: $stderr, argv: %i[--environment demo])
+    class Setup < Contained::CLI::Base
+      def handle!
+        arguments = arguments!
+
+        config = Contained::Config.load_file(path: arguments.fetch(:config))
+        environment = arguments.fetch(:environment)
+
+        Contained::Command::Setup.execute!(stdin: @stdin, stdout: @stdout, environment:, config:)
+      end
+
+    private
+
+      # @return [Hash]
+      def arguments!
+        { config: "./config/deploy.yml", environment: "default" }.tap do |arguments|
+          parser(into: arguments).parse!
+        end
+      end
+
+      # @param into [Hash]
+      # @return [OptionParser]
+      def parser(into:)
+        OptionParser.new do |options|
+          options.banner = "usage: contained setup [options] "
+
+          options.on("-h", "--help", "help") do
+            @stdout.puts(options)
+            exit
+          end
+
+          options.on("-c", "--config=CONFIG", "config") do |config|
+            into[:config] = config
+          end
+
+          options.on("-e", "--environment=ENVIRONMENT", "environment") do |environment|
+            into[:environment] = environment
+          end
+        end
+      end
+    end
   end
 end

data/lib/contained/cli.rb

@@ -33,7 +33,7 @@ module Contained
       handler.handle!(stdin: @stdin, stdout: @stdout, argv: @argv)
     end
 
-    private
+  private
 
     # @return [OptionParser]
     def parser

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,12 +12,12 @@ 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}")
-          within "~/.contained/#{stack}" do
-            execute("source .env")
-            execute("docker stack deploy -c ./compose.yml #{stack} --with-registry-auth")
-          end
+          execute(<<~BASH)
+            source ./.contained/#{stack}/.env
+            docker stack deploy -c ./.contained/#{stack}/compose.yml #{stack} --with-registry-auth
+          BASH
           puts("[done] host=#{host.hostname}")
         end
       end

data/lib/contained/command/setup.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Contained
+  module Command
+    # @example
+    #   Contained::Command::Setup.execute(environment: "production", config: {})
+    class Setup < Base
+      def execute!
+        stack = @config.fetch("stack")
+
+        deploy_compose_yml = File.open("./config/deploy/compose.yml")
+        deploy_env = File.open("./config/deploy/.#{@environment}.env")
+
+        @stdout.puts("[setup] stack=#{stack} environment=#{@environment} hosts=#{hosts}")
+
+        on hosts, in: :sequence do |host|
+          puts("[starting] host=#{host.hostname}")
+
+          execute("mkdir -p ./.contained/#{stack}")
+
+          upload!(deploy_compose_yml, "./.contained/#{stack}/compose.yml")
+          upload!(deploy_env, "./.contained/#{stack}/.env")
+
+          execute(<<~BASH)
+            source ./.contained/#{stack}/.env
+            docker stack deploy -c ./.contained/#{stack}/compose.yml #{stack} --with-registry-auth
+          BASH
+
+          puts("[done] host=#{host.hostname}")
+        end
+      end
+    end
+  end
+end

data/lib/contained/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contained
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Kevin Sylvestre
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fileutils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: optparse
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +116,7 @@ files:
 - lib/contained/command/base.rb
 - lib/contained/command/deploy.rb
 - lib/contained/command/login.rb
+- lib/contained/command/setup.rb
 - lib/contained/config.rb
 - lib/contained/config/registry.rb
 - lib/contained/version.rb