secrez 1.0.4 → 1.1.1

package/README.md

@@ -181,48 +181,6 @@ Running Secrez in different containers (with the `-c` option), you can set up mu
 secrez -c ~/data/secrez
 ```
 
-## How to set up a Git repo for the data
-
-The best way to go is to set up a repo on your own server. If you can't do that, using a private repo on a service like GitHub is not a bad option. Let's see how you can configure it in this second case.
-
-First, you go to GitHub and create a new private repo. Don't add anything like README, Licence, etc. In the next page, GitHub will show you the command you must run to set up it locally. Here is an example, imagining that your data are in the default folder
-
-```
-git --init --main-branch main
-git --remote-url git@github.com:sullof/jarrabish.git
-```
-
-To push any change run
-```
-git -p
-```
-and, if you pushed changes to the repo on some other computer, to pull and merge, run
-```
-git -P
-```
-Notice that the lowercase `p` is an alias for `push` and the uppercase `P` for `pull`.
-
-### What if I have a private remote repo?
-
-You should use Git anyway, to have a safe backup of your data. In this case, just run
-```
-git --init
-```
-to set the repo up. After, use `git -p` to commit your changes. It will allow you to reverse the data in case some critical error occurs. When you have a private repo, you can just add the remote url (see example above).
-
-If you need more, you can run commands using Shell, like
-```
-shell "cd ~/.secrez && git log"
-```
-However, if you like to do some reset, you should quit and run the commands directly in the shell.
-
-**Be careful when you do anything inside your container, you can irreversibly damage your data.**
-
-### What about Mercurial or Subversion?
-
-You can use a different version control system.  
-If you do so, though, be careful to correctly set up in the directory the equivalent of `.gitignore` to avoid pushing to the repo also data that must exist only locally.
-
 ## The commands
 
 ```
@@ -451,6 +409,12 @@ Secrez does not want to compete with password managers. So, don't expect in the
 
 ## History
 
+__1.1.0__
+* Remove `git`. If used carefully, the command was helpful, but still it is at risk of creating conflicts. After long thoughts, I disapproved my own proposal at: https://github.com/secrez/secrez/pull/163 
+
+__1.0.4__
+* Fix wrong example in `import`
+
 __1.0.3__
 * `git` asks to quit Secrez and merge manually if there are remote changes
 * `totp` allows to add a totp code to an existing yaml file using the option `--set` (see the examples)
@@ -801,12 +765,12 @@ Thanks a lot for any contribution 😉
 -----------------------|---------|----------|---------|---------|-----------------------------------
 File                   | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                 
 -----------------------|---------|----------|---------|---------|-----------------------------------
-All files              |   69.69 |    55.82 |   71.76 |   69.62 |                                   
+All files              |   71.33 |    58.19 |   71.98 |   71.28 |                                   
  src                   |   59.63 |    54.79 |      55 |   61.32 |                                   
   Command.js           |   79.66 |    78.72 |   76.92 |   83.93 | 35,54-59,68,71,95                 
   PreCommand.js        |   21.95 |    11.54 |   14.29 |   21.95 | 9-95,108                          
   cliConfig.js         |     100 |      100 |     100 |     100 |                                   
- src/commands          |   78.81 |    63.22 |   89.24 |    78.6 |                                   
+ src/commands          |   81.58 |    66.85 |   89.95 |    81.4 |                                   
   Alias.js             |   90.54 |    77.36 |     100 |   90.41 | 85,96,118,145,149,154,164         
   Bash.js              |      75 |        0 |   66.67 |      75 | 20-21                             
   Cat.js               |    98.9 |    88.89 |     100 |    98.9 | 144                               
@@ -820,7 +784,6 @@ All files              |   69.69 |    55.82 |   71.76 |   69.62 |
   Edit.js              |   13.58 |        0 |      40 |   13.58 | 78-193                            
   Export.js            |   90.91 |       68 |     100 |   90.91 | 109,114-115,120,130,137,140       
   Find.js              |   93.59 |    86.67 |     100 |   93.42 | 90,153,192-196,202                
