dip 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a9ad2527f29216fd1a230c2c8acc9032f08cd1eea686f89df433f8c59be50fb
-  data.tar.gz: d84a3f71b392136dd0d275391ec0c58424b91a00e3ae0a1ea93233ec3a718026
+  metadata.gz: d0c6660d3c5dec159ce66556651d44345ce59c9d964fc016f740bf2d25a7f772
+  data.tar.gz: ad54f1140a5e5468fda94511e7e2261b81b093c2c5e416bbbef0a98d08ab4960
 SHA512:
-  metadata.gz: 99e059244669e8aa9a7ab9393aaad1461231667ef66ce0073ad417462bae8996c9819794e8fba8006ea4fabf6296426b006ae5ff485afb0b92aefaafd5719bf2
-  data.tar.gz: 5497a34f27a83e88f91eadca30dbaf3732f38da9b70c5d7bbfbe994ab3b0293156966bb187c3394120ab35a992995d3ea8b7d1e6e4b7d4384b55e141badfd28e
+  metadata.gz: 32be532c2a9926e4217ef81b696d73526bbaeaec6d2163489b96e9119a8370c70bfe5294ed4458945a7bbaf76bbe279a6504666955654ef1e3ebf5eca670ae43
+  data.tar.gz: d94e94a96a57df4dc9477fd58ace8ba92abf70af862f34e3336ec3628099b70d44e2e8e48eb18734cd0d18554893738a52d1268d7a19874705e387e448e2b06b

data/lib/dip/cli.rb

@@ -5,13 +5,6 @@ require 'thor'
 module Dip
   class CLI < Thor
     class << self
-      def retrieve_command_name(args)
-        meth = args.first.to_sym unless args.empty?
-        args.unshift("run") if meth && ::Dip.config.interaction.key?(meth.to_sym)
-
-        super(args)
-      end
-
       # Hackery. Take the run method away from Thor so that we can redefine it.
       def is_thor_reserved_word?(word, type)
         return false if word == "run"
@@ -20,6 +13,22 @@ module Dip
       end
     end
 
+    stop_on_unknown_option! :up
+
+    def method_missing(cmd, *args)
+      if Dip.config.interaction.key?(cmd.to_sym)
+        args.unshift(cmd.to_s)
+        args.unshift("run")
+        self.class.start(args)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(cmd)
+      Dip.config.interaction.key?(cmd.to_sym)
+    end
+
     desc 'version', 'dip version'
     def version
       require_relative 'version'
@@ -39,6 +48,11 @@ module Dip
       end
     end
 
+    desc "up [OPTIONS] SERVICE", "Run docker-compose up command"
+    def up(*argv)
+      compose("up", *argv)
+    end
+
     desc 'CMD or dip run CMD [OPTIONS]', 'Run configured command in a docker-compose service'
     method_option :help, aliases: '-h', type: :boolean,
                          desc: 'Display usage information'
@@ -69,22 +83,16 @@ module Dip
       end
     end
 
+    require_relative 'cli/ssh'
     desc "ssh", "ssh-agent container commands"
-    def ssh(*args)
-      require_relative 'cli/ssh'
-      Dip::CLI::SSH.start(args)
-    end
+    subcommand :ssh, Dip::CLI::SSH
 
+    require_relative 'cli/dns'
     desc "dns", "DNS server for automatic docker container discovery"
-    def dns(*args)
-      require_relative 'cli/dns'
-      Dip::CLI::DNS.start(args)
-    end
+    subcommand :dns, Dip::CLI::DNS
 
+    require_relative 'cli/nginx'
     desc "nginx", "Nginx reverse proxy server"
-    def nginx(*args)
-      require_relative 'cli/nginx'
-      Dip::CLI::Nginx.start(args)
-    end
+    subcommand :nginx, Dip::CLI::Nginx
   end
 end

data/lib/dip/cli/dns.rb

@@ -7,7 +7,7 @@ module Dip
   class CLI
     # See more https://github.com/aacebedo/dnsdock
     class DNS < Thor
-      desc "dns up", "Run dnsdock container"
+      desc "up", "Run dnsdock container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :name, aliases: '-n', type: :string, default: "dnsdock",
@@ -39,7 +39,7 @@ module Dip
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
-      desc "dns down", "Stop dnsdock container"
+      desc "down", "Stop dnsdock container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :name, aliases: '-n', type: :string, default: "dnsdock",
@@ -54,7 +54,7 @@ module Dip
         end
       end
 
-      desc "dns restart", "Stop and start dnsdock container"
+      desc "restart", "Stop and start dnsdock container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       def restart(*args)
@@ -67,7 +67,7 @@ module Dip
         end
       end
 
-      desc "dns ip", "Get ip address of dnsdock container"
+      desc "ip", "Get ip address of dnsdock container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :name, aliases: '-n', type: :string, default: "dnsdock",

data/lib/dip/cli/nginx.rb

@@ -7,7 +7,7 @@ module Dip
   class CLI
     # See more https://github.com/bibendi/nginx-proxy
     class Nginx < Thor
-      desc "nginx up", "Run nginx container"
+      desc "up", "Run nginx container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :name, aliases: '-n', type: :string, default: "nginx",
@@ -39,7 +39,7 @@ module Dip
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
-      desc "nginx down", "Stop nginx container"
+      desc "down", "Stop nginx container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :name, aliases: '-n', type: :string, default: "nginx",
@@ -54,7 +54,7 @@ module Dip
         end
       end
 
-      desc "nginx restart", "Stop and start nginx container"
+      desc "restart", "Stop and start nginx container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       def restart(*args)

data/lib/dip/cli/ssh.rb

@@ -6,7 +6,7 @@ require_relative "../commands/ssh"
 module Dip
   class CLI
     class SSH < Thor
-      desc "ssh up", "Run ssh-agent container"
+      desc "up", "Run ssh-agent container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :key, aliases: '-k', type: :string, default: "$HOME/.ssh/id_rsa",
@@ -32,7 +32,7 @@ module Dip
 
       map add: :up
 
-      desc "ssh down", "Stop ssh-agent container"
+      desc "down", "Stop ssh-agent container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       def down
@@ -43,7 +43,7 @@ module Dip
         end
       end
 
-      desc "ssh restart", "Stop and start ssh-agent container"
+      desc "restart", "Stop and start ssh-agent container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       def restart(*args)
@@ -56,7 +56,7 @@ module Dip
         end
       end
 
-      desc "ssh status", "Show status of ssh-agent container"
+      desc "status", "Show status of ssh-agent container"
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       def status

data/lib/dip/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - bibendi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor