command line client:
[pithos] / tools / store
index d19dcd6..e2afc8e 100755 (executable)
 #!/usr/bin/env python
 
+# Copyright 2011 GRNET S.A. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+# 
+#   1. Redistributions of source code must retain the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer.
+# 
+#   2. Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and
+# documentation are those of the authors and should not be
+# interpreted as representing official policies, either expressed
+# or implied, of GRNET S.A.
+
 from getpass import getuser
-from httplib import HTTPConnection
 from optparse import OptionParser
-from os.path import basename
-from sys import argv, exit, stdin
+from os import environ
+from sys import argv, exit, stdin, stdout
+from datetime import datetime
+from lib.client import Pithos_Client, Fault
+from lib.util import get_user, get_auth, get_server, get_api
 
 import json
 import logging
-
-
-DEFAULT_HOST = 'pithos.dev.grnet.gr'
-DEFAULT_API = 'v1'
-
-
-class Fault(Exception):
-    def __init__(self, data=''):
-        Exception.__init__(self, data)
-        self.data = data
-
-
-class Client(object):
-    def __init__(self, host, account, api='v1', verbose=False, debug=False):
-        """`host` can also include a port, e.g '127.0.0.1:8000'."""
-        
-        self.host = host
-        self.account = account
-        self.api = api
-        self.verbose = verbose or debug
-        self.debug = debug
-    
-    def req(self, method, path, body=None, headers=None, format='text'):
-        full_path = '/%s/%s%s?format=%s' % (self.api, self.account, path, format)
-        conn = HTTPConnection(self.host)
-        
-        kwargs = {}
-        kwargs['headers'] = headers or {}
-        kwargs['headers']['Content-Length'] = len(body) if body else 0
-        if body:
-            kwargs['body'] = body
-            kwargs['headers']['Content-Type'] = 'application/octet-stream'
-        
-        conn.request(method, full_path, **kwargs)
-        resp = conn.getresponse()
-        headers = dict(resp.getheaders())
-        
-        if self.verbose:
-            print '%d %s' % (resp.status, resp.reason)
-            for key, val in headers.items():
-                print '%s: %s' % (key.capitalize(), val)
-            print
-        
-        data = resp.read()
-        
-        if self.debug:
-            print data
-            print
-        
-        if format == 'json':
-            data = json.loads(data)
-        
-        return resp.status, headers, data
-    
-    def delete(self, path, format='text'):
-        return self.req('DELETE', path, format=format)
-    
-    def get(self, path, format='text'):
-        return self.req('GET', path, format=format)
-    
-    def head(self, path, format='text'):
-        return self.req('HEAD', path, format=format)
-    
-    def post(self, path, body=None, format='text', headers=None):
-        return self.req('POST', path, body, headers=headers, format=format)
-    
-    def put(self, path, body=None, format='text', headers=None):
-        return self.req('PUT', path, body, headers=headers, format=format)
-    
-    def _list(self, path, detail=False):
-        format = 'json' if detail else 'text'
-        status, headers, data = self.get(path, format=format)
-        return data
-    
-    def _get_metadata(self, path, prefix):
-        status, headers, data = self.head(path)
-        prefixlen = len(prefix)
-        meta = {}
-        for key, val in headers.items():
-            if key.startswith(prefix):
-                key = key[prefixlen:]
-                meta[key] = val
-        return meta
-    
-    
-    # Storage Account Services
-    
-    def list_containers(self, detail=False):
-        return self._list('', detail)
-    
-    def account_metadata(self):
-        return self._get_metadata('', 'x-account-')
-    
-    
-    # Storage Container Services
-    
-    def list_objects(self, container, detail=False):
-        return self._list('/' + container, detail)
-    
-    def create_container(self, container):
-        status, header, data = self.put('/' + container)
-        if status == 202:
-            return False
-        elif status != 201:
-            raise Fault(data)
-        return True
-    
-    def delete_container(self, container):
-        self.delete('/' + container)
-    
-    def retrieve_container_metadata(self, container):
-        return self._get_metadata('/%s' % container, 'x-container-')
-    
-    
-    # Storage Object Services
-    
-    def retrieve_object(self, container, object):
-        path = '/%s/%s' % (container, object)
-        status, headers, data = self.get(path)
-        return data
-    
-    def create_object(self, container, object, data):
-        path = '/%s/%s' % (container, object)
-        self.put(path, data)
-    
-    def copy_object(self, src_container, src_object, dst_container, dst_object):
-        path = '/%s/%s' % (dst_container, dst_object)
-        headers = {}
-        headers['X-Copy-From'] = '/%s/%s' % (src_container, src_object)
-        headers['Content-Length'] = 0
-        self.put(path, headers=headers)
-    
-    def delete_object(self, container, object):
-        self.delete('/%s/%s' % (container, object))
-    
-    def retrieve_object_metadata(self, container, object):
-        path = '/%s/%s' % (container, object)
-        return self._get_metadata(path, 'x-object-meta-')
-    
-    def update_object_metadata(self, container, object, **meta):
-        path = '/%s/%s' % (container, object)
-        headers = {}
-        for key, val in meta.items():
-            http_key = 'X-Object-Meta-' + key
-            headers[http_key] = val
-        self.post(path, headers=headers)
-
+import types
+import re
+import time as _time
+import os
 
 _cli_commands = {}
 
