Merge pull request #30 from dotpack/dev

Dev

Author: Torann

.gitignore

@@ -1,5 +1,4 @@
 /vendor
-*.mmdb
 composer.phar
 composer.lock
 .DS_Store

README.md

@@ -51,6 +51,13 @@ $ php artisan vendor:publish
 
 A configuration file will be publish to `config/geoip.php`
 
+Update max mind cities database:
+
+~~~
+$ php artisan geoip:update
+~~~
+
+**Database Service**: To use the database version of [MaxMind](http://www.maxmind.com) services download the `GeoLite2-City.mmdb` from [http://dev.maxmind.com/geoip/geoip2/geolite2/](http://dev.maxmind.com/geoip/geoip2/geolite2/) and extract it to `storage/app/geoip.mmdb`. And that's it.
 
 ## Usage
 
@@ -90,12 +97,6 @@ array (
 
 In the case that a location is not found the fallback location will be returned with the `default` parameter set to `true`. To set your own default change it in the configurations `config/geoip.php`
 
-## Services
-
-### [MaxMind](http://www.maxmind.com)
-
-- **Database Service**: To use the database version of MaxMind services download the `GeoLite2-City.mmdb` from [http://dev.maxmind.com/geoip/geoip2/geolite2/](http://dev.maxmind.com/geoip/geoip2/geolite2/) and extract it to `database/maxmind/`. And that's it.
-
 ## Change Log
 
 #### v0.2.0

composer.json

@@ -2,7 +2,7 @@
     "name": "torann/geoip",
     "description": "Supports the two main GeoIP services (infoDB and Maxmind).",
     "keywords": ["laravel", "laravel 5", "geoip", "location", "geolocation"],
-	"license": "BSD 2-Clause",
+    "license": "BSD 2-Clause",
     "authors": [
         {
             "name": "Daniel Stainback",
@@ -12,16 +12,25 @@
     "require": {
         "php": ">=5.3.0",
         "illuminate/support": "~5.0",
-		"geoip2/geoip2": "2.1.1"
+        "illuminate/session": "~5.0",
+        "illuminate/console": "~5.0",
+        "illuminate/config": "~5.0",
+        "monolog/monolog": "~1.11",
+        "geoip2/geoip2": "~2.1",
+        "guzzlehttp/guzzle": "^6.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0",
+        "phpspec/phpspec": "~2.1"
     },
     "autoload": {
         "psr-4": {
-          "Torann\\GeoIP\\": "src/Torann/GeoIP"
+            "Torann\\GeoIP\\": "src/Torann/GeoIP"
         }
     },
     "extra": {
         "branch-alias": {
             "dev-master": "0.2-dev"
         }
     }
-}
+}

src/Torann/GeoIP/Console/UpdateCommand.php

@@ -0,0 +1,57 @@
+<?php namespace Torann\GeoIP\Console;
+
+use Illuminate\Config\Repository;
+use Illuminate\Console\Command;
+use Torann\GeoIP\GeoIPUpdater;
+
+class UpdateCommand extends Command
+{
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'geoip:update';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Update geoip database files to the latest version';
+
+	/**
+	 * @var \Torann\GeoIP\GeoIPUpdater
+	 */
+	protected $geoIPUpdater;
+
+	/**
+	 * Create a new console command instance.
+	 *
+	 * @param \Illuminate\Config\Repository $config
+	 */
+	public function __construct(Repository $config)
+	{
+		parent::__construct();
+
+		$this->geoIPUpdater = new GeoIPUpdater($config);
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return void
+	 */
+	public function fire()
+	{
+		$result = $this->geoIPUpdater->update();
+
+		if (!$result) {
+			$this->error('Update failed!');
+
+			return;
+		}
+
+		$this->info('New update file ('.$result.') installed.');
+	}
+}