docker_rails_proxy 0.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 560e55ef710ff5dd7ca014076a8f0d901392e9f6f6a4d9f90bff13afe508c8ae
-  data.tar.gz: 6797397a319714e456ecd65452f930ede67355a361c34b5cd57d688d2617105a
+  metadata.gz: 873a065cab149074c38e094de0a69f8c7950c1e3a91d6caf7a4caee810e926a7
+  data.tar.gz: c03370b0ae15790291cbd9ac9fd3f00290f181c2ad78aab345bce9a613104498
 SHA512:
-  metadata.gz: 45dc24ae60670e8cd95d128aea8e6dfc9583060e27f7c1158dc4047150620db549790ec243f30543afbf38af0327b0bc960d7a9f7efb63cc862985fa2f3625e6
-  data.tar.gz: 8e9c17b1182e1e59032ac550199fef05f80535c4f2275afc51f2d7aebee06597cf9cdf8c5ce5c6478edabfe7c25fed64a4c4a50afafee9b9adedb5bea053c2f6
+  metadata.gz: 1bba82f568174c4337fbadc1bc56326ec3d4d42a8845361838b171e9aad9faff53269fedb64e4ff88c99a0adeb23af890715799fb98708b415ae4c20d6630590
+  data.tar.gz: 8281e2ccd0a694134903cf80de6e40b9533dcb12549a7ed0194657a2649bfcdbceb1349fa8aac5f49784783ad61fb2790fbeab7da40dea8a1561ca3593e3511c

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/rails.rb

@@ -59,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/rsync.rb

@@ -36,7 +36,7 @@ module DockerRailsProxy
     def _rsync_host
       @_rsync_host ||= begin
         ip   = ENV.fetch('DOCKER_HOST') { '127.0.0.1' }.to_s.sub('tcp://', '').sub(/:\d+$/, '')
-        port = '10873'
+        port = ENV.fetch('RSYNC_PORT') { '10873' }
 
         loop do
           break if (port = %x(kubectl get svc "#{APP_NAME}" -o jsonpath='{.spec.ports[?(@.name=="rsync")].nodePort}' 2> /dev/null).strip).present?

data/lib/docker_rails_proxy/version.rb

@@ -1,3 +1,3 @@
 module DockerRailsProxy
-  VERSION = '0.2'
+  VERSION = '0.2.4'
 end

data/lib/docker_rails_proxy.rb

@@ -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.2'
+  version: 0.2.4
 platform: ruby
 authors:
 - Jairo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies: []
 description: Configures docker-compose and provides rails command helpers
 email:
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: docker, docker-compose and rails wrapper