Merge pull request #31 from tejovanthWork/master

adds select options for field-variables

playground/cookiecutter.config.js

@@ -1,37 +1,49 @@
 module.exports = [
-    {
-        name: "Normal Component",
-        templatePath: "templates/COMPONENT_NAME/",
-        outputPath: "output/",
-        fields: [
-            {
-                templateVariable: 'COMPONENT_NAME',
-                question: "What is your components name?",
-                errorMessage: "Can't be more than 10 characters long."
-            },
-            {
-                templateVariable: 'specialNumber',
-                question: "What is your favourite letter?",
-                errorMessage: "Z is not valid.",
-                isValid(val) {
-                    return val !== 'Z'
-                }
-            }
-        ]
-    },
-    {
-        name: "Container Component",
-        templatePath: "templates/CONTAINER_NAME.js",
-        outputPath: "output/containers",
-        fields: [
-            {
-                templateVariable: 'CONTAINER_NAME',
-                question: "What is your container component's name?",
-                errorMessage: "Must be at least 5 characters long.",
-                isValid(val) {
-                    return val.length <= 5
-                }
-            }
-        ]
-    }
+  {
+    name: "Normal Component",
+    templatePath: "templates/COMPONENT_NAME/",
+    outputPath: "output/",
+    fields: [
+      {
+        templateVariable: "COMPONENT_NAME",
+        question: "What is your components name?",
+        errorMessage: "Can't be more than 10 characters long."
+      },
+      {
+        templateVariable: "specialNumber",
+        question: "What is your favourite letter?",
+        errorMessage: "Z is not valid.",
+        isValid(val) {
+          return val !== "Z";
+        }
+      }
+    ]
+  },
+  {
+    name: "Container Component",
+    templatePath: "templates/CONTAINER_NAME.js",
+    outputPath: "output/containers",
+    fields: [
+      {
+        templateVariable: "CONTAINER_NAME",
+        question: "What is your container component's name?",
+        errorMessage: "Must be at least 5 characters long.",
+        isValid(val) {
+          return val.length <= 5;
+        }
+      }
+    ]
+  },
+  {
+    name: "List of options",
+    templatePath: "templates/CONTAINER_NAME.js",
+    outputPath: "output/containers",
+    fields: [
+      {
+        templateVariable: "CONTAINER_NAME",
+        question: "Select one of the following names:",
+        choices: ["TestContainer", "CoolContainer"]
+      }
+    ]
+  }
 ];

readme.md

@@ -1,6 +1,6 @@
 # cookiecutter :cookie: :scissors:
 
