New rules can be added by XML #14

ScreamingDev · Mar 14, 2015 · 188c3b0 · 188c3b0
1 parent 6453185
commit 188c3b0
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 35 deletions.
diff --git a/lib/PHPSemVer/Console/CompareCommand.php b/lib/PHPSemVer/Console/CompareCommand.php
@@ -40,7 +40,7 @@ protected function configure()
             'R',
             InputArgument::OPTIONAL,
             'A ruleset (eg. "semver2.0")',
-            'semver2.0'
+            'SemVer2'
         );
 
         $this->addArgument(
@@ -87,8 +87,47 @@ protected function execute(
         $previousWrapper = new $wrapper( $input->getArgument( 'previous' ) );
         $latestWrapper   = new $wrapper( $input->getArgument( 'latest' ) );
 
-        $rule = new NoneDeletedRule( $previousWrapper->getBuilder(), $latestWrapper->getBuilder() );
-        $rule->process();
+        $xmlFile      = PHPSEMVER_LIB_PATH . '/PHPSemVer/Rules/Semver2.xml';
+        $xmlFileShort = trim( str_replace( getcwd(), '', $xmlFile ), DIRECTORY_SEPARATOR );
+
+        $xml = simplexml_load_file( $xmlFile );
+
+        $ruleSets = $xml->xpath( '//ruleset' );
+
+        $appliedRules = array();
+        foreach ( $ruleSets as $ruleSet )
+        {
+            foreach ( $ruleSet->xpath( '//rule' ) as $rule )
+            {
+                if ( ! $rule->attributes() || ! $rule->attributes()->ref )
+                {
+                    continue;
+                }
+
+                $rule = (string) $rule->attributes()->ref;
+
+                $segments = explode( '.', $rule );
+                $class    = '\\PHPSemVer\\Rules\\' . implode( '\\', $segments ) . 'Rule';
+
+                if ( ! class_exists( $class ) )
+                {
+                    throw new \Exception(
+                        sprintf(
+                            'Invalid rule "%s" in "%s" (class "%s" not found).',
+                            $rule,
+                            $xmlFileShort,
+                            $class
+                        )
+                    );
+
+                    continue;
+                }
+
+                $singleRule     = new NoneDeletedRule( $previousWrapper->getBuilder(), $latestWrapper->getBuilder() );
+                $singleRule->process();
+                $appliedRules[] = $singleRule;
+            }
+        }
 
         $table = new Table( $output );
         $table->setHeaders(
@@ -98,14 +137,17 @@ protected function execute(
             )
         );
 
-        foreach ( $rule->getErrors() as $error )
+        foreach ( $appliedRules as $rule )
         {
-            $table->addRow(
-                array(
-                    $error->getRule(),
-                    $error->getMessage()
-                )
-            );
+            foreach ( $rule->getErrors() as $error )
+            {
+                $table->addRow(
+                    array(
+                        $error->getRule(),
+                        $error->getMessage()
+                    )
+                );
+            }
         }
 
         $table->render();

diff --git a/lib/PHPSemVer/Rules/Semver2Rule.php b/lib/PHPSemVer/Rules/Semver2Rule.php
diff --git a/lib/PHPSemVer/Rules/semver2.xml b/lib/PHPSemVer/Rules/semver2.xml
diff --git a/lib/PHPSemVer/Wrapper/AbstractWrapper.php b/lib/PHPSemVer/Wrapper/AbstractWrapper.php
@@ -62,6 +62,8 @@ public function getBuilder()
                 continue;
             }
 
+            $sourceFile = realpath($sourceFile);
+
             $tokenizer->setSourceFile( $sourceFile );
 
             $parser = $this->getParser( $tokenizer, $builder, $cache );

diff --git a/lib/PHPSemVer/Wrapper/Git.php b/lib/PHPSemVer/Wrapper/Git.php
@@ -52,8 +52,15 @@ public function getAllFileNames()
         );
 
         $allPrevious = explode( PHP_EOL, $result->getOutput() );
+        $allPrevious = array_filter( $allPrevious );
 
-        return array_filter( $allPrevious );
+        $allFileNames = array();
+        foreach ( $allPrevious as $singleFile )
+        {
+            $allFileNames[ $singleFile ] = $this->getPath( $singleFile );
+        }
+
+        return $allFileNames;
     }
 
     /**