Updates for supporting reposync script

Author: Tom Howe

README.rst

@@ -1,2 +1,3 @@
 Syncs a git repo with a local file system, optionally calling
-a callback.
+a callback. Now includes script for pushing and pulling changes
+in a single script called reposync.

reposync/fs_monitor.py

@@ -17,6 +17,7 @@ def my_init(self, monitor):
   def process_IN_CLOSE_WRITE(self, event):
     if pattern.search(event.pathname) is not None:
       return
+    log.info("event: {0}".format(event))
     log.info("adding and committing: {0}".format(event.pathname))
     git_add = Popen(['git', 'add', event.pathname], cwd=event.path, stdout=PIPE, stderr=PIPE)
     git_add_result = git_add.communicate()

reposync/sync.py

@@ -49,13 +49,15 @@ def __init__(self, repos, interval, branch, callback):
     self.branch = branch
     self.callback = callback
     self.repos = repos
+    for repo in self.repos:
+      log.info("Monitoring remote repo for: {0}".format(repo))
     scheduler.enter(interval, 1, self.update_from_git, ())
 
   def update_from_git(self):
     check_call(['git', 'fetch'])
     current_path = os.getcwd()
-    for repo in repos:
-      os.chdir(self.path)
+    for repo in self.repos:
+      os.chdir(repo)
       current_ref = Popen(['git', 'symbolic-ref', 'HEAD'], stdout=PIPE).communicate()[0].strip()
       if current_ref != 'refs/heads/{0}'.format(self.branch):
         log.info('Repository is currently on: {0}.  Switching to: refs/heads/{1}'.format(current_ref, self.branch))
@@ -67,7 +69,7 @@ def update_from_git(self):
       remote_hash = p2.communicate()[0].strip()
       log.debug('Repo: {0}. Local hash: {1}.  Remote hash: {2}'.format(repo, local_hash, remote_hash))
       if local_hash != remote_hash:
-          log.info('Updating local repository: {0} to: {1}'.format(repo, remote_hash))
+        log.info('Updating local repository: {0} to: {1}'.format(repo, remote_hash))
         check_call(['git', 'pull', 'origin', self.branch])
         if self.callback is not None:
           log.info('Calling callback for {0}'.format(repo))
@@ -81,6 +83,15 @@ def update_from_git(self):
   def start(self):
     scheduler.run()
 
+  def stop(self):
+    if not scheduler.empty:
+      for event in scheduler.queue:
+        try:
+          scheduler.cancel(event)
+        except ValueError:
+          log.debug('Job beat us to the shutdown punch: {0}'.format(event))
+
+
 def kill_handler(signal, frame):
   log.info('Shutting Down')
   if not scheduler.empty:

setup.py

@@ -1,10 +1,10 @@
 from setuptools import setup, find_packages
 
 setup(name='reposync',
-        version='1.0a',
+        version='1.0a1',
         author='Tom Howe',
         author_email='[email protected]',
-        packages=['.'],
+        packages=['reposync'],
         install_requires=[ 'pyinotify' ],
-        scripts=[ 'scripts/repopush', 'scripts/repopull' ]
+        scripts=[ 'scripts/reposync', 'scripts/repopush', 'scripts/repopull' ]
         )