jack-eb 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35033b3491aacbbc133d70a83cb0347e3a61518e
-  data.tar.gz: 224f5f929c0d055d62dff3a3e58b14ff68bd6d2d
+  metadata.gz: 96d7ba0d66a46632ba581171a490b72cf0f1a175
+  data.tar.gz: 70bbd49ab108937debcb4e701224422d75cca808
 SHA512:
-  metadata.gz: aa180a5634c0862e3068f6692e065b1f102fb0948a51c800a1e1183682c96a83658dcfd15f0b9296b1b4b4e4a5e56d2d6dde9c4abaace5a4e8ccb79b2621bd32
-  data.tar.gz: b2cca38a575b4837cdfbd8d7eafaa9029fc1ab9a9f78bf98fe1682c253d6cea9cf789f5647006b7f7c54f6108e191e4efb18850baab65a73e9a3816ee1b6196f
+  metadata.gz: d55be4caa29ab9f488b9c59290f63bca4cea6ee32ad672c393bd187bfb4dd4adc9561f7aff15e0ac583e5c787a7b938908dd4167ff9199475057e25c830caef4
+  data.tar.gz: 82a0fdb9d77530c04be1f65dacdd63e088ca1e4518e8e19f9c699d83723384bc99f09d062981546e604cd823c7616699affa9a7fb5ca04988745f3bd50150972

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.4.0]
+* fix jack deploy, remove debugging
+* fix embedded_eb lookup
+* add docs
+
 ## [1.3.0]
 - flatten cli interface: jack config apply -> jack apply
 

data/CONTRIBUTING.md

