Merge branch 'development'

coldbox-modules · Jun 3, 2020 · 5daf126 · 5daf126
2 parents d44c03a + e27efe8
commit 5daf126
Show file tree

Hide file tree

Showing 15 changed files with 8,235 additions and 444 deletions.
diff --git a/.cfformat.json b/.cfformat.json
@@ -17,19 +17,19 @@
 	"function_call.multiline.leading_comma.padding": true,
 	"function_call.casing.builtin": "cfdocs",
 	"function_call.casing.userdefined": "camel",
-	"function_call.multiline.element_count": 3,
+	"function_call.multiline.element_count": 2,
 	"function_call.multiline.leading_comma": false,
 	"function_call.multiline.min_length": 40,
 	"function_declaration.padding": true,
 	"function_declaration.empty_padding": false,
 	"function_declaration.multiline.leading_comma": false,
 	"function_declaration.multiline.leading_comma.padding": true,
-	"function_declaration.multiline.element_count": 3,
+	"function_declaration.multiline.element_count": 2,
 	"function_declaration.multiline.min_length": 40,
 	"function_declaration.group_to_block_spacing": "compact",
 	"function_anonymous.empty_padding": false,
 	"function_anonymous.group_to_block_spacing": "compact",
-	"function_anonymous.multiline.element_count": 3,
+	"function_anonymous.multiline.element_count": 2,
 	"function_anonymous.multiline.leading_comma": false,
 	"function_anonymous.multiline.leading_comma.padding": true,
 	"function_anonymous.multiline.min_length": 40,
@@ -44,6 +44,7 @@
 	"max_columns": 120,
 	"metadata.multiline.element_count": 3,
 	"metadata.multiline.min_length": 40,
+	"method_call.chain.multiline" : 3,
 	"newline":"\n",
 	"property.multiline.element_count": 3,
 	"property.multiline.min_length": 40,