@@ -169,26 +61,25 @@ def cli_command(*args):
 def class_for_cli_command(name):
     return _cli_commands[name]
 
-def print_dict(d, header='name'):
-    if header:
-        print d.pop(header)
-    for key, val in sorted(d.items()):
-        print '%s: %s' % (key.rjust(15), val)
-
-
 class Command(object):
-    def __init__(self, argv):
-        parser = OptionParser()
-        parser.add_option('--host', dest='host', metavar='HOST', default=DEFAULT_HOST,
-                            help='use server HOST')
-        parser.add_option('--user', dest='user', metavar='USERNAME', default=getuser(),
-                            help='use account USERNAME')
-        parser.add_option('--api', dest='api', metavar='API', default=DEFAULT_API,
-                            help='use api API')
-        parser.add_option('-v', action='store_true', dest='verbose', default=False,
-                            help='use verbose output')
-        parser.add_option('-d', action='store_true', dest='debug', default=False,
-                            help='use debug output')
+    syntax = ''
+    
+    def __init__(self, name, argv):
+        parser = OptionParser('%%prog %s [options] %s' % (name, self.syntax))
+        parser.add_option('--host', dest='host', metavar='HOST',
+                          default=get_server(), help='use server HOST')
+        parser.add_option('--user', dest='user', metavar='USERNAME',
+                          default=get_user(),
+                          help='use account USERNAME')
+        parser.add_option('--token', dest='token', metavar='AUTH',
+                          default=get_auth(),
+                          help='use account AUTH')
+        parser.add_option('--api', dest='api', metavar='API',
+                          default=get_api(), help='use api API')
+        parser.add_option('-v', action='store_true', dest='verbose',
+                          default=False, help='use verbose output')
+        parser.add_option('-d', action='store_true', dest='debug',
+                          default=False, help='use debug output')
         self.add_options(parser)
         options, args = parser.parse_args(argv)
         
@@ -199,26 +90,59 @@ class Command(object):
                 val = getattr(options, key)
                 setattr(self, key, val)
         
-        self.client = Client(self.host, self.user, self.api, self.verbose, self.debug)
+        self.client = Pithos_Client(self.host, self.token, self.user, self.api, self.verbose,
+                             self.debug)
         
         self.parser = parser
         self.args = args
     
+    def _build_args(self, attrs):
+        args = {}
+        for a in [a for a in attrs if getattr(self, a)]:
+            args[a] = getattr(self, a)
+        return args
+
     def add_options(self, parser):
         pass
-
+    
     def execute(self, *args):
         pass
 
-
 @cli_command('list', 'ls')
 class List(Command):
