particle-commands 0.5.0 → 0.5.2

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+### 0.5.2 - 2023-10-17
+- Fix asset ota key in project properties file
+
+### 0.5.1 - 2023-10-11
+- Fix gitignore file
+
 ### 0.5.0 - 2023-10-10
 - Add the new Particle project template
 

package/dist/cmd/project_init.js

@@ -296,7 +296,7 @@ var ProjectInitCommand = exports.ProjectInitCommand = function (_Command) {
 			var properties = { name: name };
 			var project = new _project_properties2.default(directory, { fs: _project_properties2.default.buildFs(fs) });
 			return this.createNotifyDirectory(site, fs, directory).then(function () {
-				return _this6.createNotifyTemplateIfNeeded(site, fs, _path2.default.join(directory, '.gitignore'), '.gitignore', properties);
+				return _this6.createNotifyTemplateIfNeeded(site, fs, _path2.default.join(directory, '.gitignore'), 'gitignorefile', properties);
 			}).then(function () {
 				return _this6.createNotifyFileIfNeeded(site, fs, _path2.default.join(directory, 'project.properties'), '');
 			}).then(function () {

package/dist/cmd/project_properties.js

@@ -123,17 +123,24 @@ var ProjectProperties = function () {
 	}, {
 		key: 'writeAssetOtaDir',
 		value: function writeAssetOtaDir() {
-			// Add a commented line for assetOtaDir
-			var data = '#assetOtaDir=assets\n';
-			return this.fs.appendFile(this.name(), data, 'utf8');
+			var _this3 = this;
+
+			// // Add a commented line for assetOtaDir if it doesn't exist
+			this.load().then(function () {
+				var val = _this3.getField('#assetOtaDir');
+				if (!val) {
+					_this3.setField('#assetOtaDir', 'assets');
+					return _this3.save();
+				}
+			});
 		}
 	}, {
 		key: 'serialize',
 		value: function serialize() {
-			var _this3 = this;
+			var _this4 = this;
 
 			return Object.keys(this.fields).map(function (field) {
-				return field + '=' + _this3.fields[field];
+				return field + '=' + _this4.fields[field];
 			}).join('\n') + '\n';
 		}
 	}, {
@@ -162,11 +169,11 @@ var ProjectProperties = function () {
 	}, {
 		key: 'projectLayout',
 		value: function projectLayout() {
-			var _this4 = this;
+			var _this5 = this;
 
 			return this.exists().then(function (exists) {
 				if (exists) {
-					return _this4.sourceDirExists().then(function (exists) {
+					return _this5.sourceDirExists().then(function (exists) {
 						return exists ? extended : simple;
 					});
 				} else {

package/dist/cmd/templates/project/gitignorefile

@@ -0,0 +1,55 @@
+# Key files
+*.der
+*.pem
+
+# Ignore build results and bundles
+*.bin
+*.zip
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+target/*
+
+# Platform-specific settings
+.DS_Store
+*.crc_block
+*.no_crc
+
+# VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Ignore all local history of files
+**/.history
+
+# Windows
+Thumbs.db
+*.stackdump
+[Dd]esktop.ini
+
+# C Prerequisites
+*.d
+
+# C Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# C Linker output
+*.map
+
+# C Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "particle-commands",
   "description": "Library of UX-neutral commands that provide key functionality for developer tools",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "author": "Matthew McGowan",
   "bugs": {
     "url": "https://github.com/particle-iot/particle-commands/issues"
@@ -76,7 +76,7 @@
     "version": "npm run update-changelog",
     "compile": "npm run compile:src && npm run copy:dotfiles",
     "compile:src": "babel src -d dist --copy-files",
-    "copy:dotfiles": "copyfiles -u 4 src/cmd/templates/project/.github/**/* src/cmd/templates/project/.gitignore dist/cmd/templates/project/",
+    "copy:dotfiles": "copyfiles -u 4 src/cmd/templates/project/.github/**/* dist/cmd/templates/project/",
     "babel-watch": "babel src -d dist --watch --source-maps --copy-files",
     "doctoc": "doctoc --title '## Table of Contents' README.md",
     "list-folders": "node --require babel-register bin/list_folders.js",

package/src/cmd/project_init.js

@@ -210,7 +210,7 @@ export class ProjectInitCommand extends Command {
 		const properties = { name };
 		const project = new ProjectProperties(directory, { fs:ProjectProperties.buildFs(fs) });
 		return this.createNotifyDirectory(site, fs, directory)
-			.then(() => this.createNotifyTemplateIfNeeded(site, fs, path.join(directory, '.gitignore'), '.gitignore', properties))
+			.then(() => this.createNotifyTemplateIfNeeded(site, fs, path.join(directory, '.gitignore'), 'gitignorefile', properties))
 			.then(() => this.createNotifyFileIfNeeded(site, fs, path.join(directory, 'project.properties'), ''))
 			.then(() => this.createNotifyDirectory(site, fs, path.join(directory, 'src')))
 			.then(() => this.createNotifyDirectory(site, fs, path.join(directory, '.github', 'workflows')))

package/src/cmd/project_properties.js

@@ -73,9 +73,15 @@ export default class ProjectProperties {
 	}
 
 	writeAssetOtaDir() {
-		// Add a commented line for assetOtaDir
-		const data = '#assetOtaDir=assets\n';
-		return this.fs.appendFile(this.name(), data, 'utf8');
+		// // Add a commented line for assetOtaDir if it doesn't exist
+		this.load()
+			.then(() => {
+				const val = this.getField('#assetOtaDir');
+				if (!val) {
+					this.setField('#assetOtaDir', 'assets');
+					return this.save();
+				}
+			});
 	}
 
 	serialize() {

package/src/cmd/templates/project/gitignorefile

@@ -0,0 +1,55 @@
+# Key files
+*.der
+*.pem
+
+# Ignore build results and bundles
+*.bin
+*.zip
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+target/*
+
+# Platform-specific settings
+.DS_Store
+*.crc_block
+*.no_crc
+
+# VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Ignore all local history of files
+**/.history
+
+# Windows
+Thumbs.db
+*.stackdump
+[Dd]esktop.ini
+
+# C Prerequisites
+*.d
+
+# C Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# C Linker output
+*.map
+
+# C Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb

package/test/cmd/project_init.spec.js

@@ -16,7 +16,7 @@ describe('project_init', () => {
 
 	beforeEach(() => {
 		const fs = {};
-		addFile(fs, ProjectInitCommand.templateFile('.gitignore'));
+		addFile(fs, ProjectInitCommand.templateFile('gitignorefile'));
 		addFile(fs, ProjectInitCommand.templateFile('README.md'));
 		addFile(fs, ProjectInitCommand.templateFile('src/project.cpp'));
 		addFile(fs, ProjectInitCommand.templateFile('.github/workflows/main.yaml'));
@@ -51,7 +51,7 @@ describe('project_init', () => {
 			expect(fs.existsSync(directory), 'expected project directory to exist').to.be.true;
 			expect(fs.existsSync(path.join(directory, 'src')), 'expected src directory to exist').to.be.true;
 			expect(fs.existsSync(path.join(directory, 'project.properties')), 'expected project.properties to exist').to.be.true;
-			expectTemplate(path.join(directory, '.gitignore'), '.gitignore', properties);
+			expectTemplate(path.join(directory, '.gitignore'), 'gitignorefile', properties);
 			expectTemplate(path.join(directory, '.github', 'workflows', 'main.yaml'), '.github/workflows/main.yaml', properties);
 			expectTemplate(path.join(directory, 'README.md'), 'README.md', properties);
 			expectTemplate(path.join(directory, 'src', properties.name+'.cpp'), 'src/project.cpp', properties);