litefeel / writing-on-github

lib/client/persist.php

Indentation +60 added lines, -60 removed lines

@@ -9,75 +9,75 @@
  */
 class Writing_On_GitHub_Persist_Client extends Writing_On_GitHub_Base_Client {
 
-    /**
-     * Get the data for the current user.
-     *
-     * @return array
-     */
-    protected function export_user() {
-        $user_id = get_current_user_id();
-        $user = get_userdata( $user_id );
+	/**
+	 * Get the data for the current user.
+	 *
+	 * @return array
+	 */
+	protected function export_user() {
+		$user_id = get_current_user_id();
+		$user = get_userdata( $user_id );
 
-        if ( $user ) {
-            return array(
-                'name'  => $user->display_name,
-                'email' => $user->user_email,
-            );
-        }
+		if ( $user ) {
+			return array(
+				'name'  => $user->display_name,
+				'email' => $user->user_email,
+			);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Delete the file.
-     *
-     * @return array
-     */
-    public function delete_file( $path, $sha, $message ) {
-        $body = new stdClass();
-        $body->message = $message;
-        $body->sha = $sha;
-        $body->branch = $this->branch();
+	/**
+	 * Delete the file.
+	 *
+	 * @return array
+	 */
+	public function delete_file( $path, $sha, $message ) {
+		$body = new stdClass();
+		$body->message = $message;
+		$body->sha = $sha;
+		$body->branch = $this->branch();
 
-        if ( $author = $this->export_user() ) {
-            $body->author = $author;
-        }
+		if ( $author = $this->export_user() ) {
+			$body->author = $author;
+		}
 
-        return $this->call( 'DELETE', $this->content_endpoint( $path ), $body );
-    }
+		return $this->call( 'DELETE', $this->content_endpoint( $path ), $body );
+	}
 
-    /**
-     * Create the file.
-     *
-     * @return array
-     */
-    public function create_file( $blob, $message ) {
-        $body = $blob->to_body();
-        $body->message = $message;
-        $body->branch = $this->branch();
-        unset($body->sha);
+	/**
+	 * Create the file.
+	 *
+	 * @return array
+	 */
+	public function create_file( $blob, $message ) {
+		$body = $blob->to_body();
+		$body->message = $message;
+		$body->branch = $this->branch();
+		unset($body->sha);
 
-        if ( $author = $this->export_user() ) {
-            $body->author = $author;
-        }
+		if ( $author = $this->export_user() ) {
+			$body->author = $author;
+		}
 
-        return $this->call( 'PUT', $this->content_endpoint( $blob->path() ), $body );
-    }
+		return $this->call( 'PUT', $this->content_endpoint( $blob->path() ), $body );
+	}
 
-    /**
-     * Update the file.
-     *
-     * @return array
-     */
-    public function update_file( $blob, $message ) {
-        $body = $blob->to_body();
-        $body->message = $message;
-        $body->branch = $this->branch();
+	/**
+	 * Update the file.
+	 *
+	 * @return array
+	 */
+	public function update_file( $blob, $message ) {
+		$body = $blob->to_body();
+		$body->message = $message;
+		$body->branch = $this->branch();
 
-        if ( $author = $this->export_user() ) {
-            $body->author = $author;
-        }
+		if ( $author = $this->export_user() ) {
+			$body->author = $author;
+		}
 
-        return $this->call( 'PUT', $this->content_endpoint( $blob->path() ), $body );
-    }
+		return $this->call( 'PUT', $this->content_endpoint( $blob->path() ), $body );
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -16,9 +16,9 @@ 
      */
     protected function export_user() {
         $user_id = get_current_user_id();
-        $user = get_userdata( $user_id );
+        $user = get_userdata($user_id);
 
-        if ( $user ) {
+        if ($user) {
             return array(
                 'name'  => $user->display_name,
                 'email' => $user->user_email,
@@ -33,17 +33,17 @@ 
      *
      * @return array
      */
-    public function delete_file( $path, $sha, $message ) {
+    public function delete_file($path, $sha, $message) {
         $body = new stdClass();
         $body->message = $message;
         $body->sha = $sha;
         $body->branch = $this->branch();
 
-        if ( $author = $this->export_user() ) {
+        if ($author = $this->export_user()) {
             $body->author = $author;
         }
 
-        return $this->call( 'DELETE', $this->content_endpoint( $path ), $body );
+        return $this->call('DELETE', $this->content_endpoint($path), $body);
     }
 
     /**
@@ -51,17 +51,17 @@ 
      *
      * @return array
      */
-    public function create_file( $blob, $message ) {
+    public function create_file($blob, $message) {
         $body = $blob->to_body();
         $body->message = $message;
         $body->branch = $this->branch();
         unset($body->sha);
 
-        if ( $author = $this->export_user() ) {
+        if ($author = $this->export_user()) {
             $body->author = $author;
         }
 
-        return $this->call( 'PUT', $this->content_endpoint( $blob->path() ), $body );
+        return $this->call('PUT', $this->content_endpoint($blob->path()), $body);
     }
 
     /**
@@ -69,15 +69,15 @@ 
      *
      * @return array
      */
-    public function update_file( $blob, $message ) {
+    public function update_file($blob, $message) {
         $body = $blob->to_body();
         $body->message = $message;
         $body->branch = $this->branch();
 
-        if ( $author = $this->export_user() ) {
+        if ($author = $this->export_user()) {
             $body->author = $author;
         }
 
-        return $this->call( 'PUT', $this->content_endpoint( $blob->path() ), $body );
+        return $this->call('PUT', $this->content_endpoint($blob->path()), $body);
     }
 }

lib/response.php

Indentation +70 added lines, -70 removed lines

@@ -9,87 +9,87 @@
  */
 class Writing_On_GitHub_Response {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
 
-    /**
-     * Writing_On_GitHub_Response constructor.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
+	/**
+	 * Writing_On_GitHub_Response constructor.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
 
-    /**
-     * Writes to the log and returns the error response.
-     *
-     * @param WP_Error $error Error to respond with.
-     *
-     * @return false
-     */
-    public function error( WP_Error $error ) {
-        global $wp_version;
+	/**
+	 * Writes to the log and returns the error response.
+	 *
+	 * @param WP_Error $error Error to respond with.
+	 *
+	 * @return false
+	 */
+	public function error( WP_Error $error ) {
+		global $wp_version;
 
-        $this->log( $error );
+		$this->log( $error );
 
-        if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
-            /**
-             * WordPress 4.1.0 introduced allowing WP_Error objects to be
-             * passed directly into `wp_send_json_error`. This shims in
-             * compatibility for older versions. We're currently supporting 3.9+.
-             */
-            if ( version_compare( $wp_version, '4.1.0', '<' ) ) {
-                $result = array();
+		if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
+			/**
+			 * WordPress 4.1.0 introduced allowing WP_Error objects to be
+			 * passed directly into `wp_send_json_error`. This shims in
+			 * compatibility for older versions. We're currently supporting 3.9+.
+			 */
+			if ( version_compare( $wp_version, '4.1.0', '<' ) ) {
+				$result = array();
 
-                foreach ( $error->errors as $code => $messages ) {
-                    foreach ( $messages as $message ) {
-                        $result[] = array( 'code' => $code, 'message' => $message );
-                    }
-                }
+				foreach ( $error->errors as $code => $messages ) {
+					foreach ( $messages as $message ) {
+						$result[] = array( 'code' => $code, 'message' => $message );
+					}
+				}
 
-                $error = $result;
-            }
+				$error = $result;
+			}
 
-            wp_send_json_error( $error );
-        }
+			wp_send_json_error( $error );
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Writes to the log and returns the success response.
-     *
-     * @param string $success Success message to respond with.
-     *
-     * @return true
-     */
-    public function success( $success ) {
-        $this->log( $success );
+	/**
+	 * Writes to the log and returns the success response.
+	 *
+	 * @param string $success Success message to respond with.
+	 *
+	 * @return true
+	 */
+	public function success( $success ) {
+		$this->log( $success );
 
-        if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
-            wp_send_json_success( $success );
-        }
+		if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
+			wp_send_json_success( $success );
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Writes a log message.
-     *
-     * Can extract a message from WP_Error object.
-     *
-     * @param string|WP_Error $msg Message to log.
-     */
-    protected function log( $msg ) {
-        if ( is_wp_error( $msg ) ) {
-            $msg = $msg->get_error_message();
-        }
+	/**
+	 * Writes a log message.
+	 *
+	 * Can extract a message from WP_Error object.
+	 *
+	 * @param string|WP_Error $msg Message to log.
+	 */
+	protected function log( $msg ) {
+		if ( is_wp_error( $msg ) ) {
+			$msg = $msg->get_error_message();
+		}
 
-        Writing_On_GitHub::write_log( $msg );
-    }
+		Writing_On_GitHub::write_log( $msg );
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -21,7 +21,7 @@ 
      *
      * @param Writing_On_GitHub $app Application container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -32,30 +32,30 @@ 
      *
      * @return false
      */
-    public function error( WP_Error $error ) {
+    public function error(WP_Error $error) {
         global $wp_version;
 
-        $this->log( $error );
+        $this->log($error);
 
-        if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
+        if (defined('DOING_AJAX') && DOING_AJAX && defined('WOGH_AJAX') && WOGH_AJAX) {
             /**
              * WordPress 4.1.0 introduced allowing WP_Error objects to be
              * passed directly into `wp_send_json_error`. This shims in
              * compatibility for older versions. We're currently supporting 3.9+.
              */
-            if ( version_compare( $wp_version, '4.1.0', '<' ) ) {
+            if (version_compare($wp_version, '4.1.0', '<')) {
                 $result = array();
 
-                foreach ( $error->errors as $code => $messages ) {
-                    foreach ( $messages as $message ) {
-                        $result[] = array( 'code' => $code, 'message' => $message );
+                foreach ($error->errors as $code => $messages) {
+                    foreach ($messages as $message) {
+                        $result[] = array('code' => $code, 'message' => $message);
                     }
                 }
 
                 $error = $result;
             }
 
-            wp_send_json_error( $error );
+            wp_send_json_error($error);
         }
 
         return false;
@@ -68,11 +68,11 @@ 
      *
      * @return true
      */
-    public function success( $success ) {
-        $this->log( $success );
+    public function success($success) {
+        $this->log($success);
 
-        if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
-            wp_send_json_success( $success );
+        if (defined('DOING_AJAX') && DOING_AJAX && defined('WOGH_AJAX') && WOGH_AJAX) {
+            wp_send_json_success($success);
         }
 
         return true;
@@ -85,11 +85,11 @@ 
      *
      * @param string|WP_Error $msg Message to log.
      */
-    protected function log( $msg ) {
-        if ( is_wp_error( $msg ) ) {
+    protected function log($msg) {
+        if (is_wp_error($msg)) {
             $msg = $msg->get_error_message();
         }
 
-        Writing_On_GitHub::write_log( $msg );
+        Writing_On_GitHub::write_log($msg);
     }
 }

lib/controller.php

Indentation +230 added lines, -230 removed lines

@@ -9,234 +9,234 @@
  */
 class Writing_On_GitHub_Controller {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    public $app;
-
-    /**
-     * Instantiates a new Controller object
-     *
-     * @param Writing_On_GitHub $app Applicatio container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Webhook callback as triggered from GitHub push.
-     *
-     * Reads the Webhook payload and syncs posts as necessary.
-     *
-     * @return boolean
-     */
-    public function pull_posts() {
-        $this->set_ajax();
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::pull_posts()' )
-            ) );
-        }
-
-        if ( ! $this->app->request()->is_secret_valid() ) {
-            return $this->app->response()->error( new WP_Error(
-                'invalid_headers',
-                __( 'Failed to validate secret.', 'writing-on-github' )
-            ) );
-        }
-
-        // ping
-        if ( $this->app->request()->is_ping() ) {
-            return $this->app->response()->success( __( 'Wordpress is ready.', 'writing-on-github' ) );
-        }
-
-        // push
-        if ( ! $this->app->request()->is_push() ) {
-            return $this->app->response()->error( new WP_Error(
-                'invalid_headers',
-                __( 'Failed to validate webhook event.', 'writing-on-github' )
-            ) );
-        }
-        $payload = $this->app->request()->payload();
-
-        if ( ! $payload->should_import() ) {
-            return $this->app->response()->error( new WP_Error(
-                'invalid_payload',
-                sprintf(
-                    __( "%s won't be imported.", 'writing-on-github' ),
-                    strtolower( $payload->get_commit_id() ) ? : '[Missing Commit ID]'
-                )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-        remove_action( 'save_post', array( $this, 'export_post' ) );
-        remove_action( 'delete_post', array( $this, 'delete_post' ) );
-
-        $result = $this->app->import()->payload( $payload );
-
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
-        }
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Imports posts from the current master branch.
-     *
-     * @return boolean
-     */
-    public function import_master( $user_id = 0 ) {
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::import_master()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-        remove_action( 'save_post', array( $this, 'export_post' ) );
-        remove_action( 'save_post', array( $this, 'delete_post' ) );
-
-        if ( $user_id ) {
-            wp_set_current_user( $user_id );
-        }
-
-        $result = $this->app->import()->master();
-
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            update_option( '_wogh_import_error', $result->get_error_message() );
-
-            return $this->app->response()->error( $result );
-        }
-
-        update_option( '_wogh_import_complete', 'yes' );
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Export all the posts in the database to GitHub.
-     *
-     * @param  int        $user_id
-     * @param  boolean    $force
-     * @return boolean
-     */
-    public function export_all( $user_id = 0, $force = false ) {
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_all()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-
-        if ( $user_id ) {
-            wp_set_current_user( $user_id );
-        }
-
-        $result = $this->app->export()->full($force);
-        $this->app->semaphore()->unlock();
-
-        // Maybe move option updating out of this class/upgrade message display?
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            update_option( '_wogh_export_error', $result->get_error_message() );
-
-            return $this->app->response()->error( $result );
-        } else {
-            update_option( '_wogh_export_complete', 'yes' );
-            update_option( '_wogh_fully_exported', 'yes' );
-
-            return $this->app->response()->success( $result );
-        }
-    }
-
-    /**
-     * Exports a single post to GitHub by ID.
-     *
-     * Called on the save_post hook.
-     *
-     * @param int $post_id Post ID.
-     *
-     * @return boolean
-     */
-    public function export_post( $post_id ) {
-        if ( wp_is_post_revision( $post_id ) ) {
-            return;
-        }
-
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_post()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-        $result = $this->app->export()->update( $post_id );
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
-        }
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Removes the post from the tree.
-     *
-     * Called the delete_post hook.
-     *
-     * @param int $post_id Post ID.
-     *
-     * @return boolean
-     */
-    public function delete_post( $post_id ) {
-        if ( wp_is_post_revision( $post_id ) ) {
-            return;
-        }
-
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::delete_post()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-        $result = $this->app->export()->delete( $post_id );
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
-        }
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Indicates we're running our own AJAX hook
-     * and thus should respond with JSON, rather
-     * than just returning data.
-     */
-    protected function set_ajax() {
-        if ( ! defined( 'WOGH_AJAX' ) ) {
-            define( 'WOGH_AJAX', true );
-        }
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	public $app;
+
+	/**
+	 * Instantiates a new Controller object
+	 *
+	 * @param Writing_On_GitHub $app Applicatio container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Webhook callback as triggered from GitHub push.
+	 *
+	 * Reads the Webhook payload and syncs posts as necessary.
+	 *
+	 * @return boolean
+	 */
+	public function pull_posts() {
+		$this->set_ajax();
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::pull_posts()' )
+			) );
+		}
+
+		if ( ! $this->app->request()->is_secret_valid() ) {
+			return $this->app->response()->error( new WP_Error(
+				'invalid_headers',
+				__( 'Failed to validate secret.', 'writing-on-github' )
+			) );
+		}
+
+		// ping
+		if ( $this->app->request()->is_ping() ) {
+			return $this->app->response()->success( __( 'Wordpress is ready.', 'writing-on-github' ) );
+		}
+
+		// push
+		if ( ! $this->app->request()->is_push() ) {
+			return $this->app->response()->error( new WP_Error(
+				'invalid_headers',
+				__( 'Failed to validate webhook event.', 'writing-on-github' )
+			) );
+		}
+		$payload = $this->app->request()->payload();
+
+		if ( ! $payload->should_import() ) {
+			return $this->app->response()->error( new WP_Error(
+				'invalid_payload',
+				sprintf(
+					__( "%s won't be imported.", 'writing-on-github' ),
+					strtolower( $payload->get_commit_id() ) ? : '[Missing Commit ID]'
+				)
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+		remove_action( 'save_post', array( $this, 'export_post' ) );
+		remove_action( 'delete_post', array( $this, 'delete_post' ) );
+
+		$result = $this->app->import()->payload( $payload );
+
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $this->app->response()->error( $result );
+		}
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Imports posts from the current master branch.
+	 *
+	 * @return boolean
+	 */
+	public function import_master( $user_id = 0 ) {
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::import_master()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+		remove_action( 'save_post', array( $this, 'export_post' ) );
+		remove_action( 'save_post', array( $this, 'delete_post' ) );
+
+		if ( $user_id ) {
+			wp_set_current_user( $user_id );
+		}
+
+		$result = $this->app->import()->master();
+
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			update_option( '_wogh_import_error', $result->get_error_message() );
+
+			return $this->app->response()->error( $result );
+		}
+
+		update_option( '_wogh_import_complete', 'yes' );
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Export all the posts in the database to GitHub.
+	 *
+	 * @param  int        $user_id
+	 * @param  boolean    $force
+	 * @return boolean
+	 */
+	public function export_all( $user_id = 0, $force = false ) {
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_all()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+
+		if ( $user_id ) {
+			wp_set_current_user( $user_id );
+		}
+
+		$result = $this->app->export()->full($force);
+		$this->app->semaphore()->unlock();
+
+		// Maybe move option updating out of this class/upgrade message display?
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			update_option( '_wogh_export_error', $result->get_error_message() );
+
+			return $this->app->response()->error( $result );
+		} else {
+			update_option( '_wogh_export_complete', 'yes' );
+			update_option( '_wogh_fully_exported', 'yes' );
+
+			return $this->app->response()->success( $result );
+		}
+	}
+
+	/**
+	 * Exports a single post to GitHub by ID.
+	 *
+	 * Called on the save_post hook.
+	 *
+	 * @param int $post_id Post ID.
+	 *
+	 * @return boolean
+	 */
+	public function export_post( $post_id ) {
+		if ( wp_is_post_revision( $post_id ) ) {
+			return;
+		}
+
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_post()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+		$result = $this->app->export()->update( $post_id );
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $this->app->response()->error( $result );
+		}
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Removes the post from the tree.
+	 *
+	 * Called the delete_post hook.
+	 *
+	 * @param int $post_id Post ID.
+	 *
+	 * @return boolean
+	 */
+	public function delete_post( $post_id ) {
+		if ( wp_is_post_revision( $post_id ) ) {
+			return;
+		}
+
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::delete_post()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+		$result = $this->app->export()->delete( $post_id );
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $this->app->response()->error( $result );
+		}
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Indicates we're running our own AJAX hook
+	 * and thus should respond with JSON, rather
+	 * than just returning data.
+	 */
+	protected function set_ajax() {
+		if ( ! defined( 'WOGH_AJAX' ) ) {
+			define( 'WOGH_AJAX', true );
+		}
+	}
 }

Spacing +75 added lines, -75 removed lines

@@ -21,7 +21,7 @@ 
      *
      * @param Writing_On_GitHub $app Applicatio container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -34,58 +34,58 @@ 
      */
     public function pull_posts() {
         $this->set_ajax();
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
+        if ( ! $this->app->semaphore()->is_open()) {
+            return $this->app->response()->error(new WP_Error(
                 'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::pull_posts()' )
-            ) );
+                sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::pull_posts()')
+            ));
         }
 
-        if ( ! $this->app->request()->is_secret_valid() ) {
-            return $this->app->response()->error( new WP_Error(
+        if ( ! $this->app->request()->is_secret_valid()) {
+            return $this->app->response()->error(new WP_Error(
                 'invalid_headers',
-                __( 'Failed to validate secret.', 'writing-on-github' )
-            ) );
+                __('Failed to validate secret.', 'writing-on-github')
+            ));
         }
 
         // ping
-        if ( $this->app->request()->is_ping() ) {
-            return $this->app->response()->success( __( 'Wordpress is ready.', 'writing-on-github' ) );
+        if ($this->app->request()->is_ping()) {
+            return $this->app->response()->success(__('Wordpress is ready.', 'writing-on-github'));
         }
 
         // push
-        if ( ! $this->app->request()->is_push() ) {
-            return $this->app->response()->error( new WP_Error(
+        if ( ! $this->app->request()->is_push()) {
+            return $this->app->response()->error(new WP_Error(
                 'invalid_headers',
-                __( 'Failed to validate webhook event.', 'writing-on-github' )
-            ) );
+                __('Failed to validate webhook event.', 'writing-on-github')
+            ));
         }
         $payload = $this->app->request()->payload();
 
-        if ( ! $payload->should_import() ) {
-            return $this->app->response()->error( new WP_Error(
+        if ( ! $payload->should_import()) {
+            return $this->app->response()->error(new WP_Error(
                 'invalid_payload',
                 sprintf(
-                    __( "%s won't be imported.", 'writing-on-github' ),
-                    strtolower( $payload->get_commit_id() ) ? : '[Missing Commit ID]'
+                    __("%s won't be imported.", 'writing-on-github'),
+                    strtolower($payload->get_commit_id()) ?: '[Missing Commit ID]'
                 )
-            ) );
+            ));
         }
 
         $this->app->semaphore()->lock();
-        remove_action( 'save_post', array( $this, 'export_post' ) );
-        remove_action( 'delete_post', array( $this, 'delete_post' ) );
+        remove_action('save_post', array($this, 'export_post'));
+        remove_action('delete_post', array($this, 'delete_post'));
 
-        $result = $this->app->import()->payload( $payload );
+        $result = $this->app->import()->payload($payload);
 
         $this->app->semaphore()->unlock();
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
+            return $this->app->response()->error($result);
         }
 
-        return $this->app->response()->success( $result );
+        return $this->app->response()->success($result);
     }
 
     /**
@@ -93,36 +93,36 @@ 
      *
      * @return boolean
      */
-    public function import_master( $user_id = 0 ) {
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
+    public function import_master($user_id = 0) {
+        if ( ! $this->app->semaphore()->is_open()) {
+            return $this->app->response()->error(new WP_Error(
                 'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::import_master()' )
-            ) );
+                sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::import_master()')
+            ));
         }
 
         $this->app->semaphore()->lock();
-        remove_action( 'save_post', array( $this, 'export_post' ) );
-        remove_action( 'save_post', array( $this, 'delete_post' ) );
+        remove_action('save_post', array($this, 'export_post'));
+        remove_action('save_post', array($this, 'delete_post'));
 
-        if ( $user_id ) {
-            wp_set_current_user( $user_id );
+        if ($user_id) {
+            wp_set_current_user($user_id);
         }
 
         $result = $this->app->import()->master();
 
         $this->app->semaphore()->unlock();
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-            update_option( '_wogh_import_error', $result->get_error_message() );
+            update_option('_wogh_import_error', $result->get_error_message());
 
-            return $this->app->response()->error( $result );
+            return $this->app->response()->error($result);
         }
 
-        update_option( '_wogh_import_complete', 'yes' );
+        update_option('_wogh_import_complete', 'yes');
 
-        return $this->app->response()->success( $result );
+        return $this->app->response()->success($result);
     }
 
     /**
@@ -132,34 +132,34 @@ 
      * @param  boolean    $force
      * @return boolean
      */
-    public function export_all( $user_id = 0, $force = false ) {
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
+    public function export_all($user_id = 0, $force = false) {
+        if ( ! $this->app->semaphore()->is_open()) {
+            return $this->app->response()->error(new WP_Error(
                 'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_all()' )
-            ) );
+                sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::export_all()')
+            ));
         }
 
         $this->app->semaphore()->lock();
 
-        if ( $user_id ) {
-            wp_set_current_user( $user_id );
+        if ($user_id) {
+            wp_set_current_user($user_id);
         }
 
         $result = $this->app->export()->full($force);
         $this->app->semaphore()->unlock();
 
         // Maybe move option updating out of this class/upgrade message display?
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-            update_option( '_wogh_export_error', $result->get_error_message() );
+            update_option('_wogh_export_error', $result->get_error_message());
 
-            return $this->app->response()->error( $result );
+            return $this->app->response()->error($result);
         } else {
-            update_option( '_wogh_export_complete', 'yes' );
-            update_option( '_wogh_fully_exported', 'yes' );
+            update_option('_wogh_export_complete', 'yes');
+            update_option('_wogh_fully_exported', 'yes');
 
-            return $this->app->response()->success( $result );
+            return $this->app->response()->success($result);
         }
     }
 
@@ -172,28 +172,28 @@ 
      *
      * @return boolean
      */
-    public function export_post( $post_id ) {
-        if ( wp_is_post_revision( $post_id ) ) {
+    public function export_post($post_id) {
+        if (wp_is_post_revision($post_id)) {
             return;
         }
 
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
+        if ( ! $this->app->semaphore()->is_open()) {
+            return $this->app->response()->error(new WP_Error(
                 'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_post()' )
-            ) );
+                sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::export_post()')
+            ));
         }
 
         $this->app->semaphore()->lock();
-        $result = $this->app->export()->update( $post_id );
+        $result = $this->app->export()->update($post_id);
         $this->app->semaphore()->unlock();
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
+            return $this->app->response()->error($result);
         }
 
-        return $this->app->response()->success( $result );
+        return $this->app->response()->success($result);
     }
 
     /**
@@ -205,28 +205,28 @@ 
      *
      * @return boolean
      */
-    public function delete_post( $post_id ) {
-        if ( wp_is_post_revision( $post_id ) ) {
+    public function delete_post($post_id) {
+        if (wp_is_post_revision($post_id)) {
             return;
         }
 
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
+        if ( ! $this->app->semaphore()->is_open()) {
+            return $this->app->response()->error(new WP_Error(
                 'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::delete_post()' )
-            ) );
+                sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::delete_post()')
+            ));
         }
 
         $this->app->semaphore()->lock();
-        $result = $this->app->export()->delete( $post_id );
+        $result = $this->app->export()->delete($post_id);
         $this->app->semaphore()->unlock();
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
+            return $this->app->response()->error($result);
         }
 
-        return $this->app->response()->success( $result );
+        return $this->app->response()->success($result);
     }
 
     /**
@@ -235,8 +235,8 @@ 
      * than just returning data.
      */
     protected function set_ajax() {
-        if ( ! defined( 'WOGH_AJAX' ) ) {
-            define( 'WOGH_AJAX', true );
+        if ( ! defined('WOGH_AJAX')) {
+            define('WOGH_AJAX', true);
         }
     }
 }

lib/cli.php

Indentation +146 added lines, -146 removed lines

@@ -9,150 +9,150 @@
  */
 class Writing_On_GitHub_CLI extends WP_CLI_Command {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Grab the Application container on instantiation.
-     */
-    public function __construct() {
-        $this->app = Writing_On_GitHub::$instance;
-    }
-
-    /**
-     * Exports an individual post
-     * all your posts to GitHub
-     *
-     * ## OPTIONS
-     *
-     * <post_id|all>
-     * : The post ID to export or 'all' for full site
-     *
-     * <user_id>
-     * : The user ID you'd like to save the commit as
-     *
-     * ## EXAMPLES
-     *
-     *     wp wogh export all 1
-     *     wp wogh export 1 1
-     *
-     * @synopsis <post_id|all> <user_id>
-     *
-     * @param array $args Command arguments.
-     */
-    public function export( $args ) {
-        list( $post_id, $user_id ) = $args;
-
-        if ( ! is_numeric( $user_id ) ) {
-            WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
-        }
-
-        $this->app->export()->set_user( $user_id );
-
-        if ( 'all' === $post_id ) {
-            WP_CLI::line( __( 'Starting full export to GitHub.', 'writing-on-github' ) );
-            $this->app->controller()->export_all();
-        } elseif ( is_numeric( $post_id ) ) {
-            WP_CLI::line(
-                sprintf(
-                    __( 'Exporting post ID to GitHub: %d', 'writing-on-github' ),
-                    $post_id
-                )
-            );
-            $this->app->controller()->export_post( (int) $post_id );
-        } else {
-            WP_CLI::error( __( 'Invalid post ID', 'writing-on-github' ) );
-        }
-    }
-
-    /**
-     * Imports the post in your GitHub repo
-     * into your WordPress blog
-     *
-     * ## OPTIONS
-     *
-     * <user_id>
-     * : The user ID you'd like to save the commit as
-     *
-     * ## EXAMPLES
-     *
-     *     wp wogh import 1
-     *
-     * @synopsis <user_id>
-     *
-     * @param array $args Command arguments.
-     */
-    public function import( $args ) {
-        list( $user_id ) = $args;
-
-        if ( ! is_numeric( $user_id ) ) {
-            WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
-        }
-
-        update_option( '_wogh_export_user_id', (int) $user_id );
-
-        WP_CLI::line( __( 'Starting import from GitHub.', 'writing-on-github' ) );
-
-        $this->app->controller()->import_master();
-    }
-
-    /**
-     * Fetches the provided sha or the repository's
-     * master branch and caches it.
-     *
-     * ## OPTIONS
-     *
-     * <user_id>
-     * : The user ID you'd like to save the commit as
-     *
-     * ## EXAMPLES
-     *
-     *     wp wogh prime --branch=master
-     *     wp wogh prime --sha=<commit_sha>
-     *
-     * @synopsis [--sha=<commit_sha>] [--branch]
-     *
-     * @param array $args Command arguments.
-     * @param array $assoc_args Command associated arguments.
-     */
-    public function prime( $args, $assoc_args ) {
-        if ( isset( $assoc_args['branch'] ) ) {
-            WP_CLI::line( __( 'Starting branch import.', 'writing-on-github' ) );
-
-            $commit = $this->app->api()->fetch()->master();
-
-            if ( is_wp_error( $commit ) ) {
-                WP_CLI::error(
-                    sprintf(
-                        __( 'Failed to import and cache branch with error: %s', 'writing-on-github' ),
-                        $commit->get_error_message()
-                    )
-                );
-            } else {
-                WP_CLI::success(
-                    sprintf(
-                        __( 'Successfully imported and cached commit %s from branch.', 'writing-on-github' ),
-                        $commit->sha()
-                    )
-                );
-            }
-        } else if ( isset( $assoc_args['sha'] ) ) {
-            WP_CLI::line( 'Starting sha import.' );
-
-            $commit = $this->app->api()->fetch()->commit( $assoc_args['sha'] );
-
-            WP_CLI::success(
-                sprintf(
-                    __( 'Successfully imported and cached commit %s.', 'writing-on-github' ),
-                    $commit->sha()
-                )
-            );
-        } else {
-            WP_CLI::error( 'Invalid fetch.' );
-        }
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Grab the Application container on instantiation.
+	 */
+	public function __construct() {
+		$this->app = Writing_On_GitHub::$instance;
+	}
+
+	/**
+	 * Exports an individual post
+	 * all your posts to GitHub
+	 *
+	 * ## OPTIONS
+	 *
+	 * <post_id|all>
+	 * : The post ID to export or 'all' for full site
+	 *
+	 * <user_id>
+	 * : The user ID you'd like to save the commit as
+	 *
+	 * ## EXAMPLES
+	 *
+	 *     wp wogh export all 1
+	 *     wp wogh export 1 1
+	 *
+	 * @synopsis <post_id|all> <user_id>
+	 *
+	 * @param array $args Command arguments.
+	 */
+	public function export( $args ) {
+		list( $post_id, $user_id ) = $args;
+
+		if ( ! is_numeric( $user_id ) ) {
+			WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
+		}
+
+		$this->app->export()->set_user( $user_id );
+
+		if ( 'all' === $post_id ) {
+			WP_CLI::line( __( 'Starting full export to GitHub.', 'writing-on-github' ) );
+			$this->app->controller()->export_all();
+		} elseif ( is_numeric( $post_id ) ) {
+			WP_CLI::line(
+				sprintf(
+					__( 'Exporting post ID to GitHub: %d', 'writing-on-github' ),
+					$post_id
+				)
+			);
+			$this->app->controller()->export_post( (int) $post_id );
+		} else {
+			WP_CLI::error( __( 'Invalid post ID', 'writing-on-github' ) );
+		}
+	}
+
+	/**
+	 * Imports the post in your GitHub repo
+	 * into your WordPress blog
+	 *
+	 * ## OPTIONS
+	 *
+	 * <user_id>
+	 * : The user ID you'd like to save the commit as
+	 *
+	 * ## EXAMPLES
+	 *
+	 *     wp wogh import 1
+	 *
+	 * @synopsis <user_id>
+	 *
+	 * @param array $args Command arguments.
+	 */
+	public function import( $args ) {
+		list( $user_id ) = $args;
+
+		if ( ! is_numeric( $user_id ) ) {
+			WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
+		}
+
+		update_option( '_wogh_export_user_id', (int) $user_id );
+
+		WP_CLI::line( __( 'Starting import from GitHub.', 'writing-on-github' ) );
+
+		$this->app->controller()->import_master();
+	}
+
+	/**
+	 * Fetches the provided sha or the repository's
+	 * master branch and caches it.
+	 *
+	 * ## OPTIONS
+	 *
+	 * <user_id>
+	 * : The user ID you'd like to save the commit as
+	 *
+	 * ## EXAMPLES
+	 *
+	 *     wp wogh prime --branch=master
+	 *     wp wogh prime --sha=<commit_sha>
+	 *
+	 * @synopsis [--sha=<commit_sha>] [--branch]
+	 *
+	 * @param array $args Command arguments.
+	 * @param array $assoc_args Command associated arguments.
+	 */
+	public function prime( $args, $assoc_args ) {
+		if ( isset( $assoc_args['branch'] ) ) {
+			WP_CLI::line( __( 'Starting branch import.', 'writing-on-github' ) );
+
+			$commit = $this->app->api()->fetch()->master();
+
+			if ( is_wp_error( $commit ) ) {
+				WP_CLI::error(
+					sprintf(
+						__( 'Failed to import and cache branch with error: %s', 'writing-on-github' ),
+						$commit->get_error_message()
+					)
+				);
+			} else {
+				WP_CLI::success(
+					sprintf(
+						__( 'Successfully imported and cached commit %s from branch.', 'writing-on-github' ),
+						$commit->sha()
+					)
+				);
+			}
+		} else if ( isset( $assoc_args['sha'] ) ) {
+			WP_CLI::line( 'Starting sha import.' );
+
+			$commit = $this->app->api()->fetch()->commit( $assoc_args['sha'] );
+
+			WP_CLI::success(
+				sprintf(
+					__( 'Successfully imported and cached commit %s.', 'writing-on-github' ),
+					$commit->sha()
+				)
+			);
+		} else {
+			WP_CLI::error( 'Invalid fetch.' );
+		}
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -44,28 +44,28 @@ 
      *
      * @param array $args Command arguments.
      */
-    public function export( $args ) {
-        list( $post_id, $user_id ) = $args;
+    public function export($args) {
+        list($post_id, $user_id) = $args;
 
-        if ( ! is_numeric( $user_id ) ) {
-            WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
+        if ( ! is_numeric($user_id)) {
+            WP_CLI::error(__('Invalid user ID', 'writing-on-github'));
         }
 
-        $this->app->export()->set_user( $user_id );
+        $this->app->export()->set_user($user_id);
 
-        if ( 'all' === $post_id ) {
-            WP_CLI::line( __( 'Starting full export to GitHub.', 'writing-on-github' ) );
+        if ('all' === $post_id) {
+            WP_CLI::line(__('Starting full export to GitHub.', 'writing-on-github'));
             $this->app->controller()->export_all();
-        } elseif ( is_numeric( $post_id ) ) {
+        } elseif (is_numeric($post_id)) {
             WP_CLI::line(
                 sprintf(
-                    __( 'Exporting post ID to GitHub: %d', 'writing-on-github' ),
+                    __('Exporting post ID to GitHub: %d', 'writing-on-github'),
                     $post_id
                 )
             );
-            $this->app->controller()->export_post( (int) $post_id );
+            $this->app->controller()->export_post((int) $post_id);
         } else {
-            WP_CLI::error( __( 'Invalid post ID', 'writing-on-github' ) );
+            WP_CLI::error(__('Invalid post ID', 'writing-on-github'));
         }
     }
 
@@ -86,16 +86,16 @@ 
      *
      * @param array $args Command arguments.
      */
-    public function import( $args ) {
-        list( $user_id ) = $args;
+    public function import($args) {
+        list($user_id) = $args;
 
-        if ( ! is_numeric( $user_id ) ) {
-            WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
+        if ( ! is_numeric($user_id)) {
+            WP_CLI::error(__('Invalid user ID', 'writing-on-github'));
         }
 
-        update_option( '_wogh_export_user_id', (int) $user_id );
+        update_option('_wogh_export_user_id', (int) $user_id);
 
-        WP_CLI::line( __( 'Starting import from GitHub.', 'writing-on-github' ) );
+        WP_CLI::line(__('Starting import from GitHub.', 'writing-on-github'));
 
         $this->app->controller()->import_master();
     }
@@ -119,40 +119,40 @@ 
      * @param array $args Command arguments.
      * @param array $assoc_args Command associated arguments.
      */
-    public function prime( $args, $assoc_args ) {
-        if ( isset( $assoc_args['branch'] ) ) {
-            WP_CLI::line( __( 'Starting branch import.', 'writing-on-github' ) );
+    public function prime($args, $assoc_args) {
+        if (isset($assoc_args['branch'])) {
+            WP_CLI::line(__('Starting branch import.', 'writing-on-github'));
 
             $commit = $this->app->api()->fetch()->master();
 
-            if ( is_wp_error( $commit ) ) {
+            if (is_wp_error($commit)) {
                 WP_CLI::error(
                     sprintf(
-                        __( 'Failed to import and cache branch with error: %s', 'writing-on-github' ),
+                        __('Failed to import and cache branch with error: %s', 'writing-on-github'),
                         $commit->get_error_message()
                     )
                 );
             } else {
                 WP_CLI::success(
                     sprintf(
-                        __( 'Successfully imported and cached commit %s from branch.', 'writing-on-github' ),
+                        __('Successfully imported and cached commit %s from branch.', 'writing-on-github'),
                         $commit->sha()
                     )
                 );
             }
-        } else if ( isset( $assoc_args['sha'] ) ) {
-            WP_CLI::line( 'Starting sha import.' );
+        } else if (isset($assoc_args['sha'])) {
+            WP_CLI::line('Starting sha import.');
 
-            $commit = $this->app->api()->fetch()->commit( $assoc_args['sha'] );
+            $commit = $this->app->api()->fetch()->commit($assoc_args['sha']);
 
             WP_CLI::success(
                 sprintf(
-                    __( 'Successfully imported and cached commit %s.', 'writing-on-github' ),
+                    __('Successfully imported and cached commit %s.', 'writing-on-github'),
                     $commit->sha()
                 )
             );
         } else {
-            WP_CLI::error( 'Invalid fetch.' );
+            WP_CLI::error('Invalid fetch.');
         }
     }
 }

lib/api.php

Indentation +48 added lines, -48 removed lines

@@ -9,59 +9,59 @@
  */
 class Writing_On_GitHub_Api {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
 
-    /**
-     * GitHub fetch client.
-     *
-     * @var Writing_On_GitHub_Fetch_Client
-     */
-    protected $fetch;
+	/**
+	 * GitHub fetch client.
+	 *
+	 * @var Writing_On_GitHub_Fetch_Client
+	 */
+	protected $fetch;
 
-    /**
-     * Github persist client.
-     *
-     * @var Writing_On_GitHub_Persist_Client
-     */
-    protected $persist;
+	/**
+	 * Github persist client.
+	 *
+	 * @var Writing_On_GitHub_Persist_Client
+	 */
+	protected $persist;
 
-    /**
-     * Instantiates a new Api object.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
+	/**
+	 * Instantiates a new Api object.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
 
-    /**
-     * Lazy-load fetch client.
-     *
-     * @return Writing_On_GitHub_Fetch_Client
-     */
-    public function fetch() {
-        if ( ! $this->fetch ) {
-            $this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
-        }
+	/**
+	 * Lazy-load fetch client.
+	 *
+	 * @return Writing_On_GitHub_Fetch_Client
+	 */
+	public function fetch() {
+		if ( ! $this->fetch ) {
+			$this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+		}
 
-        return $this->fetch;
-    }
+		return $this->fetch;
+	}
 
-    /**
-     * Lazy-load persist client.
-     *
-     * @return Writing_On_GitHub_Persist_Client
-     */
-    public function persist() {
-        if ( ! $this->persist ) {
-            $this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
-        }
+	/**
+	 * Lazy-load persist client.
+	 *
+	 * @return Writing_On_GitHub_Persist_Client
+	 */
+	public function persist() {
+		if ( ! $this->persist ) {
+			$this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
+		}
 
-        return $this->persist;
-    }
+		return $this->persist;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
      *
      * @param Writing_On_GitHub $app Application container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -45,8 +45,8 @@ 
      * @return Writing_On_GitHub_Fetch_Client
      */
     public function fetch() {
-        if ( ! $this->fetch ) {
-            $this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+        if ( ! $this->fetch) {
+            $this->fetch = new Writing_On_GitHub_Fetch_Client($this->app);
         }
 
         return $this->fetch;
@@ -58,8 +58,8 @@ 
      * @return Writing_On_GitHub_Persist_Client
      */
     public function persist() {
-        if ( ! $this->persist ) {
-            $this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
+        if ( ! $this->persist) {
+            $this->persist = new Writing_On_GitHub_Persist_Client($this->app);
         }
 
         return $this->persist;

lib/payload.php

Indentation +112 added lines, -112 removed lines

@@ -9,116 +9,116 @@
  */
 class Writing_On_GitHub_Payload {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Payload data.
-     *
-     * @var stdClass
-     */
-    protected $data;
-
-    /**
-     * Writing_On_GitHub_Payload constructor.
-     *
-     * @param Writing_On_GitHub $app      Application container.
-     * @param string                $raw_data Raw request data.
-     */
-    public function __construct( Writing_On_GitHub $app, $raw_data ) {
-        $this->app  = $app;
-        $this->data = json_decode( $raw_data );
-    }
-
-    /**
-     * Returns whether payload should be imported.
-     *
-     * @return bool
-     */
-    public function should_import() {
-        // @todo how do we get this without importing the whole api object just for this?
-        if ( strtolower( $this->data->repository->full_name ) !== strtolower( $this->app->api()->fetch()->repository() ) ) {
-            return false;
-        }
-
-        // The last term in the ref is the payload_branch name.
-        $refs   = explode( '/', $this->data->ref );
-        $payload_branch = array_pop( $refs );
-
-        $branch = $this->app->api()->fetch()->branch();
-
-        if ( $branch !== $payload_branch ) {
-            return false;
-        }
-
-        // We add a tag to commits we push out, so we shouldn't pull them in again.
-        $tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
-
-        if ( ! $tag ) {
-            throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
-        }
-
-        if ( $tag === substr( $this->message(), -1 * strlen( $tag ) ) ) {
-            return false;
-        }
-
-        if ( ! $this->get_commit_id() ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function get_before_commit_id() {
-        return $this->data->before ? $this->data->before : null;
-    }
-
-    /**
-     * Returns the sha of the head commit.
-     *
-     * @return string
-     */
-    public function get_commit_id() {
-        return $this->data->head_commit ? $this->data->head_commit->id : null;
-    }
-
-    /**
-     * Returns the email address for the commit author.
-     *
-     * @return string
-     */
-    public function get_author_email() {
-        return $this->data->head_commit->author->email;
-    }
-
-    /**
-     * Returns array commits for the payload.
-     *
-     * @return array
-     */
-    public function get_commits() {
-        return $this->data->commits;
-    }
-
-    /**
-     * Returns the repository's full name.
-     *
-     * @return string
-     */
-    public function get_repository_name() {
-        return $this->data->repository->full_name;
-    }
-
-    /**
-     * Returns the payload's commit message.
-     *
-     * @return string
-     */
-    protected function message() {
-        return $this->data->head_commit->message;
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Payload data.
+	 *
+	 * @var stdClass
+	 */
+	protected $data;
+
+	/**
+	 * Writing_On_GitHub_Payload constructor.
+	 *
+	 * @param Writing_On_GitHub $app      Application container.
+	 * @param string                $raw_data Raw request data.
+	 */
+	public function __construct( Writing_On_GitHub $app, $raw_data ) {
+		$this->app  = $app;
+		$this->data = json_decode( $raw_data );
+	}
+
+	/**
+	 * Returns whether payload should be imported.
+	 *
+	 * @return bool
+	 */
+	public function should_import() {
+		// @todo how do we get this without importing the whole api object just for this?
+		if ( strtolower( $this->data->repository->full_name ) !== strtolower( $this->app->api()->fetch()->repository() ) ) {
+			return false;
+		}
+
+		// The last term in the ref is the payload_branch name.
+		$refs   = explode( '/', $this->data->ref );
+		$payload_branch = array_pop( $refs );
+
+		$branch = $this->app->api()->fetch()->branch();
+
+		if ( $branch !== $payload_branch ) {
+			return false;
+		}
+
+		// We add a tag to commits we push out, so we shouldn't pull them in again.
+		$tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
+
+		if ( ! $tag ) {
+			throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
+		}
+
+		if ( $tag === substr( $this->message(), -1 * strlen( $tag ) ) ) {
+			return false;
+		}
+
+		if ( ! $this->get_commit_id() ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	public function get_before_commit_id() {
+		return $this->data->before ? $this->data->before : null;
+	}
+
+	/**
+	 * Returns the sha of the head commit.
+	 *
+	 * @return string
+	 */
+	public function get_commit_id() {
+		return $this->data->head_commit ? $this->data->head_commit->id : null;
+	}
+
+	/**
+	 * Returns the email address for the commit author.
+	 *
+	 * @return string
+	 */
+	public function get_author_email() {
+		return $this->data->head_commit->author->email;
+	}
+
+	/**
+	 * Returns array commits for the payload.
+	 *
+	 * @return array
+	 */
+	public function get_commits() {
+		return $this->data->commits;
+	}
+
+	/**
+	 * Returns the repository's full name.
+	 *
+	 * @return string
+	 */
+	public function get_repository_name() {
+		return $this->data->repository->full_name;
+	}
+
+	/**
+	 * Returns the payload's commit message.
+	 *
+	 * @return string
+	 */
+	protected function message() {
+		return $this->data->head_commit->message;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -29,9 +29,9 @@ 
      * @param Writing_On_GitHub $app      Application container.
      * @param string                $raw_data Raw request data.
      */
-    public function __construct( Writing_On_GitHub $app, $raw_data ) {
+    public function __construct(Writing_On_GitHub $app, $raw_data) {
         $this->app  = $app;
-        $this->data = json_decode( $raw_data );
+        $this->data = json_decode($raw_data);
     }
 
     /**
@@ -41,32 +41,32 @@ 
      */
     public function should_import() {
         // @todo how do we get this without importing the whole api object just for this?
-        if ( strtolower( $this->data->repository->full_name ) !== strtolower( $this->app->api()->fetch()->repository() ) ) {
+        if (strtolower($this->data->repository->full_name) !== strtolower($this->app->api()->fetch()->repository())) {
             return false;
         }
 
         // The last term in the ref is the payload_branch name.
-        $refs   = explode( '/', $this->data->ref );
-        $payload_branch = array_pop( $refs );
+        $refs   = explode('/', $this->data->ref);
+        $payload_branch = array_pop($refs);
 
         $branch = $this->app->api()->fetch()->branch();
 
-        if ( $branch !== $payload_branch ) {
+        if ($branch !== $payload_branch) {
             return false;
         }
 
         // We add a tag to commits we push out, so we shouldn't pull them in again.
-        $tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
+        $tag = apply_filters('wogh_commit_msg_tag', 'wogh');
 
-        if ( ! $tag ) {
-            throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
+        if ( ! $tag) {
+            throw new Exception(__('Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github'));
         }
 
-        if ( $tag === substr( $this->message(), -1 * strlen( $tag ) ) ) {
+        if ($tag === substr($this->message(), -1 * strlen($tag))) {
             return false;
         }
 
-        if ( ! $this->get_commit_id() ) {
+        if ( ! $this->get_commit_id()) {
             return false;
         }
 

lib/fileinfo.php

Indentation +8 added lines, -8 removed lines

@@ -6,13 +6,13 @@
  */
 class Writing_On_GitHub_File_Info {
 
-    public function __construct( stdClass $data ) {
-        $this->sha          = $data->sha;
-        $this->path         = $data->path;
-        $this->status       = $data->status;
-    }
+	public function __construct( stdClass $data ) {
+		$this->sha          = $data->sha;
+		$this->path         = $data->path;
+		$this->status       = $data->status;
+	}
 
-    public $sha;
-    public $path;
-    public $status;  // added removed modified
+	public $sha;
+	public $path;
+	public $status;  // added removed modified
 }

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  */
 class Writing_On_GitHub_File_Info {
 
-    public function __construct( stdClass $data ) {
+    public function __construct(stdClass $data) {
         $this->sha          = $data->sha;
         $this->path         = $data->path;
         $this->status       = $data->status;
@@ -14,5 +14,5 @@ 
 
     public $sha;
     public $path;
-    public $status;  // added removed modified
+    public $status; // added removed modified
 }

lib/export.php

Indentation +255 added lines, -255 removed lines

@@ -10,259 +10,259 @@
  */
 class Writing_On_GitHub_Export {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Initializes a new export manager.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Updates all of the current posts in the database on master.
-     *
-     * @param  bool    $force
-     *
-     * @return string|WP_Error
-     */
-    public function full( $force = false ) {
-        $posts = $this->app->database()->fetch_all_supported( $force );
-
-        if ( is_wp_error( $posts ) ) {
-            /*　@var WP_Error $posts */
-            return $posts;
-        }
-
-        $error = '';
-
-        foreach ( $posts as $post ) {
-            $result = $this->update( $post->id() );
-            if ( is_wp_error( $result ) ) {
-                /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
-            }
-        }
-
-        if ( is_wp_error( $error ) ) {
-            /* @var WP_Error $error */
-            return $error;
-        }
-
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
-    }
-
-
-    /**
-     * Check if it exists in github
-     * @param  int  $post_id
-     * @return boolean
-     */
-    protected function github_path( $post_id ) {
-        $github_path = get_post_meta( $post_id, '_wogh_github_path', true );
-
-        if ( $github_path && $this->app->api()->fetch()->exists( $github_path ) ) {
-            return $github_path;
-        }
-
-        return false;
-    }
-
-    /**
-     * Updates the provided post ID in master.
-     *
-     * @param int $post_id Post ID to update.
-     *
-     * @return string|WP_Error
-     */
-    public function update( $post_id ) {
-        $post = $this->app->database()->fetch_by_id( $post_id );
-
-        if ( is_wp_error( $post ) ) {
-            /*　@var WP_Error $post */
-            return $post;
-        }
-
-        if ( 'trash' === $post->status() ) {
-            return $this->delete( $post_id );
-        }
-
-        if ( $old_github_path = $this->github_path( $post->id() ) ) {
-            error_log("old_github_path: $old_github_path");
-            $post->set_old_github_path($old_github_path);
-        }
-
-        $result = $this->new_posts( array( $post ) );
-
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
-    }
-
-    /**
-     * Updates GitHub-created posts with latest WordPress data.
-     *
-     * @param Writing_On_GitHub_Post[] $posts Array of Posts to create.
-     *
-     * @return string|WP_Error
-     */
-    public function new_posts( array $posts ) {
-        $persist = $this->app->api()->persist();
-
-        $error = '';
-        foreach ( $posts as $post ) {
-            $result = $this->new_post( $post, $persist );
-            if ( is_wp_error( $result ) ) {
-                /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
-            }
-        }
-
-        if ( is_wp_error( $error ) ) {
-            return $error;
-        }
-
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
-    }
-
-    protected function new_post( $post, $persist ) {
-        $github_path = $post->github_path();
-        $old_github_path = $post->old_github_path();
-        $blob = $post->to_blob();
-        $result = false;
-
-        if ( $old_github_path && $old_github_path != $github_path ) {
-            // rename
-            $message = apply_filters(
-                'wogh_commit_msg_move_post',
-                sprintf(
-                    'Move %s to %s via WordPress at %s (%s)',
-                    $old_github_path, $github_path,
-                    site_url(),
-                    get_bloginfo( 'name' )
-                )
-            ) . $this->get_commit_msg_tag();
-
-            $result = $persist->delete_file( $post->old_github_path(), $blob->sha(), $message );
-            if ( is_wp_error( $result ) ) {
-                return $result;
-            }
-
-            $result = $persist->create_file( $blob, $message );
-            if ( is_wp_error( $result ) ) {
-                return $result;
-            }
-        } elseif ( ! $old_github_path ) {
-            // create new
-            $message = apply_filters(
-                'wogh_commit_msg_new_post',
-                sprintf(
-                    'Create new post %s from WordPress at %s (%s)',
-                    $github_path,
-                    site_url(),
-                    get_bloginfo( 'name' )
-                )
-            ) . $this->get_commit_msg_tag();
-            $result = $persist->create_file( $blob, $message );
-            if ( is_wp_error( $result ) ) {
-                return $result;
-            }
-        } elseif ( $old_github_path && $old_github_path == $github_path ) {
-            // update
-            $message = apply_filters(
-                'wogh_commit_msg_update_post',
-                sprintf(
-                    'Update post %s from WordPress at %s (%s)',
-                    $github_path,
-                    site_url(),
-                    get_bloginfo( 'name' )
-                )
-            ) . $this->get_commit_msg_tag();
-            $result = $persist->update_file( $blob, $message );
-            if ( is_wp_error( $result ) ) {
-                return $result;
-            }
-        }
-
-        $sha = $result->content->sha;
-        $post->set_sha($sha);
-        $post->set_old_github_path($github_path);
-
-        return true;
-    }
-
-    /**
-     * Deletes a provided post ID from master.
-     *
-     * @param int $post_id Post ID to delete.
-     *
-     * @return string|WP_Error
-     */
-    public function delete( $post_id ) {
-        $post = $this->app->database()->fetch_by_id( $post_id );
-
-        if ( is_wp_error( $post ) ) {
-            /*　@var WP_Error $post */
-            return $post;
-        }
-
-        $github_path = get_post_meta( $post_id, '_wogh_github_path', true );
-
-        $message = apply_filters(
-            'wogh_commit_msg_delete',
-            sprintf(
-                'Deleting %s via WordPress at %s (%s)',
-                $github_path,
-                site_url(),
-                get_bloginfo( 'name' )
-            ),
-            $post
-        ) . $this->get_commit_msg_tag();
-
-        $result = $this->app->api()->persist()->delete_file( $github_path, $post->sha(), $message );
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $result;
-        }
-
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
-    }
-
-
-    /**
-     * Saves the export user to the database.
-     *
-     * @param int $user_id User ID to export with.
-     *
-     * @return bool
-     */
-    public function set_user( $user_id ) {
-        return update_option( self::EXPORT_USER_OPTION, (int) $user_id );
-    }
-
-    /**
-     * Gets the commit message tag.
-     *
-     * @return string
-     */
-    protected function get_commit_msg_tag() {
-        $tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
-
-        if ( ! $tag ) {
-            throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
-        }
-
-        return ' - ' . $tag;
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Initializes a new export manager.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Updates all of the current posts in the database on master.
+	 *
+	 * @param  bool    $force
+	 *
+	 * @return string|WP_Error
+	 */
+	public function full( $force = false ) {
+		$posts = $this->app->database()->fetch_all_supported( $force );
+
+		if ( is_wp_error( $posts ) ) {
+			/*　@var WP_Error $posts */
+			return $posts;
+		}
+
+		$error = '';
+
+		foreach ( $posts as $post ) {
+			$result = $this->update( $post->id() );
+			if ( is_wp_error( $result ) ) {
+				/* @var WP_Error $result */
+				$error = wogh_append_error( $error, $result );
+			}
+		}
+
+		if ( is_wp_error( $error ) ) {
+			/* @var WP_Error $error */
+			return $error;
+		}
+
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+	}
+
+
+	/**
+	 * Check if it exists in github
+	 * @param  int  $post_id
+	 * @return boolean
+	 */
+	protected function github_path( $post_id ) {
+		$github_path = get_post_meta( $post_id, '_wogh_github_path', true );
+
+		if ( $github_path && $this->app->api()->fetch()->exists( $github_path ) ) {
+			return $github_path;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Updates the provided post ID in master.
+	 *
+	 * @param int $post_id Post ID to update.
+	 *
+	 * @return string|WP_Error
+	 */
+	public function update( $post_id ) {
+		$post = $this->app->database()->fetch_by_id( $post_id );
+
+		if ( is_wp_error( $post ) ) {
+			/*　@var WP_Error $post */
+			return $post;
+		}
+
+		if ( 'trash' === $post->status() ) {
+			return $this->delete( $post_id );
+		}
+
+		if ( $old_github_path = $this->github_path( $post->id() ) ) {
+			error_log("old_github_path: $old_github_path");
+			$post->set_old_github_path($old_github_path);
+		}
+
+		$result = $this->new_posts( array( $post ) );
+
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+	}
+
+	/**
+	 * Updates GitHub-created posts with latest WordPress data.
+	 *
+	 * @param Writing_On_GitHub_Post[] $posts Array of Posts to create.
+	 *
+	 * @return string|WP_Error
+	 */
+	public function new_posts( array $posts ) {
+		$persist = $this->app->api()->persist();
+
+		$error = '';
+		foreach ( $posts as $post ) {
+			$result = $this->new_post( $post, $persist );
+			if ( is_wp_error( $result ) ) {
+				/* @var WP_Error $result */
+				$error = wogh_append_error( $error, $result );
+			}
+		}
+
+		if ( is_wp_error( $error ) ) {
+			return $error;
+		}
+
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+	}
+
+	protected function new_post( $post, $persist ) {
+		$github_path = $post->github_path();
+		$old_github_path = $post->old_github_path();
+		$blob = $post->to_blob();
+		$result = false;
+
+		if ( $old_github_path && $old_github_path != $github_path ) {
+			// rename
+			$message = apply_filters(
+				'wogh_commit_msg_move_post',
+				sprintf(
+					'Move %s to %s via WordPress at %s (%s)',
+					$old_github_path, $github_path,
+					site_url(),
+					get_bloginfo( 'name' )
+				)
+			) . $this->get_commit_msg_tag();
+
+			$result = $persist->delete_file( $post->old_github_path(), $blob->sha(), $message );
+			if ( is_wp_error( $result ) ) {
+				return $result;
+			}
+
+			$result = $persist->create_file( $blob, $message );
+			if ( is_wp_error( $result ) ) {
+				return $result;
+			}
+		} elseif ( ! $old_github_path ) {
+			// create new
+			$message = apply_filters(
+				'wogh_commit_msg_new_post',
+				sprintf(
+					'Create new post %s from WordPress at %s (%s)',
+					$github_path,
+					site_url(),
+					get_bloginfo( 'name' )
+				)
+			) . $this->get_commit_msg_tag();
+			$result = $persist->create_file( $blob, $message );
+			if ( is_wp_error( $result ) ) {
+				return $result;
+			}
+		} elseif ( $old_github_path && $old_github_path == $github_path ) {
+			// update
+			$message = apply_filters(
+				'wogh_commit_msg_update_post',
+				sprintf(
+					'Update post %s from WordPress at %s (%s)',
+					$github_path,
+					site_url(),
+					get_bloginfo( 'name' )
+				)
+			) . $this->get_commit_msg_tag();
+			$result = $persist->update_file( $blob, $message );
+			if ( is_wp_error( $result ) ) {
+				return $result;
+			}
+		}
+
+		$sha = $result->content->sha;
+		$post->set_sha($sha);
+		$post->set_old_github_path($github_path);
+
+		return true;
+	}
+
+	/**
+	 * Deletes a provided post ID from master.
+	 *
+	 * @param int $post_id Post ID to delete.
+	 *
+	 * @return string|WP_Error
+	 */
+	public function delete( $post_id ) {
+		$post = $this->app->database()->fetch_by_id( $post_id );
+
+		if ( is_wp_error( $post ) ) {
+			/*　@var WP_Error $post */
+			return $post;
+		}
+
+		$github_path = get_post_meta( $post_id, '_wogh_github_path', true );
+
+		$message = apply_filters(
+			'wogh_commit_msg_delete',
+			sprintf(
+				'Deleting %s via WordPress at %s (%s)',
+				$github_path,
+				site_url(),
+				get_bloginfo( 'name' )
+			),
+			$post
+		) . $this->get_commit_msg_tag();
+
+		$result = $this->app->api()->persist()->delete_file( $github_path, $post->sha(), $message );
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $result;
+		}
+
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+	}
+
+
+	/**
+	 * Saves the export user to the database.
+	 *
+	 * @param int $user_id User ID to export with.
+	 *
+	 * @return bool
+	 */
+	public function set_user( $user_id ) {
+		return update_option( self::EXPORT_USER_OPTION, (int) $user_id );
+	}
+
+	/**
+	 * Gets the commit message tag.
+	 *
+	 * @return string
+	 */
+	protected function get_commit_msg_tag() {
+		$tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
+
+		if ( ! $tag ) {
+			throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
+		}
+
+		return ' - ' . $tag;
+	}
 }

Spacing +57 added lines, -57 removed lines

@@ -22,7 +22,7 @@ 
      *
      * @param Writing_On_GitHub $app Application container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -33,30 +33,30 @@ 
      *
      * @return string|WP_Error
      */
-    public function full( $force = false ) {
-        $posts = $this->app->database()->fetch_all_supported( $force );
+    public function full($force = false) {
+        $posts = $this->app->database()->fetch_all_supported($force);
 
-        if ( is_wp_error( $posts ) ) {
+        if (is_wp_error($posts)) {
             /*　@var WP_Error $posts */
             return $posts;
         }
 
         $error = '';
 
-        foreach ( $posts as $post ) {
-            $result = $this->update( $post->id() );
-            if ( is_wp_error( $result ) ) {
+        foreach ($posts as $post) {
+            $result = $this->update($post->id());
+            if (is_wp_error($result)) {
                 /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
+                $error = wogh_append_error($error, $result);
             }
         }
 
-        if ( is_wp_error( $error ) ) {
+        if (is_wp_error($error)) {
             /* @var WP_Error $error */
             return $error;
         }
 
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+        return __('Export to GitHub completed successfully.', 'writing-on-github');
     }
 
 
@@ -65,10 +65,10 @@ 
      * @param  int  $post_id
      * @return boolean
      */
-    protected function github_path( $post_id ) {
-        $github_path = get_post_meta( $post_id, '_wogh_github_path', true );
+    protected function github_path($post_id) {
+        $github_path = get_post_meta($post_id, '_wogh_github_path', true);
 
-        if ( $github_path && $this->app->api()->fetch()->exists( $github_path ) ) {
+        if ($github_path && $this->app->api()->fetch()->exists($github_path)) {
             return $github_path;
         }
 
@@ -82,31 +82,31 @@ 
      *
      * @return string|WP_Error
      */
-    public function update( $post_id ) {
-        $post = $this->app->database()->fetch_by_id( $post_id );
+    public function update($post_id) {
+        $post = $this->app->database()->fetch_by_id($post_id);
 
-        if ( is_wp_error( $post ) ) {
+        if (is_wp_error($post)) {
             /*　@var WP_Error $post */
             return $post;
         }
 
-        if ( 'trash' === $post->status() ) {
-            return $this->delete( $post_id );
+        if ('trash' === $post->status()) {
+            return $this->delete($post_id);
         }
 
-        if ( $old_github_path = $this->github_path( $post->id() ) ) {
+        if ($old_github_path = $this->github_path($post->id())) {
             error_log("old_github_path: $old_github_path");
             $post->set_old_github_path($old_github_path);
         }
 
-        $result = $this->new_posts( array( $post ) );
+        $result = $this->new_posts(array($post));
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+        return __('Export to GitHub completed successfully.', 'writing-on-github');
     }
 
     /**
@@ -116,32 +116,32 @@ 
      *
      * @return string|WP_Error
      */
-    public function new_posts( array $posts ) {
+    public function new_posts(array $posts) {
         $persist = $this->app->api()->persist();
 
         $error = '';
-        foreach ( $posts as $post ) {
-            $result = $this->new_post( $post, $persist );
-            if ( is_wp_error( $result ) ) {
+        foreach ($posts as $post) {
+            $result = $this->new_post($post, $persist);
+            if (is_wp_error($result)) {
                 /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
+                $error = wogh_append_error($error, $result);
             }
         }
 
-        if ( is_wp_error( $error ) ) {
+        if (is_wp_error($error)) {
             return $error;
         }
 
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+        return __('Export to GitHub completed successfully.', 'writing-on-github');
     }
 
-    protected function new_post( $post, $persist ) {
+    protected function new_post($post, $persist) {
         $github_path = $post->github_path();
         $old_github_path = $post->old_github_path();
         $blob = $post->to_blob();
         $result = false;
 
-        if ( $old_github_path && $old_github_path != $github_path ) {
+        if ($old_github_path && $old_github_path != $github_path) {
             // rename
             $message = apply_filters(
                 'wogh_commit_msg_move_post',
@@ -149,20 +149,20 @@ 
                     'Move %s to %s via WordPress at %s (%s)',
                     $old_github_path, $github_path,
                     site_url(),
-                    get_bloginfo( 'name' )
+                    get_bloginfo('name')
                 )
             ) . $this->get_commit_msg_tag();
 
-            $result = $persist->delete_file( $post->old_github_path(), $blob->sha(), $message );
-            if ( is_wp_error( $result ) ) {
+            $result = $persist->delete_file($post->old_github_path(), $blob->sha(), $message);
+            if (is_wp_error($result)) {
                 return $result;
             }
 
-            $result = $persist->create_file( $blob, $message );
-            if ( is_wp_error( $result ) ) {
+            $result = $persist->create_file($blob, $message);
+            if (is_wp_error($result)) {
                 return $result;
             }
-        } elseif ( ! $old_github_path ) {
+        } elseif ( ! $old_github_path) {
             // create new
             $message = apply_filters(
                 'wogh_commit_msg_new_post',
@@ -170,14 +170,14 @@ 
                     'Create new post %s from WordPress at %s (%s)',
                     $github_path,
                     site_url(),
-                    get_bloginfo( 'name' )
+                    get_bloginfo('name')
                 )
             ) . $this->get_commit_msg_tag();
-            $result = $persist->create_file( $blob, $message );
-            if ( is_wp_error( $result ) ) {
+            $result = $persist->create_file($blob, $message);
+            if (is_wp_error($result)) {
                 return $result;
             }
-        } elseif ( $old_github_path && $old_github_path == $github_path ) {
+        } elseif ($old_github_path && $old_github_path == $github_path) {
             // update
             $message = apply_filters(
                 'wogh_commit_msg_update_post',
@@ -185,11 +185,11 @@ 
                     'Update post %s from WordPress at %s (%s)',
                     $github_path,
                     site_url(),
-                    get_bloginfo( 'name' )
+                    get_bloginfo('name')
                 )
             ) . $this->get_commit_msg_tag();
-            $result = $persist->update_file( $blob, $message );
-            if ( is_wp_error( $result ) ) {
+            $result = $persist->update_file($blob, $message);
+            if (is_wp_error($result)) {
                 return $result;
             }
         }
@@ -208,15 +208,15 @@ 
      *
      * @return string|WP_Error
      */
-    public function delete( $post_id ) {
-        $post = $this->app->database()->fetch_by_id( $post_id );
+    public function delete($post_id) {
+        $post = $this->app->database()->fetch_by_id($post_id);
 
-        if ( is_wp_error( $post ) ) {
+        if (is_wp_error($post)) {
             /*　@var WP_Error $post */
             return $post;
         }
 
-        $github_path = get_post_meta( $post_id, '_wogh_github_path', true );
+        $github_path = get_post_meta($post_id, '_wogh_github_path', true);
 
         $message = apply_filters(
             'wogh_commit_msg_delete',
@@ -224,19 +224,19 @@ 
                 'Deleting %s via WordPress at %s (%s)',
                 $github_path,
                 site_url(),
-                get_bloginfo( 'name' )
+                get_bloginfo('name')
             ),
             $post
         ) . $this->get_commit_msg_tag();
 
-        $result = $this->app->api()->persist()->delete_file( $github_path, $post->sha(), $message );
+        $result = $this->app->api()->persist()->delete_file($github_path, $post->sha(), $message);
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /*　@var WP_Error $result */
             return $result;
         }
 
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+        return __('Export to GitHub completed successfully.', 'writing-on-github');
     }
 
 
@@ -247,8 +247,8 @@ 
      *
      * @return bool
      */
-    public function set_user( $user_id ) {
-        return update_option( self::EXPORT_USER_OPTION, (int) $user_id );
+    public function set_user($user_id) {
+        return update_option(self::EXPORT_USER_OPTION, (int) $user_id);
     }
 
     /**
@@ -257,10 +257,10 @@ 
      * @return string
      */
     protected function get_commit_msg_tag() {
-        $tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
+        $tag = apply_filters('wogh_commit_msg_tag', 'wogh');
 
-        if ( ! $tag ) {
-            throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
+        if ( ! $tag) {
+            throw new Exception(__('Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github'));
         }
 
         return ' - ' . $tag;

lib/semaphore.php

Indentation +51 added lines, -51 removed lines

@@ -9,55 +9,55 @@
  */
 class Writing_On_GitHub_Semaphore {
 
-    /**
-     * Sempahore's option key.
-     */
-    const KEY = 'wogh_semaphore_lock';
-
-    /**
-     * Option key when semaphore is locked.
-     */
-    const VALUE_LOCKED = 'yes';
-
-    /**
-     * Option key when semaphore is unlocked.
-     */
-    const VALUE_UNLOCKED = 'no';
-
-    /**
-     * Clean up the old values on instantiation.
-     */
-    public function __construct() {
-        delete_option( self::KEY );
-    }
-
-    /**
-     * Checks if the Semaphore is open.
-     *
-     * Fails to report it's open if the the Api class can't make a call
-     * or the push lock has been enabled.
-     *
-     * @return bool
-     */
-    public function is_open() {
-        if ( self::VALUE_LOCKED === get_transient( self::KEY ) ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Enables the push lock.
-     */
-    public function lock() {
-        set_transient( self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS );
-    }
-
-    /**
-     * Disables the push lock.
-     */
-    public function unlock() {
-        set_transient( self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS );
-    }
+	/**
+	 * Sempahore's option key.
+	 */
+	const KEY = 'wogh_semaphore_lock';
+
+	/**
+	 * Option key when semaphore is locked.
+	 */
+	const VALUE_LOCKED = 'yes';
+
+	/**
+	 * Option key when semaphore is unlocked.
+	 */
+	const VALUE_UNLOCKED = 'no';
+
+	/**
+	 * Clean up the old values on instantiation.
+	 */
+	public function __construct() {
+		delete_option( self::KEY );
+	}
+
+	/**
+	 * Checks if the Semaphore is open.
+	 *
+	 * Fails to report it's open if the the Api class can't make a call
+	 * or the push lock has been enabled.
+	 *
+	 * @return bool
+	 */
+	public function is_open() {
+		if ( self::VALUE_LOCKED === get_transient( self::KEY ) ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Enables the push lock.
+	 */
+	public function lock() {
+		set_transient( self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS );
+	}
+
+	/**
+	 * Disables the push lock.
+	 */
+	public function unlock() {
+		set_transient( self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS );
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
      * Clean up the old values on instantiation.
      */
     public function __construct() {
-        delete_option( self::KEY );
+        delete_option(self::KEY);
     }
 
     /**
@@ -40,7 +40,7 @@ 
      * @return bool
      */
     public function is_open() {
-        if ( self::VALUE_LOCKED === get_transient( self::KEY ) ) {
+        if (self::VALUE_LOCKED === get_transient(self::KEY)) {
             return false;
         }
 
@@ -51,13 +51,13 @@ 
      * Enables the push lock.
      */
     public function lock() {
-        set_transient( self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS );
+        set_transient(self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS);
     }
 
     /**
      * Disables the push lock.
      */
     public function unlock() {
-        set_transient( self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS );
+        set_transient(self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS);
     }
 }