Merge pull request #105 from Soluto/fix-cli-structure

move cli files to lib directory and pack only them to publish
Soluto · Jan 22, 2019 · 5c887e5 · 5c887e5
2 parents 5dacbdd + 964f933
commit 5c887e5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/cli/actions/encrypt.js → cli/lib/actions/encrypt.js b/cli/actions/encrypt.js → cli/lib/actions/encrypt.js
@@ -7,7 +7,7 @@ const { promisify } = require('util');
 const { AuthenticationContext } = require('adal-node');
 const activeDirectoryEndpoint = 'https://login.microsoftonline.com/';
 const isDocker = require('../is-docker');
-const pjson = require('../package.json');
+const pjson = require('../../package.json');
 
 const DEFAULT_ENCODING = 'utf8';
 

diff --git a/cli/index.js → cli/lib/index.js b/cli/index.js → cli/lib/index.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const pjson = require('./package.json');
+const pjson = require('../package.json');
 const prog = require('caporal');
 const encrypt = require('./actions/encrypt');
 const regexGuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;

diff --git a/cli/is-docker.js → cli/lib/is-docker.js b/cli/is-docker.js → cli/lib/is-docker.js
diff --git a/cli/package.json b/cli/package.json
@@ -1,19 +1,18 @@
 {
   "name": "@soluto-asurion/kamus-cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "CLI Tool to encrypt secrets for kamus",
   "main": "index.js",
   "scripts": {
     "test": "node_modules/.bin/mocha ./test/*.spec.js --exit",
-    "eslint": "eslint . --ignore-pattern node_modules/",
-    "ci-publish": "ci-publish"
+    "eslint": "eslint . --ignore-pattern node_modules/"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/soluto/kamus.git"
   },
   "bin": {
-    "kamus-cli": "index.js"
+    "kamus-cli": "lib/index.js"
   },
   "keywords": [
     "Secrets",
@@ -44,5 +43,9 @@
     "mock-fs": "^4.7.0",
     "nock": "^10.0.5",
     "sinon": "^7.2.2"
-  }
+  },
+  "files": [
+    "/lib",
+    "yarn.lock"
+  ]
 }
diff --git a/cli/test/encrypt.spec.js b/cli/test/encrypt.spec.js
@@ -6,7 +6,7 @@ const sinon = require('sinon');
 const fs = require('fs');
 const mockFS = require('mock-fs');
 
-const encrypt = require('../actions/encrypt');
+const encrypt = require('../lib/actions/encrypt');
 
 const logger =
 {