Resolve tilde to home directory

Author: cyberwolf

README.md

@@ -7,10 +7,10 @@ Prerequisites
 =============
 
 You'll need an OAuth consumer key & secret pair. You can find a regulary refreshed pair for testing purposes in the
-[UiTiD manual][uitid_docs]. These credentials are valid for the base URL http://test.uitid.be/culturefeed/rest.
+[UiTiD manual][uitid_docs]. These credentials are valid for the base URL http://acc.uitid.be/uitid/rest.
 
 You will need to register for an UiTiD account as well. Append /auth/register' to the base URL (for example
-http://test.uitid.be/culturefeed/rest/auth/register), visit the resulting URL with your web browser and fill out the
+http://acc.uitid.be/uitid/rest/auth/register), visit the resulting URL with your web browser and fill out the
 registration form.
 
 Installation
@@ -78,7 +78,7 @@ An example of how the contents of the file could look like:
 ```ini
 consumer-key=76163fc774cb42246d9de37cadeece8a
 consumer-secret=fff975c5a8c7ba19ce92969c1879b211
-base-url[auth]=http://test.uitid.be/culturefeed/rest
+base-url[auth]=http://acc.uitid.be/uitid/rest
 ```
 
 The authenticate command

lib/CultuurNet/Auth/Command/Command.php

@@ -2,6 +2,7 @@
 
 namespace CultuurNet\Auth\Command;
 
+use CultuurNet\Auth\FileUtility;
 use \Symfony\Component\Console\Command\Command as BaseCommand;
 use \Symfony\Component\Console\Input\InputArgument;
 use \Symfony\Component\Console\Input\InputInterface;
@@ -29,6 +30,11 @@ abstract class Command extends BaseCommand
      */
     private $defaults;
 
+    /**
+     * @var FileUtility
+     */
+    private $fileUtility;
+
     /**
      * @return array
      */
@@ -85,11 +91,21 @@ public function __construct($name = null)
             );
     }
 
+    protected function getFileUtility() {
+        if (!isset($this->fileUtility)) {
+            $this->fileUtility = new FileUtility();
+        }
+
+        return $this->fileUtility;
+    }
+
     protected function execute(InputInterface $in, OutputInterface $out)
     {
         $sessionFile = $in->getOption('session');
         if (NULL !== $sessionFile) {
             // @todo Catch JsonValidationException and show errors.
+            $fileUtility = $this->getFileUtility();
+            $sessionFile = $fileUtility->expandPath($sessionFile);
             $this->session = JsonSessionFile::read($sessionFile);
         }
         else {
@@ -125,7 +141,7 @@ protected function execute(InputInterface $in, OutputInterface $out)
     /**
      *
      */
-    protected function resolveBaseUrl($api, InputInterface $in = NULL, $default = 'http://test.uitid.be/culturefeed/rest')
+    protected function resolveBaseUrl($api, InputInterface $in = NULL, $default = 'http://acc.uitid.be/uitid/rest')
     {
         if (NULL === $this->session) {
             // @todo throw exception as session isn't initialized yet

lib/CultuurNet/Auth/FileUtility.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * @file
+ */
+
+namespace CultuurNet\Auth;
+
+class FileUtility
+{
+    protected $expand;
+
+    /**
+     * @var boolean
+     */
+    protected $expandTilde;
+
+    /**
+     * @var string
+     */
+    protected $userHomeDir;
+
+    public function __construct()
+    {
+        if (function_exists('posix_getuid')) {
+            $this->expandTilde = TRUE;
+
+            $info = posix_getpwuid(posix_getuid());
+            $this->userHomeDir = $info['dir'];
+        }
+    }
+
+    public function expandPath($path)
+    {
+        if ($this->expandTilde && 0 === strpos($path, '~')) {
+            $path = substr_replace($path, $this->userHomeDir, 0, 1);
+        }
+
+        return $path;
+    }
+}