Merge branch 'development'

Author: Samuel Parkinson

.gitattributes

@@ -3,14 +3,14 @@
 # Remove unnecessary files from archive generation
 
 ## Files ##
-/.gitattributes export-ignore
-/.gitignore export-ignore
-/.travis.yml export-ignore
-/CONTRIBUTING.md export-ignore
-/LICENCE.md export-ignore
-/README.md export-ignore
-/phpunit.xml export-ignore
-/Vagrantfile export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+CONTRIBUTING.md export-ignore
+LICENCE.md export-ignore
+README.md export-ignore
+phpunit.xml export-ignore
+Vagrantfile export-ignore
 
 ## Folders ##
-/tests export-ignore
+tests/ export-ignore

.gitignore

@@ -1,9 +1,9 @@
 # Project Files & Folders #
 ###########################
 composer.lock
+*.sublime-*
 .vagrant/
 vendor/
-build/
 
 # OS Generated Files #
 ######################

.travis.yml

@@ -7,17 +7,13 @@ php:
   - hhvm
   - hhvm-nightly
 
-addons:
-  code_climate:
-    repo_token: db3a9d5167930c783c659b6a713719a2f4b7fac416d579c024fbfce876c30c11
+cache:
+  directories:
+    - vendor/
 
 before_script:
   - composer self-update
-  - composer install --dev --no-interaction --prefer-source --optimize-autoloader
-  - mkdir -p build/logs
+  - composer install --no-interaction --optimize-autoloader
 
 script:
   - vendor/bin/phpunit
-
-after_script:
-  - vendor/bin/test-reporter

README.md

