safe-rm 3.1.1 → 3.1.2

package/bin/rm.sh

@@ -43,7 +43,7 @@ debug(){
 
 
 error(){
-  echo $@ >&2
+  echo "$@" >&2
 }
 
 
@@ -389,6 +389,8 @@ remove(){
         read answer
         if [[ ${answer:0:1} =~ [yY] ]]; then
           [[ $(ls -A "$file") ]] && {
+            debug "$LINENO: $file: Directory not empty: $(ls -A "$file")"
+
             echo "$COMMAND: $file: Directory not empty"
 
             return 1
@@ -434,7 +436,9 @@ recursive_remove(){
   # never use `find $1`, for the searching order is not what we want
   local list=$(ls -A "$1")
 
-  [[ -n $list ]] && for path in "$list"; do
+  [[ -n $list ]] && for path in $list; do
+    debug "$LINENO: recursively remove: $1/$path"
+
     remove "$1/$path"
   done
 }
@@ -630,7 +634,7 @@ check_linux_trash_base(){
     local num=
 
     while IFS= read -r file; do
-      if [[ $file =~ ${filename}\.([0-9]+)$ ]]; then
+      if [[ $file =~ ${base}\.([0-9]+)$ ]]; then
           # Remove leading zeros and make sure the number is in base 10
           num=$((10#${BASH_REMATCH[1]}))
           if ((num > max_n)); then
@@ -688,7 +692,7 @@ list_files(){
     local list=$(ls -A "$1")
     local f
 
-    [[ -n $list ]] && for f in "$list"; do
+    [[ -n $list ]] && for f in $list; do
       list_files "$1/$f"
     done
   fi

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "safe-rm",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "A much safer replacement of bash rm with nearly full functionalities and options of the rm command!",
   "bin": {
     "safe-rm": "./bin/rm.sh"
   },
   "scripts": {
-    "test": "ava --timeout=10s --verbose",
+    "test:rm": "ava --timeout=10s --verbose test/safe-rm.test.js",
+    "test:as": "ava --timeout=10s --verbose test/safe-rm-as.test.js",
+    "test": "npm run test:rm && npm run test:as",
     "test:dev": "NODE_DEBUG=safe-rm npm run test",
     "test:debug": "SAFE_RM_DEBUG=1 npm run test:dev",
     "test:mock-linux": "SAFE_RM_DEBUG_LINUX=1 npm run test",

package/test/cases.js

@@ -272,4 +272,47 @@ module.exports = (
     t.true(result.stderr.includes('protected'), 'stderr should include "protected"')
     t.true(await pathExists(filepath), 'file should not be removed')
   })
+
+  !is_as(type) && test(`#44: recursively and interactively`, async t => {
+    const {
+      createDir,
+      createFile,
+      runRm,
+      pathExists
+    } = t.context
+
+    const name = 'foo'
+
+    const dir = await createDir({
+      name
+    })
+
+    const fileA = await createFile({
+      name: 'a',
+      under: dir
+    })
+
+    const fileB = await createFile({
+      name: 'b',
+      under: dir
+    })
+
+    const result = await runRm(['-ri', dir], {
+      input: ['y', 'y', 'y', 'y']
+    })
+
+    t.is(result.stderr, '', 'stderr should be empty')
+    t.is(result.code, 0, 'exit code should be 0')
+    t.is(
+      result.stdout,
+      `examine files in directory ${dir}? y
+remove ${fileA}? y
+remove ${fileB}? y
+remove ${dir}? y
+`,
+      'stdout does not match'
+    )
+
+    t.false(await pathExists(dir), 'directory should be removed')
+  })
 }

package/test/helper.js

@@ -58,13 +58,13 @@ const generateContextMethods = (
 
   // Helper function to run rm commands
   function runRm (args, {
-    input = '',
+    input = [],
     command = rm_command,
     env: arg_env = {}
   } = {}) {
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
       const env = {
-        // ...process.env,
+        ...process.env,
         ...{
           SAFE_RM_TRASH: t.context.trash_path
         },
@@ -80,21 +80,33 @@ const generateContextMethods = (
 
       child.stdout.on('data', data => {
         stdout += data.toString()
+
+        if (/\?\s*$/.test(stdout)) {
+          if (!child.stdin) {
+            reject(new Error('Child process does not support stdin'))
+            return
+          }
+
+          const this_input = input.shift()
+
+          if (!this_input) {
+            reject(new Error('Need more input'))
+            return
+          }
+
+          child.stdin.write(`${this_input}\n`)
+          stdout += `${this_input}\n`
+
+          if (input.length === 0) {
+            child.stdin.end()
+          }
+        }
       })
 
       child.stderr.on('data', data => {
         stderr += data.toString()
       })
 
-      if (input) {
-        if (!child.stdin) {
-          throw new Error('Child process does not support stdin')
-        }
-
-        child.stdin.write(input)
-        child.stdin.end()
-      }
-
       child.on('close', code => {
         const resolved = {
           code,
@@ -105,6 +117,7 @@ const generateContextMethods = (
         log(command, 'result:', resolved)
 
         resolve(resolved)
+        child.kill()
       })
     })
   }

package/.travis.yml

@@ -1,4 +0,0 @@
-language: bash
-
-script:
-    - make test