docker_rails_proxy 0.1.16 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8282c9ba08244394394df207bd38bd75332699cb68966f3e4e92feab3e63a4de
-  data.tar.gz: 2ae4f4bdefba0e1ca762968dc32e99f10fc6e5bf33d0425d0fbe736699682e2d
+  metadata.gz: a5819c64cc069f6c72b3bc21c5aaeab20d328ff6d52fd55d4563f7ecb10ede4d
+  data.tar.gz: 5ca639cd06e1b88e618b2a877db695609e91aecfaecdb8dbc91e2ca2c735ed2e
 SHA512:
-  metadata.gz: e490b98391af24d96d7cc791fb4305322da17e378c83f76c6fc3a465c0f4c07c3910bffc78346a76844401a3efd1f9365b9dbf21eca7bcb527ffd4d724e26d04
-  data.tar.gz: 8fb03b2ab38190e2e95887dac8069f25e414f9413d1ac236db248d2b58e9403e876d44cf8d172478dde8976789a039a6f03c16ca45e5a31bbba8b3f39f319142
+  metadata.gz: 4dd69e7851a48e3b577a13f6514f41f750396370908118fe02f4e1fac613b6992d51c696e5dc32e7444f94cd5dc5188925b1618f078c408da7eb5611a1491f8d
+  data.tar.gz: 02da3a720928ffccb54bfc7331c27a72bed11c9e5c07c627ec701f08929e02c487871a2b91c0b5a7672261705271fb74d391788e766a6fae054fc160b855aa8d

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

@@ -51,7 +51,7 @@ module DockerRailsProxy
         seed                 if from_scratch?
       end
 
-    private
+      private
 
       def seed
         logger.info "Seeding #{APP_NAME} data"

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

@@ -3,17 +3,22 @@ require 'json'
 module DockerRailsProxy
   class Kubectl < Base
     class Bash < self
+      UNNEEDED_ATTRIBUTES = %w[livenessProbe readinessProbe command lifecycle].freeze
+      ACCEPTED_STATUSES   = %w[Running Failed].freeze
+
       attr_accessor :data
 
       before_process do
-        self.data = JSON.parse kubectl_output("get pod #{pod} -o json")
+        self.data = JSON.parse(
+          kubectl_output("get pod #{cloned_pod_name} -o json")
+        )
       end
 
-      def process
-        %w[livenessProbe readinessProbe command lifecycle].each do |attr|
-          container.delete attr
-        end
+      before_process do
+        UNNEEDED_ATTRIBUTES.each { |attribute| container.delete(attribute) }
+      end
 
+      def process
         overrides = {
           metadata: {
             annotations: {
@@ -37,8 +42,8 @@ module DockerRailsProxy
                 tty: true,
                 resources: {
                   requests: {
-                    cpu: '100m',
-                    memory: '300Mi',
+                    cpu: '250m',
+                    memory: '500Mi',
                   }
                 }
               })
@@ -49,28 +54,27 @@ module DockerRailsProxy
         pod_name = "#{container['name']}-bash-#{Time.now.strftime '%Y%m%d%H%M%S'}"
         puts "Starting #{pod_name} pod ..."
 
-        kubectl <<-EOS
+        kubectl <<-RUN_COMMAND
           run #{pod_name} --rm -i --tty \
             --image='#{container['image']}' \
-            --generator='run-pod/v1' \
             --overrides='#{overrides.to_json}'
-        EOS
+        RUN_COMMAND
       end
 
-    private
+      private
 
-      def pod
-        @pod_name ||= begin
-          pods = kubectl_output(<<-EOS).split(" ")
-            get pods -o jsonpath='{range .items[*]}{.metadata.name},{.status.phase}{" "}{end}'}
-          EOS
+      def cloned_pod_name
+        @cloned_pod_name ||= begin
+          pods = kubectl_output(<<-GET_PODS).split(" ")
+            get pods -o jsonpath='{range .items[*]}{.metadata.name},{.status.phase}{" "}{end}'
+          GET_PODS
 
           pods = pods.map do |values|
             name, phase = values.split(',')
-            phase == 'Running' ? name : nil
+            ACCEPTED_STATUSES.include?(phase) ? name : nil
           end.compact
 
-          until_get_option pods, "Choose a pod and press [ENTER]"
+          until_get_option(pods, "Choose a pod and press [ENTER]")
         end
       end
 
@@ -79,9 +83,9 @@ module DockerRailsProxy
           containers = data.dig('spec', 'containers')
 
           if containers.size > 1
-            names = containers.map{|c| c['name'] }
-            name  = until_get_option names, "Choose a container and press [ENTER]"
-            containers.detect{|c| c['name'] == name }
+            names = containers.map { |container| container['name'] }
+            name  = until_get_option(names, "Choose a container and press [ENTER]")
+            containers.find { |container| container['name'] == name }
           else
             containers.first
           end

data/lib/docker_rails_proxy/commands/kubectl.rb

@@ -10,7 +10,7 @@ module DockerRailsProxy
     end
 
     validates do
-      unless File.exist? KUBECONFIG_PATH
+      unless File.exist?(KUBECONFIG_PATH)
         <<-EOS
 
         kubeconfig is required, run this command to set it
@@ -19,7 +19,7 @@ module DockerRailsProxy
       end unless arguments.first == 'set-kubeconfig'
     end
 
-    builds -> (params:) do
+    builds ->(params:) do
       case params[:arguments].first
       when 'bash'           then Bash
       when 'set-kubeconfig' then SetKubeconfig
@@ -30,10 +30,12 @@ module DockerRailsProxy
       kubectl arguments.join(' ')
     end
 
-  private
+    private
 
     def kubectl(command)
-      exec "kubectl --kubeconfig='#{KUBECONFIG_PATH}' #{command}"
+      cmd =  "kubectl --kubeconfig='#{KUBECONFIG_PATH}' #{command}"
+      cmd << " -- #{additional_arguments.join(', ')}" unless additional_arguments.empty?
+      exec cmd
     end
 
     def kubectl_output(command)

data/lib/docker_rails_proxy/commands/rails/credentials.rb

@@ -0,0 +1,34 @@
+module DockerRailsProxy
+  class Rails < SyncBack
+    class Credentials < self
+      attr_accessor :options
+
+      after_initialize { self.options = {} }
+      after_initialize { opt_parser.parse!(arguments) }
+
+      validates { '--environment is required' if options[:environment].nil? }
+
+      def process
+        command = "EDITOR=vim bin/rails credentials:edit --environment #{options[:environment]}"
+        execute "bash -c '#{command}'", tty: true
+      end
+
+      private
+
+      def opt_parser
+        @opt_parser ||= OptionParser.new do |opts|
+          opts.banner = "Usage: bin/#{APP_NAME} rails credentials [options]"
+
+          opts.on(
+            '--environment ENVIRONMENT', 'App environment'
+          ) { |environment| options[:environment] = environment }
+
+          opts.on('-h', '--help', 'Display this screen') do
+            puts opts
+            exit
+          end
+        end
+      end
+    end
+  end
+end

data/lib/docker_rails_proxy/commands/rails.rb

@@ -2,6 +2,16 @@ module DockerRailsProxy
   class Rails < SyncBack
     attr_reader :args
 
+    autoload :Credentials, 'docker_rails_proxy/commands/rails/credentials'
+
+    builds ->(params:) do
+      case params[:arguments].first
+      when 'credentials' then Credentials
+      else
+        DockerRailsProxy::Rails
+      end
+    end
+
     def process
       command, *@args = arguments
 
@@ -11,13 +21,12 @@ module DockerRailsProxy
       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
     end
 
-  private
+    private
 
     def console
       execute "bin/rails c #{args.join(' ')}", tty: true, replace_process: true
@@ -50,12 +59,5 @@ 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/concerns/callbacks.rb

@@ -50,18 +50,10 @@ module DockerRailsProxy
       def _make_lambda(callback:)
         case callback
         when Symbol
-          ->(resource, *rest) { resource.send(callback, *rest) }
+          ->(resource, *args, **kw_args) { resource.send(callback, *args, **kw_args) }
         when ::Proc
-          if callback.arity <= 0
-            ->(resource) { resource.instance_exec(&callback) }
-          else
-            ->(resource, *rest) do
-              if rest.empty?
-                resource.instance_exec(resource, &callback)
-              else
-                resource.instance_exec(*rest, &callback)
-              end
-            end
+          lambda do |resource, *args, **kw_args|
+            resource.instance_exec(*args, **kw_args, &callback)
           end
         else
           ->(*) {}

data/lib/docker_rails_proxy/concerns/rsync.rb

@@ -64,12 +64,13 @@ module DockerRailsProxy
       end
 
       def sync(options)
-        return if source_in_exclusions?(options)
-        source, target, volume = normalize_options(options)
+        return if source_in_exclusions?(**options)
 
-        result = send "sync_#{volume}", {
-          source: source, target: target, reverse: options[:reverse]
-        }
+        source, target, volume = normalize_options(**options)
+
+        result = send(
+          "sync_#{volume}", source: source, target: target, reverse: options[:reverse]
+        )
 
         if result && options[:silent].eql?(false)
           DockerRailsProxy.logger.info "#{source}   =======>   #{target}"

data/lib/docker_rails_proxy/version.rb

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

data/lib/docker_rails_proxy.rb

@@ -61,7 +61,7 @@ module DockerRailsProxy
 
         klass.send :_run_before_initialize_callbacks
 
-        resource = klass.new(options)
+        resource = klass.new(**options)
 
         klass.send :_run_after_initialize_callbacks, resource: resource
 
@@ -113,7 +113,7 @@ module DockerRailsProxy
 
       while value.nil? do
         print_options(values, message)
-        value = get_option(values, options)
+        value = get_option(values, **options)
       end
 
       value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_rails_proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.2.3
 platform: ruby
 authors:
 - Jairo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies: []
 description: Configures docker-compose and provides rails command helpers
 email:
@@ -37,6 +37,7 @@ files:
 - lib/docker_rails_proxy/commands/kubectl/bash.rb
 - lib/docker_rails_proxy/commands/kubectl/set_kubeconfig.rb
 - lib/docker_rails_proxy/commands/rails.rb
+- lib/docker_rails_proxy/commands/rails/credentials.rb
 - lib/docker_rails_proxy/commands/rake.rb
 - lib/docker_rails_proxy/commands/rspec.rb
 - lib/docker_rails_proxy/commands/spring.rb
@@ -75,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.17
 signing_key:
 specification_version: 4
 summary: docker, docker-compose and rails wrapper