docker_rails_proxy 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11cc5b5ffa094628db0143b27de25323c7c6e610ff51f3bc3cfd308c0d944e0e
-  data.tar.gz: c151d104cbc5835d2afa116c667eee6241ff728d7fb66df49b4a80ad34b07473
+  metadata.gz: 8282c9ba08244394394df207bd38bd75332699cb68966f3e4e92feab3e63a4de
+  data.tar.gz: 2ae4f4bdefba0e1ca762968dc32e99f10fc6e5bf33d0425d0fbe736699682e2d
 SHA512:
-  metadata.gz: 7177b8ff7a8918bb156065c3e5832269d70cccf1b8575544b06e455e085e6b0d77743d07fdd84e00ec55f1b6dc00cd7ae308c65080e588c5484a76293b1dc387
-  data.tar.gz: 83ab38f68fef1981fb682dd57e2f4cb7063a143017e322bc57fb6431affda117cecf52c8cca23b73fe8c8b9066282b3e79583325bd68eeca639596b41d757a3c
+  metadata.gz: e490b98391af24d96d7cc791fb4305322da17e378c83f76c6fc3a465c0f4c07c3910bffc78346a76844401a3efd1f9365b9dbf21eca7bcb527ffd4d724e26d04
+  data.tar.gz: 8fb03b2ab38190e2e95887dac8069f25e414f9413d1ac236db248d2b58e9403e876d44cf8d172478dde8976789a039a6f03c16ca45e5a31bbba8b3f39f319142

data/lib/docker_rails_proxy.rb

@@ -1,3 +1,5 @@
+require 'optparse'
+
 Dir[File.expand_path('../docker_rails_proxy/extends/*.rb', __FILE__)].map do |f|
   require f
 end
@@ -27,7 +29,14 @@ module DockerRailsProxy
     include Rsync
     include Logger
 
-    attr_reader :arguments, :additional_arguments
+    attr_accessor :additional_arguments_options
+    attr_reader   :arguments, :additional_arguments
+
+    after_initialize { self.additional_arguments_options = {} }
+    after_initialize { additional_arguments_parser.parse!(additional_arguments) }
+    after_initialize do
+      DockerRailsProxy.log_level(level: additional_arguments_options[:debug])
+    end
 
     def initialize(arguments:, additional_arguments:)
       @arguments            = arguments
@@ -71,7 +80,7 @@ module DockerRailsProxy
       raise NotImplementedError, 'Subclasses must implement a process method'
     end
 
-  private
+    private
 
     def build_path(*args, &block)
       self.class.build_path(*args, &block)
@@ -84,16 +93,16 @@ module DockerRailsProxy
 
     def get_option(values, default: nil, array: false)
       flush_stdin
-      print ": "
+      print ': '
       option = $stdin.gets.chomp
 
       return default if option.blank?
 
       if array
         options = option.split(',')
-        return nil unless options.map{|o| o =~ NUMBER_REGEXP }.all?
+        return unless options.all? { |o| o =~ NUMBER_REGEXP }
 
-        options.map{|o| values[o.to_i].split(',') }.flatten.compact.uniq.join(',')
+        options.map { |o| values[o.to_i].split(',') }.flatten.compact.uniq.join(',')
       else
         values[option.to_i] if option =~ NUMBER_REGEXP
       end
@@ -115,6 +124,23 @@ module DockerRailsProxy
         Timeout::timeout(0.1) { $stdin.gets.chomp } rescue break
       end
     end
+
+    def additional_arguments_parser
+      @additional_arguments_parser ||= OptionParser.new do |opts|
+        opts.banner = "Usage: bin/#{APP_NAME} #{self.class.name.demodulize.parameterize} [<arguments>] -- [<additional_arguments>]".bold
+
+        opts.on('--debug', 'Debug mode') do |debug|
+          additional_arguments_options[:debug] = ::Logger::DEBUG
+        end
+
+        yield opts if block_given?
+
+        opts.on('-h', '--help', 'Display this screen') do
+          puts opts
+          exit
+        end
+      end
+    end
   end
 
   class AwsCli < Base
@@ -169,10 +195,9 @@ module DockerRailsProxy
     end
 
     after_initialize { self.docker_options = {} }
-    after_initialize { docker_arguments_parser.parse!(additional_arguments) }
     after_initialize :set_app_container_id
 
-  private
+    private
 
     def docker_compose?
       !!Docker.kubernetes_running == false
@@ -216,32 +241,23 @@ module DockerRailsProxy
       replace_process ? exec(command) : system(command)
     end
 
-    def docker_arguments_parser
-      @docker_arguments_parser ||= OptionParser.new do |opts|
-        opts.banner = "Usage: bin/#{APP_NAME} #{self.class.name.demodulize.parameterize} -- [<docker exec arguments>]".bold
-
-        opts.on('-w', '--workdir WORKDIR', 'Working directory inside the container') do |workdir|
+    def additional_arguments_parser
+      super do |opts|
+        opts.on('--docker-workdir WORKDIR', 'Working directory inside the container') do |workdir|
           docker_options['-w'] = workdir
         end
 
-        opts.on('-u', '--user USER', 'Username or UID (format: <name|uid>[:<group|gid>])') do |user|
+        opts.on('--docker-user USER', 'Username or UID (format: <name|uid>[:<group|gid>])') do |user|
           docker_options['-u'] = user
         end
 
-        opts.on('-t', '--tty', 'Allocate a pseudo-TTY') do |tty|
+        opts.on('--docker-tty', 'Allocate a pseudo-TTY') do |tty|
           docker_options['-t'] = nil
         end
 