diff --git a/.cflintrc b/.cflintrc
@@ -1,61 +1,157 @@
 {
-    "rule": [],
-    "includes": [
-        { "code": "AVOID_USING_CFINCLUDE_TAG" },
-		{ "code": "AVOID_USING_CFABORT_TAG" },
-		{ "code": "AVOID_USING_CFEXECUTE_TAG" },
-		{ "code": "AVOID_USING_DEBUG_ATTR" },
-		{ "code": "AVOID_USING_ABORT" },
-		{ "code": "AVOID_USING_ISDATE" },
-		{ "code": "AVOID_USING_ISDEBUGMODE" },
-		{ "code": "AVOID_USING_CFINSERT_TAG" },
-		{ "code": "AVOID_USING_CFUPDATE_TAG" },
-		{ "code": "ARG_VAR_CONFLICT" },
-		{ "code": "ARG_HINT_MISSING" },
-		{ "code": "ARG_HINT_MISSING_SCRIPT" },
-		{ "code" : "ARGUMENT_INVALID_NAME" },
-		{ "code" : "ARGUMENT_ALLCAPS_NAME" },
-		{ "code" : "ARGUMENT_TOO_WORDY" },
-		{ "code" : "ARGUMENT_IS_TEMPORARY" },
-        { "code": "CFQUERYPARAM_REQ" },
-        { "code": "COMPARE_INSTEAD_OF_ASSIGN" },
-		{ "code": "COMPONENT_HINT_MISSING" },
-		{ "code" : "COMPONENT_INVALID_NAME" },
-		{ "code" : "COMPONENT_ALLCAPS_NAME" },
-		{ "code" : "COMPONENT_TOO_SHORT" },
-		{ "code" : "COMPONENT_TOO_LONG" },
-		{ "code" : "COMPONENT_TOO_WORDY" },
-		{ "code" : "COMPONENT_IS_TEMPORARY" },
-		{ "code" : "COMPONENT_HAS_PREFIX_OR_POSTFIX" },
-		{ "code": "COMPLEX_BOOLEAN_CHECK" },
-        { "code": "EXCESSIVE_FUNCTION_LENGTH" },
-        { "code": "EXCESSIVE_COMPONENT_LENGTH" },
-        { "code": "EXCESSIVE_ARGUMENTS" },
-		{ "code": "EXCESSIVE_FUNCTIONS" },
-		{ "code": "EXPLICIT_BOOLEAN_CHECK" },
-        { "code": "FUNCTION_TOO_COMPLEX" },
-		{ "code": "FUNCTION_HINT_MISSING" },
-		{ "code": "FILE_SHOULD_START_WITH_LOWERCASE" },
-        { "code": "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN" },
-        { "code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN" },
-		{ "code": "MISSING_VAR" },
-		{ "code" : "METHOD_INVALID_NAME" },
-		{ "code" : "METHOD_ALLCAPS_NAME" },
-		{ "code" : "METHOD_IS_TEMPORARY" },
-		{ "code": "NESTED_CFOUTPUT" },
-		{ "code": "NEVER_USE_QUERY_IN_CFM" },
-		{ "code": "OUTPUT_ATTR" },
-		{ "code" : "QUERYPARAM_REQ" },
-        { "code": "UNUSED_LOCAL_VARIABLE" },
-        { "code": "UNUSED_METHOD_ARGUMENT" },
-		{ "code": "SQL_SELECT_STAR" },
-		{ "code": "SCOPE_ALLCAPS_NAME" },
-		{ "code": "VAR_ALLCAPS_NAME" },
-		{ "code": "VAR_INVALID_NAME" },
-		{ "code": "VAR_TOO_WORDY" }
-    ],
-    "inheritParent": false,
-    "parameters": {
-		"TooManyFunctionsChecker.maximum" : 20
-	}
+	"rule": [],
+	"includes": [
+		{
+			"code": "AVOID_USING_CFINCLUDE_TAG"
+		},
+		{
+			"code": "AVOID_USING_CFABORT_TAG"
+		},
+		{
+			"code": "AVOID_USING_CFEXECUTE_TAG"
+		},
+		{
+			"code": "AVOID_USING_DEBUG_ATTR"
+		},
+		{
+			"code": "AVOID_USING_ABORT"
+		},
+		{
+			"code": "AVOID_USING_ISDATE"
+		},
+		{
+			"code": "AVOID_USING_ISDEBUGMODE"
+		},
+		{
+			"code": "AVOID_USING_CFINSERT_TAG"
+		},
+		{
+			"code": "AVOID_USING_CFUPDATE_TAG"
+		},
+		{
+			"code": "ARG_VAR_CONFLICT"
+		},
+		{
+			"code": "ARG_HINT_MISSING"
+		},
+		{
+			"code": "ARG_HINT_MISSING_SCRIPT"
+		},
+		{
+			"code": "ARGUMENT_INVALID_NAME"
+		},
+		{
+			"code": "ARGUMENT_ALLCAPS_NAME"
+		},
+		{
+			"code": "ARGUMENT_TOO_WORDY"
+		},
+		{
+			"code": "ARGUMENT_IS_TEMPORARY"
+		},
+		{
+			"code": "CFQUERYPARAM_REQ"
+		},
+		{
+			"code": "COMPARE_INSTEAD_OF_ASSIGN"
+		},
+		{
+			"code": "COMPONENT_HINT_MISSING"
+		},
+		{
+			"code": "COMPONENT_INVALID_NAME"
+		},
+		{
+			"code": "COMPONENT_ALLCAPS_NAME"
+		},
+		{
+			"code": "COMPONENT_TOO_SHORT"
+		},
+		{
+			"code": "COMPONENT_TOO_LONG"
+		},
+		{
+			"code": "COMPONENT_TOO_WORDY"
+		},
+		{
+			"code": "COMPONENT_IS_TEMPORARY"
+		},
+		{
+			"code": "COMPONENT_HAS_PREFIX_OR_POSTFIX"
+		},
+		{
+			"code": "COMPLEX_BOOLEAN_CHECK"
+		},
+		{
+			"code": "EXCESSIVE_ARGUMENTS"
+		},
+		{
+			"code": "EXCESSIVE_FUNCTIONS"
+		},
+		{
+			"code": "EXPLICIT_BOOLEAN_CHECK"
+		},
+		{
+			"code": "FUNCTION_HINT_MISSING"
+		},
+		{
+			"code": "FILE_SHOULD_START_WITH_LOWERCASE"
+		},
+		{
+			"code": "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN"
+		},
+		{
+			"code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN"
+		},
+		{
+			"code": "MISSING_VAR"
+		},
+		{
+			"code": "METHOD_INVALID_NAME"
+		},
+		{
+			"code": "METHOD_ALLCAPS_NAME"
+		},
+		{
+			"code": "METHOD_IS_TEMPORARY"
+		},
+		{
+			"code": "NESTED_CFOUTPUT"
+		},
+		{
+			"code": "NEVER_USE_QUERY_IN_CFM"
+		},
+		{
+			"code": "OUTPUT_ATTR"
+		},
+		{
+			"code": "QUERYPARAM_REQ"
+		},
+		{
+			"code": "UNUSED_LOCAL_VARIABLE"
+		},
+		{
+			"code": "UNUSED_METHOD_ARGUMENT"
+		},
+		{
+			"code": "SQL_SELECT_STAR"
+		},
+		{
+			"code": "SCOPE_ALLCAPS_NAME"
+		},
+		{
+			"code": "VAR_ALLCAPS_NAME"
+		},
+		{
+			"code": "VAR_INVALID_NAME"
+		},
+		{
+			"code": "VAR_TOO_WORDY"
+		}
+	],
+	"inheritParent": false,
+	"parameters": {
+		"TooManyFunctionsChecker.maximum": 50
+	},
+	"excludes": []
 }
