docker_rails_proxy 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79b3dcd393e5a9b60e7cfe3188671314011b44f802ad471c1267442d52dc878b
-  data.tar.gz: fb97c5c91622fefb42a69e9a3bea41b6420be47647aa73a1de58db6ba5adb938
+  metadata.gz: a53bc4f12cc8991f7c3026e473dd14dbc4eed8d4924d6246c4926fd25e0a6243
+  data.tar.gz: 1664d26230d94e06c147b76ccca5a8efb23e658dbdd3ad9e41b5d3d86056270e
 SHA512:
-  metadata.gz: 31de2c5a3f1f54b8dacc4e75c19a08f82b19c0c0aef99a53a36f3df49be1c7f6ba8466b6bfaed881df3fcdfd943637fdd868948337d45e69b296b709f82e44ce
-  data.tar.gz: 4e70215519f80cff3d7f5e84155dba08b37a4aa4ec205f9a155077f57a96b1e472e6906453e364c59862d6af450fb2ab1dc49fc3e008771a25d606c2fa4a6571
+  metadata.gz: 42f5d772ceca2b8c58be856bfced34fb65f2af43855dec6ac687a11783eb0cadf7881eca3ad4432b0a9481eef58cc3ccc008018dd73c6679b37cdc4f4ceec1f3
+  data.tar.gz: 59a0762778db54a0ba17577647a34af954196caaf345c690809bb18433fa5ff6781364a54acfcd24c56bd12cf1d06a1c19c628345508e0be255154f85f91758a

data/lib/docker_rails_proxy.rb

@@ -27,10 +27,11 @@ module DockerRailsProxy
     include Rsync
     include Logger
 
-    attr_reader :arguments
+    attr_reader :arguments, :additional_arguments
 
-    def initialize(arguments:)
-      @arguments = arguments
+    def initialize(arguments:, additional_arguments:)
+      @arguments            = arguments
+      @additional_arguments = additional_arguments
     end
 
     class << self
@@ -129,7 +130,7 @@ module DockerRailsProxy
       attr_accessor :vm_provisioner, :kubernetes_running
     end
 
-    attr_accessor :app_container_id
+    attr_accessor :app_container_id, :docker_options
 
     before_initialize do
       unless system 'type docker &> /dev/null'
@@ -167,6 +168,8 @@ module DockerRailsProxy
       end if Docker.kubernetes_running
     end
 
+    after_initialize { self.docker_options = {} }
+    after_initialize { docker_arguments_parser.parse!(additional_arguments) }
     after_initialize :set_app_container_id
 
   private
@@ -199,17 +202,48 @@ module DockerRailsProxy
                 tty: false,
                 container_id: app_container_id,
                 replace_process: false,
-                user: nil,
                 **)
 
-      options = []
+      docker_options['-ti'] = nil if tty
 
-      options << '-ti' if tty
-      options << "-u #{user}" if user
+      command = [
+        'docker exec',
+        docker_options.map { |key, value| [key, value].compact.join(' ') },
+        container_id,
+        command
+      ].join(' '.freeze)
 
-      command = "docker exec #{options.join(' '.freeze)} #{container_id} #{command}"
       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|
+          docker_options['-w'] = workdir
+        end
+
+        opts.on('-u', '--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|
+          docker_options['-t'] = nil
+        end
+
+        opts.on('-i', '--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
 
   class DockerMainApp < Docker

data/lib/docker_rails_proxy/cli.rb

@@ -2,20 +2,23 @@ module DockerRailsProxy
   class Cli
     class << self
       def invoke(arguments)
-        command, *args = arguments
+        command, *all_arguments = arguments
+        arguments, additional_arguments  = split_arguments(all_arguments)
 
         if command.nil?
           $stderr.puts <<-EOF
           #{"bin/#{APP_NAME} requires 1 argument.".bold}
 
-          #{"Usage: bin/#{APP_NAME} <command> [<args>]".bold}
+          #{"Usage: bin/#{APP_NAME} <command> [<arguments>]".bold}
           EOF
           exit 1
         end
 
         if COMMANDS.include? command
-          args << '-h' if args.empty?
-          "DockerRailsProxy::#{command}".constantize.(arguments: args)
+          arguments << '-h' if arguments.empty?
+          "DockerRailsProxy::#{command}".constantize.(
+            arguments: arguments, additional_arguments: additional_arguments
+          )
         else
           $stderr.puts <<-EOS
           #{'No such command'.yellow}
@@ -25,13 +28,21 @@ module DockerRailsProxy
 
           COMMANDS.each do |script|
             $stderr.puts <<-EOS
-            #{script.parameterize.bold} [<args>]
+            #{script.parameterize.bold} [<arguments>]
             EOS
           end
 
           exit 1
         end
       end
+
+      private
+
+      def split_arguments(arguments)
+        arguments = arguments.join(' ') if arguments.is_a?(Array)
+        arguments, additional_arguments = arguments.split('-- ')
+        [arguments.split(' '), additional_arguments.to_s.split(' ')]
+      end
     end
   end
 end

data/lib/docker_rails_proxy/commands/rails.rb

@@ -1,12 +1,14 @@
 module DockerRailsProxy
   class Rails < SyncBack
+    attr_reader :args
+
     def process
-      command, *args = arguments
+      command, *@args = arguments
 
       case command
-      when 'c',  'console'    then console args
-      when 'db', 'dbconsole'  then db args
-      when 'logs'             then logs args
+      when 'c',  'console'    then console
+      when 'db', 'dbconsole'  then db
+      when 'logs'             then logs
       when 'restart', 'touch' then restart
       when 'secrets'          then secrets
       else
@@ -16,11 +18,11 @@ module DockerRailsProxy
 
   private
 
-    def console(args)
+    def console
       execute "bin/rails c #{args.join(' ')}", tty: true, replace_process: true
     end
 
-    def db(args)
+    def db
       container_id = get_docker_container_id(:mysql)
 
       if container_id.empty?
@@ -36,7 +38,7 @@ module DockerRailsProxy
       )
     end
 
-    def logs(args)
+    def logs
       execute "tail -f log/#{args.first || 'development'}.log", replace_process: true
     end
 

data/lib/docker_rails_proxy/commands/rake.rb

@@ -1,8 +1,7 @@
 module DockerRailsProxy
   class Rake < SyncBack
-    def process
-      command, *args = arguments
-      execute "bin/rake #{command} #{args.join(' ')}"
+    builds ->(params:) do
+      Rails
     end
   end
 end

data/lib/docker_rails_proxy/concerns/callbacks.rb

@@ -1,16 +1,16 @@
 module DockerRailsProxy
   module Callbacks
-    INHERITABLE_CALLBACKS = %w(
+    INHERITABLE_CALLBACKS = %w[
       _before_initialize
       _after_initialize
       _validates
       _before_process
       _after_process
-    ).freeze
+    ].freeze
 
-    UNINHERITABLE_CALLBACKS = %w(
+    UNINHERITABLE_CALLBACKS = %w[
       _builds
-    ).freeze
+    ].freeze
 
     def self.included(base)
       base.extend(ClassMethods)
@@ -50,12 +50,12 @@ module DockerRailsProxy
       def _make_lambda(callback:)
         case callback
         when Symbol
-          -> (resource, *rest) { resource.send(callback, *rest) }
+          ->(resource, *rest) { resource.send(callback, *rest) }
         when ::Proc
           if callback.arity <= 0
-            -> (resource) { resource.instance_exec(&callback) }
+            ->(resource) { resource.instance_exec(&callback) }
           else
-            -> (resource, *rest) do
+            ->(resource, *rest) do
               if rest.empty?
                 resource.instance_exec(resource, &callback)
               else
@@ -64,13 +64,13 @@ module DockerRailsProxy
             end
           end
         else
-          -> (*) {}
+          ->(*) {}
         end
       end
 
       def _run_before_initialize_callbacks
         Array(_before_initialize).each do |callback|
-          if (result = callback.call(self)).is_a? String
+          if (result = callback.call(self)).is_a?(String)
             $stderr.puts %(
               #{result}
             )
@@ -85,7 +85,7 @@ module DockerRailsProxy
 
       def _run_validation_callbacks(resource:)
         Array(_validates).each do |callback|
-          if (result = callback.call(resource)).is_a? String
+          if (result = callback.call(resource)).is_a?(String)
             $stderr.puts %(
               #{result}
             )

data/lib/docker_rails_proxy/version.rb

@@ -1,3 +1,3 @@
 module DockerRailsProxy
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_rails_proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Jairo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies: []
 description: Configures docker-compose and provides rails command helpers
 email:
@@ -75,8 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: docker, docker-compose and rails wrapper