remote_sh 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4353132d67cbff99d25ce11bbcbd3cb96e2f65b3d098502892d1372d37e12810
-  data.tar.gz: 37b430e4408cf55835ea12a06581c21b3924599d23d51c9ed1559bbba1ed878c
+  metadata.gz: 160f7d6e932c0d8ab98dc6dcb0deafb884e551961b9d10621cde150123726b6b
+  data.tar.gz: 5b0334f82445679b3aaf75bbe5d38d6f7d079dc57ce69888699a137e851f00b7
 SHA512:
-  metadata.gz: f3e9abf3c62777f12d8f4054f89ca2dcfbbe1de8eaed38792d69dac875af6f16d1255043a19f5817b2d443d4cbdf8d99625e65401c2009b97935d0cfb48c2d31
-  data.tar.gz: 2d71b3c236d17f6690bcfa6e515da4675f0b3acae3c589413816699ee7e4038b93b8c24e072cc3092dc740af2e2993b6af9a7d7762736c1b2053a9023a2a2dbe
+  metadata.gz: f0a8a5f018fc324426085cf409119b1da645e97bfc3894728c16cb77aedf7dafa68148aeee09b8665344124586d477f60b6a351f5052ac880b1a95c41fd99cf4
+  data.tar.gz: 1c8bf6d16a792c629db96bb24541498fcaa53f170c82f368efb9f5e92acd2d3876879d7a53640aaa02371173b3c1d197bdba653073edeee0a9fb77e578bd9b6e

data/lib/remote_sh/file_syncer.rb

@@ -18,11 +18,13 @@ module RemoteSh
 
       Thread.new do
         Filewatcher.new("#{local_path}/**/{.[^\.]*,*}", interval: 1).watch do |_changes|
-          if @sync_side == :client || !mutex.locked?
+          if @sync_side == :client || @sync_side.nil?
             mutex.synchronize do
               @sync_side = :client
               RsyncHelper.up(local_path, host_path, host, ignored_files)
-              @sync_side = nil
+              do_after_timeout(1) do
+                mutex.synchronize { @sync_side = nil }
+              end
             end
           end
         end
@@ -33,6 +35,13 @@ module RemoteSh
       end
     end
 
+    def do_after_timeout(timeout, &block)
+      Thread.new do
+        sleep(timeout)
+        block.()
+      end
+    end
+
     def start_server(mutex, local_path, host_path, host, ignored_files)
       pid_filename = "#{PID_FOLDER}/#{local_path.gsub("/", "__")}_syncing"
       socket_file = "#{pid_filename}_socket"
@@ -75,11 +84,13 @@ module RemoteSh
         server.listeners << ssocket
 
         server.mount_proc "/request_sync" do |_req, res|
-          if @sync_side == :server || !mutex.locked?
+          if @sync_side == :server || @sync_side.nil?
             mutex.synchronize do
               @sync_side = :server
               RsyncHelper.down(local_path, host_path, host, ignored_files)
-              @sync_side = nil
+              do_after_timeout(1) do
+                mutex.synchronize { @sync_side = nil }
+              end
             end
           end
 

data/lib/remote_sh/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RemoteSh
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_sh
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Pavel Egorov