@@ -0,0 +1,56 @@
+# Contributing to Lono
+
+Contributing is welcomed and encouraged.  We love pull requests!
+
+Here are some ways *you* can contribute:
+
+* by reporting bugs
+* by suggesting new features
+* by writing or editing documentation
+* by writing specs
+* by writing code ( **no patch is too small** : fix typos, add comments, clean up inconsistent whitespace )
+* by refactoring code
+* by closing [issues][]
+* by reviewing patches
+
+[issues]: https://github.com/tongueroo/jack/issues
+
+## Submitting an Issue
+
+* We use the [GitHub issue tracker][issues] to track bugs and features.
+* Before submitting a bug report or feature request, check to make sure it hasn't
+already been submitted.
+* When submitting a bug report, please include a [Gist][] that includes a stack
+  trace and any details that may be necessary to reproduce the bug, including
+  your gem version, Ruby version, and operating system.  Ideally, a bug report
+  should include a pull request with failing specs.
+
+[gist]: https://gist.github.com/
+
+## Cleaning up issues
+
+* Issues that have no response from the submitter will be closed after 30 days.
+* Issues will be closed once they're assumed to be fixed or answered. If the
+  maintainer is wrong, it can be opened again.
+* If your issue is closed by mistake, please understand and explain the issue.
+  We will happily reopen the issue.
+
+## Submitting a Pull Request
+1. [Fork][fork] the [official repository][repo].
+2. [Create a topic branch.][branch]
+3. Implement your feature or bug fix.
+4. Add, commit, and push your changes.
+5. [Submit a pull request.][pr]
+
+## Notes
+* Please add tests if you changed code. Contributions without tests won't be accepted.
+* If you don't know how to add tests, please put in a PR and leave a comment
+  asking for help. We love helping!
+* Please don't update the Gem version.
+
+[repo]: https://github.com/tongueroo/jack/tree/master
+[fork]: https://help.github.com/articles/fork-a-repo/
+[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/
+[pr]: https://help.github.com/articles/using-pull-requests/
+
+Inspired by https://github.com/middleman/middleman-heroku/blob/master/CONTRIBUTING.md

data/README.md

@@ -4,63 +4,43 @@
 [![CircleCI](https://circleci.com/gh/tongueroo/jack.svg?style=svg)](https://circleci.com/gh/tongueroo/jack)
 [![Code Climate](https://codeclimate.com/github/tongueroo/jack/badges/gpa.svg)](https://codeclimate.com/github/tongueroo/jack)
 [![Test Coverage](https://codeclimate.com/github/tongueroo/jack/badges/coverage.svg)](https://codeclimate.com/github/tongueroo/jack)
+[![Join the chat at https://gitter.im/tongueroo/jack](https://badges.gitter.im/tongueroo/jack.svg)](https://gitter.im/tongueroo/jack?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Support](https://img.shields.io/badge/get-support-blue.svg)](https://boltops.com?utm_source=badge&utm_medium=badge&utm_campaign=jack)
 
-The documentation for this tool is at [jackandtheelasticbeanstalk.com](http://jackandtheelasticbeanstalk.com).
 
-Jack is a wrapper tool around the [aws eb cli3](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb-cli3.html) tool use for managing AWS Elastic Beanstalk, EB, environments.  It allows you to create environments using the  saved template configuration file generated by `eb config save`.  Jack moves the config file to the jack/cfg folder of your project and manages the the config files from there.
+Jack allows you to easily manage your AWS Elastic Beanstalk Jack environments.
 
-Jack provides a `jack config apply` command to update the EB environment.   Before uploading the new configuration to EB jack first downloads the current configuration and then does a diff on the changes that are about to be applied.  This gives a very helpful preview of exactly what you are intending to change.  This particularly helpful when changes are made through the EB GUI and are out of sync with what is stored in the `jack/cfg` files.
+Jack provides a `jack apply` command to update the Elastic Beanstalk environment.   Before uploading the new configuration Elastic Beanstalk jack first downloads the current configuration and then does a diff on the changes that are about to be applied.  This gives a preview of exactly what will be changed.  This is particularly helpful when changes are made through the EB GUI and are out of sync with what is stored in the downloaded `jack/cfg` files.
 
+See [jack-eb.com](http://jack-eb.com) for full documentation.
 
-
-This blog post also provides a good introduction and shows some useful examples of what you can do with the jack tool: [Jack and the Elastic Beanstalk — Tool to Manage AWS Elastic Beanstalk Environments](https://medium.com/@tongueroo/jack-and-the-elastic-beanstalk-easily-manage-aws-environments-3ab496f08ad2#.o7w3x0yd9).
-
-For things that this tool does not cover like deploying code, it is recommended that you use use the underlying aws `eb` tool directly.  `eb deploy` provides a good deploy command already. This tool has been tested with `EB CLI 3.8.3 (Python 2.7.1)`.
+This blog post also provides a good introduction and shows off useful examples of what you can do with the jack tool: [Jack and the Elastic Beanstalk — Tool to Manage AWS Elastic Beanstalk Environments](https://medium.com/@tongueroo/jack-and-the-elastic-beanstalk-easily-manage-aws-environments-3ab496f08ad2#.o7w3x0yd9).
 
 ## Use Cases
 
-* Downloading EB config to codified the EB infrastructure that has been built.
-* Allowing safe applying of new configs since the preview feature allows you to inspect the changes before actually applying the configuration.
-* Moving EB enviroments from one EB application to another EB application.  EB provides a way to clone environments within an application but not to another entire application.  This is useful if you want to "rename" the EB application.
+* Allows codification of the infrastructure by downloading the configuration. You can save the downloaded configs into version control.
+* Safely upload new configs by previewing the changes before actually uploading and applying the configuration to the infrastructure.
+* Moving EB enviroments from one EB application to another EB application. EB provides a way to clone environments within an application but is unable to move the enivornment to an entirely new application. This is useful if you want to "rename" the EB application.
 
 ## Installation
 
-```
-$ gem install jack-eb
-```
-
-Note that the gem is called jack-eb but the actual command that is installed is called `jack`.
-
-### Setup
-
-If the version of `eb` that you are using is not working with jack, here is a way to install the specific version jack has been tested with.
-
-<pre>
-cd ~/ && wget https://pypi.python.org/packages/source/a/awsebcli/awsebcli-3.8.3.tar.gz
-tar -zxvf awsebcli-3.8.3.tar.gz
-cd awsebcli-3.8.3
-sudo python setup.py install
-</pre>
-
-More detail instructions are on [AWS EB Documentation](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb-cli3-getting-set-up.html).
+If you want to quickly install jack without having to worry about jack’s dependencies you can simply install the Bolts Toolbelt which has jack included.
 
-I typically install the `eb` cli tool with homebrew.
+```sh
+brew cask install boltopslabs/software/bolts
+```
 
-<pre>
-brew update
-brew install awsebcli
-</pre>
+Or if you prefer you can install ufo with RubyGems
 
-You will also need to set up your environment with your aws access keys since the tool also uses the aws-sdk.  Add the following to your ~/.profile, replacing xxx with your actually credentials.  Do not forgot to source the ~/.profile or open up a new terminal.
+```sh
+gem install jack-eb
+```
 
-<pre>
-export AWS_ACCESS_KEY_ID=xxx
-export AWS_SECRET_ACCESS_KEY=xxx
-</pre>
+Note that the gem is called jack-eb but the actual command that is installed is called `jack`.  If you are installing jack with RubyGems you will need to handle installing the additional dependencies yourself.
 
-## Usage
+Full installation instructions are on the [Installation docs](http://jack-eb.com/docs/install/).
 
-### Conventions
+## Conventions
 
 Before using the tool, it is good to know that jack follows a convention for the environment and application name.  This is done in order to keep the jack commands simple and short.  The convention is:
 
@@ -76,121 +56,30 @@ environment_name: hi-web-prod
 application_name: hi
 </pre>
 
-The example above means the EB application name will be `hi` and the environment name will be `hi-web-prod`.  By convention, the first word, separated by a '-', of the environment name is the application name.
-
-This convention can be overridden easily via by creating a `~/.jack/settings.yml` or `jack/settings.yml` within the project and defining your own regular expression with the `conventions.app_name_pattern` key.  The regexp is a ruby regexp and must have 1 capture group.  The capture group is used to determine the application name. Here is an example:
-
-```yaml
-create:
-  keyname: default
-  platform: "64bit Amazon Linux 2016.09 v2.2.0 running Docker 1.11.2"
-conventions:
-  app_name_pattern: !ruby/regexp /\w+-(\w+)-\w+/
-```
-
-In the example above, the capture group is the second word and this will result in:
-
-<pre>
-environment_name: prod-hi-web
-application_name: hi
-</pre>
-
-
-The default setting is located at [lib/jack/default/settings.yml](https://github.com/tongueroo/jack/blob/master/lib/jack/default/settings.yml).
-
-You can also override the application name convention from the cli with the `--app` flag.  Examples are provided below.
-
-### Creating Environments
-
-If you do not yet have EB environment simply create an EB environment with jack and then you can download the initial EB config file it afterwards. To create a EB environment using jack without an initial config file.
-
-```bash
-$ git clone https://github.com/tongueroo/sinatra
-$ cd sinatra
-$ jack create hi-web-stag-1
-```
-
-The big benefit of using jack though is the ability to create EB environments based on previously saved configuration files.  So now you can download the configuration file from the newly created hi-web-stag-1 environment and version control them.
-
-```bash
-$ jack config get hi-web-stag-1
-```
-
-This above saves the configuration file at `jack/cfg/hi-web-stag-1.cfg.yml`.  Here is an [example](https://gist.github.com/tongueroo/5791a4575a71cb664d48e4e8b29791b3) of what the config file.
-
-If you would like to save the config file under a different path, you can use the `-c` option.
-
-```bash
-$ jack config get hi-web-stag-1 -c my-config
-```
-
-This saves the config file to `jack/cfg/my-config.cfg.yml` looks like.
-
-You can then create different environments using any of the saved config files.
-
-```bash
-$ jack create -c my-config hi-web-stag-2 # creates environment using jack/cfg/myconfig.cfg.yml
-```
-
-If the project is brand new and has never had `eb init` ran on it before like a project that has been newly git cloned.  Then calling any of the jack commands will automatically call `eb init` in the project.  `eb init` requires the platform flag in order to avoid prompting.  The default platform is "64bit Amazon Linux 2016.09 v2.2.0 running Docker 1.11.2".  But you can override that by creating an `~/.jack/settings.yml` or `jack/settings.yml` within the project folder and setting the `create.platform` key.
+The example above means the EB application name will be `hi` and the environment name will be `hi-web-prod`.  By convention, the first word, separated by a '-', of the environment name is the application name.  This convention can be overridden easily via by configuring the [settings](http://jack-eb.com/docs/settings/). It is also possible to override the application name convention from the cli with the `--app` flag.
 
-Here's an [example](https://gist.github.com/tongueroo/086e3c11c4d00d5c39b6). The options from each file is merged and combined together in following order: project folder, user home, [default](lib/jack/default/settings.yml) that is packaged with this gem.  So the project `jack/settings.yml` options have higher precedence than `~/.jack/settings.yml`.
+## Quick Usage
 
+Here's a quick overview of how to use jack:
 
-### More Configuration Examples
-
-Configuration templates hold all the options and settings that we can set for an EB environment.  Elastic Beanstalk surfaces a portion of settings available from the underlying AWS Resources.  These settings include ELB behavior, VPC, LaunchConfiguration, Autoscaling settings, hard drive size, environment variables, etc.  Here is an [example](https://gist.github.com/tongueroo/5791a4575a71cb664d48e4e8b29791b3).
-
-#### Get Elastic Beanstalk Configuration
-
-To download the Elastic Beanstalk configuration:
-
+```sh
+brew cask install boltopslabs/software/bolts
+git clone https://github.com/tongueroo/hi # demo sinatra app
+cd hi
+jack create hi-web-stag # creates a EB App named hi and EB Environment named hi-web-stag
+jack download hi-web-stag
+# ... make adjustments to jack/cfg/hi-web-stag.yml ...
+jack upload hi-web-stag
 ```
-$ jack config get hi-web-prod-1
 
-$ jack config get hi-web-prod-1 --app customappname
-```
+See [jack-eb.com](http://jack-eb.com) for full documentation.
 
-This will save the config to `jack/cfg/hi-web-prod-1.cfg.yml`.
+## Contributing
 
-#### Apply Elastic Beanstalk Configuration
+Everyone can contribute to make jack better.  Please fork the project and open a pull request! We love your pull requests. Contributions are encouraged and welcomed!
 
-To apply a template configuration.
-
-```
-$ jack config apply hi-web-prod-1
-
-$ jack config apply hi-web-prod-1 --app customappname
-```
-
-This will save the config to `jack/cfg/hi-web-prod-1.cfg.yml`.
-
-You will notice that the `eb config apply` command prompts you with the diff and asks for confirmation before applying.  You can bypass the prompt with the `--sure` option.
-
-#### Diff Config - Comparing your local config to the live environment config
-
-You can use the diff command directly to compare your local config to what configs the environment is actually using is useful.  To see the diff.
-
-```
-$ jack config diff hi-web-prod-1
-```
-
-A note about the configs.  They are formatted so that the keys are sorted.  This has been done so the diffs are actually useful.  It is also recommended you install colordiff so you can see the diff output colorized.  You can also specify your own diff viewer via the `JACK_DIFF` environment variable.
-
-To use a your own diff viewer, add this to your `~/.profile`:
-
-```
-$ export JACK_DIFF=colordiff
-```
-
-### More Help
-
-You can get help information from the CLI.  Examples:
-
-<pre>
-$ jack help
-$ jack create help
-$ jack config get help
-$ jack config apply help
-$ jack config sort help
-</pre>
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/docs/CNAME

@@ -1 +1 @@
-jackandtheelasticbeanstalk.com
+jack-eb.com

data/docs/README.md

@@ -1,6 +1,6 @@
 # Jack Documentation
 
-This project powers the jack documementation website: [jackandtheelasticbeanstalk.com](http://jackandtheelasticbeanstalk.com).  It is a static website generated by [Jekyll](https://jekyllrb.com/).
+This project powers the jack documementation website: [jack-eb.com](http://jack-eb.com).  It is a static website generated by [Jekyll](https://jekyllrb.com/).
 
 ## Contributing
 

data/docs/_config.yml

@@ -1,14 +1,15 @@
 # Site settings
 title: Jack
 email: tongueroo@gmail.com
-url: https://jackandtheelasticbeanstalk.com
-description: "Manage your AWS Elastic Beanstalk Jack environments easily with Jack."
+url: http://jack-eb.com
+description: "Manage your AWS Elastic Beanstalk Jack environments easily"
 keywords: "Jack, AWS Elastic Beanstalk, DevOps, Infrastructure, BoltOps, Tools, Producitivity, Documentation"
 skills: ""
 meta_author: Tung Nguyen
 
 # Google webmaster tools
 google_verify:
+google_analytics: UA-98684555-5
 
 # https://ssl.bing.com/webmaster/configure/verify/ownership Option 2 content= goes here
 bing_verify:

data/docs/_docs/conventions.md

@@ -0,0 +1,48 @@
+---
+title: Installation
+---
+
+Jack follows a convention for the environment and application name.  This is done in order to keep the jack commands simple and short.  The convention is:
+
+<pre>
+environment_name: [app]-[role]-[env]
+application_name: [app]
+</pre>
+
+A concrete example is helpful:
+
+<pre>
+environment_name: hi-web-prod
+application_name: hi
+</pre>
+
+The example above means the EB application name will be `hi` and the environment name will be `hi-web-prod`.  By convention, the first word, separated by a '-', of the environment name is the application name.
+
+This convention can be overridden easily via by creating a `~/.jack/settings.yml` or `jack/settings.yml` within the project and defining your own regular expression with the `conventions.app_name_pattern` key.  The regexp is a ruby regexp and must have 1 capture group.  The capture group is used to determine the application name. Here is an example:
+
+```yaml
+create:
+  keyname: default
+  platform: "64bit Amazon Linux 2017.03 v2.6.0 running Docker 1.12.6"
+conventions:
+  app_name_pattern: !ruby/regexp /\w+-(\w+)-\w+/
+```
+
+In the example above, the capture group is the second word and this will result in:
+
+<pre>
+environment_name: prod-hi-web
+application_name: hi
+</pre>
+
+
+The default setting is located at [lib/jack/default/settings.yml](https://github.com/tongueroo/jack/blob/master/lib/jack/default/settings.yml).
+
+You can also override the application name convention from the cli with the `--app` flag.  Examples are provided below.
+
+
+
+<a id="prev" class="btn btn-basic" href="{% link _docs/jack-help.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/settings.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+

data/docs/_docs/install.md

@@ -10,6 +10,8 @@ If you want to quickly install jack without having to worry about jack's depende
 brew cask install boltopslabs/software/bolts
 ```
 
+The bolts installer will also automatically install the [aws cli](https://aws.amazon.com/documentation/cli/) and the [aws eb cli3](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb-cli3.html) dependencies for you.  You don't have to worry about it!
+
 For more information about the Bolts Toolbelt or to get an installer for another operating system visit: [https://boltops.com/toolbelt](https://boltops.com/toolbelt)
 
 ### Install with RubyGems
@@ -26,7 +28,9 @@ Or you can add jack to your Gemfile in your project if you are working with a ru
 gem "jack-eb"
 {% endhighlight %}
 
-You also need to install jack's additional dependencies: the aws cli and the aws eb cli.
+#### Additional Depedencies
+
+If you are installing jack via RubyGems, you will also need to install jack's additional dependencies: the [aws cli](https://aws.amazon.com/documentation/cli/) and the [aws eb cli3](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb-cli3.html).  If you have used the bolts installer then you do not have to worry about installing these additional dependencies.
 
 On a Mac OS system, you can use homebrew:
 
@@ -44,5 +48,7 @@ On other operating systems, follow Amazon Web Services' official installation gu
 * [Install the Elastic Beanstalk Command Line Interface (EB CLI)](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb-cli3-install.html)
 
 
-<a class="btn btn-basic" href="/quick-start/">Back</a>
-<a class="btn btn-primary" href="{% link _docs/structure.md %}">Next Step</a>
+<a id="prev" class="btn btn-basic" href="{% link docs.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/structure.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+

data/docs/_docs/jack-apply.md

@@ -7,7 +7,7 @@ title: jack apply
 Now let's make some changes to the Elastic Beanstalk environment. Let's change the AutoScaling RollingUpdateEnabled from `true` to `false`.  Here is the line for that setting:
 
 ```yaml
-    RollingUpdateEnabled: true
+    RollingUpdateEnabled: false
 ```
 
 
@@ -39,16 +39,23 @@ Notice that this time when jack compares the configuration you see the changes t
 
 By allowing you to preview the changes and prompting for your confirmation, jack prevents you from accidentally overriding their change.  This saves later headaches and confusion when changes "suddenly" disappear.
 
-
 You can now download the updated configuration first and then re-add your changes.
 
 ```
-jack download get hi-web-stag
+jack get hi-web-stag
 # add back in your changes to `jack/cfg/hi-web-stag.cfg.yml
-jack upload apply hi-web-stag
+jack apply hi-web-stag
+```
+
+If you would like to use a different app name you can use the `--app` option.
+
+```sh
+jack apply hi-web-stag --app myapp
 ```
 
 You are now set! Jack allows you codify the infrastructure code and then enables you to apply those changes safely.
 
-<a class="btn btn-basic" href="{% link _docs/jack-get.md %}">Back</a>
-<a class="btn btn-primary" href="{% link _docs/jack-diff.md %}">Next Step</a>
+<a id="prev" class="btn btn-basic" href="{% link _docs/jack-get.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/jack-diff.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+

data/docs/_docs/jack-create.md

@@ -5,10 +5,10 @@ title: jack create
 Run the following command to create an Elastic Beanstalk Environment:
 
 ```sh
-jack create hi-web-prod
+jack create hi-web-stag
 ```
 
-The above command will automatically create an Elastic Beanstalk application called **hi** and an environment called **hi-web-prod**.  Jack follows a naming convention scheme: `[app]-[role]-[env]`.  Jack automatically separates the words by dashes and takes the first word using that as the app name.  This is how jack knows how to create an Elastic Beanstalk application named **hi** without you having to tell it that.  The naming convention can be easily [overridden]({% link _docs/conventions.md %}). The naming conventions helps provide guidance for best practices and dramatically simplies the tools usage.  Things just work.
+The above command will automatically create an Elastic Beanstalk application called **hi** and an environment called **hi-web-stag**.  Jack follows a naming convention scheme: `[app]-[role]-[env]`.  Jack automatically separates the words by dashes and takes the first word using that as the app name.  This is how jack knows how to create an Elastic Beanstalk application named **hi** without you having to tell it that.  The naming convention can be easily [overridden]({% link _docs/conventions.md %}). The naming conventions helps provide guidance for best practices and dramatically simplies the tools usage.  Things just work.
 
 After a few minutes you should see an environment fully spun up in Elastic Beanstalk's Console:
 
@@ -16,5 +16,7 @@ After a few minutes you should see an environment fully spun up in Elastic Beans
 
 In the next step, you'll download the configuration from the newly created environment.
 
-<a class="btn btn-basic" href="{% link _docs/tutorial.md %}">Back</a>
-<a class="btn btn-primary" href="{% link _docs/jack-get.md %}">Next Step</a>
+<a id="prev" class="btn btn-basic" href="{% link _docs/tutorial.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/jack-get.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+

data/docs/_docs/jack-deploy.md

@@ -2,7 +2,7 @@
 title: jack deploy
 ---
 
-So far we have been using an empty folder as our project to mainly demonstrate jack's abiliy to download and managed configuration files.  Jack can also deploy applications to the Elastic Beanstalk environments.  For this next step, we will deploy a small test sinatra app available on GitHub at [tongueroo/sinatra](https://github.com/tongueroo/sinatra).
+So far we have been using an empty folder as our project to mainly demonstrate jack's ability to download and manage configuration files.  Jack can also deploy application code to the Elastic Beanstalk environment.  For this next step, we will deploy a small test sinatra app available on GitHub at [tongueroo/sinatra](https://github.com/tongueroo/sinatra).
 
 Clone the project and cd into it:
 
@@ -27,5 +27,7 @@ The jack deploy command simply is a wrapper command to the `eb deploy` command.
 EB_OPTION='--nohang' jack deploy hi-web-stag
 ```
 
-<a class="btn btn-basic" href="{% link _docs/jack-diff.md %}">Back</a>
-<a class="btn btn-primary" href="{% link _docs/jack-terminate.md %}">Next Step</a>
+<a id="prev" class="btn btn-basic" href="{% link _docs/jack-diff.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/jack-terminate.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+

data/docs/_docs/jack-diff.md

@@ -20,5 +20,13 @@ By default, `jack diff` cleans up after itself and removes the originally downlo
 jack diff hi-web-stag --dirty
 ```
 
-<a class="btn btn-basic" href="{% link _docs/jack-apply.md %}">Back</a>
-<a class="btn btn-primary" href="{% link _docs/jack-deploy.md %}">Next Step</a>
+The diffs are formatted so that their keys are sorted.  This has been done so the diffs are actually useful.  It is also recommended you install colordiff so you can see the diff output colorized.  You can also specify your own diff viewer via the `JACK_DIFF` environment variable.  To use a your own diff viewer, add this to your `~/.profile`:
+
+```sh
+$ export JACK_DIFF=colordiff
+```
+
+<a id="prev" class="btn btn-basic" href="{% link _docs/jack-apply.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/jack-deploy.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+

data/docs/_docs/jack-get.md

@@ -8,7 +8,7 @@ Run the following command to download the configuration from the Elastic Beansta
 jack get hi-web-stag
 ```
 
-You should something similar to this:
+You should see something similar to this:
 
 <img src="/img/tutorials/jack-get.png" class="doc-photo" />
 
@@ -45,7 +45,28 @@ Platform:
     Amazon Linux/2.1.0
 ```
 
-As you can see this file contains everything there is to know about the Elastic Beanstalk environment.  With this file you can completely rebuild the environment and even "clone" it across Elastic Beanstalk applications.
+As you can see the configuration file contains everything there is to know about the Elastic Beanstalk environment.  These settings include ELB behavior, VPC, LaunchConfiguration, AutoScaling settings, hard drive size, environment variables, etc.  With this file you can completely rebuild the environment and even "clone" it across Elastic Beanstalk applications.
+
+If you would like to save the config file under a different path, you can use the `-c` option.
+
+```sh
+jack get hi-web-stag -c my-config
+```
+
+This saves the config file to `jack/cfg/my-config.cfg.yml`.  You can also override which config file to use with the `-c` flag when creating EB environments like so:
+
+```sh
+jack create hi-web-stag-2 -c my-config
+```
+
+If you would like to override the application name convention you can use the `--app` option.
+
+```sh
+jack create hi-web-stag-2 --app myapp
+```
+
+
+<a id="prev" class="btn btn-basic" href="{% link _docs/jack-create.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/jack-apply.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
 
-<a class="btn btn-basic" href="{% link _docs/jack-create.md %}">Back</a>
-<a class="btn btn-primary" href="{% link _docs/jack-apply.md %}">Next Step</a>

data/docs/_docs/jack-help.md

@@ -0,0 +1,22 @@
+---
+title: jack help
+---
+
+You can run help for quick help information right at the cli.  Example:
+
+```sh
+jack help
+```
+
+You can append `help`, `-h` or `--help` to the end of any command to get more help information about that specific command.  These all work.
+
+```sh
+jack get help
+jack apply --help
+jack create -h
+```
+
+<a id="prev" class="btn btn-basic" href="{% link _docs/jack-terminate.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/conventions.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+

data/docs/_docs/jack-terminate.md

@@ -16,5 +16,7 @@ jack terminate hi-web-stag --sure
 
 Congratulations! 🍾 You have created Elastic Beanstalk environments, downloaded and applied configuration changes, deployed new code to the environment and cleaned up after youself by terminating the environment. You have successfully used jack to manage an Elastic Beanstalk environment.
 
-<a class="btn btn-basic" href="{% link _docs/jack-deploy.md %}">Back</a>
-<a class="btn btn-primary" href="{% link _docs/next-steps.md %}">Next Step</a>
+<a id="prev" class="btn btn-basic" href="{% link _docs/jack-deploy.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/jack-help.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+

data/docs/_docs/next-steps.md

@@ -10,7 +10,8 @@ From here, there are a few resources that can help you continue along:
 * Submit an issue
 * Write a blog post describing how you are using jack, or an interesting problem jack has allowed you to solve
 
-Everyone can contribute to make jack better, including the documentation. These docs are are of the same jack repo in the [docs folder](https://github.com/tongueroo/jack/tree/master/docs). Please fork the project and open a pull request!  We love your pull requests. Contributions are encouraged and welcomed!
+Everyone can contribute to make jack better, including the documentation. These docs in the jack repo located [docs folder](https://github.com/tongueroo/jack/tree/master/docs). Please fork the project and open a pull request!  We love your pull requests. Contributions are encouraged and welcomed!
 
-<a class="btn btn-basic" href="{% link _docs/jack-terminate.md %}">Back</a>
-<a class="btn btn-primary" href="{% link articles.md %}">Next Step</a>
+<a id="prev" class="btn btn-basic" href="{% link _docs/settings.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link articles.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_docs/settings.md

@@ -0,0 +1,70 @@
+---
+title: Settings
+---
+
+Some of jack's behavior can be configured by creating a `~/.jack/settings.yml` or `jack/settings.yml` within the project.  The options from the files get merged with the following precedence:
+
+1. current folder - The current folder's `jack/settings.yml` values take the highest precedence.
+2. user - The user's `~/.jack/settings.yml` values take the second highest precedence.
+3. default - The [default settings](https://github.com/tongueroo/jack/blob/master/lib/jack/default/settings.yml) bundled with the tool takes the lowest precedence.
+
+Let's take a look at an example jack `settings.yml`:
+
+```yaml
+create:
+  keyname: default
+  platform: "64bit Amazon Linux 2017.03 v2.6.0 running Docker 1.12.6"
+conventions:
+  app_name_pattern: !ruby/regexp /(\w+)-\w+-\w+/
+```
+
+The table below covers what each setting does:
+
+Setting  | Description
+------------- | -------------
+`create.keyname`  | This sets the keyname to use when creating Elastic Beanstalk environment.  This is the ssh key you can use to login into the server.
+`create.platform`  | The solution stack to use when launching the EB environment.  You can use `aws elasticbeanstalk list-available-solution-stacks` to get a full list of the available EB solution stacks.  This is covered in more detail below.
+`conventions.app_name_pattern`  | This allows you to override the jack naming convention and determines how jack extracts the application name from the environment.  This is covered in detailed in [Conventions]({% link _docs/conventions.md %}).
+
+### Override Convention
+
+Jack follows a convention for the environment and application name.  This is done in order to keep the jack commands simple and short.  The convention is:
+
+<pre>
+environment_name: [app]-[role]-[env]
+application_name: [app]
+</pre>
+
+A concrete example is helpful:
+
+<pre>
+environment_name: hi-web-prod
+application_name: hi
+</pre>
+
+The example above means the EB application name will be `hi` and the environment name will be `hi-web-prod`.  By convention, the first word, separated by a '-', of the environment name is the application name.
+
+This convention can be overridden easily via by configuring the the `conventions.app_name_pattern` setting.  The value is a ruby regexp and must have 1 capture group.  The capture group determines the application name. Here is an example override:
+
+```yaml
+create:
+  keyname: default
+  platform: "64bit Amazon Linux 2016.09 v2.2.0 running Docker 1.11.2"
+conventions:
+  app_name_pattern: !ruby/regexp /\w+-(\w+)-\w+/
+```
+
+In the example above, the capture group is the second word and this will result in:
+
+<pre>
+environment_name: prod-hi-web
+application_name: hi
+</pre>
+
+### Chosing Solution Stack Platform
+
+If the project is brand new and has never had `eb init` ran on it before then calling any of the jack commands will automatically call `eb init` in the project. `eb init` sets the platform and defaults to "64bit Amazon Linux 2017.03 v2.6.0 running Docker 1.12.6". You can override that by setting the `create.platform` key.
+
+<a id="prev" class="btn btn-basic" href="{% link _docs/conventions.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/next-steps.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_docs/structure.md

@@ -51,7 +51,9 @@ Platform:
 
 The configuration file provides everything that is required to rebuild the Elastic Beanstalk environment.
 
-Now that you now where the jack configurations are are located and what they look like.  Let use it!
+Now that you now where the jack configurations are located and what they look like.  Let use it!
+
+<a id="prev" class="btn btn-basic" href="{% link _docs/install.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/tutorial.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
 
-<a class="btn btn-basic" href="{% link _docs/install.md %}">Back</a>
-<a class="btn btn-primary" href="{% link _docs/tutorial.md %}">Next Step</a>

data/docs/_docs/tutorial.md

@@ -6,5 +6,7 @@ In the next sections, we'll walk through using jack in detail. You will create a
 
 Let's start!
 
-<a class="btn btn-basic" href="{% link _docs/structure.md %}">Back</a>
-<a class="btn btn-primary" href="{% link _docs/jack-create.md %}">Next Step</a>
+<a id="prev" class="btn btn-basic" href="{% link _docs/structure.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/jack-create.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+

data/docs/_includes/about.html

@@ -9,10 +9,10 @@
             </div>
             <div class="row">
                 <div class="col-lg-4 col-lg-offset-2">
-                    <p>Jack is a tool to manage AWS Elastic Beanstalk environments. Jack is a wrapper tool around the aws eb cli3 tool. Jack allows you to create environments using the saved template configuration file generated by <code>eb config save</code>. Jack moves these generated config file to the jack/cfg folder of your project and manages the the config files from there.</p>
+                    <p>Jack is a tool to manage AWS Elastic Beanstalk environments. Jack is a wrapper tool around the aws eb cli3 tool. Jack allows you to create environments using the saved template configuration file generated by <code>eb config save</code>. Jack moves these generated config file to the jack/cfg folder of your project and manages the config files from there.</p>
                 </div>
                 <div class="col-lg-4">
-                    <p>Jack provides a <code>jack apply</code> command to update the Elastic Beanstalk environment. Before uploading the new configuration to Elastic Beanstalk jack first downloads the current configuration and then does a diff on the changes that you are about apply. This gives a helpful preview of exactly will be change. This is particularly helpful when changes are made through the Elastic Beanstalk GUI by multiple developers and are out of sync with what you thought they were.</p>
+                    <p>Jack provides a <code>jack apply</code> command to update the Elastic Beanstalk environment. Before uploading the new configuration to Elastic Beanstalk jack first downloads the current configuration and then does a diff on the changes that you are about apply. This gives a helpful preview of exactly what will be changed. This is particularly helpful when changes are made through the Elastic Beanstalk GUI by multiple developers and are out of sync with what you thought they were.</p>
                 </div>
             </div>
         </div>

data/docs/_includes/css/jack.css

@@ -156,3 +156,13 @@ ul.tools li {
 .use-cases li {
     margin-bottom: 15px;
 }
+
+.keyboard-tip {
+    display: none;
+}
+@media(min-width:992px) {
+    .keyboard-tip {
+        display: block;
+        font-size: 0.9em;
+    }
+}

data/docs/_includes/edit-on-github.html

@@ -5,7 +5,7 @@
 </p>
 <ul>
   <li><a href="{{ site.gh_url }}/blob/master/docs/{{ page.path }}" target="_blank">Suggest an edit to this page</a> (here's the <a href="{{ site.gh_url }}/blob/master/CONTRIBUTING.md" target="_blank">contributing guide</a>).</li>
-  <li><a href="{{ site.gh_url }}/issues/new?body=This%20issue%20is%20about%20<http://jackandtheelasticbeanstalk.com{{ page.url }}>%20(source%20file%3A%20<{{ site.gh_url }}/blob/master/docs/{{ page.path }}>)" target="_blank">Open an issue about this page</a> to report a problem.</li>
+  <li><a href="{{ site.gh_url }}/issues/new?body=This%20issue%20is%20about%20<http://jack-eb.com{{ page.url }}>%20(source%20file%3A%20<{{ site.gh_url }}/blob/master/docs/{{ page.path }}>)" target="_blank">Open an issue about this page</a> to report a problem.</li>
 </ul>
 
 </div>

data/docs/_includes/footer.html

@@ -6,8 +6,9 @@
                     <div class="footer-col col-md-4">
                         <h3>More Tools</h3>
                         <ul class="list-unstyled tools">
+                            <li><a href="http://sonic-screwdriver.cloud">Sonic Screwdriver</a></li>
                             <li><a href="http://lono.cloud">Lono</a></li>
-                            <li><a href="https://github.com/tongueroo/ufo">Ufo</a></li>
+                            <li><a href="http://ufoships.com">Ufo</a></li>
                             <li><a href="https://boltops.com/toolbelt">Toolbelt</a></li>
                         </ul>
                     </div>
@@ -42,7 +43,7 @@
 
     <!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
     <div class="scroll-top page-scroll visible-xs visible-sm">
-        <a class="btn btn-primary" href="#page-top">
+        <a id="next" class="btn btn-primary" href="#page-top">
             <i class="fa fa-chevron-up"></i>
         </a>
     </div>

data/docs/_includes/google_analytics.html

@@ -0,0 +1,10 @@
+<!-- Google analytics -->
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '{{ site.google_analytics }}', 'auto');
+  ga('send', 'pageview');
+</script>

data/docs/_includes/header.html

@@ -3,11 +3,11 @@
         <div class="container">
             <div class="row">
                 <div class="col-lg-12">
-                    <img class="img-responsive" src="/img/profile.png" alt="">
+                    <img class="img-responsive" src="/img/logos/jack-logo.png" alt="">
                     <div class="intro-text">
                         <span class="name">{{ site.title }}</span>
                         <hr class="star-light">
-                        <span class="skills">{{ site.skills }}</span>
+                        <span class="skills">{{ site.description }}</span>
                     </div>
                 </div>
             </div>

data/docs/_includes/js.html

@@ -26,3 +26,7 @@
     {% endif %}
 
     <script src="{{ "/js/nav.js" }}"></script>
+
+    {% if site.google_analytics and jekyll.environment == "production" %}
+    {% include google_analytics.html %}
+    {% endif %}

data/docs/_includes/nav.html

@@ -9,7 +9,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="/#page-top"><img class="navbar-logo" src="/img/logos/boltops-logo.png" />{{ site.title }}</a>
+                <a class="navbar-brand" href="/#page-top"><img class="navbar-logo" src="/img/logos/jack-logo.png" />{{ site.title }}</a>
             </div>
 
             <!-- Collect the nav links, forms, and other content for toggling -->

data/docs/_includes/subnav.html

@@ -1,23 +1,26 @@
-                <div class="col-md-3 content-nav">
-                    <ul>
-                        <li><a href="{% link quick-start.md %}">Quick Start</a></li>
-                        <li><a href="{% link docs.md %}">Docs</a>
-                            <ul>
-                                <li><a href="{% link _docs/install.md %}">Installation</a></li>
-                                <li><a href="{% link _docs/structure.md %}">Structure</a></li>
-                            </ul>
-                        </li>
-                        <li><a href="{% link _docs/tutorial.md %}">Tutorial</a>
-                            <ul class="build-scratch">
-                                <li><a href="{% link _docs/jack-create.md %}">jack create</a></li>
-                                <li><a href="{% link _docs/jack-get.md %}">jack get</a></li>
-                                <li><a href="{% link _docs/jack-apply.md %}">jack apply</a></li>
-                                <li><a href="{% link _docs/jack-diff.md %}">jack diff</a></li>
-                                <li><a href="{% link _docs/jack-deploy.md %}">jack deploy</a></li>
-                                <li><a href="{% link _docs/jack-terminate.md %}">jack terminate</a></li>
-                            </ul>
-                        </li>
-                        <li><a href="{% link _docs/next-steps.md %}">Next Steps</a></li>
-                        <li><a href="{% link articles.md %}">Articles</a></li>
-                    </ul>
-                </div>
+<div class="col-md-3 content-nav">
+    <ul>
+        <li><a href="{% link quick-start.md %}">Quick Start</a></li>
+        <li><a href="{% link docs.md %}">Docs</a>
+            <ul>
+                <li><a href="{% link _docs/install.md %}">Installation</a></li>
+                <li><a href="{% link _docs/structure.md %}">Structure</a></li>
+            </ul>
+        </li>
+        <li><a href="{% link _docs/tutorial.md %}">Tutorial</a>
+            <ul class="build-scratch">
+                <li><a href="{% link _docs/jack-create.md %}">jack create</a></li>
+                <li><a href="{% link _docs/jack-get.md %}">jack get</a></li>
+                <li><a href="{% link _docs/jack-apply.md %}">jack apply</a></li>
+                <li><a href="{% link _docs/jack-diff.md %}">jack diff</a></li>
+                <li><a href="{% link _docs/jack-deploy.md %}">jack deploy</a></li>
+                <li><a href="{% link _docs/jack-terminate.md %}">jack terminate</a></li>
+                <li><a href="{% link _docs/jack-help.md %}">jack help</a></li>
+            </ul>
+        </li>
+        <li><a href="{% link _docs/conventions.md %}">Conventions</a></li>
+        <li><a href="{% link _docs/settings.md %}">Settings</a></li>
+        <li><a href="{% link _docs/next-steps.md %}">Next Steps</a></li>
+        <li><a href="{% link articles.md %}">Articles</a></li>
+    </ul>
+</div>

data/docs/articles.md

@@ -3,3 +3,5 @@ title: Articles
 ---
 
 * [Jack and the Elastic Beanstalk —Easy Way to Manage AWS Elastic Beanstalk Environments](https://hackernoon.com/jack-and-the-elastic-beanstalk-easily-manage-aws-environments-3ab496f08ad2)
+
+<a id="prev" class="btn btn-basic" href="{% link _docs/next-steps.md %}">Back</a>

data/docs/docs.md

@@ -6,11 +6,13 @@ title: Docs
 
 Jack is a tool to manage AWS Elastic Beanstalk environments. Jack is a wrapper tool around the aws eb cli3 tool. Jack allows you to create environments using the saved template configuration file generated by eb config save. Jack moves these generated config file to the jack/cfg folder of your project and manages the the config files from there.
 
-Jack provides a `jack apply` command to update the Elastic Beanstalk environment. Before uploading the new configuration to Elastic Beanstalk jack first downloads the current configuration and then does a diff on the changes that you are about apply. This gives a helpful preview of exactly will be change. This is particularly helpful when changes are made through the Elastic Beanstalk GUI by multiple developers and are out of sync with what you thought they were.
+Jack provides a `jack apply` command to update the Elastic Beanstalk environment. Before uploading the new configuration to Elastic Beanstalk jack first downloads the current configuration and then does a diff on the changes that you are about apply. This gives a helpful preview of exactly what will be changed. This is particularly helpful when changes are made through the Elastic Beanstalk GUI by multiple developers and are out of sync with what you thought they were.
 
 <img src="/img/tutorials/jack-update.png" class="doc-photo" />
 
 Next we'll cover different ways to install jack.
 
-<a class="btn btn-basic" href="{% link quick-start.md %}">Back</a>
-<a class="btn btn-primary" href="{% link _docs/install.md %}">Next Step</a>
+<a id="prev" class="btn btn-basic" href="{% link quick-start.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/install.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+

data/docs/js/nav.js

@@ -8,8 +8,6 @@ function onlyShow(className) {
 }
 
 $( document ).ready(function() {
-    // onlyShow(); // hides all level 2 links
-
     var currentPath = $(location).attr('pathname');
 
     // add active class to the subnav link based on the current page
@@ -18,15 +16,24 @@ $( document ).ready(function() {
     });
     activeLink.addClass("active");
 
-    // hide level 2 list items unless currently under that area
-    // if (~currentPath.indexOf("/docs/scratch")) {
-    //     console.log("scratch");
-    //     onlyShow("build-scratch");
-    // } else if (~currentPath.indexOf("/docs/new")) {
-    //     console.log("new");
-    //     onlyShow("build-new");
-    // } else if (~currentPath.indexOf("/docs/existing")) {
-    //     console.log("existing");
-    //     onlyShow("build-existing");
-    // }
+    // allows use to use arrow keys to move back and forward through the docs
+    var keymap = {};
+
+    // LEFT
+    keymap[ 37 ] = "#prev";
+    // RIGHT
+    keymap[ 39 ] = "#next";
+
+    $( document ).on( "keyup", function(event) {
+        var href,
+            selector = keymap[ event.which ];
+        // if the key pressed was in our map, check for the href
+        if ( selector ) {
+            href = $( selector ).attr( "href" );
+            if ( href ) {
+                // navigate where the link points
+                window.location = href;
+            }
+        }
+    });
 });

data/docs/quick-start.md

@@ -18,4 +18,6 @@ Congratulations!  You have successfully created a Elastic Beanstalk environment,
 
 Learn more in the next sections.
 
-<a class="btn btn-primary" href="{% link docs.md %}">Next Step</a>
+<a id="next" class="btn btn-primary" href="{% link docs.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+

data/lib/jack/default/settings.yml

@@ -1,5 +1,5 @@
 create:
   keyname: default
-  platform: "64bit Amazon Linux 2016.09 v2.2.0 running Docker 1.11.2"
+  platform: "64bit Amazon Linux 2017.03 v2.6.0 running Docker 1.12.6"
 conventions:
   app_name_pattern: !ruby/regexp /(\w+)-\w+-\w+/

data/lib/jack/deploy.rb

@@ -53,8 +53,7 @@ module Jack
       #                         source_location/repo/branch
       #   -p, --process         enable preprocessing of the application version
       command = "#{eb_bin} deploy#{eb_base_flags} #{@env_name} #{ENV['EB_OPTIONS']}"
-      puts "command #{command.inspect}"
-      # sh(command)
+      sh(command)
     end
   end
 end

data/lib/jack/settings.rb

@@ -16,7 +16,7 @@ module Jack
       default_file = File.expand_path("../default/settings.yml", __FILE__)
       default = YAML.load_file(default_file)
 
-      @settings_yaml = default.merge(project.merge(user))
+      @settings_yaml = default.merge(user.merge(project))
     end
 
     def home

data/lib/jack/ui.rb

@@ -13,4 +13,4 @@ module Jack
       end
     end
   end
-end
+end

data/lib/jack/util.rb

@@ -98,7 +98,7 @@ module Jack::Util
     return @@aws_bin = ENV["JACK_AWS_BIN"] if ENV["JACK_AWS_BIN"]
 
     which_aws = `which aws`.strip
-    return @@aws_bin = which_aws if which_aws
+    return @@aws_bin = which_aws if which_aws != ''
 
     embedded_aws = "/opt/bolts/embedded/bin/aws"
     return @@aws_bin = embedded_aws if File.exist?(embedded_aws)
@@ -131,10 +131,10 @@ module Jack::Util
     return @@eb_bin = ENV["JACK_EB_BIN"] if ENV["JACK_EB_BIN"]
 
     which_eb = `which eb`.strip
-    return @@eb_bin = which_eb if which_eb
+    return @@eb_bin = which_eb if which_eb != ''
 
     embedded_eb = "/opt/bolts/embedded/bin/eb"
-    return @@eb_bin = embedded_eb if File.exist?(embedded_aws)
+    return @@eb_bin = embedded_eb if File.exist?(embedded_eb)
 
     # if reach here we did not detect the eb binary
     message = "ERROR: Unable to auto detect an eb executable. Please make sure you have installed the eb cli tool.\n"

data/lib/jack/version.rb

@@ -1,3 +1,3 @@
 module Jack
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/spec/lib/cli_spec.rb

@@ -17,25 +17,25 @@ describe Jack::CLI do
     end
 
     it "should upload and apply config to environment" do
-      out = execute("bin/jack config apply #{@args}")
+      out = execute("bin/jack apply #{@args}")
       # puts out
       expect(out).to include('eb config save')
     end
 
     it "should download config from environment" do
-      out = execute("bin/jack config get #{@args}")
+      out = execute("bin/jack get #{@args}")
       # puts out
       expect(out).to include("Config downloaded")
     end
 
     it "should diff local config from eb environment config" do
-      out = execute("bin/jack config diff #{@args}")
+      out = execute("bin/jack diff #{@args}")
       # puts out
       expect(out).to include("diff")
     end
 
     it "should reformat the local config to a sorted yaml format" do
-      out = execute("bin/jack config sort #{@args}")
+      out = execute("bin/jack sort #{@args}")
       # puts out
       expect(out).to include("Reformatted the local config")
     end

data/spec/lib/eb_config/create_spec.rb

@@ -28,7 +28,7 @@ describe Jack::EbConfig do
         data = YAML.load_file(create.eb_config_path)
         global = data['global']
         expect(global['application_name']).to eq "hi"
-        expect(global['default_platform']).to eq "64bit Amazon Linux 2016.09 v2.2.0 running Docker 1.11.2"
+        expect(global['default_platform']).to include("64bit Amazon Linux")
       end
     end
 

data/spec/lib/settings_spec.rb

@@ -20,8 +20,8 @@ describe Jack::Settings do
 
     context "no custom project settings" do
       it "flags uses defaults provided gem" do
-        project_flags = '--keyname "default" --platform "64bit Amazon Linux 2016.09 v2.2.0 running Docker 1.11.2"'
-        expect(settings.create_flags).to eq(project_flags)
+        project_flags = '--keyname "default" --platform "64bit Amazon Linux'
+        expect(settings.create_flags).to include(project_flags)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jack-eb
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-10 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -119,6 +119,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -139,8 +140,10 @@ files:
 - docs/_docs/jack-deploy.md
 - docs/_docs/jack-diff.md
 - docs/_docs/jack-get.md
+- docs/_docs/jack-help.md
 - docs/_docs/jack-terminate.md
 - docs/_docs/next-steps.md
+- docs/_docs/settings.md
 - docs/_docs/structure.md
 - docs/_docs/tutorial.md
 - docs/_includes/about.html
@@ -158,6 +161,7 @@ files:
 - docs/_includes/css/timeline.css
 - docs/_includes/edit-on-github.html
 - docs/_includes/footer.html
+- docs/_includes/google_analytics.html
 - docs/_includes/head.html
 - docs/_includes/header.html
 - docs/_includes/js.html
@@ -181,6 +185,7 @@ files:
 - docs/docs.md
 - docs/img/logos/boltops-logo-full.png
 - docs/img/logos/boltops-logo.png
+- docs/img/logos/jack-logo.png
 - docs/img/profile.png
 - docs/img/quotes/ben.jpg
 - docs/img/tutorials/aws-eb-dashboard.png
@@ -205,7 +210,6 @@ files:
 - docs/js/jquery.easing.min.js
 - docs/js/nav.js
 - docs/quick-start.md
-- docs/screenshot.png
 - docs/style.css
 - jack.gemspec
 - lib/jack.rb