Bury: correct implementantion

Author: mcuadros

cli/bury.go

@@ -27,7 +27,7 @@ func (c *BuryCommand) Execute(args []string) error {
 }
 
 func (c *BuryCommand) Bury() error {
-	if err := c.calcNumIfNeeded(); err != nil {
+	if err := c.calcNum(); err != nil {
 		return err
 	}
 
@@ -36,12 +36,12 @@ func (c *BuryCommand) Bury() error {
 		return nil
 	}
 
-	fmt.Printf("Trying to bury %d jobs from %q...\n", c.Num, c.Tube)
+	fmt.Printf("Trying to bury %d jobs from %q ...\n", c.Num, c.Tube)
 
 	count := 0
 	ts := beanstalk.NewTubeSet(c.conn, c.Tube)
 	for count < c.Num {
-		id, _, err := ts.Reserve(time.Hour * 24)
+		id, _, err := ts.Reserve(time.Second)
 		if err != nil {
 			return err
 		}
@@ -59,22 +59,23 @@ func (c *BuryCommand) Bury() error {
 		if err := c.conn.Bury(id, uint32(pri)); err != nil {
 			return err
 		}
-		fmt.Println(pri)
+
 		count++
 	}
 
 	fmt.Printf("Actually buried %d.\n", count)
 	return nil
 }
 
-func (c *BuryCommand) calcNumIfNeeded() error {
-	if c.Num == 0 {
-		s, err := c.GetStatsForTube(c.Tube)
-		if err != nil {
-			return err
-		}
+func (c *BuryCommand) calcNum() error {
+	s, err := c.GetStatsForTube(c.Tube)
+	if err != nil {
+		return err
+	}
 
+	if c.Num == 0 || c.Num > s.JobsReady {
 		c.Num = s.JobsReady
+		return nil
 	}
 
 	return nil

cli/kick.go

@@ -34,7 +34,7 @@ func (c *KickCommand) Kick() error {
 		return nil
 	}
 
-	fmt.Printf("Trying to kick %d jobs from %q...\n", c.Num, c.Tube)
+	fmt.Printf("Trying to kick %d jobs from %q ...\n", c.Num, c.Tube)
 
 	t := &beanstalk.Tube{c.conn, c.Tube}
 	kicked, err := t.Kick(c.Num)