-    syntax = '[container]'
+    syntax = '[<container>[/<object>]]'
     description = 'list containers or objects'
     
     def add_options(self, parser):
-        parser.add_option('-l', action='store_true', dest='detail', default=False,
-                            help='show detailed output')
+        parser.add_option('-l', action='store_true', dest='detail',
+                          default=False, help='show detailed output')
+        parser.add_option('-n', action='store', type='int', dest='limit',
+                          default=10000, help='show limited output')
+        parser.add_option('--marker', action='store', type='str',
+                          dest='marker', default=None,
+                          help='show output greater then marker')
+        parser.add_option('--prefix', action='store', type='str',
+                          dest='prefix', default=None,
+                          help='show output starting with prefix')
+        parser.add_option('--delimiter', action='store', type='str',
+                          dest='delimiter', default=None,
+                          help='show output up to the delimiter')
+        parser.add_option('--path', action='store', type='str',
+                          dest='path', default=None,
+                          help='show output starting with prefix up to /')
+        parser.add_option('--meta', action='store', type='str',
+                          dest='meta', default=None,
+                          help='show output having the specified meta keys')
+        parser.add_option('--if-modified-since', action='store', type='str',
+                          dest='if_modified_since', default=None,
+                          help='show output if modified since then')
+        parser.add_option('--if-unmodified-since', action='store', type='str',
+                          dest='if_unmodified_since', default=None,
+                          help='show output if not modified since then')
+        parser.add_option('--until', action='store', dest='until',
+                          default=None, help='show metadata until that date')
+        parser.add_option('--format', action='store', dest='format',
+                          default='%d/%m/%Y', help='format to parse until date')
     
     def execute(self, container=None):
         if container:
@@ -227,115 +151,537 @@ class List(Command):
             self.list_containers()
     
     def list_containers(self):
-        if self.detail:
-            for container in self.client.list_containers(detail=True):
-                print_dict(container)
-                print
-        else:
-            print self.client.list_containers().strip()
+        attrs = ['limit', 'marker', 'if_modified_since',
+                 'if_unmodified_since']
+        args = self._build_args(attrs)
+        args['format'] = 'json' if self.detail else 'text'
+        
+        if getattr(self, 'until'):
+            t = _time.strptime(self.until, self.format)
+            args['until'] = int(_time.mktime(t))
+        
+        l = self.client.list_containers(**args)
+        print_list(l)
     
     def list_objects(self, container):
-        if self.detail:
-            for obj in self.client.list_objects(container, detail=True):
-                print_dict(obj)
-                print
-        else:
-            print self.client.list_objects(container).strip()
-
+        #prepate params
+        params = {}
+        attrs = ['limit', 'marker', 'prefix', 'delimiter', 'path',
+                 'meta', 'if_modified_since', 'if_unmodified_since']
+        args = self._build_args(attrs)
+        args['format'] = 'json' if self.detail else 'text'
+        
+        if self.until:
+            t = _time.strptime(self.until, self.format)
+            args['until'] = int(_time.mktime(t))
+        
+        container, sep, object = container.partition('/')
+        if object:
+            return
+        
+        detail = 'json'
+        #if request with meta quering disable trash filtering
+        show_trashed = True if self.meta else False
+        l = self.client.list_objects(container, **args)
+        print_list(l, detail=self.detail)
 
 @cli_command('meta')
 class Meta(Command):
     syntax = '[<container>[/<object>]]'
-    description = 'get the metadata of an account, a container or an object'
-
+    description = 'get account/container/object metadata'
+    
+    def add_options(self, parser):
+        parser.add_option('-r', action='store_true', dest='restricted',
+                          default=False, help='show only user defined metadata')
+        parser.add_option('--until', action='store', dest='until',
+                          default=None, help='show metadata until that date')
+        parser.add_option('--format', action='store', dest='format',
+                          default='%d/%m/%Y', help='format to parse until date')
+        parser.add_option('--version', action='store', dest='version',
+                          default=None, help='show specific version \
+                                  (applies only for objects)')
+    
     def execute(self, path=''):
         container, sep, object = path.partition('/')
