dip 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eaf38b3627e299f0f3d6e6650d21ea564a6f38bb1ce84afc8fff76a1665b0d5
-  data.tar.gz: af01914d8226fc9c886b266098303fccde34e18e78a1cc3c8225119e1f127c5f
+  metadata.gz: 4c8522e4677f4fb303d8c54114d793660653d2a81248caf5301b760b2319a6ea
+  data.tar.gz: 2b75045073267fa9130ceb82635b4f8fdc2c971f1b9f7a6a332e21ef9cec04ad
 SHA512:
-  metadata.gz: e18bb5db1b8e11fe071f182016e8e117090b662551388969f68199d3314a730995f6697827ede5449aee4f514302d586a4828bb8b71b152f0dfc95df2757aa37
-  data.tar.gz: 1ef69de40baedbf4ae515fff82386eb8058bd79ce7eb36ee1cca7edac07046bd41ca3801910ce32d3c1c5734ef78b05783ca073264b547b1ffdcd66c0681ea51
+  metadata.gz: 8d14570b02016db4917507d17ce76b3afb5dc58892f95697db44242b99204b682b667ad2f78bbce0bd866c0c68548c040dc2b87317e0c39991cd2d6fa09fa6aa
+  data.tar.gz: 75fe3bfba74961f5dd8b7e537b9acc27a36536b0b70e79d73a7df31e84e94d058822b9a086b521cddf9e4169fbc5231942f5d88f0098e721c1f69d7101b21156

data/lib/dip/cli.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'thor'
+require 'dip/run_vars'
 
 module Dip
   class CLI < Thor
@@ -39,15 +40,9 @@ module Dip
     map %w(--version -v) => :version
 
     desc 'compose CMD [OPTIONS]', 'Run docker-compose commands'
-    method_option :help, aliases: '-h', type: :boolean,
-                         desc: 'Display usage information'
-    def compose(cmd, *argv)
-      if options[:help]
-        invoke :help, ['compose']
-      else
-        require_relative 'commands/compose'
-        Dip::Commands::Compose.new(cmd, argv).execute
-      end
+    def compose(*argv)
+      require_relative 'commands/compose'
+      Dip::Commands::Compose.new(*argv).execute
     end
 
     desc "up [OPTIONS] SERVICE", "Run `docker-compose up` command"
@@ -60,21 +55,15 @@ module Dip
       compose("stop", *argv)
     end
 
-    desc "down [OPTIONS]", "Run `docker-compose down` command"
+    desc "down all services [OPTIONS]", "Run `docker-compose down` command"
     def down(*argv)
       compose("down", *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'
-    def run(cmd, subcmd = nil, *argv)
-      if options[:help]
-        invoke :help, ['run']
-      else
-        require_relative 'commands/run'
-        Dip::Commands::Run.new(cmd, subcmd, argv).execute
-      end
+    def run(*argv)
+      require_relative 'commands/run'
+      Dip::Commands::Run.new(*argv).execute
     end
 
     desc "provision", "Execute commands within provision section"

data/lib/dip/commands/compose.rb

@@ -8,26 +8,25 @@ module Dip
     class Compose < Dip::Command
       DOCKER_EMBEDDED_DNS = "127.0.0.11"
 
-      def initialize(cmd, argv = [])
-        @cmd = cmd
+      attr_reader :argv, :config
+
+      def initialize(*argv)
         @argv = argv
         @config = ::Dip.config.compose || {}
       end
 
       def execute
-        compose_argv = Array(find_files) + Array(find_project_name)
-        compose_argv << @cmd
-        compose_argv += @argv
-
         Dip.env["DIP_DNS"] ||= find_dns
 
+        compose_argv = Array(find_files) + Array(find_project_name) + argv
+
         shell("docker-compose", compose_argv)
       end
 
       private
 
       def find_files
-        return unless (files = @config[:files])
+        return unless (files = config[:files])
 
         if files.is_a?(Array)
           files.each_with_object([]) do |file_name, memo|
@@ -41,7 +40,7 @@ module Dip
       end
 
       def find_project_name
-        return unless (project_name = @config[:project_name])
+        return unless (project_name = config[:project_name])
 
         if project_name.is_a?(String)
           project_name = ::Dip.env.interpolate(project_name)

data/lib/dip/commands/run.rb

@@ -7,7 +7,7 @@ require_relative 'compose'
 module Dip
   module Commands
     class Run < Dip::Command
-      def initialize(cmd, subcmd = nil, argv = [])
+      def initialize(cmd, subcmd = nil, *argv)
         @cmd = cmd.to_sym
         @subcmd = subcmd.to_sym if subcmd
         @argv = argv
@@ -43,7 +43,7 @@ module Dip
         compose_argv += command[:command].to_s.shellsplit
         compose_argv.concat(@argv)
 
-        Dip::Commands::Compose.new(compose_method, compose_argv).execute
+        Dip::Commands::Compose.new(compose_method, *compose_argv).execute
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 

data/lib/dip/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - bibendi