dip 7.4.0 → 7.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42554510aef42c0faa6c2d1ccec6be58c8997bbd1708d2a9e7008363dcc0916a
-  data.tar.gz: c2cc4e38f8f42fed73be2f88e0b66331521176d80c04bf789dccdf1de63e4d64
+  metadata.gz: 077560a05e3c58c34f61f81e80a941a6bb8a88da7b8acc59cb1e8c254985467e
+  data.tar.gz: 8d7b121d08fb87b68bf375b8651cc60f2e27307267f813ea87faf2eee6f88870
 SHA512:
-  metadata.gz: c9bb9b9e632a899c9cb4433a8aeece65e3f5ebd9705c80fabea87f2197b5013a95dbaa522127cdf42f875c546e897f00b5068a3d421023b2d5f9a1d54f933a51
-  data.tar.gz: 5eee73a6bcfc1bbda1526fb04b3143dc2784be36b6b98a2b0855a376a0799113b7d79e17f48c02dd2504b577237662284f044c5cbed39e99d0a2d1fc2973720e
+  metadata.gz: 1a00861123026227700fcb92e3ef1fa47f702efcfdd2bbce83363aeca5bedf7d2c669428f5837828c53edcb76975958334689657f2d52df7f8dee3e3991d0a08
+  data.tar.gz: f2bd7865a209166096b5b9f553da6031ec7192c889f8e6e357a230fd2f9dd9c67259501f358dffde25657370a3f7cf8d628156cbad7d9524ea9505c10ff7c724

data/README.md

@@ -38,8 +38,7 @@ After that we can type commands without `dip` prefix. For example:
 <run-command> *any-args
 compose *any-compose-arg
 up <service>
-build
-down
+ktl *any-kubectl-arg
 provision
 ```
 
@@ -81,10 +80,11 @@ Also, you can check out examples at the top.
 
 ```yml
 # Required minimum dip version
-version: '7.1'
+version: '7.5'
 
 environment:
   COMPOSE_EXT: development
+  STAGE: "staging"
 
 compose:
   files:
@@ -93,6 +93,9 @@ compose:
     - docker/docker-compose.$DIP_OS.yml
   project_name: bear
 
+kubectl:
+  namespace: rocket-$STAGE
+
 interaction:
   shell:
     description: Open the Bash shell in app's container
@@ -129,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
@@ -142,6 +151,22 @@ interaction:
     default_args: db_dev
     command: psql -h pg -U postgres
 
+  k:
+    description: Run commands in Kubernetes cluster
+    pod: svc/rocket-app:app-container
+    entrypoint: /env-entrypoint
+    subcommands:
+      bash:
+        description: Get a shell to the running container
+        command: /bin/bash
+      rails:
+        description: Run Rails commands
+        command: bundle exec rails
+      kafka-topics:
+        description: Manage Kafka topics
+        pod: svc/rocket-kafka
+        command: kafka-topics.sh --zookeeper zookeeper:2181
+
   setup_key:
     description: Copy key
     service: app
@@ -201,7 +226,13 @@ returned is `/app/sub-project-dir`.
 
 Run commands defined within the `interaction` section of dip.yml
 