+        args = {'restricted':self.restricted}
+        if getattr(self, 'until'):
+            t = _time.strptime(self.until, self.format)
+            args['until'] = int(_time.mktime(t))
+        
         if object:
-            meta = self.client.retrieve_object_metadata(container, object)
+            meta = self.client.retrieve_object_metadata(container, object,
+                                                        self.restricted,
+                                                        self.version)
         elif container:
-            meta = self.client.retrieve_container_metadata(container)
+            meta = self.client.retrieve_container_metadata(container, **args)
         else:
-            meta = self.client.account_metadata()
-        print_dict(meta, header=None)
-
+            meta = self.client.retrieve_account_metadata(**args)
+        if meta == None:
+            print 'Entity does not exist'
+        else:
+            print_dict(meta, header=None)
 
 @cli_command('create')
 class CreateContainer(Command):
-    syntax = '<container>'
+    syntax = '<container> [key=val] [...]'
     description = 'create a container'
     
-    def execute(self, container):
-        ret = self.client.create_container(container)
+    def execute(self, container, *args):
+        meta = {}
+        for arg in args:
+            key, sep, val = arg.partition('=')
+            meta[key] = val
+        ret = self.client.create_container(container, **meta)
         if not ret:
             print 'Container already exists'
 
-
 @cli_command('delete', 'rm')
 class Delete(Command):
     syntax = '<container>[/<object>]'
     description = 'delete a container or an object'
     
+    def add_options(self, parser):
+        parser.add_option('--until', action='store', dest='until',
+                          default=None, help='remove history until that date')
+        parser.add_option('--format', action='store', dest='format',
+                          default='%d/%m/%Y', help='format to parse until date')
+    
     def execute(self, path):
         container, sep, object = path.partition('/')
+        until = None
+        if getattr(self, 'until'):
+            t = _time.strptime(self.until, self.format)
+            until = int(_time.mktime(t))
+        
         if object:
-            self.client.delete_object(container, object)
+            self.client.delete_object(container, object, until)
         else:
-            self.client.delete_container(container)
-
+            self.client.delete_container(container, until)
 
 @cli_command('get')
 class GetObject(Command):
     syntax = '<container>/<object>'
     description = 'get the data of an object'
     
+    def add_options(self, parser):
+        parser.add_option('-l', action='store_true', dest='detail',
+                          default=False, help='show detailed output')
+        parser.add_option('--range', action='store', dest='range',
+                          default=None, help='show range of data')
+        parser.add_option('--if-range', action='store', dest='if_range',
+                          default=None, help='show range of data')
+        parser.add_option('--if-match', action='store', dest='if_match',
+                          default=None, help='show output if ETags match')
+        parser.add_option('--if-none-match', action='store',
+                          dest='if_none_match', default=None,
+                          help='show output if ETags don\'t match')
+        parser.add_option('--if-modified-since', action='store', type='str',
+                          dest='if_modified_since', default=None,
+                          help='show output if modified since then')
+        parser.add_option('--if-unmodified-since', action='store', type='str',
+                          dest='if_unmodified_since', default=None,
+                          help='show output if not modified since then')
+        parser.add_option('-o', action='store', type='str',
+                          dest='file', default=None,
+                          help='save output in file')
+        parser.add_option('--version', action='store', type='str',
+                          dest='version', default=None,
+                          help='get the specific \
+                               version')
+        parser.add_option('--versionlist', action='store_true',
+                          dest='versionlist', default=False,
+                          help='get the full object version list')
+    
     def execute(self, path):
+        attrs = ['if_match', 'if_none_match', 'if_modified_since',
+                 'if_unmodified_since']
+        args = self._build_args(attrs)
+        args['format'] = 'json' if self.detail else 'text'
+        if self.range:
+            args['range'] = 'bytes=%s' %self.range
+        if getattr(self, 'if_range'):
+            args['if-range'] = 'If-Range:%s' % getattr(self, 'if_range')
+        
         container, sep, object = path.partition('/')
