From 44bedfe7c6b943da559e1b8f06bc7a52c880f3e5 Mon Sep 17 00:00:00 2001
From: Fabio Rehm <fgrehm@gmail.com>
Date: Mon, 8 Jul 2013 10:40:12 -0300
Subject: [PATCH] Get rid of v3 namespaces for building boxes

---
 tasks/boxes.rake | 84 +++++++++++++++++++++++-------------------------
 1 file changed, 41 insertions(+), 43 deletions(-)

diff --git a/tasks/boxes.rake b/tasks/boxes.rake
index b5002f9..2b4e030 100644
--- a/tasks/boxes.rake
+++ b/tasks/boxes.rake
@@ -58,53 +58,51 @@ puppet   = ENV['PUPPET']   == '1'
 babushka = ENV['BABUSHKA'] == '1'
 
 namespace :boxes do
-  namespace :v3 do
-    namespace :ubuntu do
-      namespace :build do
+  namespace :ubuntu do
+    namespace :build do
 
-        desc 'Build an Ubuntu Precise 64 bits box'
-        BuildUbuntuBoxTaskV3.
-          new(:precise64,
-              :precise, 'amd64', puppet: puppet, babushka: babushka)
+      desc 'Build an Ubuntu Precise 64 bits box'
+      BuildUbuntuBoxTaskV3.
+        new(:precise64,
+            :precise, 'amd64', puppet: puppet, babushka: babushka)
 
-        desc 'Build an Ubuntu Quantal 64 bits box'
-        BuildUbuntuBoxTaskV3.
-          new(:quantal64,
-              :quantal, 'amd64', puppet: puppet, babushka: babushka)
+      desc 'Build an Ubuntu Quantal 64 bits box'
+      BuildUbuntuBoxTaskV3.
+        new(:quantal64,
+            :quantal, 'amd64', puppet: puppet, babushka: babushka)
 
-        desc 'Build an Ubuntu Raring 64 bits box'
-        BuildUbuntuBoxTaskV3.
-          new(:raring64,
-              :raring, 'amd64', puppet: puppet, babushka: babushka)
+      desc 'Build an Ubuntu Raring 64 bits box'
+      BuildUbuntuBoxTaskV3.
+        new(:raring64,
+            :raring, 'amd64', puppet: puppet, babushka: babushka)
 
-        desc 'Build all Ubuntu boxes'
-        task :all => %w( precise64 quantal64 raring64 )
-      end
+      desc 'Build all Ubuntu boxes'
+      task :all => %w( precise64 quantal64 raring64 )
     end
-
-    namespace :debian do
-      namespace :build do
-        desc 'Build an Debian Squeeze 64 bits box'
-        BuildDebianBoxTaskV3.
-          new(:squeeze64,
-              :squeeze, 'amd64', puppet: puppet, babushka: babushka)
-
-        desc 'Build an Debian Wheezy 64 bits box'
-        BuildDebianBoxTaskV3.
-          new(:wheezy64,
-              :wheezy, 'amd64', puppet: puppet, babushka: babushka)
-
-        desc 'Build an Debian Sid/unstable 64 bits box'
-        BuildDebianBoxTaskV3.
-          new(:sid64,
-              :sid, 'amd64', puppet: puppet, babushka: babushka)
-
-        desc 'Build all Debian boxes'
-        task :all => %w( squeeze64 wheezy64 sid64 )
-      end
-    end
-
-    desc 'Build all base boxes for release'
-    task :build_all => %w( ubuntu:build:all debian:build:all )
   end
+
+  namespace :debian do
+    namespace :build do
+      desc 'Build an Debian Squeeze 64 bits box'
+      BuildDebianBoxTaskV3.
+        new(:squeeze64,
+            :squeeze, 'amd64', puppet: puppet, babushka: babushka)
+
+      desc 'Build an Debian Wheezy 64 bits box'
+      BuildDebianBoxTaskV3.
+        new(:wheezy64,
+            :wheezy, 'amd64', puppet: puppet, babushka: babushka)
+
+      desc 'Build an Debian Sid/unstable 64 bits box'
+      BuildDebianBoxTaskV3.
+        new(:sid64,
+            :sid, 'amd64', puppet: puppet, babushka: babushka)
+
+      desc 'Build all Debian boxes'
+      task :all => %w( squeeze64 wheezy64 sid64 )
+    end
+  end
+
+  desc 'Build all base boxes for release'
+  task :build_all => %w( ubuntu:build:all debian:build:all )
 end