docker_rails_proxy 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e054684446e381e85f5a034bdf97b68f34cecbc8
-  data.tar.gz: '08563be16ae0fae359a12fe46c799cee34fd4785'
+  metadata.gz: 43babff9d7eadd9268d58e475813c95334b07637
+  data.tar.gz: 1216cbfd498b85552cbcaf4c46f2149c17beb2a8
 SHA512:
-  metadata.gz: a4868a69273f6b96a5a78a14d81072616399bf091cc91f5a19dd7ef9504911fb33df03b9aa04523b9f3ac41290de24a200d516141615b5c78029bba1d34bb736
-  data.tar.gz: 8997b53995275162011777f74e5b7c5a03c0db763c5231b5c1764a8b9a02fd8baab3196fe492b54bc30cb562a2aeacf60f62ac088eb67b9004961a592bd1c367
+  metadata.gz: b0af44e98d35bc23b4063edf5fcb79ab9191e7efd4d53300718c9a838b6f5ef243a7779cb6f46f24d1509e1afed84a979a04494fa9e2f2303ab8471dbcdc63ca
+  data.tar.gz: c0e3788f76daa3c87bc406b81fdc6326a8b48c5df8b1c796412e45af288db680f81f3fcf527898e410946e27c1156752a8b579cce6898880baa9d21dd7d43f38

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

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

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(' ')}" if docker_machine?
+        system "docker-compose #{command} #{args.join(' ')}" if docker_compose?
       end
     end
   end

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

@@ -34,9 +34,9 @@ module DockerRailsProxy
       after_initialize :parse_options!, :set_defaults
 
       before_process do
-        self.from_scratch = if docker_machine?
+        self.from_scratch = if docker_compose?
           %x(docker-compose ps | grep -c #{APP_NAME}).to_i.zero?
-        elsif minikube?
+        elsif kubernetes?
           %x(kubectl get deploy -l 'app=#{APP_NAME}' -o name).empty?
         end
       end
@@ -44,7 +44,7 @@ module DockerRailsProxy
       after_process { fswatch_start }
 
       def process
-        system 'docker-compose up -d' if docker_machine?
+        system 'docker-compose up -d' if docker_compose?
         sync_app_and_gems_folders
 
         set_app_container_id if app_container_id.empty?

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

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'optparse'
 require 'yaml'
 
@@ -26,7 +27,7 @@ module DockerRailsProxy
       end
 
       before_process do
-        Dir.mkdir('tmp/.kube') unless Dir.exist?('tmp/.kube')
+        FileUtils.mkdir_p 'tmp/.kube'
 
         absolute_dir = File.dirname(options[:path])
 

data/lib/docker_rails_proxy/concerns/rsync.rb

@@ -31,14 +31,14 @@ module DockerRailsProxy
 
     def _rsync_host
       @_rsync_host ||= begin
-        ip   = ENV['DOCKER_HOST'].to_s.sub('tcp://', '').sub(/:\d+$/, '')
+        ip   = ENV.fetch('DOCKER_HOST') { '127.0.0.1' }.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
+        end if Docker.kubernetes_running
 
         "rsync://#{ip}:#{port}"
       end

data/lib/docker_rails_proxy/version.rb

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

data/lib/docker_rails_proxy.rb

@@ -126,13 +126,19 @@ module DockerRailsProxy
 
   class Docker < Base
     class << self
-      attr_accessor :vm_provisioner
+      attr_accessor :vm_provisioner, :kubernetes_running
     end
 
     attr_accessor :app_container_id
 
     before_initialize do
-      if ENV['DOCKER_HOST'].nil?
+      unless system 'type docker &> /dev/null'
+        'Please install docker before continuing.'
+      end
+    end
+
+    before_initialize do
+      unless system 'docker ps &> /dev/null'
         %(
         Couldn't connect to Docker daemon you might need to run:
           docker-machine start default
@@ -142,25 +148,35 @@ module DockerRailsProxy
     end
 
     before_initialize do
-      Docker.vm_provisioner = ENV['DOCKER_CERT_PATH'].include?('.minikube') ? :minikube : :docker_machine
+      if ENV['DOCKER_CERT_PATH'].present?
+        Docker.vm_provisioner = ENV['DOCKER_CERT_PATH'].include?('.minikube') ? :minikube : :docker_machine
+      end
+
+      Docker.vm_provisioner ||= :docker_for_mac
+    end
+
+    before_initialize do
+      if system 'docker images | grep -c kube-apiserver &> /dev/null'
+        Docker.kubernetes_running = true
+      end
     end
 
     before_initialize do
       unless system 'type kubectl &> /dev/null'
         'kubectl is required, `brew install kubectl`'
-      end if Docker.vm_provisioner == :minikube
+      end if Docker.kubernetes_running
     end
 
     after_initialize :set_app_container_id
 
   private
 
-    def docker_machine?
-      Docker.vm_provisioner == :docker_machine
+    def docker_compose?
+      !!Docker.kubernetes_running == false
     end
 
-    def minikube?
-      Docker.vm_provisioner == :minikube
+    def kubernetes?
+      Docker.kubernetes_running
     end
 
     def set_app_container_id
@@ -168,9 +184,9 @@ module DockerRailsProxy
     end
 
     def get_docker_container_id(app, container: nil)
-      if docker_machine?
+      if docker_compose?
         %x(docker ps -q --filter "name=^/#{[app, container].compact.join('_')}$").strip
-      elsif minikube?
+      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?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_rails_proxy
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - Jairo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies: []
 description: Configures docker-compose and provides rails command helpers
 email: