update content

Author: Leevi

.gitignore

@@ -35,3 +35,4 @@ node_modules
 
 # Temporary files
 temp
+*.DS_Store

.vscode/settings.json

@@ -6,7 +6,7 @@
     "nirl",
     "nirlstudio",
     "res",
-    "sugly"
+    "eslang"
   ],
   "files.trimTrailingWhitespace": true,
   "javascript.validate.enable": false,

README.md

@@ -1,16 +1,16 @@
-# sugly-npm
-A command line tool to create npm compatible sugly packages.
+# es-npm
+A command line tool to create npm compatible Espresso packages.
 
 ## Install
 ````sh
-npm i -g sugly-npm
+npm i -g es-npm
 ````
 
 ## Usage
 ````sh
-mkdir my-sugly-app
-cd my-sugly-app
-sugly-npm init [default|app|module|web|site] [-c|--compact]  [-d|--dev]
+mkdir my-espresso-app
+cd my-espresso-app
+es-npm init [default|app|module|web|site] [-c|--compact]  [-d|--dev]
 ````
 ### Templates
 - default - A project serves in both app and module modes..
@@ -22,4 +22,4 @@ sugly-npm init [default|app|module|web|site] [-c|--compact]  [-d|--dev]
 
 ### Options
 - -c, --compact: remove test code and dependency on mocha.
-- -d, --dev: use development (non-published & unstable) branch of sugly-lang.
+- -d, --dev: use development (non-published & unstable) branch of eslang.

es/app.s