-        print self.client.retrieve_object(container, object)
+        data = None
+        if self.versionlist:
+            if 'detail' in args.keys():
+                args.pop('detail')
+            args.pop('format')
+            self.detail = True
+            data = self.client.retrieve_object_versionlist(container, object, **args)
+        elif self.version:
+            data = self.client.retrieve_object_version(container, object,
+                                                       self.version, **args)
+        else:
+            data = self.client.retrieve_object(container, object, **args)    
+        
+        f = self.file and open(self.file, 'w') or stdout
+        if self.detail:
+            if self.versionlist:
+                print_versions(data, f=f)
+            else:
+                print_dict(data, f=f)
+        else:
+            f.write(data)
+        f.close()
 
+@cli_command('mkdir')
+class PutMarker(Command):
+    syntax = '<container>/<directory marker>'
+    description = 'create a directory marker'
+    
+    def execute(self, path):
+        container, sep, object = path.partition('/')
+        self.client.create_directory_marker(container, object)
 
 @cli_command('put')
 class PutObject(Command):
-    syntax = '<container>/<object> <path>'
-    description = 'create or update an object with contents of path'
-
-    def execute(self, path, srcpath):
+    syntax = '<container>/<object> [key=val] [...]'
+    description = 'create/override object'
+    
+    def add_options(self, parser):
+        parser.add_option('--use_hashes', action='store_true', dest='use_hashes',
+                          default=False, help='provide hashmap instead of data')
+        parser.add_option('--chunked', action='store_true', dest='chunked',
+                          default=False, help='set chunked transfer mode')
+        parser.add_option('--etag', action='store', dest='etag',
+                          default=None, help='check written data')
+        parser.add_option('--content-encoding', action='store',
+                          dest='content_encoding', default=None,
+                          help='provide the object MIME content type')
+        parser.add_option('--content-disposition', action='store', type='str',
+                          dest='content_disposition', default=None,
+                          help='provide the presentation style of the object')
+        #parser.add_option('-S', action='store',
+        #                  dest='segment_size', default=False,
+        #                  help='use for large file support')
+        parser.add_option('--manifest', action='store',
+                          dest='x_object_manifest', default=None,
+                          help='upload a manifestation file')
+        parser.add_option('--content-type', action='store',
+                          dest='content_type', default=None,
+                          help='create object with specific content type')
+        parser.add_option('--sharing', action='store',
+                          dest='x_object_sharing', default=None,
+                          help='define sharing object policy')
+        parser.add_option('-f', action='store',
+                          dest='srcpath', default=None,
+                          help='file descriptor to read from (pass - for standard input)')
+        parser.add_option('--public', action='store_true',
+                          dest='x_object_public', default=False,
+                          help='make object publicly accessible')
+    
+    def execute(self, path, *args):
+        if path.find('=') != -1:
+            raise Fault('Missing path argument')
+        
+        #prepare user defined meta
+        meta = {}
+        for arg in args:
+            key, sep, val = arg.partition('=')
+            meta[key] = val
+        
+        attrs = ['etag', 'content_encoding', 'content_disposition',
+                 'content_type', 'x_object_sharing', 'x_object_public']
+        args = self._build_args(attrs)
+        
         container, sep, object = path.partition('/')
-        f = open(srcpath) if srcpath != '-' else stdin
-        data = f.read()
-        self.client.create_object(container, object, data)
-        f.close()
-
+        
+        f = None
+        if self.srcpath:
+            f = open(self.srcpath) if self.srcpath != '-' else stdin
+        
+        if self.use_hashes and not f:
+            raise Fault('Illegal option combination')
+        
+        if self.chunked:
+            self.client.create_object_using_chunks(container, object, f,
+                                                    meta=meta, **args)
+        elif self.use_hashes:
+            format = 'json' if detail else 'text'
+            self.client.create_object_by_hashmap(container, object, f, format,
+                                 meta=meta, **args)
+        elif self.x_object_manifest:
+            self.client.create_manifestation(container, object, self.x_object_manifest)
+        elif not f:
+            self.client.create_zero_length_object(container, object, meta=meta, **args)
+        else:
+            self.client.create_object(container, object, f, meta=meta, **args)
+        if f:
+            f.close()
 
 @cli_command('copy', 'cp')
 class CopyObject(Command):
