Merge branch 'add-testing-env'

BrazilianFriendsOfSymfony · Jul 6, 2014 · 787e08b · 787e08b
2 parents e063a46 + 1ab611f
commit 787e08b
Show file tree

Hide file tree

Showing 16 changed files with 181 additions and 58 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+composer.lock
+phpunit.xml
+vendor
+log
+Tests/App/cache
+Tests/App/logs
+
+.idea
diff --git a/Command/DeployCommand.php b/Command/DeployCommand.php
@@ -11,6 +11,7 @@
 
 namespace BFOS\SyncContentBundle\Command;
 
+use BFOS\SyncContentBundle\Server\ServerRegister;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -57,32 +58,28 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $servername = $input->getArgument('server');
 
         /**
-         * @var \BFOS\SyncContentBundle\Manager $manager
+         * @var ServerRegister $register
          */
-        $manager = $this->getContainer()->get('bfos_sync_content.manager');
-
-        $server = $manager->getServer($servername);
-
-
-        $this->synchronize_content($server, $manager, $output);
+        $register = $this->getContainer()->get('bfos_sync_content.server_register');
 
+        $server = $register->getServer($servername);
 
+        $this->synchronize_content($server, $register, $output);
 
         $output->writeln('Synchronization was successful.');
         return true;
 
     }
 
 