- [![CircleCI](https://circleci.com/gh/mattvagni/cookiecutter/tree/master.svg?style=svg)](https://circleci.com/gh/mattvagni/cookiecutter/tree/master) [![Greenkeeper badge](https://badges.greenkeeper.io/mattvagni/cookiecutter.svg)](https://greenkeeper.io/) [![npm version](https://badge.fury.io/js/cookiecutter.svg)](https://badge.fury.io/js/cookiecutter)
+[![CircleCI](https://circleci.com/gh/mattvagni/cookiecutter/tree/master.svg?style=svg)](https://circleci.com/gh/mattvagni/cookiecutter/tree/master) [![Greenkeeper badge](https://badges.greenkeeper.io/mattvagni/cookiecutter.svg)](https://greenkeeper.io/) [![npm version](https://badge.fury.io/js/cookiecutter.svg)](https://badge.fury.io/js/cookiecutter)
 
 A CLI for creating boilerplate files/folders based on templates you provide. Like [Yeoman](http://yeoman.io/) or Python's [Cookiecutter](https://github.com/audreyr/cookiecutter) but much, much simpler.
 
@@ -13,58 +13,63 @@ It is designed for existing projects where you want an easy way to create boiler
 A good use-case for cookiecutter is, for example, creating a new Redux connected React component within a project. Not hard... but also not fun.
 
 :white_check_mark: Cookiecutter supports:
+
 - Multiple templates with the ability to pick which template to use via the CLI.
 - Multiple fields per template with the ability to specify them from the CLI.
 - Custom validation & error messages for fields.
 - Any type of file or folder structure.
 
 :x: Cookiecutter **doesn't** support:
+
 - Conditionals or any other logic in templates. You can however achieve similar things by having multiple templates).
 - Bootstrapping a project from scratch (i.e I have no code but need to set a project up)
 - Adding code to existing files
 - Lots of other things Yeoman _does_ support. If your use-case is complex, cookiecutter might not cut it.
 
 ## Quick Setup
+
 First `npm install --save-dev cookiecutter`. You can also install this globally if you prefer.
 
 The add the following to your package.json (no need to do this if you are using yarn):
+
 ```json
 "scripts": {
     "cookiecutter": "cookiecutter"
 }
 ```
+
 You can now start creating your template. For example if you create a 'templates' folder in your root and add the following template:
 
 ```js
 // templates/COMPONENT_NAME.js
-import React from 'react';
+import React from "react";
 
 class COMPONENT_NAME extends React.Component {
-    render() {
-        return <div>Hello World</div>;
-    }
+  render() {
+    return <div>Hello World</div>;
+  }
 }
 
 export default COMPONENT_NAME;
 ```
 
 You can now configure Cookiecutter to replace the string `COMPONENT_NAME` like so by creating a file in the root of your project called `cookiecutter.config.js`. Cookiecutter will always look in your root for a file called `cookiecutter.config.js`.
+
 ```js
 // cookiecutter.config.js
 module.exports = [
-    {
-        name: "Normal React Component",
-        templatePath: "templates/COMPONENT_NAME.js",
-        outputPath: "src/components/",
-        fields: [
-            {
-                templateVariable: 'COMPONENT_NAME',
-                question: "What is the component's name?",
-            }
-        ]
-    }
+  {
+    name: "Normal React Component",
+    templatePath: "templates/COMPONENT_NAME.js",
+    outputPath: "src/components/",
+    fields: [
+      {
+        templateVariable: "COMPONENT_NAME",
+        question: "What is the component's name?"
+      }
+    ]
+  }
 ];
-
 ```
 
 If you now run `npm run cookiecutter` you will be prompted to pick which template you'd like to use. After which you will be asked to answer each field's question. It should look something like this:
@@ -84,6 +89,7 @@ That's it. Cookiecutter now created the following file:
 Cookiecutter will **never** overwrite any existing files.
 
 ## Validating fields / custom validation
+
 To do this you can add `isValid` and a custom `errorMessage` to a fields configuration.
 Using the example above you could, for example, ensure component names follow a naming convention.
 
@@ -109,39 +115,67 @@ module.exports = [
 
 ```
 
+## Select style options at the field level
+
+Set the `options` key in the `fields` object to enable user-selectable responses to the template variables.
+
+```diff
+// in cookiecutter.config.js
+module.exports = [
+    {
+       name: "Normal React Component",
+        templatePath: "templates/COMPONENT_NAME/index.js",
+        outputPath: "src/components/",
+        fields: [
+            {
+                templateVariable: 'COMPONENT_NAME',
+                question: "What is the component's name?",
++               choices: ["CoolComponent", "BigComponent", "TestComponent"],
+            }
+        ]
+    }
+];
+
+```
+
 ## Multiple templates
+
 You can configure multiple templates and Cookiecutter will let you pick which template to use. The template's 'name' is what will be used in the CLI when asking which template to use.
 
 You can specify multiple templates like so:
+
 ```js
 // in cookiecutter.config.js
 module.exports = [
-    {
-       // Configuration for the 1st template
-    },
-    {
-       // Configuration for the 2nd template
-    },
+  {
+    // Configuration for the 1st template
+  },
+  {
+    // Configuration for the 2nd template
+  }
 ];
-
 ```
 
 ## Templates with folders
+
 If you specify a folder as a template, then the folder will be created in the output directory as well. This is useful if you have a folder structure such as:
 
 ```
 - ComponentName
     - index.js
     - styles.css
 ```
+
 Cookiecutter will recursively copy all files within your templates folder and replace any occurrences of your specified fields.
 
 If you don't want this behavior, specify a file as your template's `templatePath`.
 
 ## Custom config location
+
 If you would like your config to be somewhere else you can use the `-c=path/to/your/config.js` flag when you call cookiecutter.
 
 ## Contributing
+
 After cloning the repo `yarn install`.
 
 You can play with the cli in the 'playground' folder. To do this, `cd` into it and run `. run.sh`. This is like running the cli once it's published and on npm but allows you to work on it locally.
@@ -150,6 +184,7 @@ To run tests run `yarn test`.
 To lint files (this will also happen in CircleCI when you open a PR): `yarn lint`
 
 ## Roadmap/Plans
+
 - Offer a set of helpers for validation user input. Esp. for common 'cases' such as snake_case, PascalCase etc.
 - Allow users to specify a custom path for their config.
 - Offer the ability for people to show a message that is only shown AFTER a template is successfully rendered. This could be helpful for things such as help-text such as: 'You can import this component like so: ...'

src/lib/questions.js

@@ -22,7 +22,8 @@ function makeFieldQuestions(templateConfig) {
         return {
             name: field.templateVariable,
             message: field.question,
-            type: 'input',
+            type: !!field.choices ? 'list' : 'input',
+            choices: field.choices || undefined,
             validate(value) {
                 if (value.length === 0) {
                     return 'This field is mandatory.';

src/lib/tests/questions.test.js

@@ -26,6 +26,11 @@ const testConfig = [
                 templateVariable: 'NUMBER',
                 question: 'What is your favourite number?',
             },
+            {
+                templateVariable: 'CHOICE',
+                question: 'Do you need a choice?',
+                choices: ['Yes', 'No'],
+            },
         ],
     },
 ];
@@ -37,18 +42,21 @@ it('makeTemplateQuestion() should make the right question', () => {
 });
 
 it('makeFieldQuestions() should make the correct questions', () => {
-
     const fieldQuestions = makeFieldQuestions(testConfig[0]);
 
-    // It should correctly handle there not being a custom error message and isValid
+  // It should correctly handle there not being a custom error message and isValid
     expect(fieldQuestions[0].validate('this is wrong')).toBe('Nope');
     expect(fieldQuestions[0].validate('42')).toBe(true);
 
-    // Should handle there being an error but not a custom error message
-    expect(fieldQuestions[1].validate('this is also wrong')).toBe('Invalid value.');
+  // Should handle there being an error but not a custom error message
+    expect(fieldQuestions[1].validate('this is also wrong')).toBe(
+    'Invalid value.'
+  );
 
-    // Should error on empty values since we require all questions to require a value.
+  // Should error on empty values since we require all questions to require a value.
     expect(fieldQuestions[2].validate('')).toBe('This field is mandatory.');
     expect(fieldQuestions[2].validate('this is valid')).toBe(true);
 
+    expect(fieldQuestions[3].validate('Yes')).toBe(true);
+    expect(fieldQuestions[3].validate('No')).toBe(true);
 });