dru 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df4335d16710597624a2442e9d1b593a992ed716063a41dbc5811ed98e0d0980
-  data.tar.gz: 9a175fb8feb8dc086cd01a9d08075e469e890b983d68ace2f406395807face0b
+  metadata.gz: f75222fea85c8eefdd69ea93f802d91ebee51005ba4c1101ced62c4982743b2b
+  data.tar.gz: 39838ee39b7a874223b4b7986ff4574fc22067e1944a50c2d3169843a36d781c
 SHA512:
-  metadata.gz: fc242d06d74627299a75d15a09c57cd520685d09c4cad2b13ac087375a81722aa3ae5e642f90625082acf20a1f037fc0e52fa3d189666b8b151b270cd7cc5be3
-  data.tar.gz: '086e53ab1e4c6cbb4487a8f27c957df719f01611bb8e981748a658e71b310ea2b9f29d9e7d95611471d66482f9cf9a0d40d7237bca9975ca41281df21bdcbb60'
+  metadata.gz: '09f30684009c75b7d32b458e14de955d950bb9113653c843d2b22a895ae4ecde977cb6a5551a0a568d307f6eea3e7526a1049c311f199c72609b4beaa0dfd366'
+  data.tar.gz: b9b79033ee1d5e9624e59fd4fb056c7a05f0144d1f96681e9d5624203cf52ca1bb6e91de969d98465d01af7d01c6909bb56eb7aa2fda74df940747be00b96957

data/Gemfile.lock

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

data/exe/dru

@@ -11,7 +11,7 @@ Signal.trap('INT') do
 end
 
 begin
-  Dru::CLI.start
+  Dru::CLI.start(Dru::Argv.new.parse)
 rescue Dru::CLI::Error => err
   puts "ERROR: #{err.message}"
   exit 1

data/lib/dru.rb

@@ -1,8 +1,13 @@
+require "dru/argv"
 require "dru/config"
 require "dru/cli"
 
 module Dru
-  DRUCONFIG = File.expand_path('~/.druconfig') 
+  DRUCONFIG = File.expand_path('~/.druconfig')
+  DOCKER_COMPOSE_COMMAND = 'docker-compose'.freeze
+  DOCKER_COMPOSE_COMMANDS = %w[build bundle config create events images kill
+                               logs pause port ps pull push restart rm scale
+                               start stop top unpause]
 
   def self.config
     Config.instance.tap { |instance| instance.config_file_path = DRUCONFIG }

data/lib/dru/argv.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Dru
+  class Argv
+    attr_reader :argv
+
+    def initialize(argv = ARGV)
+      @argv = argv
+    end
+
+    def parse
+      return argv unless docker_compose_command_index
+
+      argv.dup.insert(docker_compose_command_index, Thor::Options::OPTS_END)
+    end
+
+    private
+
+    def docker_compose_command_index
+      argv.index { |arg| docker_compose_command?(arg) }
+    end
+
+    def docker_compose_command?(arg)
+      Dru::DOCKER_COMPOSE_COMMANDS.include?(arg)
+    end
+  end
+end

data/lib/dru/cli.rb

@@ -11,13 +11,45 @@ module Dru
     # Error raised by this runner
     Error = Class.new(StandardError)
 
+    class_option :environment, aliases: '-e', type: :string,
+                                desc: 'Environment'
+
+    default_command :docker_compose
+
+    def self.help(shell, subcommand = false)
+      shell.say `#{DOCKER_COMPOSE_COMMAND} help`
+      shell.say
+
+      shell.say <<-OUT
+These Docker-Compose commands are provided by Dru:
+
+Usage:
+  dru [-e ENV] [docker-compose-options] [COMMAND] [ARGS...]
+  dru -h|--help
+
+      OUT
+
+      super
+    end
+
     desc 'version', 'dru version'
     def version
       require_relative 'version'
-      puts "v#{Dru::VERSION}"
+      shell.say "dru version: #{Dru::VERSION}"
+      shell.say `#{DOCKER_COMPOSE_COMMAND} version`
     end
     map %w(--version -v) => :version
 
+    desc 'docker-compose', 'Run docker-compose', hide: true
+    def docker_compose(*command)
+      if command.empty?
+        invoke :help
+      else
+        require_relative 'commands/docker_compose'
+        Dru::Commands::DockerCompose.new(command: command, options: options).execute
+      end
+    end
+
     desc 'down', 'Stops containers and removes containers, networks, volumes, and images created by `up`.'
     method_option :help, aliases: '-h', type: :boolean,
                          desc: 'Display usage information'
@@ -49,8 +81,6 @@ module Dru
                          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']
@@ -79,8 +109,6 @@ module Dru
                          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']

data/lib/dru/command.rb

@@ -12,8 +12,6 @@ module Dru
       end
     end
 
-    DOCKER_COMPOSE_COMMAND = 'docker-compose'.freeze
-
     attr_accessor :options
 
     def_delegators :command, :run

data/lib/dru/commands/docker_compose.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative '../command'
+
+module Dru
+  module Commands
+    class DockerCompose < Dru::Command
+      attr_reader :command
+
+      def initialize(options:, command:)
+        @options = options
+        @command = command
+      end
+
+      def execute(input: $stdin, output: $stdout)
+        run_docker_compose_command(*command, tty: true)
+      end
+    end
+  end
+end

data/lib/dru/templates/docker_compose/.gitkeep

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

data/lib/dru/version.rb

@@ -1,3 +1,3 @@
 module Dru
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dru
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Christian Rimondi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-color
@@ -361,10 +361,12 @@ files:
 - ext/dru/dru.h
 - ext/dru/extconf.rb
 - lib/dru.rb
+- lib/dru/argv.rb
 - lib/dru/cli.rb
 - lib/dru/command.rb
 - lib/dru/commands/.gitkeep
 - lib/dru/commands/attach.rb
+- lib/dru/commands/docker_compose.rb
 - lib/dru/commands/down.rb
 - lib/dru/commands/exec.rb
 - lib/dru/commands/runner.rb
@@ -373,6 +375,7 @@ files:
 - lib/dru/container_command.rb
 - lib/dru/templates/.gitkeep
 - lib/dru/templates/attach/.gitkeep
+- lib/dru/templates/docker_compose/.gitkeep
 - lib/dru/templates/down/.gitkeep
 - lib/dru/templates/exec/.gitkeep
 - lib/dru/templates/runner/.gitkeep