Cleaned up configs and removed resources (no longer needed)

xsist10 · Apr 21, 2014 · ee7bb91 · ee7bb91
1 parent 311a6cc
commit ee7bb91
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 81 deletions.
diff --git a/res/config.json b/res/config.json
diff --git a/res/thawte.pem b/res/thawte.pem
diff --git a/shone.phar b/shone.phar
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -101,9 +101,6 @@ public function compile($pharFile = 'shone.phar')
         }
         $this->addShoneBin($phar);
 
-        // Add resources
-        $this->addFile($phar, new \SplFileInfo(__DIR__.'/../res/config.json'));
-
         // Stubs
         $phar->setStub($this->getStub());
 
@@ -125,7 +122,6 @@ private function addFile($phar, $file, $strip = true)
             $content = "\n".$content."\n";
         }
 
-        $content = str_replace('@package_version@', $this->version, $content);
         $content = str_replace('@release_date@', $this->versionDate, $content);
 
         $phar->addFromString($path, $content);

diff --git a/src/Config.php b/src/Config.php
@@ -41,8 +41,31 @@ class Config
      * @var array
      */
     public static $defaultConfig = array(
-        'ignore-ext'        => array(),
-        'ssl-cert-check'    => 1
+        'ssl-cert-check'    => 1,
+        'ignore-ext'        => array(
+            'avi',
+            'bmp',
+            'doc',
+            'docx',
+            'gif',
+            'ico',
+            'jpeg',
+            'jpg',
+            'json',
+            'lock',
+            'log',
+            'md',
+            'mkv',
+            'mp3',
+            'mpeg',
+            'mpg',
+            'pdf',
+            'png',
+            'tar',
+            'txt',
+            'yml',
+            'zip'
+        )
     );
 
     /**
@@ -55,11 +78,6 @@ class Config
      */
     private $config_file;
 
-    /**
-     * @var string
-     */
-    private $home_file;
-
     /**
      * Build a new config object
      *
@@ -80,15 +98,8 @@ public function __construct()
             $home = getcwd();
         }
 
-        $this->home_file = $home . '/shone.json';
-
         // Attempt to load a custom config
-        $this->config_file = realpath($this->home_file);
-        if (!is_readable($this->config_file))
-        {
-            // Failing that, default to the bundled one
-            $this->config_file = __DIR__ . '/../res/config.json';
-        }
+        $this->config_file = $home . '/shone.json';
         if (is_file($this->config_file) && is_readable($this->config_file)) {
             $json = json_decode(file_get_contents($this->config_file), true);
             $this->merge($json);
@@ -113,7 +124,7 @@ public function getConfigFile()
      */
     public function save()
     {
-        return file_put_contents($this->home_file, json_encode($this->config)) > 0;
+        return file_put_contents($this->config_file, json_encode($this->config)) > 0;
     }
 
     /**

diff --git a/src/Scanner.php b/src/Scanner.php
@@ -25,7 +25,7 @@
  */
 class Scanner
 {
-    const VERSION = '@package_version@';
+    const VERSION = '1.1.3';
     const RELEASE_DATE = '@release_date@';
 
     const USER_AGENT = 'Shone PHAR Client';
@@ -84,15 +84,10 @@ public function __construct()
      * Get the user-agent to pass for the scanner
      *
      * @return string
-     * @codeCoverageIgnore
      */
     protected function getUserAgent()
     {
-        if (self::VERSION == '@package_version@') {
-            return self::USER_AGENT . ' - dev';
-        } else {
-            return self::USER_AGENT . ' - ' . self::VERSION;
-        }
+        return self::USER_AGENT . ' - ' . self::VERSION;
     }
 
     /**

diff --git a/src/Tests/Command/SelfUpdateCommandTest.php b/src/Tests/Command/SelfUpdateCommandTest.php
@@ -10,6 +10,7 @@
 
 namespace Shone\Scanner\Tests\Command;
 
+use Shone\Scanner\Scanner;
 use Shone\Scanner\Console\Application;
 use Shone\Scanner\Command\SelfUpdateCommand;
 use Shone\Scanner\Utils\RemoteFileSystem;
@@ -55,7 +56,7 @@ public function testExecuteForCommandAliasWithSameVersion()
         $rfs = $this->getMock('Shone\Scanner\Utils\RemoteFileSystem');
         $rfs->expects($this->atLeastOnce())
             ->method('getFile')
-            ->will($this->returnValue(json_encode(array('version' => '@package_version@'))));
+            ->will($this->returnValue(json_encode(array('version' => Scanner::VERSION))));
 
         $command = $this->getMock('Shone\Scanner\Command\SelfUpdateCommand', array('getRemoteFileSystem'));