Merge lp:~jameinel/u1db/u1db-client-init into lp:u1db

[John A Meinel]

This adds 'u1db-client init-db test.db' as a command. Basically get/put/create require the database to already exist, this exposes a way to create a database.

I think we'll want to have a more api-way of creating a database rather than creating the SQLite instance, but this at least gets us something for the demo.

[John A Meinel (jameinel)]

Small update, we need a way to set the 'replica_uid'.

We could do this by setting a random (an actual uuid), and make setting it optional.
But this was the fastest path to getting something.

[lp:~jameinel/u1db/u1db-client-init]

103. By John A Meinel on 2011-11-01

We need a way to set the uid for the new database.

Ultimately, we could create this ourselves from a random number
generator. For now, pass it on the commandline.

[Samuele Pedroni (pedronis)]

looks good (but see comments about u1db-client-commandline).

Seems we really need to make set_replica_uid and get_replica_uid public and test what happens if the uid is changed after the fact (I'm thinking copy db change replica_uid, try to sync with original (should be a nop), update try to sync again).

review: Approve

=== modified file 'u1db/commandline/client.py'
--- u1db/commandline/client.py	2011-11-01 13:49:23 +0000
+++ u1db/commandline/client.py	2011-11-01 13:49:23 +0000
@@ -53,6 +53,16 @@
     return cmd_get(args.database, args.doc_id, args.outfile, sys.stderr)
 
 
+def cmd_init_db(database, replica_uid):
+    """Create a new database"""
+    db = sqlite_backend.SQLitePartialExpandDatabase(database)
+    db._set_replica_uid(replica_uid)
+
+
+def client_init_db(args):
+    return cmd_init_db(args.database, args.replica_uid)
+
+
 def cmd_put(database, doc_id, old_doc_rev, in_file, out_file):
     """run 'put_doc' and update the data."""
     db = sqlite_backend.SQLiteDatabase.open_database(database)
@@ -85,6 +95,11 @@
     p.add_argument('-V', '--version', action='version', version=_u1db_version)
     p.add_argument('-v', '--verbose', action='store_true', help='be chatty')
     subs = p.add_subparsers(title='commands')
+    parser_init_db = subs.add_parser('init-db', help='Create a new database')
+    parser_init_db.add_argument('database', help='The database to create')
+    parser_init_db.add_argument('replica_uid',
+        help='The unique identifier for this database')
+    parser_init_db.set_defaults(func=client_init_db)
     parser_create = subs.add_parser('create',
         help='Create a new document from scratch')
     parser_create.add_argument('database', help='The database to update')

=== modified file 'u1db/tests/commandline/test_client.py'
--- u1db/tests/commandline/test_client.py	2011-11-01 13:49:23 +0000
+++ u1db/tests/commandline/test_client.py	2011-11-01 13:49:23 +0000
@@ -73,6 +73,12 @@
         self.assertEqual('doc-id', args.doc_id)
         self.assertEqual(sys.stdout, args.outfile)
 
+    def test_init_db(self):
+        args = self.parse_args(['init-db', 'test.db', 'replica-uid'])
+        self.assertEqual(client.client_init_db, args.func)
+        self.assertEqual('test.db', args.database)
+        self.assertEqual('replica-uid', args.replica_uid)
+
     def test_put(self):
         args = self.parse_args(['put', 'test.db', 'doc-id', 'old-doc-rev'])
         self.assertEqual(client.client_put, args.func)
@@ -127,6 +133,17 @@
                          err.getvalue())
 
 
+class TestCmdInit(TestCaseWithDB):
+
+    def test_init_new(self):
+        path = self.working_dir + '/test2.db'
+        self.assertFalse(os.path.exists(path))
+        client.cmd_init_db(path, 'test-uid')
+        self.assertTrue(os.path.exists(path))
+        db = sqlite_backend.SQLiteDatabase.open_database(path)
+        self.assertEqual('test-uid', db._replica_uid)
+
+
 class TestCmdPut(TestCaseWithDB):
 
     def setUp(self):
@@ -211,6 +228,11 @@
         self.assertEqual(tests.simple_doc, stdout)
         self.assertEqual('doc_rev: %s\n' % (doc_rev,), stderr)
 
+    def test_init(self):
+        path = self.working_dir + '/test2.db'
+        ret, stdout, stderr = self.run_main(['init-db', path, 'uid'])
+        db2 = sqlite_backend.SQLiteDatabase.open_database(path)
+
     def test_put(self):
         _, doc_rev = self.db.create_doc(tests.simple_doc, doc_id='test-id')
         ret, stdout, stderr = self.run_main(