Merge branch '1.1.1'

* 1.1.1: registering a public package for the first time, hit count fixed #157 Added tip for API usage in README.md #154 Added process.env.PORT and process.env.IP support #141 Added help text to package detail errors #149
Hacklone · Jul 26, 2015 · d3e1bfd · d3e1bfd
2 parents ed79bf1 + 1a5478f
commit d3e1bfd
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -124,7 +124,8 @@ Must be a valid JSON
 
 | name                                       | description                                                                          | default                               |
 |--------------------------------------------|--------------------------------------------------------------------------------------|---------------------------------------|
-| port                                       | Port on which the private bower server will listen                                   | 5678                                  |
+| port                                       | Port on which the private bower server will listen                                   | 5678 (process.env.PORT if set to null)|
+| hostName                                   | Host name on which the private bower server will listen                              | null (process.env.IP if set to null)  |
 | registryFile                               | File for persisting private packages (must be a valid json)                          | ./bowerRepository.json                |
 | timeout                                    | server package timeout                                                               | 144 000                               |
 | public.disabled                            | Disable fallback feature for public packages                                         | false                                 |
@@ -244,6 +245,9 @@ Add ```Auth-Key``` header to request.
 ##Use behind proxy
 > git config --global url."https://".insteadOf git://
 
+##Calling the API
+- do not forget to set the ```Content-Type``` header to ```application/json```
+
 #License
 > The MIT License (MIT)
 

diff --git a/bower.conf.json b/bower.conf.json
@@ -1,5 +1,6 @@
 {
     "port": 5678,
+    "hostName": null,
     "registryFile": "./bowerRepository.json",
     "timeout": 144000,
     "public": {

diff --git a/lib/application.js b/lib/application.js
@@ -32,8 +32,8 @@ module.exports = function Application() {
         repoCacheHandler.start(repoCacheOptions);
     }
 
-    function _listen(port) {
-        _listeningServer = _serverApp.listen(port);
+    function _listen(port, hostName) {
+        _listeningServer = _serverApp.listen(port, hostName);
     }
 
     function _serveStatic(staticPath) {

diff --git a/lib/infrastructure/configurationManager.js b/lib/infrastructure/configurationManager.js
@@ -35,6 +35,9 @@ module.exports = function ConfigurationManager() {
         function setConfigValues() {
             self.config.registryFile = getRelativeFilePath(configFile.registryFile || './bowerRepository.json');
 
+            self.config.port = self.config.port || utils.process.env.PORT;
+            self.config.hostName = self.config.hostName || utils.process.env.IP;
+
             self.config.public = self.config.public || {};
 
             self.config.public.registryFile = getRelativeFilePath(configFile.public.registryFile || './bowerRepositoryPublic.json');

diff --git a/lib/main.js b/lib/main.js
@@ -65,7 +65,7 @@ module.exports = function Main() {
             res.status(500).send('Something wen\'t wrong :(');
         });
 
-        application.listen(_config.port);
+        application.listen(_config.port, _config.hostName);
     }
 
     function _handleErrors() {

diff --git a/lib/service/packageManager.js b/lib/service/packageManager.js
@@ -173,7 +173,7 @@ module.exports = function PackageManager() {
                             var privatePackage = {
                                 name: packageName,
                                 url: pack.url,
-                                hits: publicPackage.hits
+                                hits: 1
                             };
 
                             privatePackageStore.registerPackages([privatePackage]);

diff --git a/site/index.html b/site/index.html
@@ -94,7 +94,7 @@ <h3 style="line-height: 1.5em; cursor: pointer;" class="text-primary" ng-click="
                                 Loading package details...
                             </span>
                             <span ng-if="package.detailsError" class="text-danger">
-                                Failed to load package details!
+                                Failed to load package details! (Your private-bower server needs read access to this Git repository!)
                             </span>
                         </div>
                         <div ng-if="package.details" class="details">