Release

baseljs · May 12, 2016 · eef6289 · eef6289
1 parent d7cea2c
commit eef6289
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 This change log is started in 0.0.9;
 
+## 0.1.0 (2016-05-12)
+- Save basel.json data in package.json
+- Release
+
 ## 0.0.17 (2016-04-29)
 - Adapt to accept other themes
 

diff --git a/bin/basel-init.js b/bin/basel-init.js
@@ -16,7 +16,6 @@ program
 
 var options = {
   name: program.args.length ? program.args[0] : 'basel',
-  branch: program.branch || 'master',
   database: program.database || 'database',
   title: program.title,
   type: program.type || 'simple',

diff --git a/lib/install.js b/lib/install.js
@@ -71,5 +71,14 @@ var renameRemote = function(options, done){
 }
 
 var createJson = function(options){
-	fs.writeFileSync(path.join(process.cwd(),options.name,'basel.json') , JSON.stringify(options));
+	fs.readFile(path.join(process.cwd(),options.name,'package.json'), function(err, data){
+		data = JSON.parse(data);
+		if(!err){
+			for(var key in options){
+				data[key] = options[key];
+			}
+			fs.writeFileSync(path.join(process.cwd(),options.name,'package.json') , JSON.stringify(data, null, 4));		
+		}
+	})
+	fs.writeFileSync(path.join(process.cwd(),options.name,'basel.json') , JSON.stringify(options, null, 4));
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "basel",
-  "version": "0.0.17",
+  "version": "0.1.0",
   "description": "Framework for Bootstrap, AngularJS, SQLite, Electron",
   "author": "Jayr Alencar <http://github.com/jayralencar>",
   "readmeFilename": "README.md" ,