docker_rails_proxy 0.0.12 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3a12d0b5a75064d9d2536c11ccd90898c8d88f6
-  data.tar.gz: 279c5c537357f88c68cad0dd49ba48d7b2b224d8
+  metadata.gz: e054684446e381e85f5a034bdf97b68f34cecbc8
+  data.tar.gz: '08563be16ae0fae359a12fe46c799cee34fd4785'
 SHA512:
-  metadata.gz: 8d9e1bbfb5714a48d34b7b42846677db5b5278876b066a4289fa465b1d2a3baa465e6743700078f43a39641fea4943aca27bb6c8ccc6d9fc0b55a004929c04be
-  data.tar.gz: d59f6de86cc746002b3f59a9bfcf3d4d4ddaf0aebae75f8e8bbc4018f81c0c6de70b2da1a864853f5de1702c33092a4cdcaf25e4e4f8e0009eec161e769e386c
+  metadata.gz: a4868a69273f6b96a5a78a14d81072616399bf091cc91f5a19dd7ef9504911fb33df03b9aa04523b9f3ac41290de24a200d516141615b5c78029bba1d34bb736
+  data.tar.gz: 8997b53995275162011777f74e5b7c5a03c0db763c5231b5c1764a8b9a02fd8baab3196fe492b54bc30cb562a2aeacf60f62ac088eb67b9004961a592bd1c367

data/lib/docker_rails_proxy/commands/bundle.rb

@@ -2,7 +2,7 @@ module DockerRailsProxy
   class Bundle < SyncBack
     def process
       command, *args = arguments
-      system "docker exec -it #{APP_NAME} bundle #{command} #{args.join(' ')}"
+      execute "bundle #{command} #{args.join(' ')}"
     end
   end
 end

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

@@ -2,6 +2,8 @@ module DockerRailsProxy
   class Compose < Docker
     class Down < self
       def process
+        return unless docker_machine?
+
         containers = %x(
           docker-compose ps | grep '#{APP_NAME}' | awk '{print $1}' | xargs
         ).strip.split(' ')

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

@@ -13,7 +13,7 @@ EOS
 
       def process
         File.write(OVERRIDE_PATH, OVERRIDE_FILE)
-        puts "#{OVERRIDE_PATH} was created"
+        logger.info "#{OVERRIDE_PATH} was created"
       end
     end
   end

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

@@ -3,7 +3,7 @@ module DockerRailsProxy
     class Proxy < self
       def process
         command, *args = arguments
-        system "docker-compose #{command} #{args.join(' ')}"
+        system "docker-compose #{command} #{args.join(' ')}" if docker_machine?
       end
     end
   end

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

@@ -9,7 +9,7 @@ module DockerRailsProxy
           --latency=0.1 \
           --exclude '.git' \
           --exclude '4913' \
