contained 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4175520c4ec751558d7d28563a476fcc23eb3f46ee06bac71580fb77312aaae4
-  data.tar.gz: b30a71a1728939c95220ddcd62f037051451d76b8d9bb201d18824ff4dd14b38
+  metadata.gz: 0e7b386047099983a38eaf2abbee4a1fa369ccb6477d6669b2a75528d62a883e
+  data.tar.gz: d046b94b3abac997c3d3b74eb3046684f143d11ba55c5e9acadc141ccaa58399
 SHA512:
-  metadata.gz: 3828f26f88c6de1cfb04973053ea874ed3d2d26697bad3196fbcd65c164bc2d0c2e0ae67f3fd64053d1694acc3dcd5481e12f00862a14aa62e8d666a8613b1b4
-  data.tar.gz: 2243642c5d055fce876311a111945cc75895f2d6f924c3c20c2b46b79d1499b05152cb5f40f96eb7e0e2317c49478a6cceac55fd300085fc34d4227f2622b861
+  metadata.gz: 5dfc9d1e95e88f589fa68682e41c93b50f415c65a3a27a7d004b230af1055ad82b8f26f97a59d23ae8fce9eb2c9583cdd8956f46b571684bdd004d64e4977a3c
+  data.tar.gz: 2222589039c72fc3153adc069b76c8de6037d93346d36c09ba314b6535faa833d32ae7aa5dd28faba27032127307a9bccca486576a2febfbf4ba40c18fe594a3

data/Gemfile

@@ -7,5 +7,10 @@ gemspec
 gem "irb"
 gem "rake"
 gem "rspec"
+gem "rspec_junit_formatter"
 gem "rubocop"
 gem "rubocop-basic"
+gem "rubocop-rake"
+gem "rubocop-rspec"
+gem "simplecov"
+gem "yard"

data/README.md

@@ -1,6 +1,28 @@
 # Contained
 