-  Git.js               |   13.41 |        0 |      50 |   13.41 | 74-197                            
   Help.js              |     100 |       80 |     100 |     100 | 30                                
   Import.js            |    93.2 |    85.48 |     100 |    93.1 | ...06,308,321,327,369,384-390,417 
   Lcat.js              |     100 |    85.71 |     100 |     100 | 55                                
@@ -861,11 +824,11 @@ All files              |   69.69 |    55.82 |   71.76 |   69.62 |
   MainPromptMock.js    |     100 |      100 |   66.67 |     100 |                                   
   MultiEditorPrompt.js |      25 |        0 |       0 |      25 | 8-35                              
   SigintManager.js     |      25 |        0 |      20 |      25 | 11-37                             
- src/utils             |   69.92 |     62.1 |   56.25 |   69.55 |                                   
+ src/utils             |   69.92 |    63.28 |   56.25 |   69.55 |                                   
   AliasManager.js      |     100 |    91.67 |     100 |     100 | 48                                
   ContactManager.js    |   71.43 |       60 |   85.71 |   71.43 | 13,36-38                          
   Fido2Client.js       |   15.38 |        0 |   11.11 |   15.38 | 15-101                            
-  HelpProto.js         |    91.6 |    83.08 |     100 |   91.45 | 44,137-138,155-160,179            
+  HelpProto.js         |    91.6 |    84.06 |     100 |   91.45 | 44,137-138,155-160,179            
   Logger.js            |   63.64 |    56.25 |   36.84 |   62.79 | ...38-50,58,66-70,75,85,89,94,107 
 -----------------------|---------|----------|---------|---------|-----------------------------------
 

package/coverage.report

@@ -1,5 +1,5 @@
 