-    syntax = '<src container>/<src object> [<dst container>/]<dst object>'
-    description = 'copies an object to a different location'
+    syntax = '<src container>/<src object> [<dst container>/]<dst object> [key=val] [...]'
+    description = 'copy an object to a different location'
     
-    def execute(self, src, dst):
+    def add_options(self, parser):
+        parser.add_option('--version', action='store',
+                          dest='version', default=False,
+                          help='copy specific version')
+        parser.add_option('--public', action='store_true',
+                          dest='public', default=False,
+                          help='make object publicly accessible')
+        parser.add_option('--content-type', action='store',
+                          dest='content_type', default=None,
+                          help='change object\'s content type')
+    
+    def execute(self, src, dst, *args):
         src_container, sep, src_object = src.partition('/')
         dst_container, sep, dst_object = dst.partition('/')
+        
+        #prepare user defined meta
+        meta = {}
+        for arg in args:
+            key, sep, val = arg.partition('=')
+            meta[key] = val
+        
         if not sep:
             dst_container = src_container
             dst_object = dst
-        self.client.copy_object(src_container, src_object, dst_container, dst_object)
-
+        
+        args = {'content_type':self.content_type} if self.content_type else {}
+        self.client.copy_object(src_container, src_object, dst_container,
+                                dst_object, meta, self.public, self.version,
+                                **args)
 
 @cli_command('set')
-class SetOjectMeta(Command):
-    syntax = '<container>/<object> key=val [key=val] [...]'
-    description = 'set object metadata'
+class SetMeta(Command):
+    syntax = '[<container>[/<object>]] key=val [key=val] [...]'
+    description = 'set account/container/object metadata'
     
     def execute(self, path, *args):
-        container, sep, object = path.partition('/')
+        #in case of account fix the args
+        if path.find('=') != -1:
+            args = list(args)
+            args.append(path)
+            args = tuple(args)
+            path = ''
         meta = {}
         for arg in args:
             key, sep, val = arg.partition('=')
             meta[key.strip()] = val.strip()
-        self.client.update_object_metadata(container, object, **meta)
+        container, sep, object = path.partition('/')
+        if object:
+            self.client.update_object_metadata(container, object, **meta)
+        elif container:
+            self.client.update_container_metadata(container, **meta)
+        else:
+            self.client.update_account_metadata(**meta)
 
