Closes puphpet#1227; Squashed commit of the following:

commit 3497213
Author: Juan Treminio <[email protected]>
Date:   Mon Dec 1 20:20:00 2014 -0600

    Removes reference to ManifestController; puphpet#1227

commit 22eb32c
Author: Juan Treminio <[email protected]>
Date:   Mon Dec 1 20:19:39 2014 -0600

    Moves Vagrantfile* up one level and removes extension slug; puphpet#1227

commit 4880dda
Author: Juan Treminio <[email protected]>
Date:   Mon Dec 1 18:46:52 2014 -0600

    Moves form templates up one level; Renamed Vagrantfile* templates Vagrantfile; puphpet#1227

commit ffa8460
Merge: 9c2be43 10ba171
Author: Juan Treminio <[email protected]>
Date:   Mon Dec 1 17:18:18 2014 -0600

    Merge branch 'master' into 1227-simplify

commit 9c2be43
Author: Juan Treminio <[email protected]>
Date:   Mon Dec 1 17:09:56 2014 -0600

    Removes references to manifest controller from services and routes; puphpet#1227

commit 6086309
Author: Juan Treminio <[email protected]>
Date:   Sun Nov 30 15:09:11 2014 -0600

    Removes .librarian and .tmp after running librarian; puphpet#1227

commit 2d1d5f5
Author: Juan Treminio <[email protected]>
Date:   Sun Nov 30 15:08:42 2014 -0600

    Ignores .tmp from librarian; puphpet#1227

commit 0b9d8b7
Author: Juan Treminio <[email protected]>
Date:   Sun Nov 30 14:29:04 2014 -0600

    Move all Puppet files into archive folder; puphpet#1227

commit 4214ccb
Merge: d5f8f39 b56dffd
Author: Juan Treminio <[email protected]>
Date:   Sun Nov 30 12:02:42 2014 -0600

    Merge branch 'master' into 1227-simplify

commit d5f8f39
Author: Juan Treminio <[email protected]>
Date:   Sun Nov 30 01:52:32 2014 -0600

    Replaces all method in Configure classes with array; puphpet#1227

commit ff37eb6
Author: Juan Treminio <[email protected]>
Date:   Sun Nov 30 00:44:34 2014 -0600

    Removes getSources() functionality

    Reads Puppetfile in project root and dumps contents into
    zip file's Puppetfile;

    Previous functionality was not taking into account versioning,
    and this solution is much cleaner and simpler to keep track of. puphpet#1227

Author: jtreminio

.gitignore

@@ -8,7 +8,8 @@
 /bin/*
 !/bin/librarian
 /composer.phar
-/Puppetfile.lock
-/.librarian
 /.tmp
-/modules
+/archive/puphpet/puppet/Puppetfile.lock
+/archive/puphpet/puppet/.librarian
+/archive/puphpet/puppet/.tmp
+/archive/puphpet/puppet/modules

src/Puphpet/MainBundle/Resources/views/manifest/puphpet/.gitattributes renamed to archive/.gitattributes

@@ -4,12 +4,14 @@ set -e
 
 __DIR__="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-BASE_DIR="${__DIR__}/../"
+BASE_DIR="${__DIR__}/../archive/puphpet/puppet"
 CWD=`pwd`
 
 cd `realpath $BASE_DIR`
 
 librarian-puppet install --clean
+rm -rf .librarian
+rm -rf .tmp
 
 rm -rf modules/git
 git clone https://github.com/puphpet/puppetlabs-git.git modules/git

src/Puphpet/MainBundle/Resources/views/manifest/Vagrantfile renamed to archive/Vagrantfile

@@ -4,35 +4,13 @@
 
 use Puphpet\MainBundle\Extension;
 
-use Symfony\Component\DependencyInjection\ContainerInterface as Container;
-
 class Configure extends Extension\ExtensionAbstract
 {
-    protected $name = 'Apache';
-    protected $slug = 'apache';
-    protected $targetFile = 'puphpet/puppet/nodes/apache.pp';
+    const DIR = __DIR__;
 
-    protected $sources = [
-        'apache' => ":git => 'https://github.com/puphpet/puppetlabs-apache.git'",
+    protected $conf = [
+        'name'            => 'Apache',
+        'slug'            => 'apache',
+        'frontController' => 'puphpet.extension.apache.front_controller',
     ];
-
-    /**
-     * @param Container $container
-     */
-    public function __construct(Container $container)
-    {
-        $this->dataLocation = __DIR__ . '/Resources/config';
-
-        parent::__construct($container);
-    }
-
-    public function getFrontController()
-    {
-        return $this->container->get('puphpet.extension.apache.front_controller');
-    }
-
-    public function getManifestController()
-    {
-        return $this->container->get('puphpet.extension.apache.manifest_controller');
-    }
 }

