wombat-cli 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc2a49c4d8120a5421a09bb71a1ccd43b11d81ee
-  data.tar.gz: 9f3f59613fd739f1902a5be5fae389f83b595735
+  metadata.gz: 24513ed8218b0ec591f138d605341cd0ab9da123
+  data.tar.gz: c4a4c9604cce41aac08b8577981460be4284abdb
 SHA512:
-  metadata.gz: 8686a4aca69bc596561fd37e59a694deff12935481213de4ad469d9b91814a7b59b21ae49ee59367bf0635c1ebac34d6f91019a787477224d277ebccf44c4fe0
-  data.tar.gz: 21d805f89f60acf24918cff6aed1415cbec9f2a1ac6a0d5b15581027373f5bd0b7cbbd55289f4ce507b9c4d6443ee86b5cba55e31044286f84ef82818070b6ac
+  metadata.gz: e9146ee47ac655aefbc1dfdc8bf51db8ce1666cc6ec4dc844d215dc1e10e4356e26195148be71f71e9ec1b93ac4a8bb30f998e0a50dc16de040dd77c7ffa097f
+  data.tar.gz: e7f413cdbd2e2a67be729bb5c9cfece927c114582a492b07497b7f0160b862722a5f020f0eb2d1e31b1d2b3bb47ce616e5a362a6b7eacbc2306a43c326573350

data/.gitignore

