Fix several bugs in the packaging, and tidy up a bit

diff --git a/.gitignore b/.gitignore
index 65ff395..edfb991 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,8 @@
 /index.param.0
 /index.v.0
 /index.vocab.0
-/nodesource_setup.sh
+/ndcode-zettair-*.tgz
 /node_modules
 /package-lock.json
 /yarn.lock
 /yarn-error.log
-/zettair-*.tgz

diff --git a/.npmignore b/.npmignore
index adaa6a1..8dafd37 100644 (file)
--- a/.npmignore
+++ b/.npmignore
@@ -1,11 +1,12 @@
-build
-doc
-env.sh
-index.map.0
-index.param.0
-index.v.0
-index.vocab.0
-n.sh
-node_modules
-nodesource_setup.sh
-zetjs-*.tgz
+/build
+/doc
+/env.sh
+/index.map.0
+/index.param.0
+/index.v.0
+/index.vocab.0
+/ndcode-zettair-*.tgz
+/node_modules
+/package-lock.json
+/yarn.lock
+/yarn-error.log

diff --git a/index.js b/index.js
new file mode 100644 (file)
index 0000000..57b8a3f
--- /dev/null
+++ b/index.js
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2018 Nick Downing <nick@ndcode.org>
+ * SPDX-License-Identifier: MIT
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+module.exports = require('./build/Release/zettair.node');

diff --git a/n.sh b/n.sh
deleted file mode 100755 (executable)
index 5c1bfa4..0000000
--- a/n.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#sudo update-alternatives --install /usr/bin/node node /usr/bin/nodejs 10
-curl -sL https://deb.nodesource.com/setup_9.x -o nodesource_setup.sh
-sudo bash nodesource_setup.sh
-sudo apt-get install nodejs
-npm install node-gyp

diff --git a/package.json b/package.json
index 9d5b27c..f2f65fe 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ndcode/zettair",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "Bindings to zettair search engine.",
   "keywords": [
     "Zettair",
@@ -18,7 +18,7 @@
   "bugs": {
     "email": "nick@ndcode.org"
   },
-  "main": "build/release/zettair.node",
+  "main": "index.js",
   "directories": {},
   "dependencies": {
     "node-gyp": "^3.6.2"

diff --git a/test.js b/test.js
index 7b10d06..ae19228 100755 (executable)
--- a/test.js
+++ b/test.js
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  */
 
-const zetjs = require('build/release/zettair.node');
+const zettair = require('./build/Release/zettair.node');
 
-const obj = new zetjs.Index();
+const obj = new zettair.Index();
 console.log(obj.search('moby', 0, 10));