Merge pull request #82 from SparkPost/deploy

Update deploy script to check version in constant

Author: rajumsys

.svnignore

@@ -8,3 +8,4 @@ bin
 phpunit.xml.dist
 .travis.yml
 coverage
+.coveralls.yml

admin.widget.class.php

@@ -87,7 +87,7 @@ public function test_email_sending($recipient, $debug = false)
                 $this->render_message('Test email sent successfully', 'updated');
             }
         } else {
-            $this->render_message('Test email could not be sent.  Please check your plugin settings and refer to <a href="https://support.sparkpost.com/customer/en/portal/topics/770787-getting-started/articles" target="_blank">Getting Started</a> in the <a href="https://support.sparkpost.com/" target="_blank">SparkPost Support Center</a>.');
+            $this->render_message('Test email could not be sent.  Please check your plugin settings and refer to <a href="https://support.sparkpost.com/customer/portal/articles/2670627-sparkpost-new-user-guide" target="_blank">Getting Started</a> in the <a href="https://support.sparkpost.com/" target="_blank">SparkPost Support Center</a>.');
         }
     }
 

deploy.sh

@@ -18,11 +18,11 @@ SVNUSER="sparkpost" # your svn username
 
 # Let's begin...
 echo ".........................................."
-echo 
+echo
 echo "Preparing to deploy wordpress plugin"
-echo 
+echo
 echo ".........................................."
-echo 
+echo
 
 # Check if subversion is installed before getting all worked up
 if ! which svn >/dev/null; then
@@ -35,15 +35,20 @@ NEWVERSION1=`grep "^Stable tag:" $GITPATH/readme.txt | awk -F' ' '{print $NF}'`
 echo "readme.txt version: $NEWVERSION1"
 NEWVERSION2=`grep "^Version:" $GITPATH/$MAINFILE | awk -F' ' '{print $NF}'`
 echo "$MAINFILE version: $NEWVERSION2"
+NEWVERSION3=`grep "^define('WPSP_PLUGIN_VERSION', '2.5.0');"  $GITPATH/wordpress-sparkpost.php | awk -F"'" '{print $4}'`
+echo "$MAINFILE version constant : $NEWVERSION3"
 
-if [ "$NEWVERSION1" != "$NEWVERSION2" ]; then echo "Version in readme.txt & $MAINFILE don't match. Exiting...."; exit 1; fi
+if [[ "$NEWVERSION1" != "$NEWVERSION2" || "$NEWVERSION2" != "$NEWVERSION3" ]]; then
+	echo "Version in readme.txt, $MAINFILE (in comment or constant) don't match. Exiting....";
+	exit 1
+fi
 
 echo "Versions match in readme.txt and $MAINFILE. Let's proceed..."
 
 if git show-ref --tags --quiet --verify -- "refs/tags/$NEWVERSION1"
-  then 
-    echo "Version $NEWVERSION1 already exists as git tag. Exiting...."; 
-    exit 1; 
+  then
+    echo "Version $NEWVERSION1 already exists as git tag. Exiting....";
+    exit 1;
   else
     echo "Git version does not exist. Let's proceed..."
 fi
@@ -60,7 +65,7 @@ echo "Pushing latest commit to origin, with tags"
 git push origin master
 git push origin master --tags
 
-echo 
+
 echo "Creating local copy of SVN repo ..."
 if [ -d $SVNPATH ]; then rm -rf $SVNPATH; fi
 svn co $SVNURL $SVNPATH

mailer.smtp.class.php

@@ -22,7 +22,7 @@ public function configure_phpmailer($phpmailer) {
             return;
         }
 
-        $tracking_enabled = (bool) $settings['enable_tracking'];
+        $tracking_enabled = $settings['enable_tracking'];
         $x_msys_api = array(
             'options' => array (
                 'open_tracking' => (bool) apply_filters('wpsp_open_tracking', $tracking_enabled),
@@ -39,7 +39,7 @@ public function configure_phpmailer($phpmailer) {
         $phpmailer->Username = 'SMTP_Injection';
         $phpmailer->Password = apply_filters('wpsp_api_key', $settings['password']);
 
-        $json_x_msys_api = apply_filters('wpsp_smtp_msys_api', json_encode($x_msys_api));
-        $phpmailer->addCustomHeader('X-MSYS-API', $json_x_msys_api);
+        $json_x_msys_api = apply_filters('wpsp_smtp_msys_api', $x_msys_api);
+        $phpmailer->addCustomHeader('X-MSYS-API', json_encode($json_x_msys_api));
     }
 }