-> secrez@1.0.4 test /Users/sullof/Projects/Personal/secrez/packages/secrez
+> secrez@1.1.0 test /Users/francescosullo/Projects/Personal/secrez/packages/secrez
 > cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ./node_modules/.bin/_mocha test/*.test.js test/**/*.test.js test/**/**/*.js --exit
 
 
@@ -29,10 +29,10 @@
   #Cat
     ✓ should return the help
     ✓ should show the content of a file
-    ✓ should show either one or all the versions of a file
+    ✓ should show either one or all the versions of a file (1015ms)
     ✓ should throw if entry is not a file or file does not exist
     ✓ should throw if trying to cat a binary file
-    ✓ should show the content of a Yaml file
+    ✓ should show the content of a Yaml file (1033ms)
 
   #Cd
     ✓ should return the help
@@ -41,7 +41,7 @@
 
   #Chat
     ✓ should return the help
-    ✓ should run the chat if the courier is ready (288ms)
+    ✓ should run the chat if the courier is ready (173ms)
 
   #Contacts
     ✓ should return the help
@@ -55,17 +55,17 @@
 
   #Copy
     ✓ should return the help
-    ✓ should copy a file to the clipboard (431ms)
-    ✓ should copy a string to the clipboard (267ms)
-    ✓ should copy a card to the clipboard (984ms)
-    ✓ should return an error if the file does not exist or is a folder (52ms)
+    ✓ should copy a file to the clipboard (382ms)
+    ✓ should copy a string to the clipboard (233ms)
+    ✓ should copy a card to the clipboard (877ms)
+    ✓ should return an error if the file does not exist or is a folder
     ✓ should throw if copying to clipboard a binary files
 
   #Courier
     ✓ should return the help
     ✓ should check if it is ready
-    ✓ should set up the courier (182ms)
-    ✓ should set up the courier and get the default message when is already set up (174ms)
+    ✓ should set up the courier (140ms)
+    ✓ should set up the courier and get the default message when is already set up (141ms)
 
   #Ds
     ✓ should return the help
@@ -78,13 +78,13 @@
     ✓ should return the help
     ✓ should export a file to the current local folder
     ✓ should export a binary file to the current local folder
-    ✓ should export an encrypted file to the current local folder (55ms)
-    ✓ should export a file and delete it after 1 second (1210ms)
+    ✓ should export an encrypted file to the current local folder
+    ✓ should export a file and delete it after 1 second (1204ms)
     ✓ should return an error if the file does not exist or is a folder
 
   #Find
     ✓ should return the help
-    ✓ should show find a string in the tree (58ms)
+    ✓ should show find a string in the tree (1033ms)
     ✓ should find no result without parameters
     ✓ should skip binary files from search
 
@@ -149,7 +149,7 @@
 
   #Mv
     ✓ should return the help
-    ✓ should rename a file
+    ✓ should rename a file (1010ms)
     ✓ should move a file to another folder
     ✓ should move many files to another folder
     ✓ should move a file to another subfolder
@@ -158,14 +158,14 @@
     ✓ should move file to another dataset using wildcards
     ✓ should move file managing duplicates
     ✓ should throw if parameters are missed or wrong
-    ✓ should move files from and to other datasets (51ms)
+    ✓ should move files from and to other datasets (1023ms)
     ✓ should move the results of a find
 
   #Paste
     ✓ should return the help
-    ✓ should paste the clipboard content to a new file (101ms)
-    ✓ should paste the clipboard content to an existent file (168ms)
-    ✓ should paste a single field to a yml card (98ms)
+    ✓ should paste the clipboard content to a new file (88ms)
+    ✓ should paste the clipboard content to an existent file (101ms)
+    ✓ should paste a single field to a yml card (48ms)
 
   #Pwd
     ✓ should return the help
@@ -179,7 +179,7 @@
     ✓ should delete a file with one version
     ✓ should delete many files usign wildcards
     ✓ should return errors if wrong parameters
-    ✓ should delete some versions of a file
+    ✓ should delete some versions of a file (1011ms)
 
   #Shell
     ✓ should return the help
@@ -195,13 +195,13 @@
 
   #Totp
     ✓ should return the help
-    ✓ should totp a file to the clipboard (403ms)
-    ✓ should read a totp secret from an image and add the totp field to the card (136ms)
-    ✓ should read a totp secret from an image and return the secret (59ms)
+    ✓ should totp a file to the clipboard (359ms)
+    ✓ should read a totp secret from an image and add the totp field to the card (55ms)
+    ✓ should read a totp secret from an image and return the secret
     ✓ should throw if bad image
     ✓ should throw if missing parameters
-    ✓ should throw if the yaml is malformed (74ms)
-    ✓ should read a totp secret from the clipboard (168ms)
+    ✓ should throw if the yaml is malformed
+    ✓ should read a totp secret from the clipboard (101ms)
 
   #Touch
     ✓ should return the help
@@ -219,7 +219,7 @@
 
   #Whoami
     ✓ should return the help
-    ✓ should see who am I (46ms)
+    ✓ should see who am I (74ms)
 
   #Help
     ✓ should return the help
@@ -230,23 +230,23 @@
     ✓ should join a chat with user0x
     ✓ should jump between chats
     ✓ should return all the users
-    ✓ should throw if contact not found or multiple chat (67ms)
+    ✓ should throw if contact not found or multiple chat
 
   #Leave
     ✓ should return the help
     ✓ should leave the room
 
   #Quit
-    ✓ should return the help (54ms)
-    ✓ should quit the chat, even if inside a room (82ms)
+    ✓ should return the help
+    ✓ should quit the chat, even if inside a room (47ms)
 
   #Send
     ✓ should return the help
-    ✓ should send a message to user0 (193ms)
+    ✓ should send a message to user0 (111ms)
 
   #Show
     ✓ should return the help
-    ✓ should show history messages (810ms)
+    ✓ should show history messages (747ms)
 
 
   162 passing (28s)
@@ -255,12 +255,12 @@
 -----------------------|---------|----------|---------|---------|-----------------------------------
 File                   | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                 
 -----------------------|---------|----------|---------|---------|-----------------------------------
-All files              |   69.69 |    55.82 |   71.76 |   69.62 |                                   
+All files              |   71.33 |    58.19 |   71.98 |   71.28 |                                   
  src                   |   59.63 |    54.79 |      55 |   61.32 |                                   
   Command.js           |   79.66 |    78.72 |   76.92 |   83.93 | 35,54-59,68,71,95                 
   PreCommand.js        |   21.95 |    11.54 |   14.29 |   21.95 | 9-95,108                          
   cliConfig.js         |     100 |      100 |     100 |     100 |                                   
- src/commands          |   78.81 |    63.22 |   89.24 |    78.6 |                                   
+ src/commands          |   81.58 |    66.85 |   89.95 |    81.4 |                                   
   Alias.js             |   90.54 |    77.36 |     100 |   90.41 | 85,96,118,145,149,154,164         
   Bash.js              |      75 |        0 |   66.67 |      75 | 20-21                             
   Cat.js               |    98.9 |    88.89 |     100 |    98.9 | 144                               
@@ -274,7 +274,6 @@ All files              |   69.69 |    55.82 |   71.76 |   69.62 |
   Edit.js              |   13.58 |        0 |      40 |   13.58 | 78-193                            
   Export.js            |   90.91 |       68 |     100 |   90.91 | 109,114-115,120,130,137,140       
   Find.js              |   93.59 |    86.67 |     100 |   93.42 | 90,153,192-196,202                
-  Git.js               |   13.41 |        0 |      50 |   13.41 | 74-197                            
   Help.js              |     100 |       80 |     100 |     100 | 30                                
   Import.js            |    93.2 |    85.48 |     100 |    93.1 | ...06,308,321,327,369,384-390,417 
   Lcat.js              |     100 |    85.71 |     100 |     100 | 55                                
@@ -315,10 +314,10 @@ All files              |   69.69 |    55.82 |   71.76 |   69.62 |
   MainPromptMock.js    |     100 |      100 |   66.67 |     100 |                                   
   MultiEditorPrompt.js |      25 |        0 |       0 |      25 | 8-35                              
   SigintManager.js     |      25 |        0 |      20 |      25 | 11-37                             
- src/utils             |   69.92 |     62.1 |   56.25 |   69.55 |                                   
+ src/utils             |   69.92 |    63.28 |   56.25 |   69.55 |                                   
   AliasManager.js      |     100 |    91.67 |     100 |     100 | 48                                
   ContactManager.js    |   71.43 |       60 |   85.71 |   71.43 | 13,36-38                          
   Fido2Client.js       |   15.38 |        0 |   11.11 |   15.38 | 15-101                            
-  HelpProto.js         |    91.6 |    83.08 |     100 |   91.45 | 44,137-138,155-160,179            
+  HelpProto.js         |    91.6 |    84.06 |     100 |   91.45 | 44,137-138,155-160,179            
   Logger.js            |   63.64 |    56.25 |   36.84 |   62.79 | ...38-50,58,66-70,75,85,89,94,107 
 -----------------------|---------|----------|---------|---------|-----------------------------------

package/package.json

@@ -1,73 +1,73 @@
 {
-	"name": "secrez",
-	"version": "1.0.4",
-	"license": "MIT",
-	"nyc": {
-		"include": "src",
-		"exclude": []
-	},
-	"dependencies": {
-		"@secrez/core": "~1.0.3",
-		"@secrez/crypto": "~1.0.1",
-		"@secrez/fs": "~1.0.3",
-		"@secrez/hub": "~0.2.1",
-		"@secrez/utils": "~1.0.2",
-		"case": "^1.6.3",
-		"chalk": "^3.0.0",
-		"clipboardy": "^2.3.0",
-		"command-line-args": "^5.1.1",
-		"external-editor": "^3.1.0",
-		"fs-extra": "^9.1.0",
-		"homedir": "^0.6.0",
-		"inquirer": "^7.1.0",
-		"inquirer-command-prompt": "^0.1.0",
-		"jimp": "^0.13.0",
-		"lodash": "^4.17.15",
-		"otplib": "^12.0.1",
-		"qrcode-reader": "^1.0.4",
-		"superagent": "^5.3.1",
-		"tiny-cli-editor": "^0.1.1"
-	},
-	"devDependencies": {
-		"@secrez/courier": "~0.2.2",
-		"@secrez/test-helpers": "~1.0.2",
-		"chai": "^4.2.0",
-		"chalk": "^3.0.0",
-		"cross-env": "^7.0.2",
-		"eslint": "^6.8.0",
-		"eslint-plugin-node": "^11.0.0",
-		"mocha": "^7.1.1",
-		"nyc": "^15.1.0",
-		"test-console": "^1.1.0"
-	},
-	"bin": {
-		"secrez": "bin/secrez.js"
-	},
-	"preferGlobal": true,
-	"description": "A secrets manager in times of crypto coins.",
-	"main": "src/index.js",
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/secrez/secrez.git"
-	},
-	"author": {
-		"name": "Francesco Sullo",
-		"email": "francesco@sullo.co"
-	},
-	"bugs": {
-		"url": "https://github.com/secrez/secrez/issues"
-	},
-	"homepage": "https://github.com/secrez/secrez#readme",
-	"engines": {
-		"node": ">=10.0.0"
-	},
-	"gitHead": "42cbc519dd2802a1e03c6203bb724c726c2bfb79",
-	"scripts": {
-		"dev": "cross-env NODE_ENV=dev bin/secrez.js -c `pwd`/tmp/secrez-dev -i 1e3 -l `pwd`/tmp",
-		"lint": "eslint -c .eslintrc 'src/**/*.js' 'bin/*.js' 'test/*.test.js' 'test/**/*.js' 'test/**/**/*.js'",
-		"test-only": "cross-env NODE_ENV=test ./node_modules/.bin/mocha test/*.test.js test/**/*.test.js test/**/**/*.js --exit",
-		"test": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ./node_modules/.bin/_mocha test/*.test.js test/**/*.test.js test/**/**/*.js --exit",
-		"posttest": "nyc check-coverage --statements 65 --branches 50 --functions 65 --lines 65",
-		"build-helpers": "cd test/helpers/os && ./build.sh"
-	}
-}
+  "name": "secrez",
+  "version": "1.1.1",
+  "license": "MIT",
+  "nyc": {
+    "include": "src",
+    "exclude": []
+  },
+  "dependencies": {
+    "@secrez/core": "~1.0.3",
+    "@secrez/crypto": "~1.0.1",
+    "@secrez/fs": "~1.0.3",
+    "@secrez/hub": "~0.2.1",
+    "@secrez/utils": "~1.0.2",
+    "case": "^1.6.3",
+    "chalk": "^3.0.0",
+    "clipboardy": "^2.3.0",
+    "command-line-args": "^5.1.1",
+    "external-editor": "^3.1.0",
+    "fs-extra": "^9.1.0",
+    "homedir": "^0.6.0",
+    "inquirer": "^7.1.0",
+    "inquirer-command-prompt": "^0.1.0",
+    "jimp": "^0.13.0",
+    "lodash": "^4.17.15",
+    "otplib": "^12.0.1",
+    "qrcode-reader": "^1.0.4",
+    "superagent": "^5.3.1",
+    "tiny-cli-editor": "^0.1.1"
+  },
+  "devDependencies": {
+    "@secrez/courier": "~0.2.2",
+    "@secrez/test-helpers": "~1.0.2",
+    "chai": "^4.2.0",
+    "chalk": "^3.0.0",
+    "cross-env": "^7.0.2",
+    "eslint": "^6.8.0",
+    "eslint-plugin-node": "^11.0.0",
+    "mocha": "^7.1.1",
+    "nyc": "^15.1.0",
+    "test-console": "^1.1.0"
+  },
+  "bin": {
+    "secrez": "bin/secrez.js"
+  },
+  "preferGlobal": true,
+  "description": "A secrets manager in times of crypto coins.",
+  "main": "src/index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/secrez/secrez.git"
+  },
+  "author": {
+    "name": "Francesco Sullo",
+    "email": "francesco@sullo.co"
+  },
+  "bugs": {
+    "url": "https://github.com/secrez/secrez/issues"
+  },
+  "homepage": "https://github.com/secrez/secrez#readme",
+  "engines": {
+    "node": ">=10.0.0"
+  },
+  "gitHead": "42cbc519dd2802a1e03c6203bb724c726c2bfb79",
+  "scripts": {
+    "dev": "cross-env NODE_ENV=dev bin/secrez.js -c `pwd`/tmp/secrez-dev -i 1e3 -l `pwd`/tmp",
+    "lint": "eslint -c .eslintrc 'src/**/*.js' 'bin/*.js' 'test/*.test.js' 'test/**/*.js' 'test/**/**/*.js'",
+    "test-only": "cross-env NODE_ENV=test ./node_modules/.bin/mocha test/*.test.js test/**/*.test.js test/**/**/*.js --exit",
+    "test": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ./node_modules/.bin/_mocha test/*.test.js test/**/*.test.js test/**/**/*.js --exit",
+    "posttest": "nyc check-coverage --statements 65 --branches 50 --functions 65 --lines 65",
+    "build-helpers": "cd test/helpers/os && ./build.sh"
+  }
+}

package/src/commands/Import.js

@@ -99,8 +99,8 @@ class Import extends require('../Command') {
       examples: [
         ['import seed.json', 'copies seed.json from the disk into the current directory'],
         ['import seed.json.secrez --password s8eeuhwy36534', 'imports seed.json and decrypts it using the specified password'],
-        ['import seed.json.secrez -d', 'imports seed.json trying to decrypt it using the key shared with the contact who encrypted the data'],
-        ['import seed.json.secrez -d --public-key Tush76/u+..... ', 'imports seed.json trying to decrypt it using a shared key generated using the specified public key'],
+        ['import seed.json.secrez', 'imports seed.json trying to decrypt it using the key shared with the contact who encrypted the data'],
+        ['import seed.json.secrez--public-key Tush76/u+..... ', 'imports seed.json trying to decrypt it using a shared key generated using the specified public key'],
         ['import -m ethKeys', 'copies ethKeys and remove it from the disk'],
         ['import -p ~/passwords', 'imports all the text files in the folder passwords'],
         ['import -b -p ~/passwords', 'imports all the files, included binaries'],

package/src/utils/HelpProto.js

@@ -108,7 +108,7 @@ class HelpProto {
           let m = max - x
           if (example.length <= m) {
             elem = spacer + ' '.repeat(x) + example
-            str.push(elem + ' '.repeat(tot - elem.length))
+            str.push(elem + ' '.repeat(tot > elem.length ? tot - elem.length : 3))
             break
           } else {
             j = -1
@@ -125,7 +125,7 @@ class HelpProto {
             }
             let good = example.substring(0, li)
             elem = spacer + ' '.repeat(x) + good
-            str.push(elem + ' '.repeat(tot - elem.length))
+            str.push(elem + ' '.repeat(tot > elem.length ? tot - elem.length : 3))
             example = example.substring(li + 1)
             i++
             // console.log(i, example)