ruby-livesync 1.0.0.beta4 → 1.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e77356b7dfd5070935875d4842a16129c5d1eeaaec1e049d2b4e4824032a2c0
-  data.tar.gz: f8350e318d1f3e31dc5925981c1526b74d404795c4300419a2db489ff38e0f2a
+  metadata.gz: 182e21dbd5e045ed2de4492cdefcd295dd92f9af62154ce4cfb7569610cd55ee
+  data.tar.gz: c3d0fe0760f40b408b9e3b72d0349dcf5a838f8aff1224ae2de424af508947fb
 SHA512:
-  metadata.gz: 9989027e61b51d31e4248e71c7d24e3d1a8c9cfaf74ab532cd99fcc6f25ae7d9e23c12790cc31a57e306395213c846e132e3cdc24c6d14d548f74d525860515d
-  data.tar.gz: 43ac4cf5d5ff1cc2926bb13ba60f4efbafa07fd54d940d8bdb55cbd183b6a608c6d644a4a7173c2ebdf1d490534eedd37e1940ef9854b98b16201d3461be5009
+  metadata.gz: 76aa54c57ad5ee3b64fcee946432021d5e5e948125ffaf72c524bb81bd2abdfefbd53138a67772d05e557690b6ffb89cf608b6267ac124fcb3f0ecc84f59d9e1
+  data.tar.gz: b38edffeb1ae8e63d20346cebf2510da50950bd621d2bf8cf864d0975915b8ee91d823299449cc294225b9c657b966df9e2b934c5a22fe21a988c03e82b41e61

data/lib/ruby-livesync/live_sync/cmd_watcher.rb

@@ -25,13 +25,13 @@ module LiveSync
 
       Thread.new do
         stdout.sync = true
-        lines = stdout.each_line.each do |line|
+        stdout.each_line.each do |line|
           file,events = parse line
           yield [OpenStruct.new(absolute_name: file, flags: events)]
         end
       end
       Thread.new do
-        STDERR.puts stderr.read
+        stderr.each_line.each{ |line| STDERR.puts line }
       end
     end
 

data/lib/ruby-livesync/live_sync/py/inotify.py

@@ -1,11 +1,13 @@
 import pyinotify
 import os
 import time
+import sys
 
 class EventHandler(pyinotify.ProcessEvent):
-    def my_init(self, excludes, recursive, mask):
+    def my_init(self, excludes, recursive, mask, base_device):
         self.excludes = excludes
         self.recursive = recursive
+        self.base_device = base_device
         self.mask = mask
         self.events = set()
 
@@ -21,15 +23,32 @@ class EventHandler(pyinotify.ProcessEvent):
                 print(f"{event_desc} {full_path}", flush=True)
             self.events.clear()
 
+    def watch_path(self, path):
+        if not any(exclude in path for exclude in self.excludes):
+            try:
+                if os.stat(path).st_dev == self.base_device:
+                    wm.add_watch(path, self.mask, auto_add=True)
+                else:
+                    print(f"Skipping {path} (different device)", file=sys.stderr)
+            except Exception as e:
+                print(f"Error adding watch on {path}: {e}", file=sys.stderr)
+
     def add_watch(self, path):
-        wm.add_watch(path, self.mask, rec=self.recursive, auto_add=True)
+        if self.recursive:
+            for root, dirs, _ in os.walk(path):
+                self.watch_path(root)
+                for dir in dirs:
+                    self.watch_path(os.path.join(root, dir))
+        else:
+            self.watch_path(path)
 
-excludes = [%{excludes}]
-recursive = %{recursive}
-event_mask = pyinotify.IN_CREATE | pyinotify.IN_MODIFY | pyinotify.IN_MOVED_TO | pyinotify.IN_DELETE  # Event mask
+excludes    = [%{excludes}]
+recursive   = %{recursive}
+event_mask  = pyinotify.IN_CREATE | pyinotify.IN_MODIFY | pyinotify.IN_MOVED_TO | pyinotify.IN_DELETE  # Event mask
+base_device = os.stat('%{path}').st_dev
 
 wm = pyinotify.WatchManager()
-handler = EventHandler(excludes=excludes, recursive=recursive, mask=event_mask)
+handler = EventHandler(excludes=excludes, recursive=recursive, mask=event_mask, base_device=base_device)
 notifier = pyinotify.Notifier(wm, handler)
 handler.add_watch('%{path}')
 

data/lib/ruby-livesync/live_sync/rsync.rb

@@ -1,7 +1,7 @@
 module LiveSync
   class Rsync < Target
 
-    dsl :opts, type: String
+    dsl :opts, default: '-ax --partial', type: String
 
     attr_reader :ssh
 

data/lib/ruby-livesync/live_sync/version.rb

@@ -1,5 +1,5 @@
 module LiveSync
 
-  VERSION = '1.0.0.beta4'
+  VERSION = '1.0.0.beta5'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-livesync
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta4
+  version: 1.0.0.beta5
 platform: ruby
 authors:
 - Braulio Oliveira