docker-sync 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d9b0bbe3c46dc3198195f56ecade1577fe9ae97a
-  data.tar.gz: f54093017e0e51194753815902d87feee75db211
+SHA256:
+  metadata.gz: ecc935b13c597ecb9e2beaf3a75881c58d5c386d6df3e937cdb07b15ccee88d7
+  data.tar.gz: 381e33ab0456a9974c31128de0603ae15e1f566d901f260783bc6acc79be75ee
 SHA512:
-  metadata.gz: cd43a0bc62654a748ea0bd13603cde76151879e9a755dc1ef5946de6c495ea7f4a1b98a0e1427335f28824eae6141cf12e527aa76540d3165f2ce07d5cff21b7
-  data.tar.gz: 20a97b141f4f6651d1528c064145f208352f9ae17e0c29d8a62cc17d08f892634dec74184f3d90952381f5fc5c39c2bfbe829d355f1034bd07fe2a00707555ef
+  metadata.gz: fec25c5c03c77cea81f99cafa27457063033b2d077942864e6c8d8962c83958046016c20392bced7204ef8c3dabfe20236180d77145f51cbfdcd228b39712e4b
+  data.tar.gz: b0281a5d8449aa08b0e3bd3fd1829c6a54cb41495fe61ca5f6b9d48ac857e79631a582b9fa15a7eec347176f3a8aab5e8c7e7b508eca852551babfd5f1c6c364

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.8

data/lib/docker-sync/dependencies.rb

@@ -23,7 +23,14 @@ module DockerSync
       Docker.ensure!
       Unison.ensure!  if config.unison_required?
       Rsync.ensure!   if config.rsync_required?
-      Fswatch.ensure! if config.fswatch_required?
+      if config.fswatch_required?
+        unless Fswatch.available?
+          Fswatch.ensure!
+          puts "please restart docker sync so the installation of fswatch takes effect"
+          raise(UNSUPPORTED_OPERATING_SYSTEM)
+        end
+      end
+
     end
 
     def self.ensure_all_for_linux!(_config)

data/lib/docker-sync/dependencies/docker.rb

@@ -11,7 +11,7 @@ module DockerSync
 
       def self.running?
         return @running if defined? @running
-        @running = system('docker ps &> /dev/null')
+        @running = system('docker ps 2>&1 > /dev/null')
       end
 
       def self.ensure!

data/lib/docker-sync/dependencies/unox.rb

@@ -13,7 +13,7 @@ module DockerSync
 
       def self.available?
         return @available if defined? @available
-        cmd = 'brew list unox &> /dev/null'
+        cmd = 'brew list unox 2>&1 > /dev/null'
         @available = defined?(Bundler) ? Bundler.clean_system(cmd) : system(cmd)
       end
 

data/lib/docker-sync/sync_strategy/rsync.rb

@@ -71,6 +71,21 @@ module DockerSync
         return args
       end
 
+      # sleep until rsync --dry-run succeeds in connecting to the daemon on the configured IP and port. 
+      def health_check
+        health_check_cmd = "rsync --dry-run rsync://#{@options['sync_host_ip']}:#{@options['sync_host_port']}:: 2> /dev/null"
+
+        retry_counter = 0
+        
+        health_check_status = `#{health_check_cmd}`
+        while health_check_status == '' && retry_counter < 10 do
+          say_status 'ok', "waiting for rsync daemon on rsync://#{@options['sync_host_ip']}:#{@options['sync_host_port']}", :white if @options['verbose']
+          retry_counter += 1
+          health_check_status = `#{health_check_cmd}`
+          sleep 1
+        end
+      end
+
       def get_container_name
         return "#{@sync_name}"
       end
@@ -109,8 +124,8 @@ module DockerSync
           say_status 'ok', "#{container_name} container still running", :blue if @options['verbose']
         end
         say_status 'ok', "#{container_name}: starting initial sync of #{@options['src']}", :white if @options['verbose']
-        # this sleep is needed since the container could be not started
-        sleep 3
+
+        health_check
         sync
         say_status 'success', 'Rsync server started', :green
       end

data/lib/docker-sync/update_check.rb

@@ -70,20 +70,6 @@ class UpdateChecker
 
   end
 
-  def check_unison_image
-    return # we do not need this anymore since we use versioned ( tagged ) images and they will be pulled autoamtically if they are missing
-    return if ENV['DOCKER_SYNC_SKIP_UPDATE']
-    say_status 'ok','Checking if a newer unison image is available'
-
-    if system("docker pull eugenmayer/unison:2.51.2.1 | grep 'Downloaded newer image for'")
-      say_status 'ok', 'Downloaded newer image for unison', :green
-      @newer_image_found = true
-    else
-      say_status 'ok', 'No newer image found - current image is up to date.'
-    end
-
-  end
-
   def get_current_version
     path = File.expand_path('../../../', __FILE__)
     version = File.read("#{path}/VERSION")
@@ -103,7 +89,7 @@ class UpdateChecker
     # update the timestamp
     @config.update! 'update_last_check' => DateTime.now.iso8601(9)
 
-    check = docker_sync_update_check
+    check = docker_sync_update_check7
     if check.update_available
       say_status 'warning',"There is an update (#{check.latest_version}) available (current version #{check.current_version}). Please update before you continue",:yellow
       if yes?("Shall I update docker-sync to #{check.latest_version} for you?")

data/lib/docker-sync/watch_strategy/fswatch.rb

@@ -17,12 +17,17 @@ module DockerSync
         @options = options
         @events_to_watch = %w(AttributeModified Created Link MovedFrom MovedTo Renamed Removed Updated)
 
-        begin
-          Dependencies::Fswatch.ensure!
-        rescue StandardError => e
-          say_status 'error', e.message, :red
-          exit 1
-        end
+          unless Dependencies::Fswatch.available?
+            begin
+              Dependencies::Fswatch.ensure!
+            rescue StandardError => e
+              say_status 'error', e.message, :red
+              exit 1
+            end
+            puts "please restart docker sync so the installation of fswatch takes effect"
+            raise(UNSUPPORTED_OPERATING_SYSTEM)
+          end
+
       end
 
       def run

data/lib/docker-sync/watch_strategy/unison.rb

@@ -27,8 +27,11 @@ module DockerSync
       end
 
       def stop
-        Process.kill 'TERM', @watch_fork
-        Process.wait @watch_fork
+        # Make sure @watch_fork is not nil otherwise a TypeError is thrown
+        if @watch_fork
+          Process.kill 'TERM', @watch_fork
+          Process.wait @watch_fork
+        end
       end
 
       def clean

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Docker Sync - Fast and efficient way to sync code to docker-containers