docker_rails_proxy 0.1.10 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5008c7df40c8205919dcdaa5545a13841f1b1e36c90ce5ac3ed5912fb75d3d2b
-  data.tar.gz: 27cc29c48a8e84254bcf6cb4ef5f7ca6868168b9a3b3f21a74dab96b90496ba7
+  metadata.gz: 11cc5b5ffa094628db0143b27de25323c7c6e610ff51f3bc3cfd308c0d944e0e
+  data.tar.gz: c151d104cbc5835d2afa116c667eee6241ff728d7fb66df49b4a80ad34b07473
 SHA512:
-  metadata.gz: 56fb302cf1af8c2f7632e9502b63142dd349c6ef08b8272e33dd7aeb4a2fe41ddba687baf23640532f4a2f75c3c44a0dac76cfe6e7d0a15c905ba0a5e6b9f955
-  data.tar.gz: d56a4f0a5287a0b1a2862876e7c65046c217eb11194c02c631b0ab4206b73cb8d82e225dfe7de59c8709d485156c33d2ae9fb510748da67f290edb12c7ee9198
+  metadata.gz: 7177b8ff7a8918bb156065c3e5832269d70cccf1b8575544b06e455e085e6b0d77743d07fdd84e00ec55f1b6dc00cd7ae308c65080e588c5484a76293b1dc387
+  data.tar.gz: 83ab38f68fef1981fb682dd57e2f4cb7063a143017e322bc57fb6431affda117cecf52c8cca23b73fe8c8b9066282b3e79583325bd68eeca639596b41d757a3c

data/README.md

@@ -1,6 +1,28 @@
 ### To release a new version
 
-Update `lib/docker_rails_proxy/version.rb` with the new version and commit that change.
+**Test locally**
+
+change the version on `lib/docker_rails_proxy/version.rb`
+
+and build the gem
+
+```
+gem build docker_rails_proxy.gemspec                                                                                                                                      [ruby-2.6.3]
+  Successfully built RubyGem
+  Name: docker_rails_proxy
+  Version: 0.1.13
+  File: docker_rails_proxy-0.1.13.gem
+```
+
+on the repo when you want to test, i.e `~/Projects/Eureka`
+
+install the local gem
+
+```
+gem install docker_rails_proxy -l ~/Projects/docker_rails_proxy/docker_rails_proxy-0.1.13.gem
+```
+
+Once it's ready, create the tag and push
 
 **Git Tag**
 ```bash
@@ -12,6 +34,5 @@ git push origin v0.0.1
 
 The user on rubygems.org is eureaktechteam@gmail.com.  Credentials are in 1password "Eureka Tech" vault 
 ```bash
-gem build docker_rails_proxy.gemspec
 gem push docker_rails_proxy-0.0.1.gem
 ```

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
@@ -185,7 +188,7 @@ module DockerRailsProxy
 
     def get_docker_container_id(app, container: nil)
       if docker_compose?
-        %x(docker ps -q --filter "name=^/#{[app, container].compact.join('_')}$").strip
+        %x(docker ps -q --filter "name=#{[app, container].compact.join('_')}$").strip
       elsif kubernetes?
         pod_name = %x(kubectl get pod -l "app=#{app}" 2> /dev/null | grep Running | awk '{print $1}').strip
         return '' if pod_name.empty?
@@ -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,28 @@ 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(' -- ')
+        [parse_arguments(arguments), parse_arguments(additional_arguments)]
+      end
+
+      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
+      end
     end
   end
 end

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

@@ -37,7 +37,7 @@ module DockerRailsProxy
         self.from_scratch = if docker_compose?
           %x(docker-compose ps | grep -c #{APP_NAME}).to_i.zero?
         elsif kubernetes?
-          %x(kubectl get deploy -l 'app=#{APP_NAME}' -o name).empty?
+          %x(kubectl get deployment #{APP_NAME} -o name).empty?
         end
       end
 
@@ -77,10 +77,12 @@ module DockerRailsProxy
       end
 
       def fswatch_start
+        logger.debug "fswatch command: #{FSWATCH_CMD}"
         logger.info 'fswatch has been started'
+
         PTY.spawn(FSWATCH_CMD) do |stdout, stdin, pid|
           begin
-            stdout.each { |path| sync_or_kill(path: path, pid: pid) }
+            stdout.each { |path| sync_or_kill(path: path.strip, pid: pid) }
           rescue Errno::EIO
             logger.error EIO_ERROR
           end
@@ -98,7 +100,9 @@ module DockerRailsProxy
         return if stopping?
 
         if branch_name == (branch = current_branch)
+          logger.debug("syncing #{path}")
           sync source: path
+          logger.debug("#{path} synced")
         else
           $stderr.puts %(
           `git checkout #{branch}` was detected, stopping fswatch

data/lib/docker_rails_proxy/commands/rails.rb

@@ -1,14 +1,17 @@
 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
+      when 'credentials'      then credentials
       else
         execute "bin/rails #{command} #{args.join(' ')}", tty: true
       end
@@ -16,11 +19,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 +39,7 @@ module DockerRailsProxy
       )
     end
 
-    def logs(args)
+    def logs
       execute "tail -f log/#{args.first || 'development'}.log", replace_process: true
     end
 
@@ -47,5 +50,12 @@ module DockerRailsProxy
     def secrets
       execute "bash -c 'EDITOR=vim bin/rails secrets:edit'", tty: true
     end
+
+    def credentials
+      # Temporary solution to use credentials in Rails 5.2
+      # Future version will use the --environment argument instead
+      command = "RAILS_ENV=#{args.first} EDITOR=vim bin/rails credentials:edit"
+      execute "bash -c '#{command}'", tty: true
+    end
   end
 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/concerns/logger.rb

@@ -12,7 +12,7 @@ module DockerRailsProxy
       def logger
         @logger ||= ::Logger.new(STDOUT).tap do |log|
           log.formatter = proc do |severity, datetime, progname, msg|
-            "> #{datetime.strftime '%Y-%m-%d %T'} -- #{msg}\n"
+            "#{severity[0]}, [#{datetime.strftime('%Y-%m-%d %T')}] -- : #{msg}\n"
           end
         end
       end

data/lib/docker_rails_proxy/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: docker_rails_proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.15
 platform: ruby
 authors:
 - Jairo
 - Vázquez
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies: []
 description: Configures docker-compose and provides rails command helpers
 email:
@@ -60,7 +60,7 @@ homepage: https://github.com/jairovm/docker_rails_proxy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -75,9 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: docker, docker-compose and rails wrapper
 test_files: []