Adding fetch command

bin/uaparser.php

@@ -10,5 +10,6 @@
 $application->add(new UpdateCommand(realpath(__DIR__ . '/../resources')));
 $application->add(new ParserCommand());
 $application->add(new LogfileCommand());
+$application->add(new FetchCommand());
 
 $application->run();

src/UAParser/Command/FetchCommand.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * ua-parser
+ *
+ * Copyright (c) 2011-2012 Dave Olsen, http://dmolsen.com
+ *
+ * Released under the MIT license
+ */
+namespace UAParser\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Filesystem\Filesystem;
+use UAParser\Util\Fetcher;
+
+class FetchCommand extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('ua-parser:update')
+            ->setDescription('Fetches an updated YAML file for ua-parser and overwrites the current JSON file.')
+            ->addArgument(
+                'file',
+                InputArgument::REQUIRED,
+                'regexes.yaml output file'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $fs = new Filesystem();
+        $fetcher = new Fetcher();
+        $fs->dumpFile($input->getArgument('file'), $fetcher->fetch());
+    }
+}

src/UAParser/Command/UpdateCommand.php

@@ -13,7 +13,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use UAParser\Util\Converter;
-use UAParser\Util\Updater;
+use UAParser\Util\Fetcher;
 
 class UpdateCommand extends Command
 {
@@ -42,11 +42,9 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->getUpdater()->update($input->getOption('no-backup'));
-    }
+        $fetcher = new Fetcher();
+        $converter = new Converter($this->resourceDirectory);
 
-    private function getUpdater()
-    {
-        return new Updater(new Converter($this->resourceDirectory));
+        $converter->convertString($fetcher->fetch(), $input->getOption('no-backup'));
     }
 }

src/UAParser/Util/Converter.php

@@ -21,7 +21,7 @@ class Converter
     private $fs;
 
     /**
-     * @param strin $destination
+     * @param string $destination
      * @param Filesystem $fs
      */
     public function __construct($destination, Filesystem $fs = null)

src/UAParser/Util/Updater.php → src/UAParser/Util/Fetcher.php

@@ -8,17 +8,9 @@
  */
 namespace UAParser\Util;
 
-class Updater
+class Fetcher
 {
-    /** @var Converter */
-    private $converter;
-
-    public function __construct(Converter $converter)
-    {
-        $this->converter = $converter;
-    }
-
-    public function update($backupBeforeOverride = true)
+    public function fetch()
     {
         $context = stream_context_create(
             array(
@@ -32,9 +24,6 @@ public function update($backupBeforeOverride = true)
             )
         );
 
-        $this->converter->convertString(
-            file_get_contents('https://raw.github.com/tobie/ua-parser/master/regexes.yaml', null, $context),
-            $backupBeforeOverride
-        );
+        return file_get_contents('https://raw.github.com/tobie/ua-parser/master/regexes.yaml', null, $context);
     }
 }

tests/UAParser/Tests/Util/FetcherTest.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * ua-parser
+ *
+ * Copyright (c) 2011-2012 Dave Olsen, http://dmolsen.com
+ *
+ * Released under the MIT license
+ */
+namespace UAParser\Tests\Util;
+
+use PHPUnit_Framework_TestCase as AbstractTestCase;
+use UAParser\Util\Fetcher;
+
+/**
+ * @group online
+ */
+class FetcherTest extends AbstractTestCase
+{
+
+    /** @var Fetcher */
+    private $fetcher;
+
+    public function setUp()
+    {
+        $this->fetcher = new Fetcher();
+    }
+
+    public function testFetch()
+    {
+        $this->assertInternalType('string', $this->fetcher->fetch());
+    }
+}

tests/UAParser/Tests/Util/Logfile/AbstractReaderTest.php

@@ -38,7 +38,7 @@ public function testTestRealLine()
     public function testReadEmptyLine()
     {
         $this->setExpectedException(
-            'UAParser\Exception\ParserException',
+            'UAParser\Exception\ReaderException',
             'Cannot extract user agent string from line "invalid"'
         );
         $this->reader->read('invalid');