+@cli_command('update')
+class UpdateObject(Command):
+    syntax = '<container>/<object> path [key=val] [...]'
+    description = 'update object metadata/data (default mode: append)'
+    
+    def add_options(self, parser):
+        parser.add_option('-a', action='store_true', dest='append',
+                          default=True, help='append data')
+        parser.add_option('--offset', action='store',
+                          dest='offset',
+                          default=None, help='starting offest to be updated')
+        parser.add_option('--range', action='store', dest='content-range',
+                          default=None, help='range of data to be updated')
+        parser.add_option('--chunked', action='store_true', dest='chunked',
+                          default=False, help='set chunked transfer mode')
+        parser.add_option('--content-encoding', action='store',
+                          dest='content_encoding', default=None,
+                          help='provide the object MIME content type')
+        parser.add_option('--content-disposition', action='store', type='str',
+                          dest='content_disposition', default=None,
+                          help='provide the presentation style of the object')
+        parser.add_option('--manifest', action='store', type='str',
+                          dest='x_object_manifest', default=None,
+                          help='use for large file support')        
+        parser.add_option('--sharing', action='store',
+                          dest='x_object_sharing', default=None,
+                          help='define sharing object policy')
+        parser.add_option('--nosharing', action='store_true',
+                          dest='no_sharing', default=None,
+                          help='clear object sharing policy')
+        parser.add_option('-f', action='store',
+                          dest='srcpath', default=None,
+                          help='file descriptor to read from: pass - for standard input')
+        parser.add_option('--public', action='store_true',
+                          dest='x_object_public', default=False,
+                          help='make object publicly accessible')
+    
+    def execute(self, path, *args):
+        if path.find('=') != -1:
+            raise Fault('Missing path argument')
+        
+        #prepare user defined meta
+        meta = {}
+        for arg in args:
+            key, sep, val = arg.partition('=')
+            meta[key] = val
+        
+        if self.no_sharing:
+            self.x_object_sharing = ''
+        
+        attrs = ['content_encoding', 'content_disposition', 'x_object_sharing',
+                 'x_object_public']
+        args = self._build_args(attrs)
+        
+        container, sep, object = path.partition('/')
+        
+        f = None
+        if self.srcpath:
+            f = open(self.srcpath) if self.srcpath != '-' else stdin
+        
+        if self.chunked:
+            self.client.update_object_using_chunks(container, object, f,
+                                                    meta=meta, **args)
+        else:
+            self.client.update_object(container, object, f, meta=meta, **args)
+        if f:
+            f.close()
+
+@cli_command('move', 'mv')
+class MoveObject(Command):
+    syntax = '<src container>/<src object> [<dst container>/]<dst object>'
+    description = 'move an object to a different location'
+    
+    def add_options(self, parser):
+        parser.add_option('--version', action='store',
+                          dest='version', default=None,
+                          help='move a specific object version')
+        parser.add_option('--public', action='store_true',
+                          dest='public', default=False,
+                          help='make object publicly accessible')
+        parser.add_option('--content-type', action='store',
+                          dest='content_type', default=None,
+                          help='change object\'s content type')
+    
+    def execute(self, src, dst, *args):
+        src_container, sep, src_object = src.partition('/')
+        dst_container, sep, dst_object = dst.partition('/')
+        if not sep:
+            dst_container = src_container
+            dst_object = dst
+        
+        #prepare user defined meta
+        meta = {}
+        for arg in args:
+            key, sep, val = arg.partition('=')
+            meta[key] = val
+        
+        args = {'content_type':self.content_type} if self.content_type else {}
+        self.client.move_object(src_container, src_object, dst_container,
+                                dst_object, meta, self.public, self.version, **args)
+
+@cli_command('unset')
+class UnsetObject(Command):
+    syntax = '<container>/[<object>] key [key] [...]'
+    description = 'delete metadata info'
+    
+    def execute(self, path, *args):
+        #in case of account fix the args
+        if len(args) == 0:
+            args = list(args)
+            args.append(path)
+            args = tuple(args)
+            path = ''
+        meta = []
+        for key in args:
+            meta.append(key)
+        container, sep, object = path.partition('/')
+        if object:
+            self.client.delete_object_metadata(container, object, meta)
+        elif container:
+            self.client.delete_container_metadata(container, meta)
+        else:
+            self.client.delete_account_metadata(meta)
+
+@cli_command('group')
+class CreateGroup(Command):
+    syntax = 'key=val [key=val] [...]'
+    description = 'create account groups'
+    
+    def execute(self, *args):
+        groups = {}
+        for arg in args:
+            key, sep, val = arg.partition('=')
+            groups[key] = val
+        self.client.set_account_groups(**groups)
+
+@cli_command('ungroup')
+class DeleteGroup(Command):
+    syntax = 'key [key] [...]'
+    description = 'delete account groups'
+    
+    def execute(self, *args):
+        groups = []
+        for arg in args:
+            groups.append(arg)
+        self.client.unset_account_groups(groups)
+
+@cli_command('policy')
+class SetPolicy(Command):
+    syntax = 'container key=val [key=val] [...]'
+    description = 'set container policies'
+    
+    def execute(self, path, *args):
+        if path.find('=') != -1:
+            raise Fault('Missing container argument')
+        
+        container, sep, object = path.partition('/')
+        
+        if object:
+            raise Fault('Only containers have policies')
+        
+        policies = {}
+        for arg in args:
+            key, sep, val = arg.partition('=')
+            policies[key] = val
+        
+        self.client.set_container_policies(container, **policies)
+
+@cli_command('publish')
+class PublishObject(Command):
+    syntax = '<container>/<object>'
+    description = 'publish an object'
+    
+    def execute(self, src):
+        src_container, sep, src_object = src.partition('/')
+        
+        self.client.publish_object(src_container, src_object)
+
+@cli_command('unpublish')
+class UnpublishObject(Command):
+    syntax = '<container>/<object>'
+    description = 'unpublish an object'
+    
+    def execute(self, src):
+        src_container, sep, src_object = src.partition('/')
+        
+        self.client.unpublish_object(src_container, src_object)
+
+@cli_command('sharing')
+class SharingObject(Command):
+    syntax = 'list users sharing objects with the user'
+    description = 'list user accounts sharing objects with the user'
+    
+    def add_options(self, parser):
+        parser.add_option('-l', action='store_true', dest='detail',
+                          default=False, help='show detailed output')
+        parser.add_option('-n', action='store', type='int', dest='limit',
+                          default=10000, help='show limited output')
+        parser.add_option('--marker', action='store', type='str',
+                          dest='marker', default=None,
+                          help='show output greater then marker')
+        
+    
+    def execute(self):
+        attrs = ['limit', 'marker']
+        args = self._build_args(attrs)
+        args['format'] = 'json' if self.detail else 'text'
+        
+        print_list(self.client.list_shared_by_others(**args))
 
 def print_usage():
