Merge branch 'release/v1.3.2'

meanbee · Nov 3, 2015 · aaeb9d1 · aaeb9d1
2 parents c58d8fe + b19c276
commit aaeb9d1
Show file tree

Hide file tree

Showing 9 changed files with 153 additions and 82 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Working on Magento client sites typically requires a fresh copy of the productio
 Download the phar.
 
 ```
-wget https://github.com/meanbee/magedbm/releases/download/v.1.3.0/magedbm.phar
+wget https://s3-eu-west-1.amazonaws.com/magedbm-releases/magedbm.phar
 ```
 
 Make sure it's executable

diff --git a/src/Meanbee/Magedbm/Application.php b/src/Meanbee/Magedbm/Application.php
@@ -7,14 +7,16 @@
 use Meanbee\Magedbm\Command\ListCommand;
 use Meanbee\Magedbm\Command\PutCommand;
 
-class Application extends \Symfony\Component\Console\Application {
+class Application extends \Symfony\Component\Console\Application
+{
 
     const APP_NAME = "Magedbm";
     const APP_VERSION = "1.0.0";
 
     protected $autoloader;
 
-    public function __construct($autoloader = null) {
+    public function __construct($autoloader = null)
+    {
         parent::__construct(self::APP_NAME, self::APP_VERSION);
 
         if ($autoloader !== null) {
@@ -28,11 +30,13 @@ public function __construct($autoloader = null) {
         $this->add(new PutCommand());
     }
 
-    public function getAutoloader() {
+    public function getAutoloader()
+    {
         return $this->autoloader;
     }
 
-    public function setAutoloader($autoloader) {
+    public function setAutoloader($autoloader)
+    {
         $this->autoloader = $autoloader;
 
         return $this;

diff --git a/src/Meanbee/Magedbm/Command/BaseCommand.php b/src/Meanbee/Magedbm/Command/BaseCommand.php
@@ -9,14 +9,15 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class BaseCommand extends Command {
+class BaseCommand extends Command
+{
 
-    const AWS_DIR_PATH          = '/.aws';
-    const AWS_CREDENTIALS_PATH  = '/.aws/credentials';
-    const AWS_CONFIG_PATH       = '/.aws/config';
-    const APP_DIR_PATH          = '/.magedbm';
-    const APP_CONFIG_PATH       = '/.magedbm/config';
-    const TMP_PATH              = '/tmp/magedbm';
+    const AWS_DIR_PATH = '/.aws';
+    const AWS_CREDENTIALS_PATH = '/.aws/credentials';
+    const AWS_CONFIG_PATH = '/.aws/config';
+    const APP_DIR_PATH = '/.magedbm';
+    const APP_CONFIG_PATH = '/.magedbm/config';
+    const TMP_PATH = '/tmp/magedbm';
 
     /** @var InputInterface $input */
     protected $input;
@@ -38,7 +39,8 @@ class BaseCommand extends Command {
      *
      * @return $this
      */
-    public function setInput(InputInterface $input) {
+    public function setInput(InputInterface $input)
+    {
         $this->input = $input;
 
         return $this;
@@ -49,7 +51,8 @@ public function setInput(InputInterface $input) {
      *
      * @return InputInterface
      */
-    public function getInput() {
+    public function getInput()
+    {
         return $this->input;
     }
 
@@ -60,7 +63,8 @@ public function getInput() {
      *
      * @return $this
      */
-    public function setOutput(OutputInterface $output) {
+    public function setOutput(OutputInterface $output)
+    {
         $this->output = $output;
 
         return $this;
@@ -71,7 +75,8 @@ public function setOutput(OutputInterface $output) {
      *
      * @return OutputInterface
      */
-    public function getOutput() {
+    public function getOutput()
+    {
         return $this->output;
     }
 
@@ -114,7 +119,7 @@ public function getS3Client($region = null)
             try {
                 // Upload to S3.
                 $this->s3Client = S3Client::factory(array(
-                    'region'  => $region
+                    'region' => $region
                 ));
             } catch (CredentialsException $e) {
                 $this->getOutput()->writeln('<error>AWS credentials failed</error>');
@@ -137,7 +142,7 @@ public function getConfig(InputInterface $input)
                 $config = $iniReader->readFile($this->getAppConfigPath());
                 $this->config = $config['default'];
 
-                foreach($input->getOptions() as $option => $value) {
+                foreach ($input->getOptions() as $option => $value) {
                     if ($value) {
                         $this->config[$option] = $value;
                     }
@@ -152,10 +157,11 @@ public function getConfig(InputInterface $input)
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function initialize(InputInterface $input, OutputInterface $output) {
+    protected function initialize(InputInterface $input, OutputInterface $output)
+    {
         parent::initialize($input, $output);
 
         $this->setInput($input);
@@ -201,7 +207,8 @@ protected function getAwsConfigPath()
     /**
      * Check for AWS Credentials
      */
-    protected function validateConfiguration() {
+    protected function validateConfiguration()
+    {
         if ($this instanceof ConfigureCommand) {
             return true;
         }

diff --git a/src/Meanbee/Magedbm/Command/ConfigureCommand.php b/src/Meanbee/Magedbm/Command/ConfigureCommand.php
@@ -54,7 +54,7 @@ protected function configure()
     /**
      * Execute the command.
      *
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      *
      * @throws \Exception
@@ -73,7 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             mkdir($this->getAwsDirPath());
         }
 
-        if(!is_writeable($this->getAwsDirPath())) {
+        if (!is_writeable($this->getAwsDirPath())) {
             $this->getOutput()->writeln('<error>Unable to write AWS credentials.  Please manually add to ~/.aws/credentials');
             exit;
         }
@@ -90,7 +90,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if ($input->getOption('key') && $input->getOption('secret')) {
             $credentials = array(
                 'default' => array(
-                    'aws_access_key_id'     => $input->getOption('key'),
+                    'aws_access_key_id' => $input->getOption('key'),
                     'aws_secret_access_key' => $input->getOption('secret')
                 )
             );
@@ -136,8 +136,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
     public function isConfigured()
     {
         if (file_exists($this->getAwsCredentialsPath()) && file_exists($this->getAwsConfigPath()) &&
-            file_exists($this->getAppConfigPath())) {
-                return true;
+            file_exists($this->getAppConfigPath())
+        ) {
+            return true;
         }
 
         return false;

diff --git a/src/Meanbee/Magedbm/Command/DeleteCommand.php b/src/Meanbee/Magedbm/Command/DeleteCommand.php
@@ -46,7 +46,7 @@ protected function configure()
     /**
      * Execute the command.
      *
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      *
      * @throws \Exception

diff --git a/src/Meanbee/Magedbm/Command/GetCommand.php b/src/Meanbee/Magedbm/Command/GetCommand.php
@@ -63,7 +63,7 @@ protected function configure()
     /**
      * Execute the command.
      *
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      *
      * @throws \Exception
@@ -78,7 +78,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output,
                 '<question>Are you sure you wish to overwrite local database [y/n]?</question>',
                 false
-            )) {
+            )
+            ) {
                 return;
             }
         }
@@ -151,7 +152,7 @@ protected function downloadBackup($file, $s3, $config, $input)
         try {
             $s3->getObject(array(
                 'Bucket' => $config['bucket'],
-                'Key'    => $input->getArgument('name') . '/' . $file,
+                'Key' => $input->getArgument('name') . '/' . $file,
                 'SaveAs' => $this->getFilePath($file)
             ));
         } catch (NoSuchKeyException $e) {
@@ -183,8 +184,8 @@ protected function backupImport($file, $input)
         }
 
         $params = array(
-            'filename'       => $this->getFilePath($file),
-            '--compression'  => 'gzip',
+            'filename' => $this->getFilePath($file),
+            '--compression' => 'gzip',
         );
 
         if ($input->getOption('drop-tables')) {

diff --git a/src/Meanbee/Magedbm/Command/ListCommand.php b/src/Meanbee/Magedbm/Command/ListCommand.php
@@ -42,7 +42,7 @@ protected function configure()
     /**
      * Execute the command.
      *
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      *
      * @throws \Exception
@@ -61,7 +61,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             foreach ($results as $item) {
                 $itemKeyChunks = explode('/', $item['Key']);
-                $this->getOutput()->writeln(sprintf('%s %dMB', array_pop($itemKeyChunks) , $item['Size'] / 1024 / 1024));
+                $this->getOutput()->writeln(sprintf('%s %dMB', array_pop($itemKeyChunks), $item['Size'] / 1024 / 1024));
             }
 
             if (!$results->count()) {