aws-must 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec263031a8d6a6619934045ec286e400ddf00a72
-  data.tar.gz: f1b69d4f681dc1551986be9f505540dd17337f1b
+  metadata.gz: 8bc46bd401c62d97d7cd8171ebe4ba40ab529417
+  data.tar.gz: d9ee68d839c1892fd29d32a7384d046428c26bfb
 SHA512:
-  metadata.gz: ce14b0078feac91d303e3b313ce9f33eab39afb966bdf11ee52efdee6f6e9e4380ce330b7daa8ea203b7651d580e41d3d7409c1494cf09139ed4be390a1c1bed
-  data.tar.gz: 47a828370761ca394473cea460a2b337d2f9c2a3990ca96ae701317dde6ebf467b523a4408a4632b2b60859b683470567259d428fcd8366c475feb98e1d539b8
+  metadata.gz: c52c2bb51dc2e9dbb9139cb5880840ed4b8646d999990e46d41f66d2c95b6a1bbdc8eb0a51171743d9e46a45d3ef1c8d62ccefefc024b43d38fa5f26c8a7cfac
+  data.tar.gz: 82226a0afeda175d83abeb84ba75083b729b321eab5885ab8f6b0c1a66dc683b8bb8653a3132c0757fb13eaf6ed0f93fd104c7732f7fb42ec00b283f27037bba

data/README.md

@@ -1,4 +1,4 @@
-# aws-must - Minimum Viable Solution to Manage CloudFormation Templates - $Release:0.0.2$
+# aws-must - Minimum Viable Solution to Manage CloudFormation Templates - $Release:0.0.3$
 
 `aws-must` is a tool, which allows separating infrastructure
 configuration and Amazon related syntax using
@@ -148,11 +148,11 @@ line argument `browser`, e.g. `rake demo:html-3[chromium-browser]`.
 
 #### Use Demo to Bootstrap Own Configuration
 
-To extract your own copy of demo case `i` configuration, run rake task
-`demo:bootstrap-i` with command line arguments defining template
-directory and configuration directory. For example, to copy demo case
-`3` templates to directory `tmp/tmpl` and configurations to
-`tmp/conf`, run
+To create a copy templates and YAML configuration for demo case `i`,
+run rake task `demo:bootstrap-i` and pass command line arguments
+defining template directory and configuration directory. For example,
+to copy demo case `3` templates to directory `tmp/tmpl` and
+configurations to `tmp/conf`, run
 
     rake demo:bootstrap-3[tmp/tmpl,tmp/conf]
 	
@@ -174,7 +174,7 @@ Prerequisites:
 * [Install Amazon AWS Command Line Interface](http://docs.aws.amazon.com/cli/latest/userguide/installing.html)
 * [Configure AWS Command Line Interface](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html)
 
-To demo targets, which provision Amazon, run
+To list demo targets, which provision Amazon, run
 
 	rake -T demo:stack-create
 
@@ -183,10 +183,6 @@ of the templates use fixed AMI configuration, which means that they
 work only if aws -tool defines correct region (typically in set in
 `~/.aws/config` file).
 
-**NOTICE**: Demo-case `7,8, ...` make use of public ssh-key
-`demo-key`. See
-[Amazon EC2 Key Pairs](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html),
-which explains how to upload your own key to Amazon platform.
 
 To create a `demo` stack for demo case `i`, for example demo case 7
 run
@@ -201,23 +197,23 @@ To show status of `demo` stack run
 
 	rake  demo:stack-status
 
-Instances created in demo cases `7,8,...` can be connected using ssh.
-Demo target `demo:stack-ssh` locates an ip address from stack output
-variable, and launches ssh command with the ip and the identity given
-as a parameter.
+EC2 instances created in demo cases `7,8,...` accept ssh
+connections. 
 
-For example to use ip address in demo stack output variable `IP1`, and
-with the identity `~/.ssh/demo-key/demo-key`, run
+Demo target `demo:stack-ssh` locates an ip address from a stack output
+variable given as a parameter, and makes ssh connection to this ip
+using the ssh identity given as a parameter.
+
+For example, to use ip address in demo stack output variable `IP1`,
+and the ssh private key in `~/.ssh/demo-key/demo-key`, run
 
     rake demo:stack-ssh[IP1,~/.ssh/demo-key/demo-key]
-	
-where
 
-* `IP1` : is the name of stack output variable holding IP address
-  (cf. Outputs array in `rake demo:stack-status`)
-* `~/.ssh/demo-key/demo-key` is the file path of ssh private key for
-  [Amazon SSH-key pair](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html)
-  `demo-key`.
+**NOTICE**: Use `rake  demo:stack-status` to show stack output variables.
+
+**NOTICE**: The identity used must correspond to an existing
+[Amazon EC2 Key Pair](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html)
+with the name `demo-key`.
 
 
 To delete `demo` stack

data/demo/2/conf.yaml

@@ -2,5 +2,4 @@
 
 
 description: "demo/2: a simple Amazon EC2 instance created using
-             aws-must tool.  Added 'description' tag in
-             `root.mustache`"
+             aws-must tool.  Added Description tag in root.mustache"

data/lib/tasks/demo.rake

@@ -42,12 +42,14 @@ namespace "demo" do |ns|
       sh "#{cmd} json #{demo_dir}/#{c[:id]}/conf.yaml"
     end
 
-    desc "Check the difference between version '#{c[:id]}' and '#{c[:id].to_i() -1}' "
-    task "diff-#{c[:id]}" do
-      prev = c[:id].to_i() -1
+    desc "Check the difference between version '#{c[:id]}' and :prev (default '#{c[:id].to_i() -1}') "
+    task "diff-#{c[:id]}", :prev do |t,args|
+
+      args.with_defaults( prev:  c[:id].to_i() -1 )
+
       # use bash temporary names pipes to diff two stdouts
       # Use `jq` to create canonical pretty print json
-      sh "bash -c \"diff <(#{cmd} gen -t #{demo_dir}/#{c[:id]} #{demo_dir}/#{c[:id]}/conf.yaml | jq . ) <(#{cmd} gen -t #{demo_dir}/#{prev} #{demo_dir}/#{prev}/conf.yaml | jq . ) || true \""
+      sh "bash -c \"diff <(#{cmd} gen -t #{demo_dir}/#{c[:id]} #{demo_dir}/#{c[:id]}/conf.yaml | jq . ) <(#{cmd} gen -t #{demo_dir}/#{args.prev} #{demo_dir}/#{args.prev}/conf.yaml | jq . ) || true \""
     end
 
     desc "Create stack #{stack} for demo case #{c[:id]}, supported regions=#{c[:region]}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-must
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - jarjuk