dip 7.5.0 → 7.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be7ef96533ac533734f04b61b49864b8db104269813c5dd00d8192d968c0c1dd
-  data.tar.gz: 74d31efceda6300bd5f93023f5a108c3a9972d2b4416d0e4433e98f7ec76f61e
+  metadata.gz: f054f4d57aa8fcd971e84dfd09f64e45e468f902bec2390cea1ca22429ec5b5b
+  data.tar.gz: c5d1f343917d8eb814cd12bf650f5c25fc82e642b97d24d39244ff79bd0a84c1
 SHA512:
-  metadata.gz: aafe6a31332d687c065c29e34d3c8fdc69bdc6c0507aa4a4c1d3fc1c68d5ded516c4f52e2b7092b34cf585a3ceb9f69ad4a6b764a41863ea090323d5b0a5b2c2
-  data.tar.gz: 6d801682b927567b84f07a0f7df75535d35ac1f11a953f286cc9785a8d415d55d5940b72a68365d2cafaa13e02b9aafa01f6f58282a41e2c37546274553fbf74
+  metadata.gz: f95680b8f9393ceb447641751176a44343118621a5d37670cd41e5e82ff9093e3bdabb541809ef0df18580390b78c848feee7dafb97b05c445aa9798c4c48e2c
+  data.tar.gz: ca40545fa4f180fd4c3740348e413ca760580aca68dc18f9f4839e3bc51155f3094a962294eba27b5fc10aa22df1ff178223c9bdaf9489cb7f6d53edef05e41c

data/README.md

@@ -132,6 +132,12 @@ interaction:
         compose:
           run_options: [service-ports, use-aliases]
 
+  stack:
+    description: Run full stack (server, workers, etc.)
+    runner: docker_compose
+    compose:
+      profiles: [web, workers]
+
   sidekiq:
     description: Run sidekiq in background
     service: worker

data/lib/dip/cli/console.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "thor"
-require_relative "./base"
+require_relative "base"
 require_relative "../commands/console"
 
 module Dip

data/lib/dip/cli/dns.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "thor"
-require_relative "./base"
+require_relative "base"
 require_relative "../commands/dns"
 
 module Dip

data/lib/dip/cli/nginx.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "thor"
-require_relative "./base"
+require_relative "base"
 require_relative "../commands/nginx"
 
 module Dip

data/lib/dip/cli/ssh.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "thor"
-require_relative "./base"
+require_relative "base"
 require_relative "../commands/ssh"
 
 module Dip

data/lib/dip/cli.rb

@@ -78,7 +78,7 @@ module Dip
         require_relative "commands/down_all"
         Dip::Commands::DownAll.new.execute
       else
-        compose("down", *argv)
+        compose("down", *argv.push("--remove-orphans"))
       end
     end
 

data/lib/dip/command.rb

@@ -11,7 +11,7 @@ module Dip
     class ProgramRunner
       def self.call(cmdline, env: {}, **options)
         if cmdline.is_a?(Array)
-          ::Kernel.exec(env, cmdline[0], *cmdline[1..-1], **options)
+          ::Kernel.exec(env, cmdline[0], *cmdline[1..], **options)
         else
           ::Kernel.exec(env, cmdline, **options)
         end

data/lib/dip/commands/compose.rb

@@ -13,7 +13,7 @@ module Dip
       attr_reader :argv, :config, :shell
 
       def initialize(*argv, shell: true)
-        @argv = argv
+        @argv = argv.compact
         @shell = shell
         @config = ::Dip.config.compose || {}
       end

data/lib/dip/commands/runners/docker_compose_runner.rb

@@ -9,6 +9,7 @@ module Dip
       class DockerComposeRunner < Base
         def execute
           Commands::Compose.new(
+            *compose_profiles,
             command[:compose][:method],
             *compose_arguments,
             shell: command[:shell]
@@ -17,6 +18,16 @@ module Dip
 
         private
 
+        def compose_profiles
+          return [] if command[:compose][:profiles].empty?
+
+          update_command_for_profiles
+
+          command[:compose][:profiles].each_with_object([]) do |profile, argv|
+            argv.concat(["--profile", profile])
+          end
+        end
+
         def compose_arguments
           compose_argv = command[:compose][:run_options].dup
 
@@ -57,6 +68,16 @@ module Dip
             []
           end
         end
+
+        def update_command_for_profiles
+          # NOTE: When using profiles, the method is always `up`.
+          #       This is because `docker-compose` does not support profiles
+          #       for other commands. Also, run options need to be removed
+          #       because they are not supported by `up`.
+          command[:compose][:method] = "up"
+          command[:command] = ""
+          command[:compose][:run_options] = []
+        end
       end
     end
   end

data/lib/dip/config.rb

@@ -17,7 +17,7 @@ module Dip
       environment: {},
       compose: {},
       kubectl: {},
-      interation: {},
+      interaction: {},
       provision: []
     }.freeze
 

data/lib/dip/interaction_tree.rb

@@ -45,11 +45,11 @@ module Dip
       cmd = build_command(entry)
 
       tree[name] = cmd
+      base_cmd = entry.select { |k, _| k != :subcommands }
 
       entry[:subcommands]&.each do |sub_name, sub_entry|
         sub_command_defaults!(sub_entry)
-
-        expand("#{name} #{sub_name}", entry.deep_merge(sub_entry), tree: tree)
+        expand("#{name} #{sub_name}", base_cmd.deep_merge(sub_entry), tree: tree)
       end
 
       tree
@@ -68,6 +68,7 @@ module Dip
         environment: entry[:environment] || {},
         compose: {
           method: entry.dig(:compose, :method) || entry[:compose_method] || "run",
+          profiles: Array(entry.dig(:compose, :profiles)),
           run_options: compose_run_options(entry.dig(:compose, :run_options) || entry[:compose_run_options])
         }
       }

data/lib/dip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dip
-  VERSION = "7.5.0"
+  VERSION = "7.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 7.5.0
+  version: 7.7.0
 platform: ruby
 authors:
 - bibendi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -210,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="