[Pkg-javascript-commits] [Git][js-team/node-rimraf][master] 9 commits: cme fix

Xavier Guimard gitlab at salsa.debian.org
Mon Mar 9 13:39:28 GMT 2020



Xavier Guimard pushed to branch master at Debian JavaScript Maintainers / node-rimraf


Commits:
f5bfb33e by Xavier Guimard at 2020-02-19T07:33:26+01:00
cme fix

- - - - -
e0ce4053 by Xavier Guimard at 2020-03-09T14:33:40+01:00
Use pkg-js-tools auto test & install

- - - - -
885126e5 by Xavier Guimard at 2020-03-09T14:33:51+01:00
Refresh patch

- - - - -
e983ac54 by Xavier Guimard at 2020-03-09T14:35:10+01:00
New upstream version 2.6.3
- - - - -
d8611a8c by Xavier Guimard at 2020-03-09T14:35:10+01:00
Update upstream source from tag 'upstream/2.6.3'

Update to upstream version '2.6.3'
with Debian dir 167c6cd952663db43ef8a31cbe606b610332d9ed
- - - - -
c6809f0d by Xavier Guimard at 2020-03-09T14:35:58+01:00
Add "Rules-Requires-Root: no"

- - - - -
2c6034cf by Xavier Guimard at 2020-03-09T14:35:58+01:00
Add debian/gbp.conf

- - - - -
0bd996fe by Xavier Guimard at 2020-03-09T14:35:59+01:00
Add upstream/metadata

- - - - -
f765e4a9 by Xavier Guimard at 2020-03-09T14:39:06+01:00
releasing package node-rimraf version 2.6.3-1

- - - - -


18 changed files:

- .travis.yml
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/gbp.conf
- − debian/install
- − debian/links
- debian/manpages
- + debian/nodejs/links
- debian/patches/2001_rename_nodejs.patch
- debian/rules
- − debian/tests/control
- + debian/tests/pkg-js/test
- + debian/upstream/metadata
- + package-lock.json
- package.json
- + test/bin.js


Changes:

=====================================
.travis.yml
=====================================
@@ -1,8 +1,6 @@
 sudo: false
 language: node_js
 node_js:
-  - '0.10'
-  - '0.12'
-  - '4'
-  - '5'
   - '6'
+  - '8'
+  - '10'


=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+node-rimraf (2.6.3-1) unstable; urgency=medium
+
+  * Team upload
+  * Declare compliance with policy 4.5.0
+  * Bump debhelper compatibility level to 12
+  * Update VCS fields to salsa
+  * Use pkg-js-tools auto test & install
+  * Refresh patch
+  * New upstream version 2.6.3
+  * Add "Rules-Requires-Root: no"
+  * Add debian/gbp.conf
+  * Add upstream/metadata
+
+ -- Xavier Guimard <yadd at debian.org>  Mon, 09 Mar 2020 14:36:44 +0100
+
 node-rimraf (2.6.2-1) unstable; urgency=medium
 
   * Team upload
@@ -80,7 +95,7 @@ node-rimraf (2.2.2-1) unstable; urgency=low
 node-rimraf (2.1.4-1) experimental; urgency=low
 
   * Upstream update.
-  * Use github url in watch file. 
+  * Use github url in watch file.
 
  -- Jérémy Lal <kapouer at melix.org>  Fri, 22 Mar 2013 02:31:46 +0100
 


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9


=====================================
debian/control
=====================================
@@ -3,26 +3,24 @@ Section: javascript
 Priority: optional
 Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
 Uploaders: Jérémy Lal <kapouer at melix.org>
-Build-Depends:
- debhelper (>= 9.0.0)
- , dh-buildinfo
- , nodejs
+Build-Depends: debhelper-compat (= 12)
+ , node-glob
  , node-mkdirp
  , node-tap
- , node-glob
-Standards-Version: 4.1.1
+ , pkg-js-tools (>= 0.9.20~)
+Standards-Version: 4.5.0
+Vcs-Browser: https://salsa.debian.org/js-team/node-rimraf
+Vcs-Git: https://salsa.debian.org/js-team/node-rimraf.git
 Homepage: https://github.com/isaacs/rimraf
-Vcs-Git: https://anonscm.debian.org/git/pkg-javascript/node-rimraf.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-javascript/node-rimraf.git
+Testsuite: autopkgtest-pkg-nodejs
+Rules-Requires-Root: no
 
 Package: node-rimraf
 Architecture: all
-Depends:
- ${misc:Depends}
- , nodejs
+Depends: ${misc:Depends}
  , node-glob
-Recommends:
- node-graceful-fs (>= 2)
+ , nodejs
+Recommends: node-graceful-fs
 Description: Deep deletion (like rm -rf) module for Node.js
  node-rimraf is a Node.js module that provides asynchronous deep-deletion
  of files and directories.
