dru 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f75222fea85c8eefdd69ea93f802d91ebee51005ba4c1101ced62c4982743b2b
-  data.tar.gz: 39838ee39b7a874223b4b7986ff4574fc22067e1944a50c2d3169843a36d781c
+  metadata.gz: 8712f6e940546178246f68aa0272b599a90a9f4c94cb02263b444ebe11f01f4b
+  data.tar.gz: ec001fa5801d5d355d79f7fcc98f03ce84d0a028d4ef33a31efa4bcf160b370f
 SHA512:
-  metadata.gz: '09f30684009c75b7d32b458e14de955d950bb9113653c843d2b22a895ae4ecde977cb6a5551a0a568d307f6eea3e7526a1049c311f199c72609b4beaa0dfd366'
-  data.tar.gz: b9b79033ee1d5e9624e59fd4fb056c7a05f0144d1f96681e9d5624203cf52ca1bb6e91de969d98465d01af7d01c6909bb56eb7aa2fda74df940747be00b96957
+  metadata.gz: 53c266f1b5d69ee119b0e540057677198387f0795208d9c260a96ac3b5fdbf10b1b73a9fc00890c94dad9c3b51c3d2295eab693361b665e6118abf817a4da6f2
+  data.tar.gz: 3545358f7885e0fc64aa4f268e2aae67cc2ca646cfb462dc03b6c2b63276e44e94cac93d535a0fe462081cb5cee20b5196fc0919b072f8a8c3daee9534c112ea

data/.circleci/config.yml

@@ -0,0 +1,77 @@
+# Ruby CircleCI 2.1 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2.1
+
+workflows:
+  version: 2
+
+  commit:
+     jobs:
+       - build
+       - tests:
+           requires:
+             - build
+       - upload-coverage:
+          requires:
+             - tests
+
+defaults: &defaults
+  working_directory: ~/repo
+  docker:
+    - image: circleci/ruby:2.5.1
+
+jobs:
+  build:
+    <<: *defaults
+    steps:
+      - run:
+          name: Download cc-test-reporter
+          command: |
+            mkdir -p tmp/
+            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./tmp/cc-test-reporter
+            chmod +x ./tmp/cc-test-reporter
+      - persist_to_workspace:
+          root: tmp
+          paths:
+            - cc-test-reporter
+
+  tests:
+    <<: *defaults
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/repo/tmp
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "Gemfile.lock" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+      - run:
+          name: Install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+      - run:
+          name: Run tests
+          command: |
+            bundle exec rspec
+            ./tmp/cc-test-reporter format-coverage -t simplecov -o tmp/codeclimate.json coverage/.resultset.json
+      - persist_to_workspace:
+          root: tmp
+          paths:
+            - codeclimate.json
+  upload-coverage:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/repo/tmp
+      - run:
+          name: Upload coverage results to Code Climate
+          command: |
+            ./tmp/cc-test-reporter upload-coverage -i tmp/codeclimate.json

data/Gemfile.lock

@@ -1,41 +1,26 @@
 PATH
   remote: .
   specs:
-    dru (0.6.0)
+    dru (1.0.0)
       pastel (~> 0.7.2)
       thor (~> 0.20.0)
-      tty-color (~> 0.4.2)
       tty-command (~> 0.8.0)
       tty-config (~> 0.2.0)