-        opts.on('-i', '--interactive', 'Keep STDIN open even if not attached') do |interactive|
+        opts.on('--docker-interactive', 'Keep STDIN open even if not attached') do |interactive|
           docker_options['-i'] = nil
         end
-
-        yield opts if block_given?
-
-        opts.on('-h', '--help', 'Display this screen') do
-          puts opts
-          exit
-        end
       end
     end
   end

data/lib/docker_rails_proxy/cli.rb

@@ -2,8 +2,8 @@ module DockerRailsProxy
   class Cli
     class << self
       def invoke(arguments)
-        command, *all_arguments = arguments
-        arguments, additional_arguments  = split_arguments(all_arguments)
+        command, *all_arguments         = arguments
+        arguments, additional_arguments = split_arguments(all_arguments)
 
         if command.nil?
           $stderr.puts <<-EOF
@@ -16,7 +16,7 @@ module DockerRailsProxy
 
         if COMMANDS.include? command
           arguments << '-h' if arguments.empty?
-          "DockerRailsProxy::#{command}".constantize.(
+          "DockerRailsProxy::#{command}".constantize.call(
             arguments: arguments, additional_arguments: additional_arguments
           )
         else
@@ -39,16 +39,10 @@ module DockerRailsProxy
       private
 
       def split_arguments(arguments)
-        arguments = arguments.join(' ') if arguments.is_a?(Array)
-        arguments, additional_arguments = arguments.split(' -- ')
-        [parse_arguments(arguments), parse_arguments(additional_arguments)]
-      end
+        return [arguments, []] unless (separator_index = arguments.index('--'))
 
-      def parse_arguments(arguments)
-        arguments.to_s.split(/\ -/).each_with_index.map do |argument, index|
-          argument = "-#{argument}" unless index.zero?
-          argument.match(/([^ ]+)\s*(.*)/m).captures.reject(&:blank?)
-        end.compact.flatten
+        arguments.delete_at(separator_index)
+        arguments.partition.with_index { |_, index| index < separator_index }
       end
     end
   end

data/lib/docker_rails_proxy/commands/build.rb

@@ -1,5 +1,3 @@
-require 'optparse'
-
 module DockerRailsProxy
   class Build < Docker
     attr_accessor :options

data/lib/docker_rails_proxy/commands/compose/up.rb

@@ -1,5 +1,4 @@
 require 'pty'
-require 'optparse'
 
 module DockerRailsProxy
   class Compose < Docker

data/lib/docker_rails_proxy/commands/data_bags.rb

@@ -1,5 +1,3 @@
-require 'optparse'
-
 module DockerRailsProxy
   class DataBags < AwsCli
     autoload :Pull, 'docker_rails_proxy/commands/data_bags/pull'

data/lib/docker_rails_proxy/commands/kubectl.rb

@@ -1,5 +1,3 @@
-require 'optparse'
-
 module DockerRailsProxy
   class Kubectl < Base
     autoload :Bash,          'docker_rails_proxy/commands/kubectl/bash'

data/lib/docker_rails_proxy/commands/kubectl/bash.rb

@@ -1,4 +1,3 @@
-require 'optparse'
 require 'json'
 
 module DockerRailsProxy

data/lib/docker_rails_proxy/commands/kubectl/set_kubeconfig.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'optparse'
 require 'yaml'
 
 module DockerRailsProxy

data/lib/docker_rails_proxy/commands/ssh.rb

@@ -1,5 +1,3 @@
-require 'optparse'
-
 module DockerRailsProxy
   class Ssh < DockerMainApp
     def process

data/lib/docker_rails_proxy/commands/stack.rb

@@ -1,5 +1,3 @@
-require 'optparse'
-
 module DockerRailsProxy
   class Stack < AwsCli
     autoload :Create,  'docker_rails_proxy/commands/stack/create'

data/lib/docker_rails_proxy/concerns/logger.rb

@@ -1,6 +1,18 @@
 require 'logger'
 
 module DockerRailsProxy
+  def self.logger
+    @logger ||= ::Logger.new(STDOUT).tap do |log|
+      log.formatter = proc do |severity, datetime, progname, msg|
+        "#{severity[0]}, [#{datetime.strftime('%Y-%m-%d %T')}] -- : #{msg}\n"
+      end
+    end
+  end
+
+  def self.log_level(level: nil)
+    logger.level = level || ::Logger::INFO
+  end
+
   module Logger
     class << self
       def included(base)
@@ -10,16 +22,12 @@ module DockerRailsProxy
 
     module ClassMethods
       def logger
-        @logger ||= ::Logger.new(STDOUT).tap do |log|
-          log.formatter = proc do |severity, datetime, progname, msg|
-            "#{severity[0]}, [#{datetime.strftime('%Y-%m-%d %T')}] -- : #{msg}\n"
-          end
-        end
+        ::DockerRailsProxy.logger
       end
     end
 
     def logger
-      self.class.logger
+      ::DockerRailsProxy.logger
     end
   end
 end

data/lib/docker_rails_proxy/concerns/rsync.rb

@@ -31,7 +31,7 @@ module DockerRailsProxy
       _rsync.sync source: source, reverse: reverse, silent: silent
     end
 
-  private
+    private
 
     def _rsync_host
       @_rsync_host ||= begin
@@ -72,7 +72,7 @@ module DockerRailsProxy
         }
 
         if result && options[:silent].eql?(false)
-          puts "#{source}   =======>   #{target}"
+          DockerRailsProxy.logger.info "#{source}   =======>   #{target}"
         end
 
         result

data/lib/docker_rails_proxy/version.rb

@@ -1,3 +1,3 @@
 module DockerRailsProxy
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_rails_proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Jairo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies: []
 description: Configures docker-compose and provides rails command helpers
 email:
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: docker, docker-compose and rails wrapper