-          "#{APP_PATH}" "#{GEMS_PATH}" | xargs -0 -n1 -I{} echo {}
+          "#{[APP_PATH, GEMS_PATH].compact.join('" "')}" | xargs -0 -n1 -I{} echo {}
       EOS
 
       EIO_ERROR = %(
@@ -34,55 +34,64 @@ module DockerRailsProxy
       after_initialize :parse_options!, :set_defaults
 
       before_process do
-        self.from_scratch = %x(docker-compose ps | grep -c #{APP_NAME}).to_i.zero?
+        self.from_scratch = if docker_machine?
+          %x(docker-compose ps | grep -c #{APP_NAME}).to_i.zero?
+        elsif minikube?
+          %x(kubectl get deploy -l 'app=#{APP_NAME}' -o name).empty?
+        end
       end
 
       after_process { fswatch_start }
 
       def process
-        system 'docker-compose up -d'
+        system 'docker-compose up -d' if docker_machine?
         sync_app_and_gems_folders
-        run_bundle_install if options[:bundle]
-        seed if from_scratch?
+
+        set_app_container_id if app_container_id.empty?
+        run_bundle_install   if options[:bundle]
+        seed                 if from_scratch?
       end
 
     private
 
       def seed
-        system <<-EOS.strip.freeze
-          docker exec #{APP_NAME} bin/rake db:drop db:create db:migrate db:seed
-        EOS
+        logger.info "Seeding #{APP_NAME} data"
+
+        loop do
+          break if execute "bin/rake db:reset"
+          sleep 5
+        end
       end
 
       def sync_app_and_gems_folders
         rsync_app
-        sync source: GEMS_PATH
+        sync source: GEMS_PATH if GEMS_PATH.present?
       end
 
       def rsync_app
         loop do
           break if sync(source: APP_PATH)
-          puts "waiting for rsync-volume service on #{_rsync_host}"
-          sleep 2
+          logger.info "waiting for rsync-volume service on #{_rsync_host}"
+          sleep 5
         end
       end
 
       def fswatch_start
-        puts 'fswatch has been started'
+        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) }
           rescue Errno::EIO
-            $stderr.puts EIO_ERROR
+            logger.error EIO_ERROR
           end
         end
 
       rescue PTY::ChildExited
-        $stderr.puts '"The fswatch process exited!'
+        logger.error '"The fswatch process exited!'
 
       # Captures Ctrl-C
       rescue Exception
-        puts 'fswatch has been stopped'
+        logger.info 'fswatch has been stopped'
       end
 
       def sync_or_kill(path:, pid:)
@@ -106,7 +115,7 @@ module DockerRailsProxy
 
       # since new gems may have been added, we need bundle install
       def run_bundle_install
-        system "docker exec #{APP_NAME} bundle install"
+        execute "bundle install"
       end
 
       def parse_options!

data/lib/docker_rails_proxy/commands/data_bags/pull.rb

@@ -10,7 +10,7 @@ module DockerRailsProxy
             --profile '#{options[:profile]}'
         EOS
 
-          puts "Data bags pulled from #{options[:bucket_path]} to #{options[:folder]}"
+          logger.info "Data bags pulled from #{options[:bucket_path]} to #{options[:folder]}"
         end
       end
     end

data/lib/docker_rails_proxy/commands/data_bags/push.rb

@@ -29,7 +29,7 @@ module DockerRailsProxy
             --sse aws:kms
         EOS
 
-          puts "Data bags pushed from #{options[:folder]} to #{options[:bucket_path]}"
+          logger.info "Data bags pushed from #{options[:folder]} to #{options[:bucket_path]}"
         end
       end
     end

data/lib/docker_rails_proxy/commands/rails.rb

@@ -9,31 +9,38 @@ module DockerRailsProxy
       when 'logs'             then logs args
       when 'restart', 'touch' then restart
       else
-        system "docker exec -it #{APP_NAME} bin/rails #{command} #{args.join(' ')}"
+        execute "bin/rails #{command} #{args.join(' ')}", tty: true
       end
     end
 
   private
 
     def console(args)
-      exec "docker exec -it #{APP_NAME} bin/rails c #{args.join(' ')}"
+      execute "bin/rails c #{args.join(' ')}", tty: true, replace_process: true
     end
 
     def db(args)
-      exec <<-EOS
-        docker exec -it #{APP_NAME}_db \
-          mysql #{args.first || "#{APP_NAME}_development"}
-      EOS
+      container_id = get_docker_container_id(:mysql)
+
+      if container_id.empty?
+        logger.error "Couldn't connect to mysql container, make sure it's running"
+        exit 1
+      end
+
+      execute(
+        "mysql #{args.first || "#{APP_NAME}_development"}",
+        container_id: container_id,
+        tty: true,
+        replace_process: true
+      )
     end
 
     def logs(args)
-      exec <<-EOS
-        docker exec #{APP_NAME} tail -f log/#{args.first || 'development'}.log
-      EOS
+      execute "tail -f log/#{args.first || 'development'}.log", replace_process: true
     end
 
     def restart
-      exec "docker exec #{APP_NAME} touch tmp/restart.txt"
+      execute "touch tmp/restart.txt", replace_process: true
     end
   end
 end

data/lib/docker_rails_proxy/commands/rake.rb

@@ -2,7 +2,7 @@ module DockerRailsProxy
   class Rake < SyncBack
     def process
       command, *args = arguments
-      system "docker exec -it #{APP_NAME} bin/rake #{command} #{args.join(' ')}"
+      execute "bin/rake #{command} #{args.join(' ')}"
     end
   end
 end

data/lib/docker_rails_proxy/commands/rspec.rb

@@ -2,7 +2,7 @@ module DockerRailsProxy
   class Rspec < SyncBack
     def process
       command, *args = arguments
-      system "docker exec #{APP_NAME} bin/rspec #{command} #{args.join(' ')}"
+      execute "bin/rspec #{command} #{args.join(' ')}"
     end
   end
 end

data/lib/docker_rails_proxy/commands/spring.rb

@@ -2,7 +2,7 @@ module DockerRailsProxy
   class Spring < DockerMainApp
     def process
       command, *args = arguments
-      system "docker exec #{APP_NAME} bin/spring #{command} #{args.join(' ')}"
+      execute "bin/spring #{command} #{args.join(' ')}"
     end
   end
 end

data/lib/docker_rails_proxy/commands/ssh.rb

@@ -9,7 +9,7 @@ module DockerRailsProxy
       when '-h', '--help'
         opt_parser.parse %w(-h)
       else
-        system "docker exec -it #{APP_NAME} #{command} #{args.join(' ')}"
+        execute "#{command} #{args.join(' ')}", tty: true
       end
     end
 

data/lib/docker_rails_proxy/commands/webpack.rb

@@ -2,7 +2,7 @@ module DockerRailsProxy
   class Webpack < SyncBack
     def process
       command, *args = arguments
-      system "docker exec #{APP_NAME} bin/webpack #{command} #{args.join(' ')}"
+      execute "bin/webpack #{command} #{args.join(' ')}"
     end
   end
 end

data/lib/docker_rails_proxy/commands/webpack_dev_server.rb

@@ -2,7 +2,7 @@ module DockerRailsProxy
   class WebpackDevServer < DockerMainApp
     def process
       command, *args = arguments
-      system "docker exec #{APP_NAME} bin/webpack-dev-server #{command} #{args.join(' ')}"
+      execute "bin/webpack-dev-server #{command} #{args.join(' ')}"
     end
   end
 end

data/lib/docker_rails_proxy/commands/yarn.rb

@@ -2,7 +2,7 @@ module DockerRailsProxy
   class Yarn < SyncBack
     def process
       command, *args = arguments
-      system "docker exec #{APP_NAME} bin/yarn #{command} #{args.join(' ')}"
+      execute "bin/yarn #{command} #{args.join(' ')}"
     end
   end
 end

data/lib/docker_rails_proxy/concerns/logger.rb

@@ -0,0 +1,25 @@
+require 'logger'
+
+module DockerRailsProxy
+  module Logger
+    class << self
+      def included(base)
+        base.extend(ClassMethods)
+      end
+    end
+
+    module ClassMethods
+      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"
+          end
+        end
+      end
+    end
+
+    def logger
+      self.class.logger
+    end
+  end
+end

data/lib/docker_rails_proxy/concerns/rsync.rb

@@ -31,7 +31,16 @@ module DockerRailsProxy
 
     def _rsync_host
       @_rsync_host ||= begin
-        "rsync://#{ENV['DOCKER_HOST'].to_s.sub('tcp://', '').sub(/:\d+$/, '')}:10873"
+        ip   = ENV['DOCKER_HOST'].to_s.sub('tcp://', '').sub(/:\d+$/, '')
+        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?
+          sleep 5
+          logger.info 'Waiting for rsync port ...'
+        end if Docker.vm_provisioner == :minikube
+
+        "rsync://#{ip}:#{port}"
       end
     end
 
@@ -67,7 +76,7 @@ module DockerRailsProxy
       def normalize_options(source:, reverse: false, **)
         values = if source.include? APP_PATH
                    ["#{APP_PATH}/", 'app']
-                 elsif source.include? GEMS_PATH
+                 elsif GEMS_PATH.present? and source.include?(GEMS_PATH)
                    ["#{GEMS_PATH}/", 'gems']
                  else
                    $stderr.puts "There is no rsync volume related with this path: #{source}"

data/lib/docker_rails_proxy/version.rb

@@ -1,3 +1,3 @@
 module DockerRailsProxy
-  VERSION = '0.0.12'
+  VERSION = '0.1'
 end

data/lib/docker_rails_proxy.rb

@@ -16,6 +16,7 @@ module DockerRailsProxy
   autoload :InheritableAttributes, 'docker_rails_proxy/concerns/inheritable_attributes'
   autoload :Callbacks,             'docker_rails_proxy/concerns/callbacks'
   autoload :Rsync,                 'docker_rails_proxy/concerns/rsync'
+  autoload :Logger,                'docker_rails_proxy/concerns/logger'
 
   autoload :Cli,     'docker_rails_proxy/cli'
   autoload :VERSION, 'docker_rails_proxy/version'
@@ -24,6 +25,7 @@ module DockerRailsProxy
     include InheritableAttributes
     include Callbacks
     include Rsync
+    include Logger
 
     attr_reader :arguments
 
@@ -41,9 +43,7 @@ module DockerRailsProxy
       end
 
       def execute(options)
-        system <<-EOS
-          #{build_path("bin/#{APP_NAME}")} #{command} #{options}
-        EOS
+        system "#{build_path("bin/#{APP_NAME}")} #{command} #{options}"
       end
 
       def call(options)
@@ -125,22 +125,71 @@ module DockerRailsProxy
   end
 
   class Docker < Base
+    class << self
+      attr_accessor :vm_provisioner
+    end
+
+    attr_accessor :app_container_id
+
     before_initialize do
       if ENV['DOCKER_HOST'].nil?
         %(
         Couldn't connect to Docker daemon you might need to run:
           docker-machine start default
-          eval $(docker-machine env default)
+          eval $(docker-machine env default) or eval $(minikube docker-env)
         )
       end
     end
+
+    before_initialize do
+      Docker.vm_provisioner = ENV['DOCKER_CERT_PATH'].include?('.minikube') ? :minikube : :docker_machine
+    end
+
+    before_initialize do
+      unless system 'type kubectl &> /dev/null'
+        'kubectl is required, `brew install kubectl`'
+      end if Docker.vm_provisioner == :minikube
+    end
+
+    after_initialize :set_app_container_id
+
+  private
+
+    def docker_machine?
+      Docker.vm_provisioner == :docker_machine
+    end
+
+    def minikube?
+      Docker.vm_provisioner == :minikube
+    end
+
+    def set_app_container_id
+      self.app_container_id = get_docker_container_id(APP_NAME)
+    end
+
+    def get_docker_container_id(app, container: nil)
+      if docker_machine?
+        %x(docker ps -q --filter "name=^/#{[app, container].compact.join('_')}$").strip
+      elsif minikube?
+        pod_name = %x(kubectl get pod -l "app=#{app}" 2> /dev/null | grep Running | awk '{print $1}').strip
+        return '' if pod_name.empty?
+
+        full_id  = %x(kubectl get pod #{pod_name} -o jsonpath='{ .status.containerStatuses[?(@.name=="#{container || app}")].containerID }').strip
+        full_id.split('//').last
+      end
+    end
+
+    def execute(command, tty: false, container_id: app_container_id, replace_process: false, **)
+      command = "docker exec #{tty ? '-ti' : nil} #{container_id} #{command}"
+      replace_process ? exec(command) : system(command)
+    end
   end
 
   class DockerMainApp < Docker
-    before_initialize do
-      unless system "docker ps | grep '#{APP_NAME}$' &> /dev/null"
+    after_initialize do
+      if app_container_id.empty?
         %(
-        Couldn't connect to #{APP_NAME} container you might need to run:
+        Couldn't connect to #{APP_NAME}'s container you might need to run:
           bin/#{APP_NAME} compose up
         )
       end
@@ -151,7 +200,7 @@ module DockerRailsProxy
   end
 
   class SyncBack < DockerMainApp
-    after_process { system "docker exec #{APP_NAME} chown -R nobody:nogroup ." }
+    after_process { execute "chown -R nobody:nogroup ."  }
     after_process { sync source: APP_PATH, reverse: true }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_rails_proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: '0.1'
 platform: ruby
 authors:
 - Jairo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-02 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies: []
 description: Configures docker-compose and provides rails command helpers
 email:
@@ -49,6 +49,7 @@ files:
 - lib/docker_rails_proxy/commands/yarn.rb
 - lib/docker_rails_proxy/concerns/callbacks.rb
 - lib/docker_rails_proxy/concerns/inheritable_attributes.rb
+- lib/docker_rails_proxy/concerns/logger.rb
 - lib/docker_rails_proxy/concerns/rsync.rb
 - lib/docker_rails_proxy/extends/colorization.rb
 - lib/docker_rails_proxy/extends/fixnum_support.rb