@@ -1,10 +1,10 @@
-#!/usr/bin/env sugly
+#!/usr/bin/env es
 
 const cli (import "./cli");
 const profile (import "./profile");
 
 (const valid-templates (@
-  "default", "app", "module", "web", "api"
+  "default", "app", "module", "api", "web"
 ).
 
 (const valid-options (@
@@ -14,18 +14,18 @@ const profile (import "./profile");
 (const exit-with-help (= ()
   (print "
     Usage:\
-    \tsugly-npm init [default|app|module|web|api] [-c|--compact] [-d|--dev]\
+    \tes-npm init [default|app|module|web|api] [-c|--compact] [-d|--dev]\
     \
     Templates:\
     \tdefault \tA project which may serve in both app and module modes.\
     \tapp     \tA project which only serves as an app.\
     \tmodule  \tA project which only serves as a module.\
-    \tweb     \tA web site project which serves as a sugly-based web app.\
     \tapi     \tAn app project which serves as a RESTful service.\
+    \tweb     \tA web site project which serves as a web app.\
     \
     Options:\
     \t-c, --compact \tremove test code, dependency on mocha and default vscode settings.\
-    \t-d, --dev \tuse development (non-published & unstable) branch of sugly-lang.\
+    \t-d, --dev \tuse development (non-published & unstable) branch of eslang.\
     "
   ).
   exit 1;

es/cli.s

@@ -1,19 +1,19 @@
-const fs (suglify (import "$fs");
+const fs (espress (import "$fs");
 const path (import "$path");
 const shell (import "$shelljs");
 const profile (import "./profile");
 
 const app-name (path basename (env "home");
 
 (const repo-of (= (template)
-  'https://github.com/NirlStudio/sugly-npm-template-$(template ?* "default")'
+  'https://github.com/NirlStudio/es-npm-template-$(template ?* "default")'
 ).
 
 (const clone (=> (repo)
   log info "Downloading template ...";
   shell exec 'git clone $repo .';
   shell rm "-rf", ".git/";
-  (fs exists-sync "package.json") and (fs exists-sync "sugly/");
+  (fs exists-sync "package.json") and (fs exists-sync "es/");
 ).
 
 (const update-info (=> (pkg)
@@ -34,7 +34,7 @@ const app-name (path basename (env "home");
     (app-name): 'bin/$app-name'
   ).
   pkg "repository", "";
-  pkg "keywords", (@ "sugly");
+  pkg "keywords", (@ "eslang", "espresso", "espressolang", "espresso-lang");
 ).
 
 (const compact (=> (pkg)
@@ -54,9 +54,11 @@ const app-name (path basename (env "home");
     shell mv "bin/hello.cmd", 'bin/$(app-name).cmd';
   ).
 
-  # without this, a sugly dependency will not be linked.
-  log info "Creating sugly/modules ...";
-  shell mkdir "sugly/modules";
+  # without this, an Espresso dependency will not be linked.
+  (if (fs exists-sync "bin/hello":: is-not true)
+    log info "Creating es/modules ...";
+    shell mkdir "es/modules";
+  ).
 
   log info "Generating README.md ...";
   fs write-file-sync "README.md", '# $app-name\n\n**UPDATE ME**';
@@ -78,7 +80,7 @@ const app-name (path basename (env "home");
 
   update-info pkg;
   (if (options contains "--dev")
-    pkg dependencies:: "sugly", "github:NirlStudio/sugly-lang#development";
+    pkg dependencies:: "es", "github:NirlStudio/eslang#development";
   ).
   (if (options contains "--compact")
     compact pkg;
@@ -109,6 +111,6 @@ const app-name (path basename (env "home");
     return false;
   ).
 
-  printf 'Project $app-name has been initialized. Enjoy the sugliness.\n', "green";
+  printf 'Project $app-name has been initialized. Enjoy the Espresso.\n', "green";
   return true;
 ).

es/profile.s

@@ -2,8 +2,8 @@ const fs (import "$fs");
 const path (import "$path");
 
 const user-home (env "user-home");
-const sugly-home (path resolve user-home, ".sugly");
-const profile-path (path resolve sugly-home, "npm.s");
+const espresso-home (path resolve user-home, ".es");
+const profile-path (path resolve espresso-home, "npm.s");
 
 (const default-profile (=> () (@
   name: (path basename user-home),
@@ -15,8 +15,8 @@ const profile-path (path resolve sugly-home, "npm.s");
   (if (fs existsSync user-home:: is false)
     return (default-profile );
   ).
-  (if (fs existsSync sugly-home:: is false)
-    fs mkdir sugly-home;
+  (if (fs existsSync espresso-home:: is false)
+    fs mkdir espresso-home;
   ).
   (if (fs existsSync profile-path:: is false)
     fs writeFileSync profile-path, (default-profile :: to-code:: to-string);

index.js

@@ -1,24 +1,24 @@
 'use strict'
 
 var path = require('path')
-var sugly = require('sugly')
-var modules = require('sugly/modules')
+var eslang = require('eslang')
+var modules = require('eslang/modules')
 
 // expose some native modules.
 modules.register(require('./modules.js'))
 
 // create the void.
-var $void = sugly()
+var $void = eslang()
 
 // prepare the path of app home directory.
-var appHome = path.join(__dirname, 'sugly')
+var appHome = path.join(__dirname, 'es')
 
 if (require.main === module) {
   // running as an app.
   var args = global.process.argv.slice(2) || []
   module.exports = $void.$run('app', args, appHome)
 } else {
-  // running as a module (exposing sugly module to JS code)
+  // running as a module (exposing Espresso module to JS code)
   var being = $void.createBootstrapSpace(path.join(appHome, '@'))
   module.exports = being.$import('cli')
 }

modules.js

@@ -1,6 +1,6 @@
 'use strict'
 /**
- * all native modules must be explicitly exposed to sugly code.
+ * all native modules must be explicitly exposed to Espresso script.
  */
 
 function copy (source, exporting) {
@@ -18,7 +18,7 @@ module.exports = function (uri) {
     case 'shelljs':
       return copy.bind(null, require('shelljs'))
     default:
-      console.warn('Sugly code is requesting for an unknown module:', uri)
+      console.warn('Espresso script is requesting for an unknown module:', uri)
       return null
   }
 }

package.json

@@ -1,25 +1,26 @@
 {
-  "name": "sugly-npm",
-  "version": "0.2.1",
-  "description": "A command line tool to create npm compatible sugly packages.",
+  "name": "es-npm",
+  "version": "1.0.1",
+  "description": "A command line tool to create npm compatible Espresso script packages.",
   "author": {
     "email": "[email protected]",
     "name": "Leevi Li"
   },
   "license": "MIT",
-  "repository": "NirlStudio/sugly-npm",
+  "repository": "NirlStudio/es-npm",
   "main": "index.js",
   "bin": {
-    "hello": "bin/sugly-npm"
+    "es-npm": "bin/es-npm"
   },
   "scripts": {
     "test": "mocha",
     "install": "scripts/install",
     "uninstall": "scripts/uninstall"
   },
   "keywords": [
-    "sugly",
-    "sugly-lang",
+    "eslang",
+    "espresso",
+    "espresso-lang",
     "command",
     "line",
     "tool",
@@ -35,7 +36,7 @@
   },
   "dependencies": {
     "shelljs": "^0.8.3",
-    "sugly": "github:NirlStudio/sugly-lang#development"
+    "eslang": "^1.0.3"
   },
   "devDependencies": {
     "mocha": "^6.1.4",

scripts/install

@@ -14,6 +14,6 @@ PKG_NAME=$(basename $BASE_DIR)
 CONTAINER_DIR=$(dirname $BASE_DIR)
 APP_DIR=$(dirname $CONTAINER_DIR)
 
-if [ $(basename $CONTAINER_DIR) == "node_modules" ] && [ -d $APP_DIR/sugly/modules ]; then
-  ln -s $BASE_DIR/sugly $APP_DIR/sugly/modules/$PKG_NAME
+if [ $(basename $CONTAINER_DIR) == "node_modules" ] && [ -d $APP_DIR/es/modules ]; then
+  ln -s $BASE_DIR/es $APP_DIR/es/modules/$PKG_NAME
 fi

scripts/install.cmd

@@ -0,0 +1,4 @@
+@ECHO OFF
+
+echo Windows is not supported yet, but it's comming soon.
+echo.

scripts/uninstall

@@ -14,6 +14,6 @@ PKG_NAME=$(basename $BASE_DIR)
 CONTAINER_DIR=$(dirname $BASE_DIR)
 APP_DIR=$(dirname $CONTAINER_DIR)
 
-if [ $(basename $CONTAINER_DIR) == "node_modules" ] && [ -d $APP_DIR/sugly/modules ]; then
-  rm $APP_DIR/sugly/modules/$PKG_NAME
+if [ $(basename $CONTAINER_DIR) == "node_modules" ] && [ -d $APP_DIR/es/modules ]; then
+  rm $APP_DIR/es/modules/$PKG_NAME
 fi

scripts/uninstall.cmd

@@ -0,0 +1,4 @@
+@ECHO OFF
+
+echo Windows is not supported yet, but it's comming soon.
+echo.

test/test.js

@@ -1,6 +1,6 @@
 var assert = require('assert')
 
-describe('sugly/cli', function () {
+describe('es/cli', function () {
   var cli = require('../index.js')
 
   describe('cli', function () {