Merge pull request #23 from buskamuza/optional-github-auth

Optional GitHub auth

Author: paliarush

README.md

@@ -10,7 +10,6 @@
    * [Installation steps](#installation-steps)
    * [Default credentials and settings](#default-credentials-and-settings)
    * [Getting updates and fixes](#getting-updates-and-fixes)
-   * [GitHub limitations](#github-limitations)
  * [Day-to-day development scenarios](#day-to-day-development-scenarios)
    * [Reinstall Magento](#reinstall-magento)
    * [Clear magento cache](#clear-magento-cache)
@@ -71,8 +70,12 @@ Software listed below should be available in [PATH](https://en.wikipedia.org/wik
    git clone git@github.com:paliarush/magento2-vagrant-for-developers.git vagrant-magento
    ```
 
- 1. Copy [etc/composer/auth.json.dist](etc/composer/auth.json.dist) to `etc/composer/auth.json` and specify your [GitHub OAuth token](https://github.com/settings/tokens) there. See [API rate limit and OAuth tokens](https://getcomposer.org/doc/articles/troubleshooting.md#api-rate-limit-and-oauth-tokens) for more information
- 
+ 1. Optionally, if you use private repositories on GitHub or download packages from Magento Marketplace
+   
+   - copy [etc/composer/auth.json.dist](etc/composer/auth.json.dist) to `etc/composer/auth.json`
+   - specify your GitHub token by adding `"github.com": "your-github-token"` to `github-oauth` section for GitHub authorization
+   - add Magento Marketplace keys for Marketplace authorization
+
  1. Optionally, copy [etc/config.yaml.dist](etc/config.yaml.dist) as `etc/config.yaml` and make necessary customizations
 
  1. Initialize project, configure environment, install Magento, configure PHPStorm project:
@@ -121,16 +124,6 @@ Current vagrant project follows [semantic versioning](http://semver.org/spec/v2.
 For example your current branch is `2.0`, then it will be safe to pull any changes from `origin/2.0`. However branch `3.0` will contain changes backward incompatible with `2.0`.
 Note, that semantic versioning is only used for `x.0` branches (not for `develop`).
 
-### GitHub limitations
-
-Be aware that you may encounter GitHub limits on the number of downloads (used by Composer to download Magento dependencies).
-
-These limits may significantly slow down the installation since all of the libraries will be cloned from GitHub repositories instead of downloaded as ZIP archives. In the worst case, these limitations may even terminate the installation.
-
-If you have a GitHub account, you can bypass these limitations by using an OAuth token in the Composer configuration. See [API rate limit and OAuth tokens](https://getcomposer.org/doc/articles/troubleshooting.md#api-rate-limit-and-oauth-tokens) for more information.
-
-For the Vagrant configuration you may specify your token in `etc/github.oauth.token` file after cloning the repository. The file is a basic text file and is ignored by Git, so you'll need to create it yourself. Simply write your OAuth token in this file making sure to avoid any empty spaces, and it will be read during deployment.
-
 ## Day-to-day development scenarios
 
 ### Reinstall Magento

etc/composer/auth.json.dist

@@ -1,6 +1,5 @@
 {
   "github-oauth": {
-    "github.com": "your-github-token"
   },
   "http-basic": {
     "repo.magento.com": {

scripts/host/check_requirements.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 vagrant_dir=$(cd "$(dirname "$0")/../.."; pwd)
-composer_auth_json="${vagrant_dir}/etc/composer/auth.json"
 php_executable=$(bash "${vagrant_dir}/scripts/host/get_path_to_php.sh")
 
 # Enable trace printing and exit on the first error
@@ -10,10 +9,3 @@ set -ex
 if ! ${php_executable} -v | grep -q 'Copyright' ; then
     bash "${vagrant_dir}/scripts/host/install_php.sh"
 fi
-
-if [ ! -f ${composer_auth_json} ]; then
-    set +x
-    echo "Please specify GitHub token in ${composer_auth_json} to bypass GitHub rate limits (see https://github.com/paliarush/magento2-vagrant-for-developers/tree/develop#github-limitations)"
-    exit 255
-    set -x
-fi

scripts/host/composer.sh

@@ -23,7 +23,9 @@ fi
 
 # Configure composer credentials
 cd ${current_dir}
-cp ${composer_auth_json} "${PWD}/auth.json"
+if [ -f ${composer_auth_json} ]; then
+    cp ${composer_auth_json} "${PWD}/auth.json"
+fi
 
 host_os=$(bash "${vagrant_dir}/scripts/host/get_host_os.sh")
 if [[ $(bash "${vagrant_dir}/scripts/get_config_value.sh" "environment_composer_prefer_source") == 1 ]]; then
@@ -32,4 +34,7 @@ if [[ $(bash "${vagrant_dir}/scripts/get_config_value.sh" "environment_composer_
 else
     ${php_executable} ${composer_phar} --ignore-platform-reqs "$@"
 fi
-rm "${PWD}/auth.json"
+
+if [ -f "${PWD}/auth.json" ]; then
+    rm "${PWD}/auth.json"
+fi

scripts/host/configure_php_storm.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 vagrant_dir=$(cd "$(dirname "$0")/../.."; pwd)
-composer_auth_json="${vagrant_dir}/etc/composer/auth.json"
 
 # Enable trace printing and exit on the first error
 set +x

scripts/provision/configure_environment.sh

@@ -65,7 +65,9 @@ if [ -f ${composer_auth_json} ]; then
     if [ ! -d /home/vagrant/.composer ] ; then
       sudo -H -u vagrant bash -c 'mkdir /home/vagrant/.composer'
     fi
-    cp ${composer_auth_json} /home/vagrant/.composer/auth.json
+    if [ -f ${composer_auth_json} ]; then
+        cp ${composer_auth_json} /home/vagrant/.composer/auth.json
+    fi
 fi
 
 # Declare path to scripts supplied with vagrant and Magento