From 01f58d749b715f30c99d1b19a965ce5b93813656 Mon Sep 17 00:00:00 2001
From: Gregory Oschwald <goschwald@maxmind.com>
Date: Wed, 3 Dec 2014 06:59:16 -0800
Subject: [PATCH] Prepare for 2.1.1

---
 CHANGELOG.md          |  6 ++++++
 README.md             |  2 +-
 box.json              |  2 +-
 dev-bin/phar-test.php | 16 ++++++++++++++++
 dev-bin/release.sh    | 14 ++++++++++----
 5 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100755 dev-bin/phar-test.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bf29fd..0068039 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+2.1.1 (2014-12-03)
+------------------
+
+* The 2.1.0 Phar builds included a shebang line, causing issues when loading
+  it as a library. This has been corrected. GitHub #33.
+
 2.1.0 (2014-10-29)
 ------------------
 
diff --git a/README.md b/README.md
index ff90f2d..eb7e208 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ print($record->location->longitude . "\n"); // -93.2323
 
 ```
 
-### Anonymoous-IP Example ###
+### Anonymous IP Example ###
 
 ```php
 <?php
diff --git a/box.json b/box.json
index 459a60d..a11f769 100644
--- a/box.json
+++ b/box.json
@@ -29,8 +29,8 @@
             "in": "vendor"
             }
     ],
-
     "directories": ["compat", "src/"],
     "git-version": "git-version",
+    "shebang": "",
     "stub": true
 }
diff --git a/dev-bin/phar-test.php b/dev-bin/phar-test.php
new file mode 100755
index 0000000..220b32b
--- /dev/null
+++ b/dev-bin/phar-test.php
@@ -0,0 +1,16 @@
+#!/usr/bin/env php
+
+<?php
+require_once 'geoip2.phar';
+use GeoIp2\Database\Reader;
+
+$reader = new Reader('maxmind-db/test-data/GeoIP2-City-Test.mmdb');
+
+$record = $reader->city('81.2.69.160');
+
+if ( $record->country->isoCode === 'GB' ) {
+    exit(0);
+}
+
+print('Problem with Phar!');
+exit(1);
diff --git a/dev-bin/release.sh b/dev-bin/release.sh
index 97ffbcd..8dbc0dd 100755
--- a/dev-bin/release.sh
+++ b/dev-bin/release.sh
@@ -25,12 +25,18 @@ fi
 php composer.phar self-update
 php composer.phar update --no-dev
 
-if [ ! -f box.phar ]; then
-    wget -O box.phar "https://github.com/kherge-archive/Box/releases/download/2.4.4/box-2.4.4.phar"
-fi
+# We currently use a custom version of Box due to
+# https://github.com/box-project/box2/issues/88. There are PRs from Greg with
+# the fixes.
+#
+# if [ ! -f box.phar ]; then
+#     wget -O box.phar "https://github.com/kherge-archive/Box/releases/download/2.4.4/box-2.4.4.phar"
+# fi
 
-php box.phar build
+../box2/bin/box build
+./dev-bin/phar-test.php
 
+# Download test deps
 php composer.phar update
 
 ./vendor/bin/phpunit