Revert "Fixing rm command and API…"

This reverts commit 26edba0.

Conflicts:
	docker/container.go

Author: joshwget

cli/app/app.go

@@ -163,26 +163,10 @@ func ProjectPull(p *project.Project, c *cli.Context) {
 
 // ProjectDelete delete services.
 func ProjectDelete(p *project.Project, c *cli.Context) {
-	stoppedContainers, err := p.ListStoppedContainers(c.Args()...)
-	if err != nil {
-		logrus.Fatal(err)
-	}
-	if len(stoppedContainers) == 0 {
-		fmt.Println("No stopped containers")
-		return
-	}
-	if !c.Bool("force") {
-		fmt.Printf("Going to remove %v\nAre you sure? [yN]\n", strings.Join(stoppedContainers, ", "))
-		var answer string
-		_, err := fmt.Scanln(&answer)
-		if err != nil {
-			logrus.Fatal(err)
-		}
-		if answer != "y" && answer != "Y" {
-			return
-		}
+	if !c.Bool("force") && len(c.Args()) == 0 {
+		logrus.Fatal("Will not remove all services without --force")
 	}
-	err = p.Delete(c.Args()...)
+	err := p.Delete(c.Args()...)
 	if err != nil {
 		logrus.Fatal(err)
 	}

docker/container.go

@@ -230,21 +230,6 @@ func (c *Container) Delete() error {
 	return nil
 }
 
-// IsRunning returns the running state of the container.
-func (c *Container) IsRunning() (bool, error) {
-	container, err := c.findExisting()
-	if err != nil || container == nil {
-		return false, err
-	}
-
-	info, err := c.client.ContainerInspect(container.ID)
-	if err != nil {
-		return false, err
-	}
-
-	return info.State.Running, nil
-}
-
 // Up creates and start the container based on the image name and send an event
 // to notify the container has been created. If the container exists but is stopped
 // it tries to start it.

integration/rm_test.go

@@ -15,53 +15,17 @@ func (s *RunSuite) TestDelete(c *C) {
 	c.Assert(cn, NotNil)
 	c.Assert(cn.State.Running, Equals, true)
 
-	s.FromText(c, p, "stop", SimpleTemplate)
-	s.FromText(c, p, "rm", "--force", SimpleTemplate)
+	s.FromText(c, p, "rm", "--force", `
+        hello:
+          image: busybox
+          stdin_open: true
+          tty: true
+        `)
 
 	cn = s.GetContainerByName(c, name)
 	c.Assert(cn, IsNil)
 }
 
-func (s *RunSuite) TestDeleteOnlyRemovesStopped(c *C) {
-	projectTemplate := `
-hello:
-  image: busybox
-  stdin_open: true
-  tty: true
-bye:
-  image: busybox
-  stdin_open: true
-  tty: true
-`
-
-	p := s.ProjectFromText(c, "up", projectTemplate)
-
-	helloName := fmt.Sprintf("%s_%s_1", p, "hello")
-	byeName := fmt.Sprintf("%s_%s_1", p, "bye")
-
-	helloContainer := s.GetContainerByName(c, helloName)
-	c.Assert(helloContainer, NotNil)
-	c.Assert(helloContainer.State.Running, Equals, true)
-
-	byeContainer := s.GetContainerByName(c, byeName)
-	c.Assert(byeContainer, NotNil)
-	c.Assert(byeContainer.State.Running, Equals, true)
-
-	s.FromText(c, p, "stop", "bye", projectTemplate)
-
-	byeContainer = s.GetContainerByName(c, byeName)
-	c.Assert(byeContainer, NotNil)
-	c.Assert(byeContainer.State.Running, Equals, false)
-
-	s.FromText(c, p, "rm", "--force", projectTemplate)
-
-	byeContainer = s.GetContainerByName(c, byeName)
-	c.Assert(byeContainer, IsNil)
-
-	helloContainer = s.GetContainerByName(c, helloName)
-	c.Assert(helloContainer, NotNil)
-}
-
 func (s *RunSuite) TestDeleteWithVol(c *C) {
 	p := s.ProjectFromText(c, "up", SimpleTemplate)
 
@@ -71,8 +35,12 @@ func (s *RunSuite) TestDeleteWithVol(c *C) {
 	c.Assert(cn, NotNil)
 	c.Assert(cn.State.Running, Equals, true)
 
-	s.FromText(c, p, "stop", SimpleTemplate)
-	s.FromText(c, p, "rm", "--force", "-v", SimpleTemplate)
+	s.FromText(c, p, "rm", "--force", "-v", `
+	hello:
+	  image: busybox
+	  stdin_open: true
+	  tty: true
+	`)
 
 	cn = s.GetContainerByName(c, name)
 	c.Assert(cn, IsNil)

project/project.go

@@ -239,39 +239,6 @@ func (p *Project) Pull(services ...string) error {
 	}), nil)
 }
 
-// ListStoppedContainers lists the stopped containers for the specified services.
-func (p *Project) ListStoppedContainers(services ...string) ([]string, error) {
-	stoppedContainers := []string{}
-	err := p.forEach(services, wrapperAction(func(wrapper *serviceWrapper, wrappers map[string]*serviceWrapper) {
-		wrapper.Do(nil, EventServiceDeleteStart, EventServiceDelete, func(service Service) error {
-			containers, innerErr := service.Containers()
-			if innerErr != nil {
-				return innerErr
-			}
-
-			for _, container := range containers {
-				running, innerErr := container.IsRunning()
-				if innerErr != nil {
-					log.Error(innerErr)
-				}
-				if !running {
-					containerID, innerErr := container.ID()
-					if innerErr != nil {
-						log.Error(innerErr)
-					}
-					stoppedContainers = append(stoppedContainers, containerID)
-				}
-			}
-
-			return nil
-		})
-	}), nil)
-	if err != nil {
-		return nil, err
-	}
-	return stoppedContainers, nil
-}
-
 // Delete removes the specified services (like docker rm).
 func (p *Project) Delete(services ...string) error {
 	return p.perform(EventProjectDeleteStart, EventProjectDeleteDone, services, wrapperAction(func(wrapper *serviceWrapper, wrappers map[string]*serviceWrapper) {

project/types.go

@@ -268,7 +268,6 @@ type Container interface {
 	ID() (string, error)
 	Name() string
 	Port(port string) (string, error)
-	IsRunning() (bool, error)
 }
 
 // ServiceFactory is an interface factory to create Service object for the specified