-    cmd = Command([])
+    cmd = Command('', [])
     parser = cmd.parser
     parser.usage = '%prog <command> [options]'
     parser.print_help()
@@ -347,7 +693,37 @@ def print_usage():
         commands.append('  %s %s' % (name.ljust(12), description))
     print '\nCommands:\n' + '\n'.join(sorted(commands))
 
+def print_dict(d, header='name', f=stdout, detail=True):
+    header = header if header in d else 'subdir'
+    if header and header in d:
+        f.write('%s\n' %d.pop(header).encode('utf8'))
+    if detail:
+        patterns = ['^x_(account|container|object)_meta_(\w+)$']
+        patterns.append(patterns[0].replace('_', '-'))
+        for key, val in sorted(d.items()):
+            f.write('%s: %s\n' % (key.rjust(30), val))
+
+def print_list(l, verbose=False, f=stdout, detail=True):
+    for elem in l:
+        #if it's empty string continue
+        if not elem:
+            continue
+        if type(elem) == types.DictionaryType:
+            print_dict(elem, f=f, detail=detail)
+        elif type(elem) == types.StringType:
+            if not verbose:
+                elem = elem.split('Traceback')[0]
+            f.write('%s\n' % elem)
+        else:
+            f.write('%s\n' % elem)
 
+def print_versions(data, f=stdout):
+    if 'versions' not in data:
+        f.write('%s\n' %data)
+        return
+    f.write('versions:\n')
+    for id, t in data['versions']:
+        f.write('%s @ %s\n' % (str(id).rjust(30), datetime.fromtimestamp(t)))
 
 def main():
     try:
@@ -356,18 +732,17 @@ def main():
     except (IndexError, KeyError):
         print_usage()
         exit(1)
-
-    cmd = cls(argv[2:])
+    
+    cmd = cls(name, argv[2:])
     
     try:
         cmd.execute(*cmd.args)
-    except TypeError:
-        cmd.parser.usage = '%%prog %s [options] %s' % (name, cmd.syntax)
+    except TypeError, e:
         cmd.parser.print_help()
         exit(1)
     except Fault, f:
-        print f.data
-
+        status = f.status and '%s ' % f.status or ''
+        print '%s%s' % (status, f.data)
 
 if __name__ == '__main__':
     main()