docker.objects first passobjects

5 files changed, 76 insertions, 6 deletions

diff --git a/README.md b/README.md
index 21fc645..a40d73e 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,7 @@
 docker-py
 =========
 
-<<<<<<< HEAD
 [![Build Status](https://travis-ci.org/dotcloud/docker-py.png)](https://travis-ci.org/dotcloud/docker-py)
-=======
-[![Build Status](https://travis-ci.org/shin-/docker-py.png)](https://travis-ci.org/shin-/docker-py)
->>>>>>> e3dfa3384ad3cee3320c402222f68b667ebc8142
 
 An API client for docker written in Python
 
diff --git a/docker/__init__.py b/docker/__init__.py
index 5f642a8..9e59f84 100644
--- a/docker/__init__.py
+++ b/docker/__init__.py
@@ -13,3 +13,4 @@
 #    limitations under the License.
 
 from .client import Client, APIError  # flake8: noqa
+import objects
\ No newline at end of file
diff --git a/docker/objects/__init__.py b/docker/objects/__init__.py
new file mode 100644
index 0000000..f82da2c
--- /dev/null
+++ b/docker/objects/__init__.py
@@ -0,0 +1 @@
+from .objects import init, Image, Container # flake8: noqa
diff --git a/docker/objects/objects.py b/docker/objects/objects.py
new file mode 100644
index 0000000..b70bcc9
--- /dev/null
+++ b/docker/objects/objects.py
@@ -0,0 +1,67 @@
+from .. import Client
+
+CLIENT = None
+
+
+def init(client=None, base_url="unix://var/run/docker.sock", version="1.4"):
+    global CLIENT
+    if client:
+        CLIENT = client
+    else:
+        CLIENT = Client(base_url, version)
+
+
+class Identifiable(object):
+    def __init__(self, id):
+        if isinstance(id, dict):
+            id = id.get('Id')
+        self.id = id
+
+
+class Image(Identifiable):
+    pass
+
+
+class Container(Identifiable):
+    @classmethod
+    def new(cls, image, **kwargs):
+        res = CLIENT.create_container(image, **kwargs)
+        return cls(res)
+
+    def start(self, binds=None, lxc_conf=None):
+        CLIENT.start(self.id, binds, lxc_conf)
+
+    def stop(self, timeout=10):
+        CLIENT.stop(self.id)
+
+    def restart(self, timeout=10):
+        CLIENT.restart(self.id)
+
+    def commit(self, repository=None, tag=None, message=None, author=None,
+               conf=None):
+        return Image(CLIENT.commit(self.id, repository, tag, message, author,
+                                   conf))
+
+    def diff(self):
+        return CLIENT.diff(self.id)
+
+    def export(self):
+        return CLIENT.export(self.id)
+
+    def kill(self):
+        return CLIENT.kill(self.id)
+
+    def logs(self):
+        return CLIENT.logs(self.id)
+
+    def port(self, private_port):
+        return CLIENT.port(self.id, private_port)
+
+    def top(self):
+        return CLIENT.top(self.id)
+
+    def remove(self, v=False):
+        return CLIENT.remove_container(self.id, v)
+
+    def wait(self):
+        return CLIENT.wait(self.id)
diff --git a/setup.py b/setup.py
index 208523f..4673516 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,12 @@ setup(
     name="docker-py",
     version='0.2.2',
     description="Python client for Docker.",
-    packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils'],
+    packages=['docker',
+              'docker.auth',
+              'docker.objects',
+              'docker.unixconn',
+              'docker.utils'
+              ],
     install_requires=requirements + test_requirements,
     zip_safe=False,
     test_suite='tests',
@@ -24,5 +29,5 @@ setup(
                  'Programming Language :: Python',
                  'Topic :: Utilities',
                  'License :: OSI Approved :: Apache Software License'
-    ],
+                 ],
 )