@@ -9,7 +9,6 @@ terraform.tfvars
 vendored-cookbooks
 *.log
 cloudformation/*.json
-wombat.yml
 keys/*
 packer/keys/*
 *.lock

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+# Change Log
+
+## [0.3.2](https://github.com/chef-cft/wombat/tree/0.3.2) (2016-11-14)
+[Full Changelog](https://github.com/chef-cft/wombat/compare/v0.3.1...0.3.2)
+
+**Merged pull requests:**
+
+- Readme badge hotfix [\#251](https://github.com/chef-cft/wombat/pull/251) ([cheeseplus](https://github.com/cheeseplus))
+- Fix examples, update readme [\#247](https://github.com/chef-cft/wombat/pull/247) ([cheeseplus](https://github.com/cheeseplus))
+
+## [v0.3.1](https://github.com/chef-cft/wombat/tree/v0.3.1) (2016-11-04)
+[Full Changelog](https://github.com/chef-cft/wombat/compare/v0.3.0...v0.3.1)
+
+**Merged pull requests:**
+
+- 0.3.1 release [\#246](https://github.com/chef-cft/wombat/pull/246) ([cheeseplus](https://github.com/cheeseplus))
+- Log parsing, like honeybader, does not give... [\#245](https://github.com/chef-cft/wombat/pull/245) ([cheeseplus](https://github.com/cheeseplus))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -1,6 +1,9 @@
+[![Gem Version](https://badge.fury.io/rb/wombat-cli.svg)](http://badge.fury.io/rb/wombat-cli)
+
 [![Stories in Ready](https://badge.waffle.io/chef-cft/wombat.png?label=ready&title=Ready)](https://waffle.io/chef-cft/wombat)
-# `Project Wombat`
-`wombat` is a gem that builds and creates demo environments using cloud-specific deployment
+
+# Wombat
+Wombat (`wombat-cli`) is a gem that builds and creates demo environments using cloud-specific deployment
 tools like CloudFormation. The demo environments are comprised of instances built
 from the included packer templates:
 
@@ -11,28 +14,56 @@ from the included packer templates:
 * _N_ Infrastructure Nodes
 * _N_ Windows Workstation
 
-Usage
-------------
+## Pre-requisites
+
+We'll need a few things before we can get started with Wombat.
+
+##### Install and Configure ChefDK
+
+Follow the instructions at https://docs.chef.io/install_dk.html to install and configure ChefDK (0.19.6+) as your default version of Ruby.
+
+*Note:* If not using ChefDK, Ruby 2.3+ is required.
+
+##### Install Packer
+
+Downloads are here: https://www.packer.io/downloads.html. The binary must be in $PATH for `wombat build` 
 
 ##### Download your Automate license key
 Automate requires a valid license to activate successfully. **If you do
 not have a license key, you can request one from your CHEF account
 representative.**
 
-You will need to have the `delivery.license` file present inside `packer/files/`
-directory.
+You will need to have the `delivery.license` file present inside  the `files/`
+directory of your wombat project.
 
-##### Install and Configure ChefDK
+## Usage
 
-Follow the instructions at https://docs.chef.io/install_dk.html to install and configure ChefDK as your default version of Ruby.
+### From Rubygems
 
-##### Install Packer
+If you are a developer or you prefer to install from Rubygems, we've got you covered.
 
-Downloads are here: https://www.packer.io/downloads.html . Place in your path for direct execution.
+Add Wombat to your repository's `Gemfile`:
 
-##### Create a wombat.yml
+```ruby
+gem 'wombat-cli'
+```
 
-Create a wombat.yml - there is an example `wombat.example.yml` for reference and easy copying
+*Note:* if using Bundler, make sure to `bundle install` and prefix commands as appropriate, ex `bundle exec wombat`
+
+
+Or run it as a standalone:
+
+```shell
+$ gem install wombat-cli
+```
+
+##### Get Started with Wombat
+
+```
+$ wombat init
+```
+
+This will generate a wombat skeleton project and example configuration file `wombat.yml`
 
 *NOTE:* workstation-passwd must meet the minimum Microsoft [Complexity Requirements](https://technet.microsoft.com/en-us/library/hh994562(v=ws.11).aspx)
 
@@ -42,13 +73,13 @@ Create a wombat.yml - there is an example `wombat.example.yml` for reference and
 
 ```
 # build one or more templates
-$ bin/wombat build [-o BUILDER] TEMPLATE [TEMPLATE2]
+$ wombat build [-o BUILDER] TEMPLATE [TEMPLATE2]
 
 # build all templates (sequentially)
-$ bin/wombat build [-o BUILDER]
+$ wombat build [-o BUILDER]
 
 # build all images (parallel)
-$ bin/wombat build [-o BUILDER] --parallel
+$ wombat build [-o BUILDER] --parallel
 ```
 
 *NOTE:* If the builder is not provided it defaults to `amazon-ebs`
@@ -63,7 +94,7 @@ Upload the created template from the `cloudformation` directory.
 
 ```
 # Deploy CloudFormation template
-$ bin/wombat deploy --cloud aws STACK --update-lock --create-template
+$ wombat deploy --update-lock --update-template
 ==> Updating wombat.lock
 ==> Generate CloudFormation JSON: STACK.json
 ==> Creating CloudFormation stack
@@ -72,19 +103,24 @@ Created: arn:aws:cloudformation:us-east-1:862552916454:stack/STACK/2160c580-713e
 
 ```
 # Deploy an already generated template (pre-existing template)
-bin/wombat deploy --cloud aws STACK
+# where STACK is the name of the template (w/o file extention) in the `stack_dir`
+wombat deploy STACK
 ```
 
-*NOTE:* If the cloud is not provided it defaults to `aws`
-
 ##### Login to Windows Workstation
 
 ```
 # Get Windows Workstation(s) IP(s)
-$ bin/wombat outputs STACK
+# where STACK is the name of the running CloudFormation stack
+$ wombat outputs STACK
 WindowsWorkstation (i-xxxxxxxx) => XX.XXX.XX.XXX
 ```
 
+## TODO
+
+* Complete support for Azure
+* Complete support for Google Cloud Engine
+
 From the AWS CloudFormation UI, select the Outputs tab for the desired stack.
 Use an RDP compatible client to login to the workstation with the embedded credentials.
 

data/generator_files/wombat.yml

@@ -0,0 +1,67 @@
+---
+name: wombat
+# Uncomment domain_prefix if you wish to prepend your generated domain.
+# Ex: The below example would create foo-chef.animals.biz.
+# domain_prefix: foo-
+domain: animals.biz
+enterprise: mammals
+org: marsupials
+certs: ['automate', 'chef', 'compliance']
+ttl: 6
+linux: ubuntu
+version: 0.2.1
+products:
+  chef: stable-latest
+  chef-server: stable-latest
+  chefdk: stable-latest
+  compliance: stable-latest
+  automate: stable-latest
+  push-jobs-server: stable-latest
+  manage: stable-latest
+build-nodes:
+  count: 1
+workstations:
+  platform: windows
+  # Must meet the minimum Microsoft Complexity Requirements
+  # https://technet.microsoft.com/en-us/library/hh994562(v=ws.11).aspx)
+  password: 'ZL9@T40BTmXhZ'
+  count: 1
+infranodes:
+# Add a list of infrastructure nodes here with their associated run list to have these nodes precreated on the Chef Server
+# Note: the cookbook content won't be automatically uploaded, only the node object will be created with the run list added,
+# if the content doesn't exist at the first checkin the chef-client run will fail.
+# acceptance:
+# platform: windows
+#   environment: web-acceptance
+#   run_list:
+#     - recipe[bacon::chewy]
+# delivered:
+#   environment: web-delivered
+#   run_list:
+#     - recipe[bacon::crispy]
+conf:
+  key_dir: 'keys'
+  cookbook_dir: 'cookbooks'
+  packer_dir: 'packer'
+  template_dir: 'templates'
+  log_dir: 'logs'
+  stack_dir: 'stacks'
+  audio: false
+aws:
+  az: us-east-1e
+  keypair: keypair-us-east
+  region: us-east-1
+  # This optional key presumes these IAM roles are already created
+  # and are only applied to workstations currently
+  # iam_roles: ['iam_role', 'iam_roles_buddy']
+  source_ami:
+    ubuntu: ami-8e0b9499
+    windows: ami-bd3ba0aa
+    centos: ami-6d1c2007
+gce:
+  zone: us-east1-b
+  project: wombat-gce
+  account_file: wombat-gce.json
+  source_image:
+    ubuntu: ubuntu-1404-trusty-v20160809a
+    windows: windows-server-2012-r2-dc-v20160809

data/lib/wombat/cli.rb

@@ -91,7 +91,7 @@ class Options
           end
 
           opts.on("--update-template", "Update template") do |opt|
-            options.create_template = opt
+            options.update_template = opt
           end
         },
         argv: stack_argv_proc

data/lib/wombat/deploy.rb

@@ -10,7 +10,7 @@ class DeployRunner
     @stack = opts.stack
     @cloud = opts.cloud.nil? ? "aws" : opts.cloud
     @lock_opt = opts.update_lock
-    @template_opt = opts.create_template
+    @template_opt = opts.update_template
   end
 
   def start

data/lib/wombat/version.rb

@@ -1,3 +1,3 @@
 module Wombat
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wombat-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Andre Elizondo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -105,6 +105,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - DESIGN.md
 - Gemfile
 - README.md
@@ -278,6 +279,7 @@ files:
 - generator_files/packer/workstation.json
 - generator_files/templates/bootstrap-aws.erb
 - generator_files/templates/cfn.json.erb
+- generator_files/wombat.yml
 - keys/.gitkeep
 - lib/wombat.rb
 - lib/wombat/build.rb