Remove u1db and swiftclient dirs and refactor.

4 files changed, 0 insertions, 626 deletions

diff --git a/u1db/commandline/__init__.py b/u1db/commandline/__init__.py
deleted file mode 100644
index 3f32e381..00000000
--- a/u1db/commandline/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2011 Canonical Ltd.
-#
-# This file is part of u1db.
-#
-# u1db is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# as published by the Free Software Foundation.
-#
-# u1db is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with u1db.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/u1db/commandline/client.py b/u1db/commandline/client.py
deleted file mode 100644
index 15bf8561..00000000
--- a/u1db/commandline/client.py
+++ /dev/null
@@ -1,497 +0,0 @@
-# Copyright 2011 Canonical Ltd.
-#
-# This file is part of u1db.
-#
-# u1db is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# as published by the Free Software Foundation.
-#
-# u1db is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with u1db.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Commandline bindings for the u1db-client program."""
-
-import argparse
-import os
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
-import sys
-
-from u1db import (
-    Document,
-    open as u1db_open,
-    sync,
-    errors,
-    )
-from u1db.commandline import command
-from u1db.remote import (
-    http_database,
-    http_target,
-    )
-
-
-client_commands = command.CommandGroup()
-
-
-def set_oauth_credentials(client):
-    keys = os.environ.get('OAUTH_CREDENTIALS', None)
-    if keys is not None:
-        consumer_key, consumer_secret, \
-            token_key, token_secret = keys.split(":")
-        client.set_oauth_credentials(consumer_key, consumer_secret,
-                      token_key, token_secret)
-
-
-class OneDbCmd(command.Command):
-    """Base class for commands operating on one local or remote database."""
-
-    def _open(self, database, create):
-        if database.startswith(('http://', 'https://')):
-            db = http_database.HTTPDatabase(database)
-            set_oauth_credentials(db)
-            db.open(create)
-            return db
-        else:
-            return u1db_open(database, create)
-
-
-class CmdCreate(OneDbCmd):
-    """Create a new document from scratch"""
-
-    name = 'create'
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('database',
-                            help='The local or remote database to update',
-                            metavar='database-path-or-url')
-        parser.add_argument('infile', nargs='?', default=None,
-            help='The file to read content from.')
-        parser.add_argument('--id', dest='doc_id', default=None,
-            help='Set the document identifier')
-
-    def run(self, database, infile, doc_id):
-        if infile is None:
-            infile = self.stdin
-        db = self._open(database, create=False)
-        doc = db.create_doc_from_json(infile.read(), doc_id=doc_id)
-        self.stderr.write('id: %s\nrev: %s\n' % (doc.doc_id, doc.rev))
-
-client_commands.register(CmdCreate)
-
-
-class CmdDelete(OneDbCmd):
-    """Delete a document from the database"""
-
-    name = 'delete'
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('database',
-                            help='The local or remote database to update',
-                            metavar='database-path-or-url')
-        parser.add_argument('doc_id', help='The document id to retrieve')
-        parser.add_argument('doc_rev',
-            help='The revision of the document (which is being superseded.)')
-
-    def run(self, database, doc_id, doc_rev):
-        db = self._open(database, create=False)
-        doc = Document(doc_id, doc_rev, None)
-        db.delete_doc(doc)
-        self.stderr.write('rev: %s\n' % (doc.rev,))
-
-client_commands.register(CmdDelete)
-
-
-class CmdGet(OneDbCmd):
-    """Extract a document from the database"""
-
-    name = 'get'
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('database',
-                            help='The local or remote database to query',
-                            metavar='database-path-or-url')
-        parser.add_argument('doc_id', help='The document id to retrieve.')
-        parser.add_argument('outfile', nargs='?', default=None,
-            help='The file to write the document to',
-            type=argparse.FileType('wb'))
-
-    def run(self, database, doc_id, outfile):
-        if outfile is None:
-            outfile = self.stdout
-        try:
-            db = self._open(database, create=False)
-        except errors.DatabaseDoesNotExist:
-            self.stderr.write("Database does not exist.\n")
-            return 1
-        doc = db.get_doc(doc_id)
-        if doc is None:
-            self.stderr.write('Document not found (id: %s)\n' % (doc_id,))
-            return 1  # failed
-        if doc.is_tombstone():
-            outfile.write('[document deleted]\n')
-        else:
-            outfile.write(doc.get_json() + '\n')
-        self.stderr.write('rev: %s\n' % (doc.rev,))
-        if doc.has_conflicts:
-            self.stderr.write("Document has conflicts.\n")
-
-client_commands.register(CmdGet)
-
-
-class CmdGetDocConflicts(OneDbCmd):
-    """Get the conflicts from a document"""
-
-    name = 'get-doc-conflicts'
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('database',
-                            help='The local database to query',
-                            metavar='database-path')
-        parser.add_argument('doc_id', help='The document id to retrieve.')
-
-    def run(self, database, doc_id):
-        try:
-            db = self._open(database, False)
-        except errors.DatabaseDoesNotExist:
-            self.stderr.write("Database does not exist.\n")
-            return 1
-        conflicts = db.get_doc_conflicts(doc_id)
-        if not conflicts:
-            if db.get_doc(doc_id) is None:
-                self.stderr.write("Document does not exist.\n")
-                return 1
-        self.stdout.write("[")
-        for i, doc in enumerate(conflicts):
-            if i:
-                self.stdout.write(",")
-            self.stdout.write(
-                json.dumps(dict(rev=doc.rev, content=doc.content), indent=4))
-        self.stdout.write("]\n")
-
-client_commands.register(CmdGetDocConflicts)
-
-
-class CmdInitDB(OneDbCmd):
-    """Create a new database"""
-
-    name = 'init-db'
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('database',
-                            help='The local or remote database to create',
-                            metavar='database-path-or-url')
-        parser.add_argument('--replica-uid', default=None,
-            help='The unique identifier for this database (not for remote)')
-
-    def run(self, database, replica_uid):
-        db = self._open(database, create=True)
-        if replica_uid is not None:
-            db._set_replica_uid(replica_uid)
-
-client_commands.register(CmdInitDB)
-
-
-class CmdPut(OneDbCmd):
-    """Add a document to the database"""
-
-    name = 'put'
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('database',
-                            help='The local or remote database to update',
-                            metavar='database-path-or-url'),
-        parser.add_argument('doc_id', help='The document id to retrieve')
-        parser.add_argument('doc_rev',
-            help='The revision of the document (which is being superseded.)')
-        parser.add_argument('infile', nargs='?', default=None,
-            help='The filename of the document that will be used for content',
-            type=argparse.FileType('rb'))
-
-    def run(self, database, doc_id, doc_rev, infile):
-        if infile is None:
-            infile = self.stdin
-        try:
-            db = self._open(database, create=False)
-            doc = Document(doc_id, doc_rev, infile.read())
-            doc_rev = db.put_doc(doc)
-            self.stderr.write('rev: %s\n' % (doc_rev,))
-        except errors.DatabaseDoesNotExist:
-            self.stderr.write("Database does not exist.\n")
-        except errors.RevisionConflict:
-            if db.get_doc(doc_id) is None:
-                self.stderr.write("Document does not exist.\n")
-            else:
-                self.stderr.write("Given revision is not current.\n")
-        except errors.ConflictedDoc:
-            self.stderr.write(
-                "Document has conflicts.\n"
-                "Inspect with get-doc-conflicts, then resolve.\n")
-        else:
-            return
-        return 1
-
-client_commands.register(CmdPut)
-
-
-class CmdResolve(OneDbCmd):
-    """Resolve a conflicted document"""
-
-    name = 'resolve-doc'
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('database',
-                            help='The local or remote database to update',
-                            metavar='database-path-or-url'),
-        parser.add_argument('doc_id', help='The conflicted document id')
-        parser.add_argument('doc_revs', metavar="doc-rev", nargs="+",
-            help='The revisions that the new content supersedes')
-        parser.add_argument('--infile', nargs='?', default=None,
-            help='The filename of the document that will be used for content',
-            type=argparse.FileType('rb'))
-
-    def run(self, database, doc_id, doc_revs, infile):
-        if infile is None:
-            infile = self.stdin
-        try:
-            db = self._open(database, create=False)
-        except errors.DatabaseDoesNotExist:
-            self.stderr.write("Database does not exist.\n")
-            return 1
-        doc = db.get_doc(doc_id)
-        if doc is None:
-            self.stderr.write("Document does not exist.\n")
-            return 1
-        doc.set_json(infile.read())
-        db.resolve_doc(doc, doc_revs)
-        self.stderr.write("rev: %s\n" % db.get_doc(doc_id).rev)
-        if doc.has_conflicts:
-            self.stderr.write("Document still has conflicts.\n")
-
-client_commands.register(CmdResolve)
-
-
-class CmdSync(command.Command):
-    """Synchronize two databases"""
-
-    name = 'sync'
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('source', help='database to sync from')
-        parser.add_argument('target', help='database to sync to')
-
-    def _open_target(self, target):
-        if target.startswith(('http://', 'https://')):
-            st = http_target.HTTPSyncTarget.connect(target)
-            set_oauth_credentials(st)
-        else:
-            db = u1db_open(target, create=True)
-            st = db.get_sync_target()
-        return st
-
-    def run(self, source, target):
-        """Start a Sync request."""
-        source_db = u1db_open(source, create=False)
-        st = self._open_target(target)
-        syncer = sync.Synchronizer(source_db, st)
-        syncer.sync()
-        source_db.close()
-
-client_commands.register(CmdSync)
-
-
-class CmdCreateIndex(OneDbCmd):
-    """Create an index"""
-
-    name = "create-index"
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('database', help='The local database to update',
-                            metavar='database-path')
-        parser.add_argument('index', help='the name of the index')
-        parser.add_argument('expression', help='an index expression',
-                            nargs='+')
-
-    def run(self, database, index, expression):
-        try:
-            db = self._open(database, create=False)
-            db.create_index(index, *expression)
-        except errors.DatabaseDoesNotExist:
-            self.stderr.write("Database does not exist.\n")
-            return 1
-        except errors.IndexNameTakenError:
-            self.stderr.write("There is already a different index named %r.\n"
-                              % (index,))
-            return 1
-        except errors.IndexDefinitionParseError:
-            self.stderr.write("Bad index expression.\n")
-            return 1
-
-client_commands.register(CmdCreateIndex)
-
-
-class CmdListIndexes(OneDbCmd):
-    """List existing indexes"""
-
-    name = "list-indexes"
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('database', help='The local database to query',
-                            metavar='database-path')
-
-    def run(self, database):
-        try:
-            db = self._open(database, create=False)
-        except errors.DatabaseDoesNotExist:
-            self.stderr.write("Database does not exist.\n")
-            return 1
-        for (index, expression) in db.list_indexes():
-            self.stdout.write("%s: %s\n" % (index, ", ".join(expression)))
-
-client_commands.register(CmdListIndexes)
-
-
-class CmdDeleteIndex(OneDbCmd):
-    """Delete an index"""
-
-    name = "delete-index"
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('database', help='The local database to update',
-                            metavar='database-path')
-        parser.add_argument('index', help='the name of the index')
-
-    def run(self, database, index):
-        try:
-            db = self._open(database, create=False)
-        except errors.DatabaseDoesNotExist:
-            self.stderr.write("Database does not exist.\n")
-            return 1
-        db.delete_index(index)
-
-client_commands.register(CmdDeleteIndex)
-
-
-class CmdGetIndexKeys(OneDbCmd):
-    """Get the index's keys"""
-
-    name = "get-index-keys"
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('database', help='The local database to query',
-                            metavar='database-path')
-        parser.add_argument('index', help='the name of the index')
-
-    def run(self, database, index):
-        try:
-            db = self._open(database, create=False)
-            for key in db.get_index_keys(index):
-                self.stdout.write("%s\n" % (", ".join(
-                    [i.encode('utf-8') for i in key],)))
-        except errors.DatabaseDoesNotExist:
-            self.stderr.write("Database does not exist.\n")
-        except errors.IndexDoesNotExist:
-            self.stderr.write("Index does not exist.\n")
-        else:
-            return
-        return 1
-
-client_commands.register(CmdGetIndexKeys)
-
-
-class CmdGetFromIndex(OneDbCmd):
-    """Find documents by searching an index"""
-
-    name = "get-from-index"
-    argv = None
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        parser.add_argument('database', help='The local database to query',
-                            metavar='database-path')
-        parser.add_argument('index', help='the name of the index')
-        parser.add_argument('values', metavar="value",
-                            help='the value to look up (one per index column)',
-                            nargs="+")
-
-    def run(self, database, index, values):
-        try:
-            db = self._open(database, create=False)
-            docs = db.get_from_index(index, *values)
-        except errors.DatabaseDoesNotExist:
-            self.stderr.write("Database does not exist.\n")
-        except errors.IndexDoesNotExist:
-            self.stderr.write("Index does not exist.\n")
-        except errors.InvalidValueForIndex:
-            index_def = db._get_index_definition(index)
-            len_diff = len(index_def) - len(values)
-            if len_diff == 0:
-                # can't happen (HAH)
-                raise
-            argv = self.argv if self.argv is not None else sys.argv
-            self.stderr.write(
-                "Invalid query: "
-                "index %r requires %d query expression%s%s.\n"
-                "For example, the following would be valid:\n"
-                "    %s %s %r %r %s\n"
-                % (index,
-                   len(index_def),
-                   "s" if len(index_def) > 1 else "",
-                   ", not %d" % len(values) if len(values) else "",
-                   argv[0], argv[1], database, index,
-                   " ".join(map(repr,
-                                values[:len(index_def)]
-                                + ["*" for i in range(len_diff)])),
-                   ))
-        except errors.InvalidGlobbing:
-            argv = self.argv if self.argv is not None else sys.argv
-            fixed = []
-            for (i, v) in enumerate(values):
-                fixed.append(v)
-                if v.endswith('*'):
-                    break
-            # values has at least one element, so i is defined
-            fixed.extend('*' * (len(values) - i - 1))
-            self.stderr.write(
-                "Invalid query: a star can only be followed by stars.\n"
-                "For example, the following would be valid:\n"
-                "    %s %s %r %r %s\n"
-                % (argv[0], argv[1], database, index,
-                   " ".join(map(repr, fixed))))
-
-        else:
-            self.stdout.write("[")
-            for i, doc in enumerate(docs):
-                if i:
-                    self.stdout.write(",")
-                self.stdout.write(
-                    json.dumps(
-                        dict(id=doc.doc_id, rev=doc.rev, content=doc.content),
-                        indent=4))
-            self.stdout.write("]\n")
-            return
-        return 1
-
-client_commands.register(CmdGetFromIndex)
-
-
-def main(args):
-    return client_commands.run_argv(args, sys.stdin, sys.stdout, sys.stderr)
diff --git a/u1db/commandline/command.py b/u1db/commandline/command.py
deleted file mode 100644
index eace0560..00000000
--- a/u1db/commandline/command.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2011 Canonical Ltd.
-#
-# This file is part of u1db.
-#
-# u1db is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# as published by the Free Software Foundation.
-#
-# u1db is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with u1db.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Command infrastructure for u1db"""
-
-import argparse
-import inspect
-
-
-class CommandGroup(object):
-    """A collection of commands."""
-
-    def __init__(self, description=None):
-        self.commands = {}
-        self.description = description
-
-    def register(self, cmd):
-        """Register a new command to be incorporated with this group."""
-        self.commands[cmd.name] = cmd
-
-    def make_argparser(self):
-        """Create an argparse.ArgumentParser"""
-        parser = argparse.ArgumentParser(description=self.description)
-        subs = parser.add_subparsers(title='commands')
-        for name, cmd in sorted(self.commands.iteritems()):
-            sub = subs.add_parser(name, help=cmd.__doc__)
-            sub.set_defaults(subcommand=cmd)
-            cmd._populate_subparser(sub)
-        return parser
-
-    def run_argv(self, argv, stdin, stdout, stderr):
-        """Run a command, from a sys.argv[1:] style input."""
-        parser = self.make_argparser()
-        args = parser.parse_args(argv)
-        cmd = args.subcommand(stdin, stdout, stderr)
-        params, _, _, _ = inspect.getargspec(cmd.run)
-        vals = []
-        for param in params[1:]:
-            vals.append(getattr(args, param))
-        return cmd.run(*vals)
-
-
-class Command(object):
-    """Definition of a Command that can be run.
-
-    :cvar name: The name of the command, so that you can run
-        'u1db-client <name>'.
-    """
-
-    name = None
-
-    def __init__(self, stdin, stdout, stderr):
-        self.stdin = stdin
-        self.stdout = stdout
-        self.stderr = stderr
-
-    @classmethod
-    def _populate_subparser(cls, parser):
-        """Child classes should override this to provide their arguments."""
-        raise NotImplementedError(cls._populate_subparser)
-
-    def run(self, *args):
-        """This is where the magic happens.
-
-        Subclasses should implement this, requesting their specific arguments.
-        """
-        raise NotImplementedError(self.run)
diff --git a/u1db/commandline/serve.py b/u1db/commandline/serve.py
deleted file mode 100644
index 0bb0e641..00000000
--- a/u1db/commandline/serve.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2011 Canonical Ltd.
-#
-# This file is part of u1db.
-#
-# u1db is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# as published by the Free Software Foundation.
-#
-# u1db is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with u1db.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Build server for u1db-serve."""
-
-from paste import httpserver
-
-from u1db.remote import (
-    http_app,
-    server_state,
-    )
-
-
-def make_server(host, port, working_dir):
-    """Make a server on host and port exposing dbs living in working_dir."""
-    state = server_state.ServerState()
-    state.set_workingdir(working_dir)
-    application = http_app.HTTPApp(state)
-    server = httpserver.WSGIServer(application, (host, port),
-                                   httpserver.WSGIHandler)
-    return server