@@ -9,16 +9,16 @@ An extendable framework for version control hooks.
 
 ![StaticReview Success Demo](http://i.imgur.com/8G3uORp.gif)
 
-[travis]:      https://travis-ci.org/sjparkinson/static-review
-[packagist]:   https://packagist.org/packages/sjparkinson/static-review
-[php]:         https://php.net/
+[travis]:    https://travis-ci.org/sjparkinson/static-review
+[packagist]: https://packagist.org/packages/sjparkinson/static-review
+[php]:       https://php.net/
 
 ## Usage
 
 Within a [composer][composer] managed project you can simply do the following...
 
 ```bash
-$ composer require sjparkinson/static-review:~1.1
+$ composer require sjparkinson/static-review:~1.0
 $ vendor/bin/static-review.php list hook
 ```
 

bin/static-review.php

@@ -20,15 +20,15 @@
 
 use Symfony\Component\Console\Application;
 
-$name = 'StaticReview Command Line Tool';
+$name    = 'StaticReview Command Line Tool';
 $version = '1.0.0';
 
 $console = new Application($name, $version);
 
 $console->addCommands([
     new HookListCommand,
     new HookInstallCommand,
-    new HookRunCommand
+    new HookRunCommand,
 ]);
 
 $console->run();

composer.json

@@ -38,8 +38,7 @@
 
     "require-dev": {
         "mockery/mockery": "~0.9",
-        "phpunit/phpunit": "~4.0",
-        "codeclimate/php-test-reporter": "~0.1"
+        "phpunit/phpunit": "~4.0"
     },
 
     "bin": [

hooks/php-pre-commit.php

@@ -24,6 +24,7 @@
 use StaticReview\Review\General\NoCommitTagReview;
 use StaticReview\Review\PHP\PhpLeadingLineReview;
 use StaticReview\Review\PHP\PhpLintReview;
+use StaticReview\Review\Config\ComposerConfigReview;
 
 $reporter = new Reporter();
 
@@ -33,7 +34,8 @@
 $review->addReview(new LineEndingsReview)
        ->addReview(new PhpLeadingLineReview)
        ->addReview(new NoCommitTagReview)
-       ->addReview(new PhpLintReview);
+       ->addReview(new PhpLintReview)
+       ->addReview(new ComposerConfigReview);
 
 $git = VersionControlFactory::build(VersionControlFactory::SYSTEM_GIT);
 

hooks/static-review-pre-commit.php

@@ -1,29 +1,28 @@
-<phpunit
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
 
-         bootstrap="./vendor/autoload.php"
+         bootstrap="vendor/autoload.php"
          colors="true"
          verbose="true">
 
     <!-- Test suites -->
     <testsuites>
         <testsuite name="unit">
-            <directory suffix="Test.php">tests/</directory>
+            <directory>tests/</directory>
         </testsuite>
     </testsuites>
 
     <!-- Coverage filter -->
     <filter>
         <whitelist>
-            <directory>src</directory>
+            <directory>src/</directory>
         </whitelist>
     </filter>
 
     <!-- Coverage reporting -->
     <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml" />
-        <log type="coverage-text" target="php://stdout" />
+        <log type="coverage-text"
+             target="php://stdout" />
     </logging>
 
 </phpunit>

phpunit.xml

@@ -27,39 +27,63 @@ protected function configure()
 
         $this->setDescription('Symlink a hook to the given target.');
 
-        $this->addArgument('hook', InputArgument::REQUIRED, 'The hook to link, either a path to a file or the filename of a hook in the hooks folder.')
-             ->addArgument('target', InputArgument::REQUIRED, 'The target location, including the filename (e.g. .git/hooks/pre-commit).');
+        $this->addArgument('target', InputArgument::REQUIRED, 'The hook to link, either a path to a file or the filename of a hook in the hooks folder.')
+             ->addArgument('link', InputArgument::REQUIRED, 'The target location, including the filename (e.g. .git/hooks/pre-commit).');
 
         $this->addOption('force', 'f', InputOption::VALUE_NONE, 'Overrite any existing files at the symlink target.');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $source = realpath(__DIR__ . '/../../hooks/') . '/' . $input->getArgument('hook') . '.php';
+        $force  = $input->getOption('force');
+        $target = $this->getTargetPath($input);
+        $link   = $input->getArgument('link');
 
-        if (! file_exists($source) && file_exists($input->getArgument('hook'))) {
-            $source = $input->getArgument('hook');
-        } else {
-            $error = sprintf('<error>The hook %s does not exist!</error>', $input->getArgument('hook'));
-            $output->writeln($error);
-            exit(1);
+        if ($output->isVeryVerbose()) {
+            $message = sprintf('<info>Using %s for the hook target.</info>', $target);
+            $output->writeln($message);
+
+            $message = sprintf('<info>Using %s for the hook path.</info>', $link);
+            $output->writeln($message);
         }
 
-        $target = $input->getArgument('target');
-        $force  = $input->getOption('force');
+        if (file_exists($link) && $force) {
+            unlink($link);
 
-        if ($force && file_exists($target)) {
-            unlink($target);
-            $output->writeln('Removed existing file.');
+            $message = sprintf('<info>Removed existing file at %s.</info>', $link);
+            $output->writeln($message);
         }
 
-        if (file_exists($source)
-            && (! file_exists($target) || $force)) {
-            symlink($source, $target);
-            chmod($target, 0755);
+        if (! file_exists($link) || $force) {
+            symlink($target, $link);
+            chmod($link, 0755);
             $output->writeln('Symlink created.');
         } else {
-            $output->writeln('<error>A file at the target already exists.</error>');
+            $message = sprintf('<error>A file at %s already exists.</error>', $link);
+            $output->writeln($message);
+            exit(1);
         }
     }
+
+    /**
+     * @param $input InputInterface
+     * @return string
+     */
+    protected function getTargetPath(InputInterface $input)
+    {
+        if (file_exists($input->getArgument('target'))) {
+            $target = realpath($input->getArgument('target'));
+        } else {
+            $path = '%s/%s.php';
+            $target = sprintf($path, realpath(__DIR__ . '/../../hooks/'), $input->getArgument('target'));
+        }
+
+        if (! file_exists($target)) {
+            $error = sprintf('<error>The hook %s does not exist!</error>', $target);
+            $output->writeln($error);
+            exit(1);
+        }
+
+        return $target;
+    }
 }