-## Example
+[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/ksylvest/contained/blob/main/LICENSE)
+[![RubyGems](https://img.shields.io/gem/v/contained)](https://rubygems.org/gems/contained)
+[![GitHub](https://img.shields.io/badge/github-repo-blue.svg)](https://github.com/ksylvest/contained)
+[![Yard](https://img.shields.io/badge/docs-site-blue.svg)](https://contained.ksylvest.com)
+[![CircleCI](https://img.shields.io/circleci/build/github/ksylvest/contained)](https://circleci.com/gh/ksylvest/contained)
+
+Deploy using [Docker Swarm](https://docs.docker.com/engine/swarm/) via SSH across multiple and environments.
+
+## Installation
+
+```bash
+gem install contained
+```
+
+## Commands
+
+### Init
+
+The `contained init` command copies / pastes the following into your project:
+
+```bash
+contained init
+```
 
 **config/deploy.yml**
 
@@ -8,13 +30,19 @@
 stack: example
 
 environments:
-  production: hosts
-    - 1.2.3.4
-    - 5.6.7.8
-  test: hosts
-    - 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/deploy/compose.yml**
+
+```yaml
 config:
   services:
     caddy:
@@ -48,15 +76,15 @@ config:
     caddy_config:
 ```
 
-```bash
-gem install contained
-```
+### Setup
+
+The `contained setup` command connects to all the hosts within an environment via SSH and configures docker swarm using a stack defined in the **config/deploy/compose.yml** file.
 
 ```bash
-contained setup
+contained setup --environment production
 ```
 
-## Usage
+## Examples
 
 ### w/ Caddy
 

data/lib/contained/cli/deploy.rb

@@ -11,7 +11,7 @@ module Contained
         config = Contained::Config.load_file(path: arguments.fetch(:config))
         environment = arguments.fetch(:environment)
 
-        Contained::Command::Deploy.execute!(stdin: @stdin, stdout: @stdout, environment:, config:)
+        Contained::Task::Deploy.execute!(stdin: @stdin, stdout: @stdout, environment:, config:)
       end
 
     private

data/lib/contained/cli/init.rb

@@ -61,7 +61,8 @@ module Contained
       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") }
+          response = @stdin.gets
+          return unless response.strip.eql?("yes")
         end
 
         File.write("#{path}/config/deploy.yml", CONFIG_DEPLOY_YML)
@@ -71,7 +72,8 @@ module Contained
       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") }
+          response = @stdin.get
+          return unless response.strip.eql?("yes")
         end
 
         File.write("#{path}/config/deploy/compose.yml", CONFIG_DEPLOY_COMPOSE_YML)

data/lib/contained/cli/setup.rb

@@ -11,7 +11,7 @@ module Contained
         config = Contained::Config.load_file(path: arguments.fetch(:config))
         environment = arguments.fetch(:environment)
 
-        Contained::Command::Setup.execute!(stdin: @stdin, stdout: @stdout, environment:, config:)
+        Contained::Task::Setup.execute!(stdin: @stdin, stdout: @stdout, environment:, config:)
       end
 
     private

data/lib/contained/command/base.rb

@@ -8,28 +8,25 @@ module Contained
     class Base
       include SSHKit::DSL
 
-      def self.execute!(...)
-        new(...).execute!
+      def self.command(...)
+        new(...).command
       end
 
-      # @param stdin [IO]
-      # @param stdout [IO]
       # @environment [String]
       # @config [Contained::Config]
-      def initialize(stdin:, stdout:, environment:, config:)
-        @stdin = stdin
-        @stdout = stdout
+      def initialize(environment:, config:)
         @environment = environment
         @config = config
       end
 
-      def execute!
+      # @return [Array<Symbol,String>] e.g. [:docker, :login, "hub.docker.com", "-u", "root", "-p", "secret"]
+      def command
         raise NotImplementedError, "#execute! undefined"
       end
 
     protected
 
-      # @return [Array<Hash>]
+      # @return [Array<Hash<{ hostname: String }>>]
       def hosts
         @config.dig("environments", @environment, "hosts").map do |hostname|
           @config.fetch("ssh", {}).merge({ hostname: })

data/lib/contained/command/docker_login.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Contained
+  module Command
+    # User to `docker login` to a registry using a provided username and password.
+    #
+    # @example
+    #   Contained::Task::Login.command(environment: "production", config: {
+    #     registry: {
+    #     server: "hub.docker.com",
+    #     username: "root",
+    #     password: "secret",
+    #   }) # => [:docker, :login, "hub.docker.com", "-u", "root", "-p", "secret"]
+    class DockerLogin < Base
+      DEFAULT_SERVER = "hub.docker.com"
+
+      # @return [Array<Symbol,String>]
+      def command
+        [
+          :docker,
+          :login,
+          server,
+          "-u", username,
+          "-p", password,
+        ]
+      end
+
+    private
+
+      # @return [String, nil]
+      def username
+        @config.dig("registry", "username")
+      end
+
+      # @return [String, nil]
+      def password
+        @config.dig("registry", "username")
+      end
+
+      # @return [String]
+      def server
+        @config.dig("registry", "server") || DEFAULT_SERVER
+      end
+    end
+  end
+end

data/lib/contained/command/docker_logout.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Contained
+  module Command
+    # User to `docker login` to a registry using a provided username and password.
+    #
+    # @example
+    #   Contained::Task::Login.command(environment: "production", config: {
+    #     registry: {
+    #     server: "hub.docker.com",
+    #   }) # => [:docker, :login, "hub.docker.com"]
+    class DockerLogout < Base
+      DEFAULT_SERVER = "hub.docker.com"
+
+      # @return [Array<Symbol,String>]
+      def command
+        [
+          :docker,
+          :logout,
+          server,
+        ]
+      end
+
+    private
+
+      # @return [String]
+      def server
+        @config.dig("registry", "server") || DEFAULT_SERVER
+      end
+    end
+  end
+end

data/lib/contained/task/base.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "sshkit"
+
+module Contained
+  module Task
+    # @abstract
+    class Base
+      include SSHKit::DSL
+
+      def self.execute!(...)
+        new(...).execute!
+      end
+
+      # @param stdin [IO]
+      # @param stdout [IO]
+      # @environment [String]
+      # @config [Contained::Config]
+      def initialize(stdin:, stdout:, environment:, config:)
+        @stdin = stdin
+        @stdout = stdout
+        @environment = environment
+        @config = config
+      end
+
+      def execute!
+        raise NotImplementedError, "#execute! undefined"
+      end
+
+    protected
+
+      # @return [Array<Hash<{ hostname: String }>>]
+      def hosts
+        @config.dig("environments", @environment, "hosts").map do |hostname|
+          @config.fetch("ssh", {}).merge({ hostname: })
+        end
+      end
+    end
+  end
+end

data/lib/contained/{command → task}/deploy.rb

@@ -3,22 +3,20 @@
 # .contained/itva/compose.yml
 # .contained/itva/.env
 module Contained
-  module Command
+  module Task
     # @example
-    #   Contained::Command::Deploy.execute(environment: "production", config: {})
+    #   Contained::Task::Deploy.execute(environment: "production", config: {})
     class Deploy < Base
       def execute!
         stack = @config.fetch("stack")
 
-        @stdout.puts("[deploying] stack=#{stack} environment=#{@environment}")
+        @stdout.puts("[deploy] stack=#{stack} environment=#{@environment}")
 
-        on hosts, in: :sequence do |host|
-          puts("[starting] host=#{host.hostname}")
+        on hosts, in: :sequence do
           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

data/lib/contained/{command → task}/setup.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Contained
-  module Command
+  module Task
     # @example
-    #   Contained::Command::Setup.execute(environment: "production", config: {})
+    #   Contained::Task::Setup.execute(environment: "production", config: {})
     class Setup < Base
       def execute!
         stack = @config.fetch("stack")
@@ -11,10 +11,10 @@ module Contained
         deploy_compose_yml = File.open("./config/deploy/compose.yml")
         deploy_env = File.open("./config/deploy/.env.#{@environment}")
 
-        @stdout.puts("[setup] stack=#{stack} environment=#{@environment} hosts=#{hosts}")
+        @stdout.puts("[setup] stack=#{stack} environment=#{@environment}")
 
-        on hosts, in: :sequence do |host|
-          puts("[starting] host=#{host.hostname}")
+        on hosts, in: :sequence do
+          execute(:docker, :swarm, :init) unless capture(:docker, :info).include?("Swarm: active")
 
           execute("mkdir -p ./.contained/#{stack}")
 
@@ -25,8 +25,6 @@ module Contained
             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

data/lib/contained/version.rb

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

data/lib/contained.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'zeitwerk'
-require 'optparse'
+require "zeitwerk"
+require "optparse"
 
 loader = Zeitwerk::Loader.for_gem
 loader.inflector.inflect "cli" => "CLI"

data/templates/config/deploy/compose.yml

@@ -0,0 +1,10 @@
+services:
+  app:
+    image: example/app
+    ports:
+      - "80:80"
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost/up" ]
+      interval: 30s
+      timeout: 10s
+      retries: 3

data/templates/config/deploy.yml

@@ -0,0 +1,21 @@
+stack: example
+
+registry:
+  server: hub.docker.com
+  username:
+    - DOCKER_USERNAME
+  password:
+    - DOCKER_PASSWORD
+
+ssh:
+  user: root
+
+environments:
+  production:
+    hosts:
+      - 1.2.3.4
+      - 5.6.7.8
+  test:
+    hosts:
+      - 4.3.2.1
+      - 8.7.6.5

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: contained
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Kevin Sylvestre
 bindir: exe
 cert_chain: []
-date: 2025-03-21 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb
@@ -112,14 +112,16 @@ files:
 - lib/contained/cli/deploy.rb
 - lib/contained/cli/init.rb
 - lib/contained/cli/setup.rb
-- lib/contained/command.rb
 - lib/contained/command/base.rb
-- lib/contained/command/deploy.rb
-- lib/contained/command/login.rb
-- lib/contained/command/setup.rb
+- lib/contained/command/docker_login.rb
+- lib/contained/command/docker_logout.rb
 - lib/contained/config.rb
-- lib/contained/config/registry.rb
+- lib/contained/task/base.rb
+- lib/contained/task/deploy.rb
+- lib/contained/task/setup.rb
 - lib/contained/version.rb
+- templates/config/deploy.yml
+- templates/config/deploy/compose.yml
 homepage: https://github.com/ksylvest/contained
 licenses:
 - MIT

data/lib/contained/command/login.rb

@@ -1,24 +0,0 @@
-class Contained::Command::Login
-  # @param stdin [IO]
-  # @param stdout [IO]
-  # @param argv [Array<String>]
-  def initialize(stdin:, stdout:, argv:)
-    @stdin = stdin
-    @stdout = stdout
-    @argv = argv
-  end
-
-  def execute!
-    raise NotImplementedError, "#handle! undefined"
-  end
-
-  # @return [String]
-  def username!
-    @options.fetch(:username)
-  end
-
-  # @return [String]
-  def password
-    @options.fetch(:password)
-  end
-end

data/lib/contained/command.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module Contained
-  module Command
-  end
-end