dru 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452af962ffdb65caeb9f532ae055d0fc5980645f8705f2131da025797765dced
-  data.tar.gz: 784dd5cdace3cd50a0695631473fc4d975be639dbe2828c2994aba6a0c6212f5
+  metadata.gz: ecaeff419166c955c4db31d00e6f8ec4af1a51d66d8b07adb4ef9a4313e489f4
+  data.tar.gz: d271501bff0d3d7f3d5acdb7af9d3640bd0ee49ab513453e5f47e6db77ac32c7
 SHA512:
-  metadata.gz: 12517a5b8a94c16a61ba5e7084ce2c90cd6f5b5c1bfbb596309bcdbd3b829c964481f70c0b7ef22099ec9859cc1fb7c106a111842fbcf4d21b9ffd3b56fc3bd1
-  data.tar.gz: 726ed77400c89bfb343b3460c4ec99aafdfb8598eff1dd8386ff15e234b643f23d5674167108e81a8c17182daaad86b3d6e5e74a0be57fe47da3ebd3cf90616d
+  metadata.gz: 841e2324220cdce42b0670ef357dc8d17e3a1392f43bc5ea55fd14fa7589ed79d6708859f5dd90c7400c71204f70c70b4901001b1caf267f9766c2df6800bd6b
+  data.tar.gz: d2fbe9d4e1678fd0fb31a59263e364a119672fce16b9505d0b87f5d23e39596b06ea51fefdbd8cc9df5458b0418ddbcf7bb1f12833090549570c95c921fe037b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dru (0.1.0)
+    dru (0.3.1)
       pastel (~> 0.7.2)
       thor (~> 0.20.0)
       tty-color (~> 0.4.2)

data/lib/dru/cli.rb

@@ -18,6 +18,22 @@ module Dru
     end
     map %w(--version -v) => :version
 
+    desc 'exec', 'Execute a command in a running container.'
+    method_option :help, aliases: '-h', type: :boolean,
+                         desc: 'Display usage information'
+    method_option :container, aliases: '-c', type: :string, default: 'app',
+                              desc: 'Container name'
+    method_option :environment, aliases: '-e', type: :string,
+                                desc: 'Environment'
+    def exec(*command)
+      if options[:help]
+        invoke :help, ['exec']
+      else
+        require_relative 'commands/exec'
+        Dru::Commands::Exec.new(command: command, options: options).execute
+      end
+    end
+
     desc 'up', 'Build, (re)create, start, and attach to default container'
     method_option :help, aliases: '-h', type: :boolean,
                          desc: 'Display usage information'
@@ -28,8 +44,25 @@ module Dru
         invoke :help, ['up']
       else
         require_relative 'commands/up'
-        Dru::Commands::Up.new(options).execute
+        Dru::Commands::Up.new(options: options).execute
+      end
+    end
+
+    desc 'run', 'Command description...'
+    method_option :help, aliases: '-h', type: :boolean,
+                         desc: 'Display usage information'
+    method_option :container, aliases: '-c', type: :string, default: 'app',
+                              desc: 'Container name'
+    method_option :environment, aliases: '-e', type: :string,
+                                desc: 'Environment'
+    def runner(*command)
+      if options[:help]
+        invoke :help, ['runner']
+      else
+        require_relative 'commands/runner'
+        Dru::Commands::Runner.new(command: command, options: options).execute
       end
     end
+    map %w(run) => :runner
   end
 end

data/lib/dru/command.rb

@@ -6,6 +6,12 @@ module Dru
   class Command
     extend Forwardable
 
+    class MissingContainerError < StandardError
+      def initialize(msg = 'Missing container')
+        super
+      end
+    end
+
     DOCKER_COMPOSE_COMMAND = 'docker-compose'.freeze
 
     attr_accessor :options
@@ -149,7 +155,11 @@ module Dru
     end
 
     def run_docker_compose_command(*args, **options)
-      command(options).run(DOCKER_COMPOSE_COMMAND, *docker_compose_paths, *args)
+      if options[:tty]
+        system(DOCKER_COMPOSE_COMMAND, *docker_compose_paths, *args)
+      else
+        command(options).run(DOCKER_COMPOSE_COMMAND, *docker_compose_paths, *args)
+      end
     end
 
     def container_name_to_id(container_name = 'app')

data/lib/dru/commands/exec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative '../container_command'
+
+module Dru
+  module Commands
+    class Exec < Dru::ContainerCommand
+      def execute(input: $stdin, output: $stdout)
+        run_docker_compose_command('exec', container, *@command, tty: true)
+      end
+    end
+  end
+end

data/lib/dru/commands/runner.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative '../container_command'
+
+module Dru
+  module Commands
+    class Runner < Dru::ContainerCommand
+      def execute(input: $stdin, output: $stdout)
+        run_docker_compose_command('run', '--rm', '--entrypoint', 'sh -c', container, command, tty: true)
+      end
+
+      private
+
+      def command
+        @command.join(' ')
+      end
+    end
+  end
+end

data/lib/dru/commands/up.rb

@@ -7,7 +7,7 @@ module Dru
     class Up < Dru::Command
       DOCKER_ATTACH_COMMAND = 'docker attach --detach-keys="ctrl-d"'.freeze
 
-      def initialize(options)
+      def initialize(options:)
         @options = options
       end
 

data/lib/dru/container_command.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative './command'
+
+module Dru
+  class ContainerCommand < Command
+    def initialize(command:, options:)
+      raise MissingContainerError unless options[:container]
+
+      @options = options
+      @command = command || []
+    end
+
+    def execute(input: $stdin, output: $stdout)
+      raise NotImplementedError
+    end
+
+    protected
+
+    def container
+      options[:container]
+    end
+  end
+end

data/lib/dru/templates/exec/.gitkeep

@@ -0,0 +1 @@
+#

data/lib/dru/templates/runner/.gitkeep

@@ -0,0 +1 @@
+#

data/lib/dru/version.rb

@@ -1,3 +1,3 @@
 module Dru
-  VERSION = "0.1.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dru
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Christian Rimondi
@@ -364,9 +364,14 @@ files:
 - lib/dru/cli.rb
 - lib/dru/command.rb
 - lib/dru/commands/.gitkeep
+- lib/dru/commands/exec.rb
+- lib/dru/commands/runner.rb
 - lib/dru/commands/up.rb
 - lib/dru/config.rb
+- lib/dru/container_command.rb
 - lib/dru/templates/.gitkeep
+- lib/dru/templates/exec/.gitkeep
+- lib/dru/templates/runner/.gitkeep
 - lib/dru/templates/up/.gitkeep
 - lib/dru/version.rb
 homepage: https://github.com/nebulab/dru