Merge pull request #41 from radify/set-aws-keys-during-amendation

Saves AWS keys for amend Q/A + Boilerplate Stuff
radify · Aug 24, 2015 · 631ca46 · 631ca46
2 parents 2569a43 + 0107868
commit 631ca46
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.1.4 - 2015-08-24
+* Adds devDependency badge to README
+* Fix
+    * The emendation dialogue now offers the AWS keys entered
+      during the first Q&A as the default values
+
 ## 0.1.3 - 2015-08-20
 * Additions
     * A `CHANGELOG`

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 [![Travis Build Status](https://travis-ci.org/radify/radiian.svg)](https://travis-ci.org/radify/radiian?branch=master)
 [![npm version](https://badge.fury.io/js/radiian.svg)](http://npmjs.com/package/radiian)
 [![Dependency Status](https://david-dm.org/radify/radiian.svg)](https://david-dm.org/radify/radiian)
+[![devDependency Status](https://david-dm.org/radify/radiian/dev-status.svg)](https://david-dm.org/radify/radiian#info=devDependencies)
 
 # Radiian
 

diff --git a/lib/questions.js b/lib/questions.js
@@ -26,6 +26,7 @@
       type: 'input',
       name: 'appName',
       message: function() {
+        // This clears the screen
         process.stdout.write('\u001b[2J\u001b[0;0H');
         return 'What is the name of your application?';
       },
@@ -313,7 +314,7 @@
   }, {
     type: 'input',
     name: 'aws_key',
-    message: 'What is your AWS Access Key?',
+    message: 'What is your AWS Access Key (e.g. AKIAIOSFODNN7EXAMPLE)?',
     validate: function(value) {
       var regex =  regexes.awsKey;
 
@@ -324,7 +325,7 @@
   }, {
     type: 'input',
     name: 'aws_secret_key',
-    message: 'What is your AWS Secret Access Key?',
+    message: 'What is your AWS Secret Access Key (e.g. wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY)?',
     validate: function(value) {
       var regex =  regexes.awsSecret;
       // This regex is essentially the same as the above, but it looks for 40 character,

diff --git a/lib/radiian-init.js b/lib/radiian-init.js
@@ -29,11 +29,9 @@
         if (!confirmation.confirm) {
           // load existing answers as defaults into questions so user is modifying,
           // not starting from scratch
-          for (var i = 0; i < questions.length; i++) {
-            if (questions[i].default) {
-              questions[i].default = answers[questions[i].name];
-            }
-          }
+          questions.map(function(question) {
+            question.default = answers[question.name];
+          });
           go(questions);
         } else {
           submittedAnswers = answers;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "radiian",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Radiian generates an Ansible playbook for immutable infrastructure with AWS.",
   "bin": "lib/radiian.js",
   "main": "lib/radiian.js",