diff --git a/.markdownlint.json b/.markdownlint.json
@@ -0,0 +1,14 @@
+{
+	"line-length": false,
+	"single-h1": false,
+	"no-hard-tabs" : false,
+	"fenced-code-language" : false,
+	"no-bare-urls" : false,
+	"first-line-h1": false,
+	"no-multiple-blanks": {
+		"maximum": 2
+	},
+	"no-duplicate-header" : {
+		"siblings_only" : true
+	}
+}
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"MockDataCFC",
-    "version":"3.3.1",
+    "version":"3.4.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/MockDataCFC/@build.version@/[email protected]@.zip",
     "author":"Ortus Solutions",
     "homepage":"https://github.com/Ortus-Solutions/MockDataCFC",
@@ -29,6 +29,9 @@
         "*/.md"
     ],
     "scripts":{
-        "toMaster":"recipe build/toMaster.boxr"
+        "release":"recipe build/release.boxr",
+        "format":"cfformat run handlers,models,test-harness/tests/,ModuleConfig.cfc --overwrite",
+        "format:watch":"cfformat watch handlers,models,test-harness/tests/,ModuleConfig.cfc ./.cfformat.json",
+        "format:check":"cfformat check handlers,models,test-harness/tests/,ModuleConfig.cfc"
     }
 }
diff --git a/build/Build.cfc b/build/Build.cfc
@@ -56,7 +56,7 @@ component{
         buildID=createUUID(),
         branch="development"
     ){
-        // Create project mapping
+		// Create project mapping
 		fileSystemUtil.createMapping( arguments.projectName, variables.cwd );
 
         // Run the tests
@@ -70,15 +70,18 @@ component{
         docs( argumentCollection=arguments );
 
         // checksums
-        buildChecksums();
+		buildChecksums();
+
+		// Build latest changelog
+		latestChangelog();
 
         // Finalize Message
         print.line()
             .boldMagentaLine( "Build Process is done! Enjoy your build!" )
             .toConsole();
     }
 
-     /**
+    /**
      * Run the test suites
      */
     function runTests(){
@@ -195,7 +198,28 @@ component{
             overwrite=true,
             recurse=true
         );
-    }
+	}
+
+	/**
+	 * Build the latest changelog file: changelog-latest.md
+	 */
+	function latestChangelog(){
+		print.blueLine( "Building latest changelog..." ).toConsole();
+
+		if( !fileExists( variables.cwd & "changelog.md" ) ){
+			return error( "Cannot continue building, changelog.md file doesn't exist!" );
+		}
+
+		fileWrite(
+			variables.cwd & "changelog-latest.md",
+			fileRead( variables.cwd & 'changelog.md' ).split( '----' )[2].trim() & chr( 13 ) & chr( 10 )
+		);
+
+		print
+			.greenLine( "Latest changelog file created at `changelog-latest.md`" )
+			.line()
+			.line( fileRead( variables.cwd & "changelog-latest.md" ) );
+	}
 
     /********************************************* PRIVATE HELPERS *********************************************/
 

diff --git a/build/toMaster.boxr → build/release.boxr b/build/toMaster.boxr → build/release.boxr
@@ -1,19 +1,25 @@
 # This recipe signifies a new release of the module by doing merges and bumps accordingly
 
-# Check out master
+# Check out master and update it locally
 !git checkout -f master
-# Merge development into it
+!git pull origin master
+
+# Merge development into it for release
 !git merge --no-ff development
-# Tag the master repo with the version in box.json
+
+# Tag the master repo with the version from box.json
 !git tag v`box package show version`
-# Push all branches
+
+# Push all branches back out to github
 !git push origin --all
+
 # Push all tags
 !git push origin --tags
+
 # Check development again
 !git checkout -f development
+
 # Bump to prepare for a new release, do minor, change if needed and don't tag
 bump --minor --!tagVersion
-# Send it out
 !git commit -a -m "version bump"
 !git push origin development