Reading config file from sami.php or sami.php.dist by default

.gitignore

@@ -1,4 +1,5 @@
-vendor
-composer.phar
 build
 cache
+composer.lock
+composer.phar
+vendor

Sami/Console/Command/Command.php

@@ -39,7 +39,7 @@ abstract class Command extends BaseCommand
      */
     protected function configure()
     {
-        $this->getDefinition()->addArgument(new InputArgument('config', InputArgument::REQUIRED, 'The configuration'));
+        $this->getDefinition()->addOption(new InputOption('config-file', '', InputOption::VALUE_OPTIONAL, 'The path to a sami.php configuration file', null));
         $this->getDefinition()->addOption(new InputOption('only-version', '', InputOption::VALUE_REQUIRED, 'The version to build'));
     }
 
@@ -48,25 +48,34 @@ protected function initialize(InputInterface $input, OutputInterface $output)
         $this->input = $input;
         $this->output = $output;
 
-        $config = $input->getArgument('config');
         $filesystem = new Filesystem();
-
-        if (!$filesystem->isAbsolutePath($config)) {
-            $config = getcwd().'/'.$config;
+
+        $configFile = $input->getOption('config-file');
+        if (null !== $configFile) {
+            if (!$filesystem->isAbsolutePath($configFile)) {
+                $configFile = realpath($configFile);
+            }
         }
-
-        if (!is_file($config)) {
-            throw new \InvalidArgumentException(sprintf('Configuration file "%s" does not exist.', $config));
+        else {
+            if (file_exists('sami.php')) {
+                $configFile = realpath('sami.php');
+            } elseif (file_exists('sami.php.dist')) {
+                $configFile = realpath('sami.php.dist');
+            }
+        }
+
+        if (!is_file($configFile)) {
+            throw new \InvalidArgumentException(sprintf('Configuration file "%s" does not exist.', $configFile));
         }
 
-        $this->sami = require $config;
+        $this->sami = require $configFile;
 
         if ($input->getOption('only-version')) {
             $this->sami['versions'] = $input->getOption('only-version');
         }
 
         if (!$this->sami instanceof Sami) {
-            throw new \RuntimeException(sprintf('Configuration file "%s" must return a Sami instance.', $config));
+            throw new \RuntimeException(sprintf('Configuration file "%s" must return a Sami instance.', $configFile));
         }
     }
 

sami.php → bin/sami

@@ -2,10 +2,10 @@
 <?php
 
 // installed via composer?
-if (file_exists($a = __DIR__.'/../../autoload.php')) {
+if (file_exists($a = __DIR__.'/../../../autoload.php')) {
     require_once $a;
 } else {
-    require_once __DIR__.'/vendor/autoload.php';
+    require_once __DIR__.'/../vendor/autoload.php';
 }
 
 use Sami\Console\Application;

composer.json

@@ -32,5 +32,5 @@
             "dev-master": "2.0-dev"
         }
     },
-    "bin": ["sami.php"]
+    "bin": ["bin/sami"]
 }

sami.php.dist

@@ -0,0 +1,25 @@
+<?php
+
+use Sami\Sami;
+use Sami\Version\GitVersionCollection;
+use Symfony\Component\Finder\Finder;
+
+$iterator = Finder::create()
+    ->files()
+    ->name('*.php')
+    ->exclude('vendor')
+    ->exclude('build')
+    ->in($dir = '.');
+
+$versions = GitVersionCollection::create($dir)
+    ->add('master', 'master branch');
+
+return new Sami($iterator, array(
+    'theme' => 'enhanced',
+    'versions' => $versions,
+    'title' => 'Sami API',
+    'build_dir' => __DIR__ . '/build/sami/%version%',
+    'cache_dir' => __DIR__ . '/build/cache/sami/%version%',
+    'include_parent_data' => false,
+    'default_opened_level' => 1,
+));