Hello community, here is the log from the commit of package nodejs-fstream-npm for openSUSE:Factory checked in at 2015-07-02 22:32:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs-fstream-npm (Old) and /work/SRC/openSUSE:Factory/.nodejs-fstream-npm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nodejs-fstream-npm" Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs-fstream-npm/nodejs-fstream-npm.changes 2015-04-27 13:01:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs-fstream-npm.new/nodejs-fstream-npm.changes 2015-07-02 22:32:40.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 24 12:08:30 UTC 2015 - hvogel@suse.com + +- Update to version 1.0.2 + +------------------------------------------------------------------- Old: ---- fstream-npm-1.0.0.tgz New: ---- fstream-npm-1.0.2.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs-fstream-npm.spec ++++++ --- /var/tmp/diff_new_pack.HWopDM/_old 2015-07-02 22:32:41.000000000 +0200 +++ /var/tmp/diff_new_pack.HWopDM/_new 2015-07-02 22:32:41.000000000 +0200 @@ -19,7 +19,7 @@ %define base_name fstream-npm Name: nodejs-fstream-npm -Version: 1.0.0 +Version: 1.0.2 Release: 0 Summary: An fstream DirReader class License: ISC ++++++ fstream-npm-1.0.0.tgz -> fstream-npm-1.0.2.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package/.npmignore new/package/.npmignore --- old/package/.npmignore 2012-03-27 07:52:47.000000000 +0200 +++ new/package/.npmignore 2015-03-20 08:05:59.000000000 +0100 @@ -1,2 +1,3 @@ # ignore the output junk from the example scripts example/output +node_modules/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package/example/dir-tar.js new/package/example/dir-tar.js --- old/package/example/dir-tar.js 2012-03-27 02:58:21.000000000 +0200 +++ new/package/example/dir-tar.js 2015-03-20 08:05:59.000000000 +0100 @@ -1,18 +1,18 @@ // this will show what ends up in the fstream-npm package -var P = require("fstream").DirReader -var tar = require("tar") +var P = require('fstream').DirReader +var tar = require('tar') function f (entry) { - return entry.basename !== ".git" + return entry.basename !== '.git' } -new P({ path: "./", type: "Directory", Directory: true, filter: f }) - .on("package", function (p) { - console.error("package", p) +new P({ path: './', type: 'Directory', Directory: true, filter: f }) + .on('package', function (p) { + console.error('package', p) }) - .on("ignoreFile", function (e) { - console.error("ignoreFile", e) + .on('ignoreFile', function (e) { + console.error('ignoreFile', e) }) - .on("entry", function (e) { + .on('entry', function (e) { console.error(e.constructor.name, e.path.substr(e.root.path.length + 1)) }) .pipe(tar.Pack()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package/example/dir.js new/package/example/dir.js --- old/package/example/dir.js 2012-03-27 06:22:13.000000000 +0200 +++ new/package/example/dir.js 2015-03-20 08:05:59.000000000 +0100 @@ -1,25 +1,25 @@ // this will show what ends up in the fstream-npm package -var P = require("../") -var DW = require("fstream").DirWriter +var P = require('../') +var DW = require('fstream').DirWriter -var target = new DW({ Directory: true, type: "Directory", - path: __dirname + "/output"}) +var target = new DW({ Directory: true, type: 'Directory', + path: __dirname + '/output'}) function f (entry) { - return entry.basename !== ".git" + return entry.basename !== '.git' } -P({ path: "./", type: "Directory", isDirectory: true, filter: f }) - .on("package", function (p) { - console.error("package", p) +P({ path: './', type: 'Directory', isDirectory: true, filter: f }) + .on('package', function (p) { + console.error('package', p) }) - .on("ignoreFile", function (e) { - console.error("ignoreFile", e) + .on('ignoreFile', function (e) { + console.error('ignoreFile', e) }) - .on("entry", function (e) { + .on('entry', function (e) { console.error(e.constructor.name, e.path) }) .pipe(target) - .on("end", function () { - console.error("ended") + .on('end', function () { + console.error('ended') }) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package/example/example.js new/package/example/example.js --- old/package/example/example.js 2012-03-27 07:53:51.000000000 +0200 +++ new/package/example/example.js 2015-03-20 08:05:59.000000000 +0100 @@ -1,12 +1,12 @@ // this will show what ends up in the fstream-npm package -var P = require("../") -P({ path: "./" }) - .on("package", function (p) { - console.error("package", p) +var P = require('../') +P({ path: './' }) + .on('package', function (p) { + console.error('package', p) }) - .on("ignoreFile", function (e) { - console.error("ignoreFile", e) + .on('ignoreFile', function (e) { + console.error('ignoreFile', e) }) - .on("entry", function (e) { + .on('entry', function (e) { console.error(e.constructor.name, e.path.substr(e.root.dirname.length + 1)) }) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package/example/ig-tar.js new/package/example/ig-tar.js --- old/package/example/ig-tar.js 2012-03-27 03:12:48.000000000 +0200 +++ new/package/example/ig-tar.js 2015-03-20 08:05:59.000000000 +0100 @@ -1,18 +1,18 @@ // this will show what ends up in the fstream-npm package -var P = require("fstream-ignore") -var tar = require("tar") +var P = require('fstream-ignore') +var tar = require('tar') function f (entry) { - return entry.basename !== ".git" + return entry.basename !== '.git' } -new P({ path: "./", type: "Directory", Directory: true, filter: f }) - .on("package", function (p) { - console.error("package", p) +new P({ path: './', type: 'Directory', Directory: true, filter: f }) + .on('package', function (p) { + console.error('package', p) }) - .on("ignoreFile", function (e) { - console.error("ignoreFile", e) + .on('ignoreFile', function (e) { + console.error('ignoreFile', e) }) - .on("entry", function (e) { + .on('entry', function (e) { console.error(e.constructor.name, e.path.substr(e.root.path.length + 1)) }) .pipe(tar.Pack()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package/example/tar.js new/package/example/tar.js --- old/package/example/tar.js 2012-03-27 07:09:45.000000000 +0200 +++ new/package/example/tar.js 2015-03-20 08:05:59.000000000 +0100 @@ -1,6 +1,6 @@ // this will show what ends up in the fstream-npm package -var P = require("../") -var tar = require("tar") +var P = require('../') +var tar = require('tar') function f () { return true } @@ -8,18 +8,18 @@ // return entry.basename !== ".git" // } -new P({ path: "./", type: "Directory", isDirectory: true, filter: f }) - .on("package", function (p) { - console.error("package", p) +new P({ path: './', type: 'Directory', isDirectory: true, filter: f }) + .on('package', function (p) { + console.error('package', p) }) - .on("ignoreFile", function (e) { - console.error("ignoreFile", e) + .on('ignoreFile', function (e) { + console.error('ignoreFile', e) }) - .on("entry", function (e) { + .on('entry', function (e) { console.error(e.constructor.name, e.path) }) - .on("end", function () { - console.error("ended") + .on('end', function () { + console.error('ended') }) .pipe(tar.Pack()) .pipe(process.stdout) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package/fstream-npm.js new/package/fstream-npm.js --- old/package/fstream-npm.js 2013-10-12 00:32:23.000000000 +0200 +++ new/package/fstream-npm.js 2015-03-20 08:10:25.000000000 +0100 @@ -1,7 +1,7 @@ -var Ignore = require("fstream-ignore") -, inherits = require("inherits") -, path = require("path") -, fs = require("fs") +var Ignore = require('fstream-ignore') +var inherits = require('inherits') +var path = require('path') +var fs = require('fs') module.exports = Packer @@ -12,13 +12,13 @@ return new Packer(props) } - if (typeof props === "string") { + if (typeof props === 'string') { props = { path: props } } - props.ignoreFiles = props.ignoreFiles || [ ".npmignore", - ".gitignore", - "package.json" ] + props.ignoreFiles = props.ignoreFiles || [ '.npmignore', + '.gitignore', + 'package.json' ] Ignore.call(this, props) @@ -30,7 +30,7 @@ // lives right next to a package.json file. this.bundleMagic = this.parent && this.parent.packageRoot && - this.basename === "node_modules" + this.basename === 'node_modules' // in a node_modules folder, resolve symbolic links to // bundled dependencies when creating the package. @@ -40,42 +40,44 @@ if (this === this.root || this.parent && this.parent.bundleMagic && - this.basename.charAt(0) !== ".") { + this.basename.charAt(0) !== '.') { this.readBundledLinks() } - - this.on("entryStat", function (entry, props) { + this.on('entryStat', function (entry, props) { // files should *always* get into tarballs // in a user-writable state, even if they're // being installed from some wackey vm-mounted // read-only filesystem. - entry.mode = props.mode = props.mode | 0200 + entry.mode = props.mode = props.mode | parseInt('0200', 8) }) } Packer.prototype.readBundledLinks = function () { if (this._paused) { - this.once("resume", this.addIgnoreFiles) + this.once('resume', this.addIgnoreFiles) return } this.pause() - fs.readdir(this.path + "/node_modules", function (er, list) { + fs.readdir(this.path + '/node_modules', function (er, list) { // no harm if there's no bundle var l = list && list.length if (er || l === 0) return this.resume() var errState = null - , then = function then (er) { + var then = function then (er) { if (errState) return - if (er) return errState = er, this.resume() - if (-- l === 0) return this.resume() + if (er) { + errState = er + return this.resume() + } + if (--l === 0) return this.resume() }.bind(this) list.forEach(function (pkg) { - if (pkg.charAt(0) === ".") return then() - var pd = this.path + "/node_modules/" + pkg + if (pkg.charAt(0) === '.') return then() + var pd = this.path + '/node_modules/' + pkg fs.realpath(pd, function (er, rp) { if (er) return then() this.bundleLinks = this.bundleLinks || {} @@ -88,25 +90,31 @@ Packer.prototype.applyIgnores = function (entry, partial, entryObj) { // package.json files can never be ignored. - if (entry === "package.json") return true + if (entry === 'package.json') return true // readme files should never be ignored. if (entry.match(/^readme(\.[^\.]*)$/i)) return true + // license files should never be ignored. + if (entry.match(/^(license|licence)(\.[^\.]*)?$/i)) return true + + // changelogs should never be ignored. + if (entry.match(/^(changes|changelog|history)(\.[^\.]*)?$/i)) return true + // special rules. see below. - if (entry === "node_modules" && this.packageRoot) return true + if (entry === 'node_modules' && this.packageRoot) return true // some files are *never* allowed under any circumstances - if (entry === ".git" || - entry === ".lock-wscript" || + if (entry === '.git' || + entry === '.lock-wscript' || entry.match(/^\.wafpickle-[0-9]+$/) || - entry === "CVS" || - entry === ".svn" || - entry === ".hg" || + entry === 'CVS' || + entry === '.svn' || + entry === '.hg' || entry.match(/^\..*\.swp$/) || - entry === ".DS_Store" || + entry === '.DS_Store' || entry.match(/^\._/) || - entry === "npm-debug.log" + entry === 'npm-debug.log' ) { return false } @@ -121,13 +129,12 @@ // if they're not already present at a higher level. if (this.bundleMagic) { // bubbling up. stop here and allow anything the bundled pkg allows - if (entry.indexOf("/") !== -1) return true + if (entry.indexOf('/') !== -1) return true // never include the .bin. It's typically full of platform-specific // stuff like symlinks and .cmd files anyway. - if (entry === ".bin") return false + if (entry === '.bin') return false - var shouldBundle = false // the package root. var p = this.parent // the package before this one. @@ -143,12 +150,18 @@ // since it's *not* a symbolic link, if we're *already* in a bundle, // then we should include everything. - if (pp && pp.package && pp.basename === "node_modules") { + if (pp && pp.package && pp.basename === 'node_modules') { return true } // only include it at this point if it's a bundleDependency var bd = this.package && this.package.bundleDependencies + + if (bd && !Array.isArray(bd)) { + throw new Error(this.package.name + '\'s `bundledDependencies` should ' + + 'be an array') + } + var shouldBundle = bd && bd.indexOf(entry) !== -1 // if we're not going to bundle it, then it doesn't count as a bundleLink // if (this.bundleLinks && !shouldBundle) delete this.bundleLinks[entry] @@ -163,8 +176,8 @@ var entries = this.entries // if there's a .npmignore, then we do *not* want to // read the .gitignore. - if (-1 !== entries.indexOf(".npmignore")) { - var i = entries.indexOf(".gitignore") + if (entries.indexOf('.npmignore') !== -1) { + var i = entries.indexOf('.gitignore') if (i !== -1) { entries.splice(i, 1) } @@ -175,9 +188,8 @@ Ignore.prototype.addIgnoreFiles.call(this) } - Packer.prototype.readRules = function (buf, e) { - if (e !== "package.json") { + if (e !== 'package.json') { return Ignore.prototype.readRules.call(this, buf, e) } @@ -198,7 +210,7 @@ } this.packageRoot = true - this.emit("package", p) + this.emit('package', p) // make bundle deps predictable if (p.bundledDependencies && !p.bundleDependencies) { @@ -209,10 +221,10 @@ if (!p.files || !Array.isArray(p.files)) return [] // ignore everything except what's in the files array. - return ["*"].concat(p.files.map(function (f) { - return "!" + f + return ['*'].concat(p.files.map(function (f) { + return '!' + f })).concat(p.files.map(function (f) { - return "!" + f.replace(/\/+$/, "") + "/**" + return '!' + f.replace(/\/+$/, '') + '/**' })) } @@ -236,20 +248,20 @@ return props } - -var order = - [ "package.json" - , ".npmignore" - , ".gitignore" - , /^README(\.md)?$/ - , "LICENCE" - , "LICENSE" - , /\.js$/ ] +var order = [ + 'package.json', + '.npmignore', + '.gitignore', + /^README(\.md)?$/, + 'LICENCE', + 'LICENSE', + /\.js$/ +] Packer.prototype.sort = function (a, b) { - for (var i = 0, l = order.length; i < l; i ++) { + for (var i = 0, l = order.length; i < l; i++) { var o = order[i] - if (typeof o === "string") { + if (typeof o === 'string') { if (a === o) return -1 if (b === o) return 1 } else { @@ -259,46 +271,44 @@ } // deps go in the back - if (a === "node_modules") return 1 - if (b === "node_modules") return -1 + if (a === 'node_modules') return 1 + if (b === 'node_modules') return -1 return Ignore.prototype.sort.call(this, a, b) } - - Packer.prototype.emitEntry = function (entry) { if (this._paused) { - this.once("resume", this.emitEntry.bind(this, entry)) + this.once('resume', this.emitEntry.bind(this, entry)) return } // if there is a .gitignore, then we're going to // rename it to .npmignore in the output. - if (entry.basename === ".gitignore") { - entry.basename = ".npmignore" + if (entry.basename === '.gitignore') { + entry.basename = '.npmignore' entry.path = path.resolve(entry.dirname, entry.basename) } // all *.gyp files are renamed to binding.gyp for node-gyp // but only when they are in the same folder as a package.json file. if (entry.basename.match(/\.gyp$/) && - this.entries.indexOf("package.json") !== -1) { - entry.basename = "binding.gyp" + this.entries.indexOf('package.json') !== -1) { + entry.basename = 'binding.gyp' entry.path = path.resolve(entry.dirname, entry.basename) } // skip over symbolic links - if (entry.type === "SymbolicLink") { + if (entry.type === 'SymbolicLink') { entry.abort() return } - if (entry.type !== "Directory") { + if (entry.type !== 'Directory') { // make it so that the folder in the tarball is named "package" var h = path.dirname((entry.root || entry).path) - , t = entry.path.substr(h.length + 1).replace(/^[^\/\\]+/, "package") - , p = h + "/" + t + var t = entry.path.substr(h.length + 1).replace(/^[^\/\\]+/, 'package') + var p = h + '/' + t entry.path = p entry.dirname = path.dirname(p) @@ -313,11 +323,11 @@ // .pipe() doesn't do anythign special with "child" events, on // with "entry" events. var me = this - entry.on("entry", function (e) { + entry.on('entry', function (e) { if (e.parent === entry) { e.parent = me - me.emit("entry", e) + me.emit('entry', e) } }) - entry.on("package", this.emit.bind(this, "package")) + entry.on('package', this.emit.bind(this, 'package')) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package/package.json new/package/package.json --- old/package/package.json 2014-08-01 00:11:45.000000000 +0200 +++ new/package/package.json 2015-03-20 08:11:11.000000000 +0100 @@ -2,15 +2,21 @@ "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)", "name": "fstream-npm", "description": "fstream class for creating npm packages", - "version": "1.0.0", + "version": "1.0.2", "repository": { "type": "git", "url": "git://github.com/isaacs/fstream-npm.git" }, + "scripts": { + "test": "standard" + }, "main": "./fstream-npm.js", "dependencies": { "fstream-ignore": "^1.0.0", "inherits": "2" }, + "devDependencies": { + "standard": "^2.7.3" + }, "license": "ISC" }