-    protected function synchronize_content(Server $server, $manager, OutputInterface $output){
+    protected function synchronize_content(Server $server, ServerRegister $register, OutputInterface $output){
 
         // Synchronize files
 
-        $pathLocal = '.';
         $pathRemote = $server->getUser() . '@' . $server->getHost() . ':' . $server->getDir();
         $port = $server->getPort();
 
-        $options = $manager->getOptions();
+        $options = $register->getOptions();
 
         $output->writeln('Deploying app...');
         $results = array();

diff --git a/Command/ShowServerCommand.php b/Command/ShowServerCommand.php
@@ -32,7 +32,7 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $manager   = $this->getContainer()->get('bfos_sync_content.manager');
+        $manager   = $this->getContainer()->get('bfos_sync_content.server_register');
         $server = $input->getArgument('server');
 
         if (null === $server) {

diff --git a/Command/SyncFromCommand.php b/Command/SyncFromCommand.php
@@ -62,7 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         /**
          * @var \BFOS\SyncContentBundle\Manager $manager
          */
-        $manager = $this->getContainer()->get('bfos_sync_content.manager');
+        $manager = $this->getContainer()->get('bfos_sync_content.server_register');
 
         $server = $manager->getServer($servername);
 

diff --git a/Command/SyncToCommand.php b/Command/SyncToCommand.php
@@ -63,7 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         /**
          * @var \BFOS\SyncContentBundle\Manager $manager
          */
-        $manager = $this->getContainer()->get('bfos_sync_content.manager');
+        $manager = $this->getContainer()->get('bfos_sync_content.server_register');
 
         $server = $manager->getServer($servername);
 

diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
diff --git a/DependencyInjection/BFOSSyncContentExtension.php b/DependencyInjection/BFOSSyncContentExtension.php
@@ -25,7 +25,7 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');
 
-        $manager = $container->getDefinition('bfos_sync_content.manager');
+        $manager = $container->getDefinition('bfos_sync_content.server_register');
 
         // Options
         $manager->addMethodCall('setOptions', array($config['options']));

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -6,13 +6,13 @@
 
     <parameters>
         <parameter key="bfos_sync_content.server_loader.class">BFOS\SyncContentBundle\Loader\ServerLoader</parameter>
-        <parameter key="bfos_sync_content.manager.class">BFOS\SyncContentBundle\Manager</parameter>
+        <parameter key="bfos_sync_content.server_register.class">BFOS\SyncContentBundle\Server\ServerRegister</parameter>
     </parameters>
 
     <services>
         <service id="bfos_sync_content.server_loader" class="%bfos_sync_content.server_loader.class%">
         </service>
-        <service id="bfos_sync_content.manager" class="%bfos_sync_content.manager.class%">
+        <service id="bfos_sync_content.server_register" class="%bfos_sync_content.server_register.class%">
             <argument type="service" id="bfos_sync_content.server_loader" />
         </service>
     </services>

diff --git a/Manager.php → Server/ServerRegister.php b/Manager.php → Server/ServerRegister.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BFOS\SyncContentBundle;
+namespace BFOS\SyncContentBundle\Server;
 
 use BFOS\SyncContentBundle\Loader\LoaderInterface;
 use BFOS\SyncContentBundle\Server\Server;
 
-class Manager {
+class ServerRegister {
     /**
      * @var array
      */
@@ -46,7 +46,7 @@ public function loadServers($filename)
      * @param string $name
      * @param Server $server
      *
-     * @return Manager
+     * @return ServerRegister
      */
     public function addServer($name, $server)
     {
@@ -68,7 +68,7 @@ public function addServer($name, $server)
      *
      * @param array $servers
      *
-     * @return Manager
+     * @return ServerRegister
      */
     public function setServers(array $servers)
     {
@@ -84,7 +84,7 @@ public function setServers(array $servers)
      *
      * @param string $name
      *
-     * @return Manager
+     * @return ServerRegister
      */
     public function removeServer($name)
     {

diff --git a/Tests/App/AppKernel.php b/Tests/App/AppKernel.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace BFOS\SyncContentBundle\Tests\App;
+
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Config\Loader\LoaderInterface;
+
+class AppKernel extends Kernel
+{
+    public function registerBundles()
+    {
+        $bundles = array(
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+//            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+//            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+
+            // bundle to test
+            new BFOS\SyncContentBundle\BFOSSyncContentBundle(),
+        );
+
+        return $bundles;
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load(__DIR__.'/config/config.yml');
+    }
+}
diff --git a/Tests/App/config/config.yml b/Tests/App/config/config.yml
@@ -0,0 +1,47 @@
+framework:
+    translator:      { fallback: en }
+    secret:          secret
+#    router:
+#        resource: "%kernel.root_dir%/config/routing.yml"
+#        strict_requirements: %kernel.debug%
+    templating:
+        engines: ['php']
+    default_locale:  en
+    session:         ~
+    test:            ~
+
+bfos_sync_content:
+    options: # Global options
+        deployment:
+            rsync_exclude: "%kernel.root_dir%/config/rsync_exclude.txt"
+            pre_local_commands:
+                - 'php app/console assetic:dump'
+            post_local_commands:
+                - 'rm -rf web/js web/css'
+            #pre_remote_commands:
+            #    - './c'
+            post_remote_commands:
+                - 'php app/console cache:clear --env=prod --no-debug --no-warmup'
+                - 'php app/console doctrine:schema:update --force --env=prod'
+                - 'php app/console assets:install web --symlink'
+        sync_content:
+            content:
+                - "web/uploads"
+#    servers: "%kernel.root_dir%/config/deployment_sync_content.yml"
+#
+    servers:
+        staging:
+            host: staging.mysite.com
+            port: 22
+            user: mysite
+            dir: /home/user/mysite
+            options : # Server options, override the globals
+                rsync_options: '-azC --force --delete --verbose --progress'
+        production:
+            host: www.mysite.com
+            port: 22
+            user: mysite
+            dir: /home/user/mysite
+            options : # Server options, override the globals
+                rsync_options: '-azC --force --delete --verbose --progress'
+
diff --git a/Tests/Controller/DefaultControllerTest.php b/Tests/Controller/DefaultControllerTest.php
diff --git a/Tests/Server/ServerRegisterTest.php b/Tests/Server/ServerRegisterTest.php
@@ -0,0 +1,25 @@
+<?php
+namespace BFOS\SyncContentBundle\Tests\Command;
+
+
+use BFOS\SyncContentBundle\Loader\ServerLoader;
+use BFOS\SyncContentBundle\Server\Server;
+use BFOS\SyncContentBundle\Server\ServerRegister;
+
+class ServerRegisterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testAddServerToServersListSuccessfully()
+    {
+        // create a server register
+        $register = new ServerRegister(new ServerLoader());
+
+        // create a server
+        $server = new Server('www.test.com', 'webtest', '/home/vagrant', '123123');
+
+        // add a server to register
+        $register->addServer('srv1', $server);
+
+        // test the server was added
+        $this->assertEquals(1, count($register->getServers()), 'Server not added.');
+    }
+} 
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -0,0 +1,24 @@
+<?php
+
+$loader = @include __DIR__ . '/../vendor/autoload.php';
+if (!$loader) {
+    die(<<<'EOT'
+You must set up the project dependencies, run the following commands:
+wget http://getcomposer.org/composer.phar
+php composer.phar install
+EOT
+    );
+}
+
+passthru(sprintf('rm -rf %s/App/cache', __DIR__));
+spl_autoload_register(function($class) {
+    if (0 === strpos($class, 'BFOS\\SyncContentBundle\\')) {
+        $path = __DIR__.'/../'.implode('/', array_slice(explode('\\', $class), 2)).'.php';
+        if (!stream_resolve_include_path($path)) {
+            return false;
+        }
+        require_once $path;
+
+        return true;
+    }
+});
diff --git a/composer.json b/composer.json
@@ -17,7 +17,13 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.3.2"
+        "php": ">=5.3.2",
+        "symfony/framework-bundle": ">=2.2",
+        "symfony/finder": ">=2.2.0",
+        "symfony/console": "2.6.*@dev"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "3.7.*"
     },
     "autoload": {
         "psr-0": { "BFOS\\SyncContentBundle": "" }

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
+    <php>
+        <server name="KERNEL_DIR" value="Tests/App" />
+    </php>
+
+    <testsuites>
+        <testsuite name="BFOSSyncContentBundle test suite">
+            <directory suffix="Test.php">./Tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>