-      tty-cursor (~> 0.5.0)
-      tty-editor (~> 0.4.0)
-      tty-file (~> 0.6.0)
-      tty-font (~> 0.2.0)
-      tty-markdown (~> 0.4.0)
-      tty-pager (~> 0.11.0)
-      tty-platform (~> 0.1.0)
-      tty-progressbar (~> 0.15.0)
-      tty-prompt (~> 0.16.1)
-      tty-screen (~> 0.6.4)
-      tty-spinner (~> 0.8.0)
-      tty-table (~> 0.10.0)
-      tty-tree (~> 0.1.0)
       tty-which (~> 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
+    docile (1.3.1)
     equatable (0.5.0)
-    kramdown (1.16.2)
-    necromancer (0.4.0)
+    json (2.2.0)
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
     rake (10.5.0)
     rake-compiler (1.0.5)
       rake
-    rouge (3.1.1)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -49,66 +34,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    strings (0.1.4)
-      strings-ansi (~> 0.1.0)
-      unicode-display_width (~> 1.4.0)
-      unicode_utils (~> 1.4.0)
-    strings-ansi (0.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     thor (0.20.3)
-    timers (4.2.0)
     tty-color (0.4.3)
     tty-command (0.8.2)
       pastel (~> 0.7.0)
     tty-config (0.2.0)
-    tty-cursor (0.5.0)
-    tty-editor (0.4.0)
-      tty-prompt (~> 0.16.0)
-      tty-which (~> 0.3.0)
-    tty-file (0.6.0)
-      diff-lcs (~> 1.3.0)
-      pastel (~> 0.7.2)
-      tty-prompt (~> 0.16.1)
-    tty-font (0.2.0)
-    tty-markdown (0.4.0)
-      kramdown (~> 1.16.2)
-      pastel (~> 0.7.2)
-      rouge (~> 3.1.0)
-      strings (~> 0.1.0)
-      tty-color (~> 0.4.2)
-      tty-screen (~> 0.6.4)
-    tty-pager (0.11.0)
-      strings (~> 0.1.0)
-      tty-screen (~> 0.6.4)
-      tty-which (~> 0.3.0)
-    tty-platform (0.1.0)
-    tty-progressbar (0.15.1)
-      tty-cursor (~> 0.5.0)
-      tty-screen (~> 0.6.4)
-      unicode-display_width (~> 1.3)
-    tty-prompt (0.16.1)
-      necromancer (~> 0.4.0)
-      pastel (~> 0.7.0)
-      timers (~> 4.0)
-      tty-cursor (~> 0.5.0)
-      tty-reader (~> 0.3.0)
-    tty-reader (0.3.0)
-      tty-cursor (~> 0.5.0)
-      tty-screen (~> 0.6.4)
-      wisper (~> 2.0.0)
-    tty-screen (0.6.5)
-    tty-spinner (0.8.0)
-      tty-cursor (>= 0.5.0)
-    tty-table (0.10.0)
-      equatable (~> 0.5.0)
-      necromancer (~> 0.4.0)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.0)
-      tty-screen (~> 0.6.4)
-    tty-tree (0.1.0)
     tty-which (0.3.0)
-    unicode-display_width (1.4.0)
-    unicode_utils (1.4.0)
-    wisper (2.0.0)
 
 PLATFORMS
   ruby
@@ -119,6 +55,7 @@ DEPENDENCIES
   rake (~> 10.0)
   rake-compiler
   rspec (~> 3.0)
+  simplecov (~> 0.16.1)
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/README.md

@@ -1,28 +1,75 @@
+[![Gem Version](https://badge.fury.io/rb/dru.svg)](https://badge.fury.io/rb/dru)
+[![CircleCI](https://circleci.com/gh/nebulab/dru/tree/master.svg?style=svg)](https://circleci.com/gh/nebulab/dru/tree/master)
+[![Maintainability](https://api.codeclimate.com/v1/badges/9049d097bf908467eb85/maintainability)](https://codeclimate.com/github/nebulab/dru/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/9049d097bf908467eb85/test_coverage)](https://codeclimate.com/github/nebulab/dru/test_coverage)
+
 # Dru
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/dru`. To experiment with that code, run `bin/console` for an interactive prompt.
+DRU is a run utility to work on your projects with docker-compose where you can't put your config files inside the folder and also enhance the docker-compose command with custom commands, custom aliases, and environments support.
 
-TODO: Delete this and the text above, and describe your gem
+## Why should you use DRU?
 
-## Installation
+Sometimes when we are working on projects, we can't put docker related configuration files into the project folder
+or push it into our version control system.
 
-Add this line to your application's Gemfile:
+Sure, we can always put the docker configuration files in a different place, but every time we have to run a command, it looks like:
 
-```ruby
-gem 'dru'
-```
+    $ docker-compose -f ~/config_folder/docker-compose.yml up
+
+and if we have another docker configuration for a different environment the things go even worst:
+
+    $ docker-compose -f ~/config_folder/docker-compose.yml -f ~/config_folder/docker-compose.test.yml up
+
+By following some simple conventions, DRU let we run the first command with:
+
+    $ dru up
 
-And then execute:
+and the second will be like:
 
-    $ bundle
+    $ dru -e test up
 
-Or install it yourself as:
+Furthermore, if we need to access the docker container shell, with vanilla docker-compose:
+
+    $ docker-compose -f ~/config_folder/docker-compose.yml run --rm --entrypoint sh container_name
+
+with DRU:
+
+    $ dru shell container_name
+
+## Installation
 
     $ gem install dru
 
 ## Usage
 
-TODO: Write usage instructions here
+Run:
+
+    $ dru help
+
+for the list of the available commands.
+
+All commands follow the same conventions. When you run a DRU command, by default it will look for a `docker-compose.yml` file into the `~/.dru/project_folder` where `project_folder` has the same name as the current working directory.
+
+Suppose that you are in a directory called `example_project`, when you run a DRU command (e.g. `dru up`) it will search for a `docker-compose.yml` file into the `~/.dru/example_project` folder.
+
+DRU also supports environments, that means that if you add the `-e test` option, it will combine the `~/.dru/example_project/docker-compose.yml` and `~/.dru/example_project/docker-compose.test.yml` into a single configuration.
+
+Essentially it will run `docker-compose -f ~/.dru/example_project/docker-compose.yml -f ~/.dru/example_project/docker-compose.test.yml` when the second file name is given by the environment option. See [docker-compose documentation](https://docs.docker.com/compose/reference/overview/#specifying-multiple-compose-files) for more informations.
+
+## Configuration
+
+To override the default configuration you have to create the file `.druconfig` under your home folder:
+
+```yaml
+# ~/.druconfig
+
+# default: ~/.dru if you like, you can set a custom location (path) for your docker configurations projects like ~/docker-config
+docker_projects_folder: ~/.dru
+
+# optional: use this if you want to create custom aliases
+alias:
+  shell: run --rm --entrypoint sh
+```
 
 ## Development
 
@@ -32,12 +79,16 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/dru. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/nebulab/dru. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+## License
+
+DRU is copyright © 2019 [Nebulab](http://nebulab.it/). It is free software, and may be redistributed under the terms specified in the [license](LICENSE.txt).
 
-## Code of Conduct
+## About
 
-Everyone interacting in the Dru project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/dru/blob/master/CODE_OF_CONDUCT.md).
+![Nebulab](http://nebulab.it/assets/images/public/logo.svg)
 
-## Copyright
+DRU is funded and maintained by the [Nebulab](http://nebulab.it/) team.
 
-Copyright (c) 2018 Nebulab. See [MIT License](LICENSE.txt) for further details.
+We firmly believe in the power of open-source. [Contact us](http://nebulab.it/contact-us/) if you like our work and you need help with your project design or development.

data/dru.gemspec

@@ -35,22 +35,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/dru/extconf.rb"]
 
-  spec.add_dependency "tty-color", "~> 0.4.2"
   spec.add_dependency "tty-command", "~> 0.8.0"
   spec.add_dependency "tty-config", "~> 0.2.0"
-  spec.add_dependency "tty-cursor", "~> 0.5.0"
-  spec.add_dependency "tty-editor", "~> 0.4.0"
-  spec.add_dependency "tty-file", "~> 0.6.0"
-  spec.add_dependency "tty-font", "~> 0.2.0"
-  spec.add_dependency "tty-markdown", "~> 0.4.0"
-  spec.add_dependency "tty-pager", "~> 0.11.0"
-  spec.add_dependency "tty-platform", "~> 0.1.0"
-  spec.add_dependency "tty-progressbar", "~> 0.15.0"
-  spec.add_dependency "tty-prompt", "~> 0.16.1"
-  spec.add_dependency "tty-screen", "~> 0.6.4"
-  spec.add_dependency "tty-spinner", "~> 0.8.0"
-  spec.add_dependency "tty-table", "~> 0.10.0"
-  spec.add_dependency "tty-tree", "~> 0.1.0"
   spec.add_dependency "tty-which", "~> 0.3.0"
   spec.add_dependency "pastel", "~> 0.7.2"
   spec.add_dependency "thor", "~> 0.20.0"
@@ -59,4 +45,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "simplecov", "~> 0.16.1"
 end

data/exe/dru

@@ -6,13 +6,11 @@ $:.unshift(lib_path) if !$:.include?(lib_path)
 require 'dru'
 
 Signal.trap('INT') do
-  warn("\n#{caller.join("\n")}: interrupted")
   exit(1)
 end
 
 begin
-  Dru::CLI.start(Dru::Argv.new.parse)
-rescue Dru::CLI::Error => err
-  puts "ERROR: #{err.message}"
+  Dru::CLI.start(Dru::Argv.parse)
+rescue Dru::CLI::Error
   exit 1
 end

data/lib/dru.rb

@@ -4,10 +4,11 @@ require "dru/cli"
 
 module Dru
   DRUCONFIG = File.expand_path('~/.druconfig')
+  DOCKER_COMMAND = 'docker'.freeze
   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]
+  DOCKER_COMPOSE_COMMANDS = %w[build bundle config create down events exec images kill
+                               logs pause port ps pull push restart rm run scale
+                               start stop top unpause up]
 
   def self.config
     Config.instance.tap { |instance| instance.config_file_path = DRUCONFIG }

data/lib/dru/argv.rb

@@ -1,27 +1,66 @@
 # frozen_string_literal: true
 
+require 'shellwords'
+
 module Dru
   class Argv
     attr_reader :argv
 
+    def self.parse(*args)
+      new(*args).parse
+    end
+
     def initialize(argv = ARGV)
-      @argv = argv
+      @argv = argv.dup
     end
 
     def parse
-      return argv unless docker_compose_command_index
+      return argv unless known_command
 
-      argv.dup.insert(docker_compose_command_index, Thor::Options::OPTS_END)
+      if dru_command?(known_command)
+        parse_dru_command
+      elsif docker_compose_command?(known_command)
+        parse_docker_compose_command
+      else
+        parse_alias_command
+      end
     end
 
     private
 
-    def docker_compose_command_index
-      argv.index { |arg| docker_compose_command?(arg) }
+    def parse_docker_compose_command
+      argv.insert(known_command_index, Thor::Options::OPTS_END)
+    end
+
+    def parse_dru_command
+      argv.unshift(argv.delete(known_command))
+    end
+
+    def parse_alias_command
+      argv[known_command_index] = Shellwords.split(Dru.config.alias[known_command])
+      @argv = self.class.parse(argv.flatten)
+    end
+
+    def known_command
+      argv[known_command_index] if known_command_index
+    end
+
+    def known_command_index
+      @known_command_index ||= argv.index do |arg|
+        dru_command?(arg) || docker_compose_command?(arg) || alias_command?(arg)
+      end
+    end
+
+    def docker_compose_command?(command)
+      Dru::DOCKER_COMPOSE_COMMANDS.include?(command)
+    end
+
+    def dru_command?(command)
+      Dru::CLI.commands.keys.push('help').include?(command)
     end
 
-    def docker_compose_command?(arg)
-      Dru::DOCKER_COMPOSE_COMMANDS.include?(arg)
+    def alias_command?(command)
+      Dru.config.alias.respond_to?(command)
     end
   end
 end

data/lib/dru/cli.rb

@@ -16,6 +16,8 @@ module Dru
 
     default_command :docker_compose
 
+    stop_on_unknown_option! :attach, :up
+
     def self.help(shell, subcommand = false)
       shell.say `#{DOCKER_COMPOSE_COMMAND} help`
       shell.say
@@ -50,73 +52,18 @@ Usage:
       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'
-    def down(*)
-      if options[:help]
-        invoke :help, ['down']
-      else
-        require_relative 'commands/down'
-        Dru::Commands::Down.new.execute
-      end
-    end
-
-    desc 'attach', 'Attach local standard input, output, and error streams to a running container'
+    desc 'attach [OPTIONS] SERVICE', 'Attach local standard input, output, and error streams to a running service'
     method_option :help, aliases: '-h', type: :boolean,
                          desc: 'Display usage information'
-    method_option :container, aliases: '-c', type: :string, default: 'app',
-                              desc: 'Container name'
-    def attach(*)
-      if options[:help]
+    method_option :detach_keys, type: :string, default: 'ctrl-d',
+                         desc: 'Override the key sequence for detaching a container'
+    def attach(service = nil)
+      if options[:help] || service.nil?
         invoke :help, ['attach']
       else
         require_relative 'commands/attach'
-        Dru::Commands::Attach.new(options: options).execute
-      end
-    end
-
-    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'
-    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'
-    method_option :detach, aliases: '-d', type: :boolean,
-                           desc: 'Detached mode'
-    def up(*)
-      if options[:help]
-        invoke :help, ['up']
-      else
-        require_relative 'commands/up'
-        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'
-    def runner(*command)
-      if options[:help]
-        invoke :help, ['runner']
-      else
-        require_relative 'commands/runner'
-        Dru::Commands::Runner.new(command: command, options: options).execute
+        Dru::Commands::Attach.new(service: service, options: options).execute
       end
     end
-    map %w(run) => :runner
   end
 end

data/lib/dru/command.rb

@@ -6,16 +6,8 @@ module Dru
   class Command
     extend Forwardable
 
-    class MissingContainerError < StandardError
-      def initialize(msg = 'Missing container')
-        super
-      end
-    end
-
     attr_accessor :options
 
-    def_delegators :command, :run
-
     # Execute this command
     #
     # @api public
@@ -36,76 +28,6 @@ module Dru
       TTY::Command.new({ printer: :quiet, uuid: false }.merge(options))
     end
 
-    # The cursor movement
-    #
-    # @see http://www.rubydoc.info/gems/tty-cursor
-    #
-    # @api public
-    def cursor
-      require 'tty-cursor'
-      TTY::Cursor
-    end
-
-    # Open a file or text in the user's preferred editor
-    #
-    # @see http://www.rubydoc.info/gems/tty-editor
-    #
-    # @api public
-    def editor
-      require 'tty-editor'
-      TTY::Editor
-    end
-
-    # File manipulation utility methods
-    #
-    # @see http://www.rubydoc.info/gems/tty-file
-    #
-    # @api public
-    def generator
-      require 'tty-file'
-      TTY::File
-    end
-
-    # Terminal output paging
-    #
-    # @see http://www.rubydoc.info/gems/tty-pager
-    #
-    # @api public
-    def pager(**options)
-      require 'tty-pager'
-      TTY::Pager.new(options)
-    end
-
-    # Terminal platform and OS properties
-    #
-    # @see http://www.rubydoc.info/gems/tty-pager
-    #
-    # @api public
-    def platform
-      require 'tty-platform'
-      TTY::Platform.new
-    end
-
-    # The interactive prompt
-    #
-    # @see http://www.rubydoc.info/gems/tty-prompt
-    #
-    # @api public
-    def prompt(**options)
-      require 'tty-prompt'
-      TTY::Prompt.new(options)
-    end
-
-    # Get terminal screen properties
-    #
-    # @see http://www.rubydoc.info/gems/tty-screen
-    #
-    # @api public
-    def screen
-      require 'tty-screen'
-      TTY::Screen
-    end
-
     # The unix which utility
     #
     # @see http://www.rubydoc.info/gems/tty-which
@@ -142,26 +64,39 @@ module Dru
       File.join(project_configuration_path, 'docker-compose.yml')
     end
 
-    def environment_docker_compose
-      return unless environment
-
-      File.join(project_configuration_path, "docker-compose.#{environment}.yml")
+    def override_docker_compose
+      override = environment || 'override'
+      docker_compose_file = File.join(project_configuration_path, "docker-compose.#{override}.yml")
+      return unless File.exist?(docker_compose_file)
+      docker_compose_file
     end
 
     def docker_compose_paths
-      docker_compose_default_path + docker_compose_environment_path
+      docker_compose_default_path + docker_compose_override_path
     end
 
-    def run_docker_compose_command(*args, **options)
-      if options[:tty]
-        system(DOCKER_COMPOSE_COMMAND, *docker_compose_paths, *args)
-      else
-        command(options).run(DOCKER_COMPOSE_COMMAND, *docker_compose_paths, *args)
+    def run(*command, **options)
+      command(options).run!(*command, { in: '/dev/tty', err: '/dev/tty' }.merge(options)).tap do |result|
+        raise Dru::CLI::Error, result.err unless result.success?
       end
     end
 
-    def container_name_to_id(container_name = 'app')
-      run_docker_compose_command('ps', '-q', container_name, printer: :null).first
+    def run_docker_compose_command(*command, **options)
+      run(DOCKER_COMPOSE_COMMAND, '-p', docker_compose_project_name, *docker_compose_paths, *command, **options)
+    end
+
+    def run_docker_command(*command, **options)
+      run(DOCKER_COMMAND, *command, **options)
+    end
+
+    def container_name_to_id(container_name)
+      run_docker_compose_command('ps', '-q', container_name, only_output_on_error: true).out.strip
+    end
+
+    def docker_compose_project_name
+      return project_name unless environment
+
+      "#{project_name}_#{environment}"
     end
 
     private
@@ -170,10 +105,10 @@ module Dru
       ['-f', default_docker_compose]
     end
 
-    def docker_compose_environment_path
-      return [] unless environment_docker_compose
+    def docker_compose_override_path
+      return [] unless override_docker_compose
 
-      ['-f', environment_docker_compose]
+      ['-f', override_docker_compose]
     end
   end
 end

data/lib/dru/commands/attach.rb

@@ -1,25 +1,29 @@
 # frozen_string_literal: true
 
-require_relative '../container_command'
-require_relative './down'
+require_relative '../command'
 
 module Dru
   module Commands
-    class Attach < Dru::ContainerCommand
-      DOCKER_ATTACH_COMMAND = 'docker attach --detach-keys="ctrl-d"'.freeze
+    class Attach < Dru::Command
+      ATTACH_COMMAND = 'attach'
+
+      def initialize(service:, options:)
+        @service = service
+        @options = options
+      end
 
       def execute(input: $stdin, output: $stdout)
-        stop_docker_compose if attach_to_container
+        run_docker_command(ATTACH_COMMAND, detach_keys, container_id)
       end
 
       private
 
-      def stop_docker_compose
-        Down.new.execute
+      def detach_keys
+        "--detach-keys=#{@options[:detach_keys]}"
       end
 
-      def attach_to_container
-        system "#{DOCKER_ATTACH_COMMAND} #{container_name_to_id(container)}"
+      def container_id
+        container_name_to_id(@service)
       end
     end
   end

data/lib/dru/commands/docker_compose.rb

@@ -5,15 +5,13 @@ 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)
+        run_docker_compose_command(*@command, tty: true)
       end
     end
   end

data/lib/dru/config.rb

@@ -8,10 +8,11 @@ module Dru
     extend Forwardable
     include Singleton
 
-    def_delegators :configs, :docker_projects_folder
+    def_delegators :configs, :docker_projects_folder, :alias
 
     DEFAULT = {
-      'docker_projects_folder' => "~/.dru" 
+      'docker_projects_folder' => "~/.dru",
+      'alias' => {}
     }.freeze
 
     attr_reader :config_file_path
@@ -29,6 +30,7 @@ module Dru
 
     def user_configs
       return {} unless config_file_path && File.file?(config_file_path)
+
       YAML.load_file(config_file_path) || {}
     end
   end

data/lib/dru/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dru
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Christian Rimondi
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: tty-color
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: tty-command
   requirement: !ruby/object:Gem::Requirement
@@ -53,188 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: tty-cursor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: tty-editor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: tty-file
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: tty-font
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: tty-markdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: tty-pager
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-- !ruby/object:Gem::Dependency
-  name: tty-platform
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: tty-progressbar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.0
-- !ruby/object:Gem::Dependency
-  name: tty-prompt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.1
-- !ruby/object:Gem::Dependency
-  name: tty-screen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.4
-- !ruby/object:Gem::Dependency
-  name: tty-spinner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: tty-table
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: tty-tree
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: tty-which
   requirement: !ruby/object:Gem::Requirement
@@ -333,6 +137,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 description: "    A ruby tool to simplify the development workflow with Docker Compose
   and Docker.\n"
 email:
@@ -344,10 +162,10 @@ extensions:
 - ext/dru/extconf.rb
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -367,12 +185,7 @@ files:
 - 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
-- lib/dru/commands/up.rb
 - lib/dru/config.rb
-- lib/dru/container_command.rb
 - lib/dru/templates/.gitkeep
 - lib/dru/templates/attach/.gitkeep
 - lib/dru/templates/docker_compose/.gitkeep

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at christian.rimondi@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

data/lib/dru/commands/down.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../command'
-
-module Dru
-  module Commands
-    class Down < Dru::Command
-      def execute(input: $stdin, output: $stdout)
-        run_docker_compose_command('down')
-      end
-    end
-  end
-end

data/lib/dru/commands/exec.rb

@@ -1,13 +0,0 @@
-# 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

@@ -1,19 +0,0 @@
-# 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

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../command'
-require_relative './attach'
-
-module Dru
-  module Commands
-    class Up < Dru::Command
-      def initialize(options:)
-        @options = options
-      end
-
-      def execute(input: $stdin, output: $stdout)
-        start_docker_compose
-        return if options[:detach]
-
-        attach_to_default_container
-      end
-
-      private
-
-      def start_docker_compose
-        run_docker_compose_command('up', '-d')
-      end
-
-      def attach_to_default_container
-        Attach.new(options: { container: 'app' }).execute
-      end
-    end
-  end
-end

data/lib/dru/container_command.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require_relative './command'
-
-module Dru
-  class ContainerCommand < Command
-    def initialize(command: nil, 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