pull returns String

kpelykh · kpelykh · commit d67dce174cbc · 2013-07-08T14:53:23.000-07:00
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ repository, before you can use it in your projects.*
 ##### Docker Builder:
 
 To use Docker Builder, as described on page http://docs.docker.io/en/latest/use/builder/,
-run dockerClient.build(baseDir), where baseDir is a path to folder containing Dockerfile.
+user dockerClient.build(baseDir), where baseDir is a path to folder containing Dockerfile.
 
 
     File baseDir = new File("~/kpelykh/docker/netcat");
diff --git a/src/main/java/com/kpelykh/docker/client/DockerClient.java b/src/main/java/com/kpelykh/docker/client/DockerClient.java
@@ -92,15 +92,15 @@ public Version version() throws DockerException {
      **
      **/
 
-    public InputStream pull(String repository) throws DockerException {
+    public String pull(String repository) throws DockerException {
         return this.pull(repository, null, null);
     }
 
-    public InputStream pull(String repository, String tag) throws DockerException {
+    public String pull(String repository, String tag) throws DockerException {
         return this.pull(repository, tag, null);
     }
 
-    public InputStream pull(String repository, String tag, String registry) throws DockerException {
+    public String pull(String repository, String tag, String registry) throws DockerException {
         Preconditions.checkNotNull(repository, "Repository was not specified");
 
         if (StringUtils.countMatches(repository, ":") == 1) {
@@ -119,7 +119,7 @@ public InputStream pull(String repository, String tag, String registry) throws D
 
         try {
             LOGGER.trace("POST: " + webResource.toString());
-            return webResource.accept(MediaType.APPLICATION_JSON).post(InputStream.class);
+            return webResource.accept(MediaType.APPLICATION_JSON).post(String.class);
         } catch (UniformInterfaceException exception) {
             if (exception.getResponse().getStatus() == 500) {
                 throw new DockerException("Server error.", exception);
diff --git a/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java b/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java
@@ -49,12 +49,7 @@ public void beforeTest() throws DockerException {
         dockerClient = new DockerClient("http://localhost:4243");
         LOG.info("Creating image 'busybox'");
 
-        InputStream in = null;
-        try {
-            in = dockerClient.pull("busybox");
-        } finally {
-            IOUtils.closeQuietly(in);
-        }
+        dockerClient.pull("busybox");
 
         assertNotNull(dockerClient);
         LOG.info("======================= END OF BEFORETEST =======================\n\n");
@@ -117,7 +112,6 @@ public void testDockerInfo() throws DockerException {
         assertTrue(dockerInfo.toString().contains("images"));
         assertTrue(dockerInfo.toString().contains("debug"));
 
-        assertFalse(dockerInfo.debug);
         assertTrue(dockerInfo.containers > 0);
         assertTrue(dockerInfo.images > 0);
         assertTrue(dockerInfo.NFd > 0);
@@ -448,7 +442,7 @@ public void removeContainer() throws DockerException {
      * */
 
     @Test
-    public void testPullImage() throws DockerException {
+    public void testPullImage() throws DockerException, IOException {
 
         String testImage = "joffrey/test001";
 
@@ -461,22 +455,10 @@ public void testPullImage() throws DockerException {
         int imgCount= info.images;
 
         LOG.info("Pulling image " + testImage);
-        InputStream in = dockerClient.pull(testImage);
 
-        byte[] buffer = new byte[1024];
-        try {
-            BufferedInputStream bis = new BufferedInputStream(in);
-            int bytesRead = 0;
-            while ((bytesRead = bis.read(buffer)) != -1) {
-                Thread.sleep(200);
-                String logChunk = new String(buffer, 0, bytesRead);
-                LOG.info(logChunk);
-            }
-        } catch (IOException ex) {
-        } catch (InterruptedException e) {
-        } finally {
-            IOUtils.closeQuietly(in);
-        }
+        String response = dockerClient.pull(testImage);
+
+        assertThat(response, containsString("Pulling image e9aa60c60128cad1 () from joffrey/test001"));
 
         tmpImgs.add(testImage);
 