@@ -31,4 +29,3 @@ Description: Deep deletion (like rm -rf) module for Node.js
  command.
  .
  Node.js is an event-based server-side javascript engine.
-


=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rimraf
 Upstream-Contact: https://github.com/isaacs/rimraf/issues
 
@@ -6,7 +6,6 @@ Files: *
 Copyright: 2011-2016 Isaac Z. Schlueter and Contributors
 License: ISC
 
-
 Files: debian/*
 Copyright: 2012, Jérémy Lal <kapouer at melix.org>
 License: ISC
@@ -23,4 +22,3 @@ License: ISC
  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
  IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-


=====================================
debian/gbp.conf
=====================================
@@ -0,0 +1,5 @@
+[DEFAULT]
+pristine-tar = True
+
+[import-orig]
+filter = [ '.gitignore', '.travis.yml', '.git*' ]


=====================================
debian/install deleted
=====================================
@@ -1,3 +0,0 @@
-rimraf.js	usr/lib/nodejs/rimraf
-bin.js		usr/lib/nodejs/rimraf
-package.json usr/lib/nodejs/rimraf


=====================================
debian/links deleted
=====================================
@@ -1 +0,0 @@
-usr/lib/nodejs/rimraf/bin.js usr/bin/rimraf


=====================================
debian/manpages
=====================================
@@ -1,2 +1 @@
 debian/rimraf.1
-


=====================================
debian/nodejs/links
=====================================
@@ -0,0 +1 @@
+rimraf/bin.js /usr/bin/rimraf


=====================================
debian/patches/2001_rename_nodejs.patch
=====================================
@@ -1,13 +1,14 @@
 Description: Fix path to nodejs binary on Debian systems
 Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2016-11-24
 Forwarded: not-needed
+Reviewed-By: Xavier Guimard <yadd at debian.org>
+Last-Update: 2020-03-09
 
 --- a/bin.js
 +++ b/bin.js
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env node
-+#!/usr/bin/env nodejs
++#!/usr/bin/node
  
  var rimraf = require('./')
  


=====================================
debian/rules
=====================================
@@ -5,11 +5,8 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@
+	dh $@ --with nodejs
 
 override_dh_fixperms:
 	dh_fixperms
-	chmod +x debian/node-rimraf/usr/lib/nodejs/rimraf/bin.js
-
-override_dh_auto_test:
-	tap test/*.js
+	chmod +x debian/node-rimraf/usr/share/nodejs/rimraf/bin.js


=====================================
debian/tests/control deleted
=====================================
@@ -1,3 +0,0 @@
-Test-Command: tap test/*.js
-Depends: @, node-tap, node-mkdirp
-


=====================================
debian/tests/pkg-js/test
=====================================
@@ -0,0 +1 @@
+tap test/*.js


=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,7 @@
+---
+Archive: GitHub
+Bug-Database: https://github.com/isaacs/rimraf/issues
+Bug-Submit: https://github.com/isaacs/rimraf/issues/new
+Changelog: https://github.com/isaacs/rimraf/tags
+Repository: https://github.com/isaacs/rimraf.git
+Repository-Browse: https://github.com/isaacs/rimraf


=====================================
package-lock.json
=====================================
The diff for this file was not included because it is too large.

=====================================
package.json
=====================================
@@ -1,17 +1,20 @@
 {
   "name": "rimraf",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "main": "rimraf.js",
   "description": "A deep deletion module for node (like `rm -rf`)",
   "author": "Isaac Z. Schlueter <i at izs.me> (http://blog.izs.me/)",
   "license": "ISC",
   "repository": "git://github.com/isaacs/rimraf.git",
   "scripts": {
+    "preversion": "npm test",
+    "postversion": "npm publish",
+    "postpublish": "git push origin --all; git push origin --tags",
     "test": "tap test/*.js"
   },
   "bin": "./bin.js",
   "dependencies": {
-    "glob": "^7.0.5"
+    "glob": "^7.1.3"
   },
   "files": [
     "LICENSE",
@@ -21,6 +24,6 @@
   ],
   "devDependencies": {
     "mkdirp": "^0.5.1",
-    "tap": "^10.1.2"
+    "tap": "^12.1.1"
   }
 }


=====================================
test/bin.js
=====================================
@@ -0,0 +1,110 @@
+var bin = require.resolve('../bin.js')
+var t = require('tap')
+var mkdirp = require('mkdirp')
+var fs = require('fs')
+var spawn = require('child_process').spawn
+var node = process.execPath
+var rimraf = require('../')
+
+t.test('setup', function (t) {
+  rimraf.sync(__dirname + '/bintest')
+  mkdirp.sync(__dirname + '/bintest')
+  process.chdir(__dirname + '/bintest')
+  mkdirp.sync('a/b/c')
+  mkdirp.sync('x/y/z')
+  fs.writeFileSync('a/1.txt', '\n')
+  fs.writeFileSync('a/2.txt', '\n')
+  fs.writeFileSync('a/3.txt', '\n')
+  fs.writeFileSync('a/*.txt', '\n')
+  fs.writeFileSync('a/b/1.txt', '\n')
+  fs.writeFileSync('a/b/2.txt', '\n')
+  fs.writeFileSync('a/b/3.txt', '\n')
+  fs.writeFileSync('a/b/*.txt', '\n')
+  fs.writeFileSync('a/b/c/1.txt', '\n')
+  fs.writeFileSync('a/b/c/2.txt', '\n')
+  fs.writeFileSync('a/b/c/3.txt', '\n')
+  fs.writeFileSync('a/b/c/*.txt', '\n')
+  fs.writeFileSync('x/1.txt', '\n')
+  fs.writeFileSync('x/2.txt', '\n')
+  fs.writeFileSync('x/3.txt', '\n')
+  fs.writeFileSync('x/*.txt', '\n')
+  fs.writeFileSync('x/y/1.txt', '\n')
+  fs.writeFileSync('x/y/2.txt', '\n')
+  fs.writeFileSync('x/y/3.txt', '\n')
+  fs.writeFileSync('x/y/*.txt', '\n')
+  fs.writeFileSync('x/y/z/1.txt', '\n')
+  fs.writeFileSync('x/y/z/2.txt', '\n')
+  fs.writeFileSync('x/y/z/3.txt', '\n')
+  fs.writeFileSync('x/y/z/*.txt', '\n')
+  t.end()
+})
+
+t.test('help', function (t) {
+  var helps = ['-help', '-h', '--help', '--?']
+  t.plan(helps.length)
+  helps.forEach(function (h) {
+    t.test(h, test.bind(null, h))
+  })
+
+  function test (h, t) {
+    var child = spawn(node, [bin, h])
+    var out = ''
+    child.stdout.on('data', function (c) { out += c })
+    child.on('close', function (code, signal) {
+      t.equal(code, 0)
+      t.equal(signal, null)
+      t.match(out, /^Usage: rimraf <path> \[<path> \.\.\.\]/)
+      t.end()
+    })
+  }
+})
+
+t.test('glob, but matches', function (t) {
+  var child = spawn(node, [bin, 'x/y/*.txt'])
+  child.on('exit', function (code) {
+    t.equal(code, 0)
+    t.throws(fs.statSync.bind(fs, 'x/y/*.txt'))
+    t.doesNotThrow(fs.statSync.bind(fs, 'x/y/1.txt'))
+    t.end()
+  })
+})
+
+t.test('--no-glob', function (t) {
+  t.plan(2)
+  t.test('no glob with *.txt', function (t) {
+    var child = spawn(node, [bin, 'x/y/*.txt', '-G'])
+    child.on('exit', function (code) {
+      t.equal(code, 0)
+      t.throws(fs.statSync.bind(fs, 'x/y/*.txt'))
+      t.doesNotThrow(fs.statSync.bind(fs, 'x/y/1.txt'))
+      t.end()
+    })
+  })
+  t.test('no glob with dir star', function (t) {
+    var child = spawn(node, [bin, '**/*.txt', '-G'])
+    child.on('exit', function (code) {
+      t.equal(code, 0)
+      t.throws(fs.statSync.bind(fs, 'x/y/*.txt'))
+      t.doesNotThrow(fs.statSync.bind(fs, 'x/y/1.txt'))
+      t.end()
+    })
+  })
+})
+
+t.test('glob, but no exact match', function (t) {
+  var child = spawn(node, [bin, 'x/y/*.txt'])
+  child.on('exit', function (code) {
+    t.equal(code, 0)
+    t.throws(fs.statSync.bind(fs, 'x/y/1.txt'))
+    t.throws(fs.statSync.bind(fs, 'x/y/2.txt'))
+    t.throws(fs.statSync.bind(fs, 'x/y/3.txt'))
+    t.throws(fs.statSync.bind(fs, 'x/y/*.txt'))
+    t.end()
+  })
+})
+
+
+t.test('cleanup', function (t) {
+  rimraf.sync(__dirname + '/bintest')
+  t.end()
+})



View it on GitLab: https://salsa.debian.org/js-team/node-rimraf/-/compare/a5574be8d2ed0a7f1d58bd5b29ce166ffd887d1e...f765e4a9f00655485f3076b9f8207f41c9893638

-- 
View it on GitLab: https://salsa.debian.org/js-team/node-rimraf/-/compare/a5574be8d2ed0a7f1d58bd5b29ce166ffd887d1e...f765e4a9f00655485f3076b9f8207f41c9893638
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-javascript-commits/attachments/20200309/085bec28/attachment-0001.html>


More information about the Pkg-javascript-commits mailing list