src/Puphpet/MainBundle/Resources/views/manifest/puphpet/config.yaml renamed to archive/puphpet/config.yaml

@@ -10,14 +10,14 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionApacheBundle:form:Apache.html.twig', [
+        return $this->render('PuphpetExtensionApacheBundle::form.html.twig', [
             'apache' => $data,
         ]);
     }
 
     public function vhostAction()
     {
-        return $this->render('PuphpetExtensionApacheBundle:form/sections:vhost.html.twig', [
+        return $this->render('PuphpetExtensionApacheBundle:sections:vhost.html.twig', [
             'vhost'             => $this->getData()['empty_vhost'],
             'available_engines' => $this->getData()['available_engines'],
         ]);

src/Puphpet/MainBundle/Resources/views/manifest/puphpet/files/dot/.bash_aliases renamed to archive/puphpet/files/dot/.bash_aliases

@@ -5,7 +5,3 @@ puphpet.extension.apache.homepage:
 puphpet.extension.apache.vhost:
     pattern:  /vhost
     defaults: { _controller: PuphpetExtensionApacheBundle:Front:vhost }
-
-puphpet.extension.apache.manifest:
-    pattern:  /manifest
-    defaults: { _controller: PuphpetExtensionApacheBundle:Manifest:index }

src/Puphpet/MainBundle/Resources/views/manifest/puphpet/files/dot/.bash_git renamed to archive/puphpet/files/dot/.bash_git

@@ -10,8 +10,3 @@ services:
         class: Puphpet\Extension\ApacheBundle\Controller\FrontController
         calls:
             - [ setContainer, [@service_container] ]
-
-    puphpet.extension.apache.manifest_controller:
-        class: Puphpet\Extension\ApacheBundle\Controller\ManifestController
-        calls:
-            - [ setContainer, [@service_container] ]

src/Puphpet/MainBundle/Resources/views/manifest/puphpet/files/dot/.vimrc renamed to archive/puphpet/files/dot/.vimrc

@@ -54,7 +54,7 @@
                 </div>
 
                 {% for vhost in apache.vhosts %}
-                    {% include 'PuphpetExtensionApacheBundle:form/sections:vhost.html.twig' with {'vhost': vhost, 'available_engines': apache.available_engines} %}
+                    {% include 'PuphpetExtensionApacheBundle:sections:vhost.html.twig' with {'vhost': vhost, 'available_engines': apache.available_engines} %}
                 {% endfor %}
 
                 <div class="row">

src/Puphpet/MainBundle/Resources/views/manifest/puphpet/files/dot/ssh/insecure_private_key renamed to archive/puphpet/files/dot/ssh/insecure_private_key

@@ -4,35 +4,13 @@
 
 use Puphpet\MainBundle\Extension;
 
-use Symfony\Component\DependencyInjection\ContainerInterface as Container;
-
 class Configure extends Extension\ExtensionAbstract
 {
-    protected $name = 'Beanstalkd';
-    protected $slug = 'beanstalkd';
-    protected $targetFile = 'puphpet/puppet/nodes/beanstalkd.pp';
+    const DIR = __DIR__;
 
-    protected $sources = [
-        'beanstalkd' => ":git => 'https://github.com/puphpet/puppet-beanstalkd.git'",
+    protected $conf = [
+        'name'            => 'Beanstalkd',
+        'slug'            => 'beanstalkd',
+        'frontController' => 'puphpet.extension.beanstalkd.front_controller',
     ];
-
-    /**
-     * @param Container $container
-     */
-    public function __construct(Container $container)
-    {
-        $this->dataLocation = __DIR__ . '/Resources/config';
-
-        parent::__construct($container);
-    }
-
-    public function getFrontController()
-    {
-        return $this->container->get('puphpet.extension.beanstalkd.front_controller');
-    }
-
-    public function getManifestController()
-    {
-        return $this->container->get('puphpet.extension.beanstalkd.manifest_controller');
-    }
 }

src/Puphpet/MainBundle/Resources/views/manifest/puphpet/files/exec-always/empty renamed to archive/puphpet/files/exec-always/empty

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionBeanstalkdBundle:form:Beanstalkd.html.twig', [
+        return $this->render('PuphpetExtensionBeanstalkdBundle::form.html.twig', [
             'beanstalkd' => $data,
         ]);
     }

src/Puphpet/MainBundle/Resources/views/manifest/puphpet/files/exec-once/empty renamed to archive/puphpet/files/exec-once/empty

@@ -1,7 +1,3 @@
 puphpet.extension.beanstalkd.homepage:
     pattern:  /
     defaults: { _controller: PuphpetExtensionBeanstalkdBundle:Front:index }
-
-puphpet.extension.beanstalkd.manifest:
-    pattern:  /manifest
-    defaults: { _controller: PuphpetExtensionBeanstalkdBundle:Manifest:index }

src/Puphpet/MainBundle/Resources/views/manifest/puphpet/files/startup-always/empty renamed to archive/puphpet/files/startup-always/empty

@@ -10,8 +10,3 @@ services:
         class: Puphpet\Extension\BeanstalkdBundle\Controller\FrontController
         calls:
             - [ setContainer, [@service_container] ]
-
-    puphpet.extension.beanstalkd.manifest_controller:
-        class: Puphpet\Extension\BeanstalkdBundle\Controller\ManifestController
-        calls:
-            - [ setContainer, [@service_container] ]

src/Puphpet/MainBundle/Resources/views/manifest/puphpet/files/startup-once/empty renamed to archive/puphpet/files/startup-once/empty

@@ -4,39 +4,13 @@
 
 use Puphpet\MainBundle\Extension;
 
-use Symfony\Component\DependencyInjection\ContainerInterface as Container;
-
 class Configure extends Extension\ExtensionAbstract
 {
-    protected $name = 'Drush';
-    protected $slug = 'drush';
-    protected $targetFile = 'puphpet/puppet/nodes/drush.pp';
+    const DIR = __DIR__;
 
-    protected $sources = [
-        'drush'    => ":git => 'https://github.com/puphpet/puppet-drush.git'",
-        'php'      => ":git => 'https://github.com/puphpet/puppet-php.git'",
-        'composer' => ":git => 'https://github.com/puphpet/puppet-composer.git'",
-        'puphpet'  => ":git => 'https://github.com/puphpet/puppet-puphpet.git'",
-        'puppi'    => ":git => 'https://github.com/puphpet/puppi.git'",
+    protected $conf = [
+        'name'            => 'Drush',
+        'slug'            => 'drush',
+        'frontController' => 'puphpet.extension.drush.front_controller',
     ];
-
-    /**
-     * @param Container $container
-     */
-    public function __construct(Container $container)
-    {
-        $this->dataLocation = __DIR__ . '/Resources/config';
-
-        parent::__construct($container);
-    }
-
-    public function getFrontController()
-    {
-        return $this->container->get('puphpet.extension.drush.front_controller');
-    }
-
-    public function getManifestController()
-    {
-        return $this->container->get('puphpet.extension.drush.manifest_controller');
-    }
 }

Puppetfile renamed to archive/puphpet/puppet/Puppetfile

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionDrushBundle:form:Drush.html.twig', [
+        return $this->render('PuphpetExtensionDrushBundle::form.html.twig', [
             'drush' => $data,
         ]);
     }

src/Puphpet/MainBundle/Resources/views/manifest/puphpet/puppet/hiera.yaml renamed to archive/puphpet/puppet/hiera.yaml

@@ -1,7 +1,3 @@
 puphpet.extension.drush.homepage:
     pattern:  /
     defaults: { _controller: PuphpetExtensionDrushBundle:Front:index }
-
-puphpet.extension.drush.manifest:
-    pattern:  /manifest
-    defaults: { _controller: PuphpetExtensionDrushBundle:Manifest:index }

src/Puphpet/Extension/ApacheBundle/Resources/views/manifest/Apache.pp.twig renamed to archive/puphpet/puppet/nodes/Apache.pp

@@ -10,8 +10,3 @@ services:
         class: Puphpet\Extension\DrushBundle\Controller\FrontController
         calls:
             - [ setContainer, [@service_container] ]
-
-    puphpet.extension.drush.manifest_controller:
-        class: Puphpet\Extension\DrushBundle\Controller\ManifestController
-        calls:
-            - [ setContainer, [@service_container] ]

src/Puphpet/Extension/BeanstalkdBundle/Resources/views/manifest/Beanstalkd.pp.twig renamed to archive/puphpet/puppet/nodes/Beanstalkd.pp

@@ -4,35 +4,13 @@
 
 use Puphpet\MainBundle\Extension;
 
-use Symfony\Component\DependencyInjection\ContainerInterface as Container;
-
 class Configure extends Extension\ExtensionAbstract
 {
-    protected $name = 'Elastic Search';
-    protected $slug = 'elastic_search';
-    protected $targetFile = 'puphpet/puppet/nodes/elasticsearch.pp';
+    const DIR = __DIR__;
 
-    protected $sources = [
-        'elasticsearch' => ":git => 'https://github.com/puphpet/puppet-elasticsearch.git'"
+    protected $conf = [
+        'name'            => 'Elastic Search',
+        'slug'            => 'elastic_search',
+        'frontController' => 'puphpet.extension.elastic_search.front_controller',
     ];
-
-    /**
-     * @param Container $container
-     */
-    public function __construct(Container $container)
-    {
-        $this->dataLocation = __DIR__ . '/Resources/config';
-
-        parent::__construct($container);
-    }
-
-    public function getFrontController()
-    {
-        return $this->container->get('puphpet.extension.elastic_search.front_controller');
-    }
-
-    public function getManifestController()
-    {
-        return $this->container->get('puphpet.extension.elastic_search.manifest_controller');
-    }
 }

src/Puphpet/Extension/DrushBundle/Resources/views/manifest/Drush.pp.twig renamed to archive/puphpet/puppet/nodes/Drush.pp

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionElasticSearchBundle:form:ElasticSearch.html.twig', [
+        return $this->render('PuphpetExtensionElasticSearchBundle::form.html.twig', [
             'elastic_search' => $data,
         ]);
     }

src/Puphpet/Extension/ElasticSearchBundle/Resources/views/manifest/ElasticSearch.pp.twig renamed to archive/puphpet/puppet/nodes/ElasticSearch.pp

@@ -1,7 +1,3 @@
 puphpet.extension.elastic_search.homepage:
     pattern:  /
     defaults: { _controller: PuphpetExtensionElasticSearchBundle:Front:index }
-
-puphpet.extension.elastic_search.manifest:
-    pattern:  /manifest
-    defaults: { _controller: PuphpetExtensionElasticSearchBundle:Manifest:index }

src/Puphpet/Extension/FirewallBundle/Resources/views/manifest/Firewall.pp.twig renamed to archive/puphpet/puppet/nodes/Firewall.pp

@@ -10,8 +10,3 @@ services:
         class: Puphpet\Extension\ElasticSearchBundle\Controller\FrontController
         calls:
             - [ setContainer, [@service_container] ]
-
-    puphpet.extension.elastic_search.manifest_controller:
-        class: Puphpet\Extension\ElasticSearchBundle\Controller\ManifestController
-        calls:
-            - [ setContainer, [@service_container] ]