Merge lp:~jameinel/u1db/u1db-client-remote-sync into lp:u1db

[John A Meinel]

This implements 'u1db-client sync SOURCE u1db://remote/target'

We can't actually land this until Samuele's changes land to finish off remote sync. I have tests that will fail, but after merging his branch they pass.

We'll want this for the demo this week, etc.

[Samuele Pedroni (pedronis)]

+1 (test passed once merged with trunk now that remote sync has landed)

review: Approve

=== modified file 'u1db/commandline/client.py'
--- u1db/commandline/client.py	2011-11-01 13:42:24 +0000
+++ u1db/commandline/client.py	2011-11-01 13:42:24 +0000
@@ -24,6 +24,7 @@
 from u1db.backends import sqlite_backend
 from u1db.remote import (
     client,
+    sync_target,
     )
 
 
@@ -66,12 +67,20 @@
                    sys.stdout)
 
 
+def _open_target(target_db):
+    if target_db.startswith('u1db://'):
+        target = sync_target.RemoteSyncTarget.connect(target_db)
+    else:
+        db = sqlite_backend.SQLiteDatabase.open_database(target_db)
+        target = db.get_sync_target()
+    return target
+
+
 def cmd_sync(source_db, target_db):
     """Start a Sync request."""
     source = sqlite_backend.SQLiteDatabase.open_database(source_db)
-    target = sqlite_backend.SQLiteDatabase.open_database(target_db)
-    st = target.get_sync_target()
-    syncer = sync.Synchronizer(source, st)
+    target = _open_target(target_db)
+    syncer = sync.Synchronizer(source, target)
     syncer.sync()
 
 

=== modified file 'u1db/tests/commandline/test_client.py'
--- u1db/tests/commandline/test_client.py	2011-11-01 13:42:24 +0000
+++ u1db/tests/commandline/test_client.py	2011-11-01 13:42:24 +0000
@@ -166,6 +166,26 @@
                          self.db.get_doc('my-test-id'))
 
 
+class TestCmdSyncRemote(tests.TestCaseWithSyncServer, TestCaseWithDB):
+
+    def setUp(self):
+        super(TestCmdSyncRemote, self).setUp()
+        self.startServer()
+        self.db2 = self.request_state._create_database('test2.db')
+
+    def test_sync_remote(self):
+        doc1_id, doc1_rev = self.db.create_doc(tests.simple_doc)
+        doc2_id, doc2_rev = self.db2.create_doc(tests.nested_doc)
+        db2_url = self.getURL('test2.db')
+        self.assertTrue(db2_url.startswith('u1db://'))
+        self.assertTrue(db2_url.endswith('/test2.db'))
+        client.cmd_sync(self.db_path, db2_url)
+        self.assertEqual((doc1_rev, tests.simple_doc, False),
+                         self.db2.get_doc(doc1_id))
+        self.assertEqual((doc2_rev, tests.nested_doc, False),
+                         self.db.get_doc(doc2_id))
+
+
 class TestCommandLine(TestCaseWithDB):
 
     def _get_u1db_client_path(self):