Merge pull request #1 from rtib/gh223_simplified

update to drop deploy parameter

README.md

@@ -93,9 +93,8 @@ Travis uses a .travis.yml file in the root of your repository to learn about you
 |remove_branches |Allows you to remove default branches set in config_defaults.yml.|
 |notifications |Allows you to specify the notifications configuration in the .travis.yml file.|
 |remove_notifications |Allows you to remove default branches set in config_defaults.yml.|
-|deploy|Boolean to determine if deploy section should be included to deploy to the Puppet Forge. Defaults to `false`.|
-|user|If deploy is `true` this string needs to be set to the Puppet Forge user name.|
-|secure|If deploy is `true` this string needs to be set to the encrypted password. See [https://docs.travis-ci.com/user/encryption-keys/#usage](https://docs.travis-ci.com/user/encryption-keys/#usage) for instructions on how to encrypt your password.|
+|user|This string needs to be set to the Puppet Forge user name. To enable deployment the secure key also needs to be set.|
+|secure|This string needs to be set to the encrypted password to enable deployment. See [https://docs.travis-ci.com/user/encryption-keys/#usage](https://docs.travis-ci.com/user/encryption-keys/#usage) for instructions on how to encrypt your password.|
 
 ### .yardopts
 

config_defaults.yml

@@ -85,7 +85,6 @@
  stage: spec
  - env: DEPLOY_TO_FORGE=yes
  stage: deploy
- deploy: false
  branches:
  - master
  - /^v\d/

moduleroot/.travis.yml.erb

@@ -112,7 +112,7 @@ notifications:
 <% end -%>
 <% end -%>
 <% end -%>
-<% if @configs['deploy'] -%>
+<% unless @configs['user'].nil? || @configs['secure'].nil? -%>
 deploy:
  provider: puppetforge
  user: <%= @configs['user'] %>