-By default, a command will be executed using [`docker compose`](https://docs.docker.com/compose/install/) command. If you are still using `docker-compose` binary (i.e., prior to Compose V2 changes), a command would be run through it. You can disable using of Compose V2 by passing an environment variable `DIP_COMPOSE_V2=false dip run`.
+A command will be executed by specified runner. Dip has three types of them:
+
+- `docker-compose` runner — used when the `service` option is defined.
+- `kubectl` runner — used when the `pod` option is defined.
+- `local` runner — used when the previous ones are not defined.
+
+If you are still using `docker-compose` binary (i.e., prior to Compose V2 changes), a command would be run through it. You can disable using of Compose V2 by passing an environment variable `DIP_COMPOSE_V2=false dip run`.
 
 ```sh
 dip run rails c
@@ -254,7 +285,7 @@ Run commands each by each from `provision` section of dip.yml
 
 ### dip compose
 
-Run docker-compose commands that are configured according to the application's dip.yml :
+Run docker-compose commands that are configured according to the application's dip.yml:
 
 ```sh
 dip compose COMMAND [OPTIONS]
@@ -262,6 +293,16 @@ dip compose COMMAND [OPTIONS]
 dip compose up -d redis
 ```
 
+### dip ktl
+
+Run kubectl commands that are configured according to the application's dip.yml:
+
+```sh
+dip ktl COMMAND [OPTIONS]
+
+STAGE=some dip ktl get pods
+```
+
 ### dip ssh
 
 Runs ssh-agent container based on https://github.com/whilp/ssh-agent with your ~/.ssh/id_rsa.

data/lib/dip/cli.rb

@@ -32,7 +32,7 @@ module Dip
       end
     end
 
-    stop_on_unknown_option! :run
+    stop_on_unknown_option! :run, :ktl
 
     desc "version", "dip version"
     def version
@@ -78,11 +78,17 @@ module Dip
         require_relative "commands/down_all"
         Dip::Commands::DownAll.new.execute
       else
-        compose("down", *argv)
+        compose("down", *argv.push("--remove-orphans"))
       end
     end
 
-    desc "run [OPTIONS] CMD [ARGS]", "Run configured command in a docker-compose service. `run` prefix may be omitted"
+    desc "ktl CMD [OPTIONS]", "Run kubectl commands"
+    def ktl(*argv)
+      require_relative "commands/kubectl"
+      Dip::Commands::Kubectl.new(*argv).execute
+    end
+
+    desc "run [OPTIONS] CMD [ARGS]", "Run configured command (`run` prefix may be omitted)"
     method_option :publish, aliases: "-p", type: :string, repeatable: true,
       desc: "Publish a container's port(s) to the host"
     method_option :help, aliases: "-h", type: :boolean, desc: "Display usage information"
@@ -91,7 +97,11 @@ module Dip
         invoke :help, ["run"]
       else
         require_relative "commands/run"
-        Dip::Commands::Run.new(*argv, publish: options[:publish]).execute
+
+        Dip::Commands::Run.new(
+          *argv,
+          **options.to_h.transform_keys!(&:to_sym)
+        ).execute
       end
     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/kubectl.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require_relative "../command"
+
+module Dip
+  module Commands
+    class Kubectl < Dip::Command
+      attr_reader :argv, :config
+
+      def initialize(*argv)
+        @argv = argv
+        @config = ::Dip.config.kubectl || {}
+      end
+
+      def execute
+        k_argv = cli_options + argv
+
+        exec_program("kubectl", k_argv)
+      end
+
+      private
+
+      def cli_options
+        %i[namespace].flat_map do |name|
+          next unless (value = config[name])
+          next unless value.is_a?(String)
+
+          value = ::Dip.env.interpolate(value).delete_suffix("-")
+          ["--#{name.to_s.tr("_", "-")}", value]
+        end.compact
+      end
+    end
+  end
+end

data/lib/dip/commands/run.rb

@@ -4,13 +4,17 @@ require "shellwords"
 require_relative "../../../lib/dip/run_vars"
 require_relative "../command"
 require_relative "../interaction_tree"
-require_relative "compose"
+require_relative "runners/local_runner"
+require_relative "runners/docker_compose_runner"
+require_relative "runners/kubectl_runner"
+
+require_relative "kubectl"
 
 module Dip
   module Commands
     class Run < Dip::Command
-      def initialize(cmd, *argv, publish: nil)
-        @publish = publish
+      def initialize(cmd, *argv, **options)
+        @options = options
 
         @command, @argv = InteractionTree
           .new(Dip.config.interaction)
@@ -22,75 +26,25 @@ module Dip
       end
 
       def execute
-        if command[:service].nil?
-          exec_program(command[:command], get_args, shell: command[:shell])
-        else
-          Dip::Commands::Compose.new(
-            command[:compose][:method],
-            *compose_arguments,
-            shell: command[:shell]
-          ).execute
-        end
+        lookup_runner
+          .new(command, argv, **options)
+          .execute
       end
 
       private
 
-      attr_reader :command, :argv, :publish
-
-      def compose_arguments
-        compose_argv = command[:compose][:run_options].dup
-
-        if command[:compose][:method] == "run"
-          compose_argv.concat(run_vars)
-          compose_argv.concat(published_ports)
-          compose_argv << "--rm"
-        end
-
-        compose_argv << command.fetch(:service)
-
-        unless (cmd = command[:command]).empty?
-          if command[:shell]
-            compose_argv << cmd
-          else
-            compose_argv.concat(cmd.shellsplit)
-          end
-        end
-
-        compose_argv.concat(get_args)
-
-        compose_argv
-      end
-
-      def run_vars
-        run_vars = Dip::RunVars.env
-        return [] unless run_vars
-
-        run_vars.map { |k, v| ["-e", "#{k}=#{Shellwords.escape(v)}"] }.flatten
-      end
-
-      def published_ports
-        if publish.respond_to?(:each)
-          publish.map { |p| "--publish=#{p}" }
-        else
-          []
-        end
-      end
+      attr_reader :command, :argv, :options
 
-      def get_args
-        if argv.any?
-          if command[:shell]
-            [argv.shelljoin]
-          else
-            Array(argv)
-          end
-        elsif !(default_args = command[:default_args]).empty?
-          if command[:shell]
-            default_args.shellsplit
-          else
-            Array(default_args)
-          end
+      def lookup_runner
+        if (runner = command[:runner])
+          camelized_runner = runner.split("_").collect(&:capitalize).join
+          Runners.const_get("#{camelized_runner}Runner")
+        elsif command[:service]
+          Runners::DockerComposeRunner
+        elsif command[:pod]
+          Runners::KubectlRunner
         else
-          []
+          Runners::LocalRunner
         end
       end
     end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Dip
+  module Commands
+    module Runners
+      class Base
+        def initialize(command, argv, **options)
+          @command = command
+          @argv = argv
+          @options = options
+        end
+
+        def execute
+          raise NotImplementedError
+        end
+
+        private
+
+        attr_reader :command, :argv, :options
+
+        def command_args
+          if argv.any?
+            if command[:shell]
+              [argv.shelljoin]
+            else
+              Array(argv)
+            end
+          elsif !(default_args = command[:default_args]).empty?
+            if command[:shell]
+              default_args.shellsplit
+            else
+              Array(default_args)
+            end
+          else
+            []
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require_relative "base"
+require_relative "../compose"
+
+module Dip
+  module Commands
+    module Runners
+      class DockerComposeRunner < Base
+        def execute
+          Commands::Compose.new(
+            *compose_profiles,
+            command[:compose][:method],
+            *compose_arguments,
+            shell: command[:shell]
+          ).execute
+        end
+
+        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
+
+          if command[:compose][:method] == "run"
+            compose_argv.concat(run_vars)
+            compose_argv.concat(published_ports)
+            compose_argv << "--rm"
+          end
+
+          compose_argv << command.fetch(:service)
+
+          unless (cmd = command[:command]).empty?
+            if command[:shell]
+              compose_argv << cmd
+            else
+              compose_argv.concat(cmd.shellsplit)
+            end
+          end
+
+          compose_argv.concat(command_args)
+
+          compose_argv
+        end
+
+        def run_vars
+          run_vars = Dip::RunVars.env
+          return [] unless run_vars
+
+          run_vars.map { |k, v| ["-e", "#{k}=#{Shellwords.escape(v)}"] }.flatten
+        end
+
+        def published_ports
+          publish = options[:publish]
+
+          if publish.respond_to?(:each)
+            publish.map { |p| "--publish=#{p}" }
+          else
+            []
+          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
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require_relative "base"
+require_relative "../kubectl"
+
+module Dip
+  module Commands
+    module Runners
+      class KubectlRunner < Base
+        def execute
+          Commands::Kubectl.new(*kubectl_arguments).execute
+        end
+
+        private
+
+        def kubectl_arguments
+          argv = ["exec", "--tty", "--stdin"]
+
+          pod, container = command.fetch(:pod).split(":")
+          argv.push("--container", container) unless container.nil?
+          argv.push(pod, "--")
+
+          unless (entrypoint = command[:entrypoint]).nil?
+            argv << entrypoint
+          end
+          argv << command.fetch(:command)
+          argv.concat(command_args)
+
+          argv
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative "base"
+require_relative "../../command"
+
+module Dip
+  module Commands
+    module Runners
+      class LocalRunner < Base
+        def execute
+          Dip::Command.exec_program(
+            command[:command],
+            command_args,
+            shell: command[:shell]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/dip/config.rb

@@ -16,7 +16,8 @@ module Dip
     CONFIG_DEFAULTS = {
       environment: {},
       compose: {},
-      interation: {},
+      kubectl: {},
+      interaction: {},
       provision: []
     }.freeze
 
@@ -94,7 +95,7 @@ module Dip
       config
     end
 
-    %i[environment compose interaction provision].each do |key|
+    %i[environment compose kubectl interaction provision].each do |key|
       define_method(key) do
         config[key] || (raise config_missing_error(key))
       end

data/lib/dip/interaction_tree.rb

@@ -58,13 +58,17 @@ module Dip
     def build_command(entry)
       {
         description: entry[:description],
+        runner: entry[:runner],
         service: entry[:service],
+        pod: entry[:pod],
+        entrypoint: entry[:entrypoint],
         command: entry[:command].to_s.strip,
         shell: entry.fetch(:shell, true),
         default_args: entry[:default_args].to_s.strip,
         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.4.0"
+  VERSION = "7.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.6.0
 platform: ruby
 authors:
 - bibendi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-24 00:00:00.000000000 Z
+date: 2023-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -180,10 +180,15 @@ files:
 - lib/dip/commands/console.rb
 - lib/dip/commands/dns.rb
 - lib/dip/commands/down_all.rb
+- lib/dip/commands/kubectl.rb
 - lib/dip/commands/list.rb
 - lib/dip/commands/nginx.rb
 - lib/dip/commands/provision.rb
 - lib/dip/commands/run.rb
+- lib/dip/commands/runners/base.rb
+- lib/dip/commands/runners/docker_compose_runner.rb
+- lib/dip/commands/runners/kubectl_runner.rb
+- lib/dip/commands/runners/local_runner.rb
 - lib/dip/commands/ssh.rb
 - lib/dip/config.rb
 - lib/dip/environment.rb