@@ -1,6 +1,6 @@ o improve maven integration o descriptor fields shouldn't be case sensitive -o add a <link> element to declare symlinks ? (see jRPM and https://issues.apache.org/bugzilla/show_bug.cgi?id=40059) +o add a <link> element to declare symlinks? (see jRPM and https://issues.apache.org/bugzilla/show_bug.cgi?id=40059) o subversion log ChangesProvider o jira release notes ChangesProvider o fix the CRLF in the maintainer scripts, or break with a warning to have the user fix it TODO.txt @@ -22,5 +22,5 @@ package org.vafer.jdeb; */ public interface Console { - void println( String s ); + void println( String s ); } src/main/java/org/vafer/jdeb/Console.java @@ -25,7 +25,7 @@ import java.io.InputStream; */ public interface DataConsumer { - void onEachDir( String dirname, String linkname, String user, int uid, String group, int gid, int mode, long size ) throws IOException; - void onEachFile( InputStream input, String filename, String linkname, String user, int uid, String group, int gid, int mode, long size) throws IOException; + void onEachDir( String dirname, String linkname, String user, int uid, String group, int gid, int mode, long size ) throws IOException; + void onEachFile( InputStream input, String filename, String linkname, String user, int uid, String group, int gid, int mode, long size) throws IOException; } src/main/java/org/vafer/jdeb/DataConsumer.java @@ -24,6 +24,6 @@ import java.io.IOException; */ public interface DataProducer { - void produce( DataConsumer receiver ) throws IOException; + void produce( DataConsumer receiver ) throws IOException; } src/main/java/org/vafer/jdeb/DataProducer.java @@ -22,22 +22,22 @@ package org.vafer.jdeb; */ public final class PackagingException extends Exception { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - public PackagingException() { - super(); - } + public PackagingException() { + super(); + } - public PackagingException(String message, Throwable cause) { - super(message, cause); - } + public PackagingException(String message, Throwable cause) { + super(message, cause); + } - public PackagingException(String message) { - super(message); - } + public PackagingException(String message) { + super(message); + } - public PackagingException(Throwable cause) { - super(cause); - } + public PackagingException(Throwable cause) { + super(cause); + } } src/main/java/org/vafer/jdeb/PackagingException.java @@ -57,413 +57,413 @@ import org.vafer.jdeb.utils.VariableResolver; */ public class Processor { - private final Console console; - private final VariableResolver resolver; - - private static final class Total { - private BigInteger count = BigInteger.valueOf(0); - - public void add(long size) { - count = count.add(BigInteger.valueOf(size)); - } - - public String toString() { - return "" + count; - } - - public BigInteger toBigInteger() { - return count; - } - } - - public Processor( final Console pConsole, final VariableResolver pResolver ) { - console = pConsole; - resolver = pResolver; - } - - private void addTo( final ArOutputStream pOutput, final String pName, final String pContent ) throws IOException { - final byte[] content = pContent.getBytes(); - pOutput.putNextEntry(new ArEntry(pName, content.length)); - pOutput.write(content); - } - - private void addTo( final ArOutputStream pOutput, final String pName, final File pContent ) throws IOException { - pOutput.putNextEntry(new ArEntry(pName, pContent.length())); - - final InputStream input = new FileInputStream(pContent); - try { - Utils.copy(input, pOutput); - } finally { - input.close(); - } - } - - /** - * Create the debian archive with from the provided control files and data producers. - * - * @param pControlFiles - * @param pData - * @param pOutput - * @param compression the compression method used for the data file (gzip, bzip2 or anything else for no compression) - * @return PackageDescriptor - * @throws PackagingException - */ - public PackageDescriptor createDeb( final File[] pControlFiles, final DataProducer[] pData, final File pOutput, String compression ) throws PackagingException, InvalidDescriptorException { - - File tempData = null; - File tempControl = null; - - try { - tempData = File.createTempFile("deb", "data"); - tempControl = File.createTempFile("deb", "control"); - - console.println("Building data"); - final StringBuffer md5s = new StringBuffer(); - final BigInteger size = buildData(pData, tempData, md5s, compression); - - console.println("Building control"); - final PackageDescriptor packageDescriptor = buildControl(pControlFiles, size, md5s, tempControl); - - if (!packageDescriptor.isValid()) { - throw new InvalidDescriptorException(packageDescriptor); - } - - final InformationOutputStream output = new InformationOutputStream(new FileOutputStream(pOutput), MessageDigest.getInstance("MD5")); - - final ArOutputStream ar = new ArOutputStream(output); - - addTo(ar, "debian-binary", "2.0\n"); - addTo(ar, "control.tar.gz", tempControl); - addTo(ar, "data.tar" + getExtension(compression), tempData); - - ar.close(); - - // intermediate values - packageDescriptor.set("MD5", output.getMd5()); - packageDescriptor.set("Size", "" + output.getSize()); - packageDescriptor.set("File", pOutput.getName()); - - return packageDescriptor; - - } catch(InvalidDescriptorException e) { - throw e; - } catch(Exception e) { - throw new PackagingException("Could not create deb package", e); - } finally { - if (tempData != null) { - if (!tempData.delete()) { - throw new PackagingException("Could not delete " + tempData); - } - } - if (tempControl != null) { - if (!tempControl.delete()) { - throw new PackagingException("Could not delete " + tempControl); - } - } - } - } - - /** - * Return the extension of a file compressed with the specified method. - * - * @param pCompression the compression method used - * @return - */ - private String getExtension( final String pCompression ) { - if ("gzip".equals(pCompression)) { - return ".gz"; - } else if ("bzip2".equals(pCompression)) { - return ".bz2"; - } else { - return ""; - } - } - - /** - * Create changes file based on the provided PackageDescriptor. - * If pRing, pKey and pPassphrase are provided the changes file will also be signed. - * It returns a ChangesDescriptor reflecting the changes - * @param pPackageDescriptor - * @param pChangesProvider - * @param pRing - * @param pKey - * @param pPassphrase - * @param pOutput - * @return ChangesDescriptor - * @throws IOException - */ - public ChangesDescriptor createChanges( final PackageDescriptor pPackageDescriptor, final ChangesProvider pChangesProvider, final InputStream pRing, final String pKey, final String pPassphrase, final OutputStream pOutput ) throws IOException, InvalidDescriptorException { - - final ChangeSet[] changeSets = pChangesProvider.getChangesSets(); - final ChangesDescriptor changesDescriptor = new ChangesDescriptor(pPackageDescriptor, changeSets); - - changesDescriptor.set("Format", "1.7"); - - if (changesDescriptor.get("Binary") == null) { - changesDescriptor.set("Binary", changesDescriptor.get("Package")); - } - - if (changesDescriptor.get("Source") == null) { - changesDescriptor.set("Source", changesDescriptor.get("Package")); - } - - if (changesDescriptor.get("Description") == null) { - changesDescriptor.set("Description", "update to " + changesDescriptor.get("Version")); - } - - final StringBuffer files = new StringBuffer("\n"); - files.append(' ').append(changesDescriptor.get("MD5")); - files.append(' ').append(changesDescriptor.get("Size")); - files.append(' ').append(changesDescriptor.get("Section")); - files.append(' ').append(changesDescriptor.get("Priority")); - files.append(' ').append(changesDescriptor.get("File")); - changesDescriptor.set("Files", files.toString()); - - if (!changesDescriptor.isValid()) { - throw new InvalidDescriptorException(changesDescriptor); - } - - final String changes = changesDescriptor.toString(); - //console.println(changes); - - final byte[] changesBytes = changes.getBytes("UTF-8"); - - if (pRing == null || pKey == null || pPassphrase == null) { - pOutput.write(changesBytes); - pOutput.close(); - return changesDescriptor; - } - - console.println("Signing changes with key " + pKey); - - final InputStream input = new ByteArrayInputStream(changesBytes); - - try { - SigningUtils.clearSign(input, pRing, pKey, pPassphrase, pOutput); - } catch (Exception e) { - e.printStackTrace(); - } - - pOutput.close(); - - return changesDescriptor; - } - - /** - * Build control archive of the deb - * @param pControlFiles - * @param pDataSize - * @param pChecksums - * @param pOutput - * @return - * @throws FileNotFoundException - * @throws IOException - * @throws ParseException - */ - private PackageDescriptor buildControl( final File[] pControlFiles, final BigInteger pDataSize, final StringBuffer pChecksums, final File pOutput ) throws IOException, ParseException { - - PackageDescriptor packageDescriptor = null; - - final TarOutputStream outputStream = new TarOutputStream(new GZIPOutputStream(new FileOutputStream(pOutput))); - outputStream.setLongFileMode(TarOutputStream.LONGFILE_GNU); - - for (int i = 0; i < pControlFiles.length; i++) { - final File file = pControlFiles[i]; - - if (file.isDirectory()) { - continue; - } - - final TarEntry entry = new TarEntry(file); - - final String name = file.getName(); - - entry.setName(name); - - if ("control".equals(name)) { - packageDescriptor = new PackageDescriptor(new FileInputStream(file), resolver); - - if (packageDescriptor.get("Date") == null) { - SimpleDateFormat fmt = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z", Locale.ENGLISH); // Mon, 26 Mar 2007 11:44:04 +0200 (RFC 2822) - // FIXME Is this field allowed in package descriptors ? - packageDescriptor.set("Date", fmt.format(new Date())); - } + private final Console console; + private final VariableResolver resolver; + + private static final class Total { + private BigInteger count = BigInteger.valueOf(0); + + public void add(long size) { + count = count.add(BigInteger.valueOf(size)); + } + + public String toString() { + return "" + count; + } + + public BigInteger toBigInteger() { + return count; + } + } + + public Processor( final Console pConsole, final VariableResolver pResolver ) { + console = pConsole; + resolver = pResolver; + } + + private void addTo( final ArOutputStream pOutput, final String pName, final String pContent ) throws IOException { + final byte[] content = pContent.getBytes(); + pOutput.putNextEntry(new ArEntry(pName, content.length)); + pOutput.write(content); + } + + private void addTo( final ArOutputStream pOutput, final String pName, final File pContent ) throws IOException { + pOutput.putNextEntry(new ArEntry(pName, pContent.length())); + + final InputStream input = new FileInputStream(pContent); + try { + Utils.copy(input, pOutput); + } finally { + input.close(); + } + } + + /** + * Create the debian archive with from the provided control files and data producers. + * + * @param pControlFiles + * @param pData + * @param pOutput + * @param compression the compression method used for the data file (gzip, bzip2 or anything else for no compression) + * @return PackageDescriptor + * @throws PackagingException + */ + public PackageDescriptor createDeb( final File[] pControlFiles, final DataProducer[] pData, final File pOutput, String compression ) throws PackagingException, InvalidDescriptorException { + + File tempData = null; + File tempControl = null; + + try { + tempData = File.createTempFile("deb", "data"); + tempControl = File.createTempFile("deb", "control"); + + console.println("Building data"); + final StringBuffer md5s = new StringBuffer(); + final BigInteger size = buildData(pData, tempData, md5s, compression); + + console.println("Building control"); + final PackageDescriptor packageDescriptor = buildControl(pControlFiles, size, md5s, tempControl); + + if (!packageDescriptor.isValid()) { + throw new InvalidDescriptorException(packageDescriptor); + } + + final InformationOutputStream output = new InformationOutputStream(new FileOutputStream(pOutput), MessageDigest.getInstance("MD5")); + + final ArOutputStream ar = new ArOutputStream(output); + + addTo(ar, "debian-binary", "2.0\n"); + addTo(ar, "control.tar.gz", tempControl); + addTo(ar, "data.tar" + getExtension(compression), tempData); + + ar.close(); + + // intermediate values + packageDescriptor.set("MD5", output.getMd5()); + packageDescriptor.set("Size", "" + output.getSize()); + packageDescriptor.set("File", pOutput.getName()); + + return packageDescriptor; + + } catch(InvalidDescriptorException e) { + throw e; + } catch(Exception e) { + throw new PackagingException("Could not create deb package", e); + } finally { + if (tempData != null) { + if (!tempData.delete()) { + throw new PackagingException("Could not delete " + tempData); + } + } + if (tempControl != null) { + if (!tempControl.delete()) { + throw new PackagingException("Could not delete " + tempControl); + } + } + } + } + + /** + * Return the extension of a file compressed with the specified method. + * + * @param pCompression the compression method used + * @return + */ + private String getExtension( final String pCompression ) { + if ("gzip".equals(pCompression)) { + return ".gz"; + } else if ("bzip2".equals(pCompression)) { + return ".bz2"; + } else { + return ""; + } + } + + /** + * Create changes file based on the provided PackageDescriptor. + * If pRing, pKey and pPassphrase are provided the changes file will also be signed. + * It returns a ChangesDescriptor reflecting the changes + * @param pPackageDescriptor + * @param pChangesProvider + * @param pRing + * @param pKey + * @param pPassphrase + * @param pOutput + * @return ChangesDescriptor + * @throws IOException + */ + public ChangesDescriptor createChanges( final PackageDescriptor pPackageDescriptor, final ChangesProvider pChangesProvider, final InputStream pRing, final String pKey, final String pPassphrase, final OutputStream pOutput ) throws IOException, InvalidDescriptorException { + + final ChangeSet[] changeSets = pChangesProvider.getChangesSets(); + final ChangesDescriptor changesDescriptor = new ChangesDescriptor(pPackageDescriptor, changeSets); + + changesDescriptor.set("Format", "1.7"); + + if (changesDescriptor.get("Binary") == null) { + changesDescriptor.set("Binary", changesDescriptor.get("Package")); + } + + if (changesDescriptor.get("Source") == null) { + changesDescriptor.set("Source", changesDescriptor.get("Package")); + } + + if (changesDescriptor.get("Description") == null) { + changesDescriptor.set("Description", "update to " + changesDescriptor.get("Version")); + } + + final StringBuffer files = new StringBuffer("\n"); + files.append(' ').append(changesDescriptor.get("MD5")); + files.append(' ').append(changesDescriptor.get("Size")); + files.append(' ').append(changesDescriptor.get("Section")); + files.append(' ').append(changesDescriptor.get("Priority")); + files.append(' ').append(changesDescriptor.get("File")); + changesDescriptor.set("Files", files.toString()); + + if (!changesDescriptor.isValid()) { + throw new InvalidDescriptorException(changesDescriptor); + } + + final String changes = changesDescriptor.toString(); + //console.println(changes); + + final byte[] changesBytes = changes.getBytes("UTF-8"); + + if (pRing == null || pKey == null || pPassphrase == null) { + pOutput.write(changesBytes); + pOutput.close(); + return changesDescriptor; + } + + console.println("Signing changes with key " + pKey); + + final InputStream input = new ByteArrayInputStream(changesBytes); + + try { + SigningUtils.clearSign(input, pRing, pKey, pPassphrase, pOutput); + } catch (Exception e) { + e.printStackTrace(); + } + + pOutput.close(); + + return changesDescriptor; + } + + /** + * Build control archive of the deb + * @param pControlFiles + * @param pDataSize + * @param pChecksums + * @param pOutput + * @return + * @throws FileNotFoundException + * @throws IOException + * @throws ParseException + */ + private PackageDescriptor buildControl( final File[] pControlFiles, final BigInteger pDataSize, final StringBuffer pChecksums, final File pOutput ) throws IOException, ParseException { + + PackageDescriptor packageDescriptor = null; + + final TarOutputStream outputStream = new TarOutputStream(new GZIPOutputStream(new FileOutputStream(pOutput))); + outputStream.setLongFileMode(TarOutputStream.LONGFILE_GNU); + + for (int i = 0; i < pControlFiles.length; i++) { + final File file = pControlFiles[i]; + + if (file.isDirectory()) { + continue; + } + + final TarEntry entry = new TarEntry(file); + + final String name = file.getName(); + + entry.setName(name); + + if ("control".equals(name)) { + packageDescriptor = new PackageDescriptor(new FileInputStream(file), resolver); + + if (packageDescriptor.get("Date") == null) { + SimpleDateFormat fmt = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z", Locale.ENGLISH); // Mon, 26 Mar 2007 11:44:04 +0200 (RFC 2822) + // FIXME Is this field allowed in package descriptors ? + packageDescriptor.set("Date", fmt.format(new Date())); + } - if (packageDescriptor.get("Distribution") == null) { - packageDescriptor.set("Distribution", "unknown"); - } + if (packageDescriptor.get("Distribution") == null) { + packageDescriptor.set("Distribution", "unknown"); + } - if (packageDescriptor.get("Urgency") == null) { - packageDescriptor.set("Urgency", "low"); - } + if (packageDescriptor.get("Urgency") == null) { + packageDescriptor.set("Urgency", "low"); + } - final String debFullName = System.getenv("DEBFULLNAME"); - final String debEmail = System.getenv("DEBEMAIL"); + final String debFullName = System.getenv("DEBFULLNAME"); + final String debEmail = System.getenv("DEBEMAIL"); - if (debFullName != null && debEmail != null) { - packageDescriptor.set("Maintainer", debFullName + " <" + debEmail + ">"); - console.println("Using maintainer from the environment variables."); - } + if (debFullName != null && debEmail != null) { + packageDescriptor.set("Maintainer", debFullName + " <" + debEmail + ">"); + console.println("Using maintainer from the environment variables."); + } - continue; - } + continue; + } - final InputStream inputStream = new FileInputStream(file); + final InputStream inputStream = new FileInputStream(file); - outputStream.putNextEntry(entry); + outputStream.putNextEntry(entry); - Utils.copy(inputStream, outputStream); + Utils.copy(inputStream, outputStream); - outputStream.closeEntry(); + outputStream.closeEntry(); - inputStream.close(); + inputStream.close(); - } + } - if (packageDescriptor == null) { - throw new FileNotFoundException("No control file in " + Arrays.toString(pControlFiles)); - } + if (packageDescriptor == null) { + throw new FileNotFoundException("No control file in " + Arrays.toString(pControlFiles)); + } - packageDescriptor.set("Installed-Size", pDataSize.divide(BigInteger.valueOf(1024)).toString()); + packageDescriptor.set("Installed-Size", pDataSize.divide(BigInteger.valueOf(1024)).toString()); - addEntry("control", packageDescriptor.toString(), outputStream); + addEntry("control", packageDescriptor.toString(), outputStream); - addEntry("md5sums", pChecksums.toString(), outputStream); + addEntry("md5sums", pChecksums.toString(), outputStream); - outputStream.close(); + outputStream.close(); - return packageDescriptor; - } + return packageDescriptor; + } - /** - * Build the data archive of the deb from the provided DataProducers - * @param pData - * @param pOutput - * @param pChecksums - * @param pCompression the compression method used for the data file (gzip, bzip2 or anything else for no compression) - * @return - * @throws NoSuchAlgorithmException - * @throws IOException - */ - BigInteger buildData( final DataProducer[] pData, final File pOutput, final StringBuffer pChecksums, String pCompression ) throws NoSuchAlgorithmException, IOException { + /** + * Build the data archive of the deb from the provided DataProducers + * @param pData + * @param pOutput + * @param pChecksums + * @param pCompression the compression method used for the data file (gzip, bzip2 or anything else for no compression) + * @return + * @throws NoSuchAlgorithmException + * @throws IOException + */ + BigInteger buildData( final DataProducer[] pData, final File pOutput, final StringBuffer pChecksums, String pCompression ) throws NoSuchAlgorithmException, IOException { - OutputStream out = new FileOutputStream(pOutput); - if ("gzip".equals(pCompression)) { - out = new GZIPOutputStream(out); - } else if ("bzip2".equals(pCompression)) { - out.write("BZ".getBytes()); - out = new CBZip2OutputStream(out); - } - - final TarOutputStream outputStream = new TarOutputStream(out); - outputStream.setLongFileMode(TarOutputStream.LONGFILE_GNU); + OutputStream out = new FileOutputStream(pOutput); + if ("gzip".equals(pCompression)) { + out = new GZIPOutputStream(out); + } else if ("bzip2".equals(pCompression)) { + out.write("BZ".getBytes()); + out = new CBZip2OutputStream(out); + } + + final TarOutputStream outputStream = new TarOutputStream(out); + outputStream.setLongFileMode(TarOutputStream.LONGFILE_GNU); - final MessageDigest digest = MessageDigest.getInstance("MD5"); + final MessageDigest digest = MessageDigest.getInstance("MD5"); - final Total dataSize = new Total(); + final Total dataSize = new Total(); - final DataConsumer receiver = new DataConsumer() { - public void onEachDir( String dirname, String linkname, String user, int uid, String group, int gid, int mode, long size ) throws IOException { + final DataConsumer receiver = new DataConsumer() { + public void onEachDir( String dirname, String linkname, String user, int uid, String group, int gid, int mode, long size ) throws IOException { - if (!dirname.endsWith("/")) { - dirname = dirname + "/"; - } + if (!dirname.endsWith("/")) { + dirname = dirname + "/"; + } // ensure the path is like : ./foo/bar if (dirname.startsWith("/")) { - dirname = "." + dirname; - } else if (!dirname.startsWith("./")) { + dirname = "." + dirname; + } else if (!dirname.startsWith("./")) { dirname = "./" + dirname; } TarEntry entry = new TarEntry(dirname); - // FIXME: link is in the constructor - entry.setUserName(user); - entry.setUserId(uid); - entry.setGroupName(group); - entry.setGroupId(gid); - entry.setMode(mode); - entry.setSize(0); + // FIXME: link is in the constructor + entry.setUserName(user); + entry.setUserId(uid); + entry.setGroupName(group); + entry.setGroupId(gid); + entry.setMode(mode); + entry.setSize(0); - outputStream.putNextEntry(entry); + outputStream.putNextEntry(entry); - console.println("dir: " + dirname); + console.println("dir: " + dirname); - outputStream.closeEntry(); - } + outputStream.closeEntry(); + } - public void onEachFile( InputStream inputStream, String filename, String linkname, String user, int uid, String group, int gid, int mode, long size ) throws IOException { + public void onEachFile( InputStream inputStream, String filename, String linkname, String user, int uid, String group, int gid, int mode, long size ) throws IOException { // ensure the path is like : ./foo/bar if (filename.startsWith("/")) { - filename = "." + filename; - } else if (!filename.startsWith("./")) { + filename = "." + filename; + } else if (!filename.startsWith("./")) { filename = "./" + filename; } - TarEntry entry = new TarEntry(filename); + TarEntry entry = new TarEntry(filename); - // FIXME: link is in the constructor - entry.setUserName(user); - entry.setUserId(uid); - entry.setGroupName(group); - entry.setGroupId(gid); - entry.setMode(mode); - entry.setSize(size); + // FIXME: link is in the constructor + entry.setUserName(user); + entry.setUserId(uid); + entry.setGroupName(group); + entry.setGroupId(gid); + entry.setMode(mode); + entry.setSize(size); - outputStream.putNextEntry(entry); + outputStream.putNextEntry(entry); - dataSize.add(size); + dataSize.add(size); - digest.reset(); + digest.reset(); - Utils.copy(inputStream, new DigestOutputStream(outputStream, digest)); - - final String md5 = Utils.toHex(digest.digest()); + Utils.copy(inputStream, new DigestOutputStream(outputStream, digest)); + + final String md5 = Utils.toHex(digest.digest()); - outputStream.closeEntry(); + outputStream.closeEntry(); - console.println( - "file:" + entry.getName() + - " size:" + entry.getSize() + - " mode:" + entry.getMode() + - " linkname:" + entry.getLinkName() + - " username:" + entry.getUserName() + - " userid:" + entry.getUserId() + - " groupname:" + entry.getGroupName() + - " groupid:" + entry.getGroupId() + - " modtime:" + entry.getModTime() + - " md5: " + md5 - ); + console.println( + "file:" + entry.getName() + + " size:" + entry.getSize() + + " mode:" + entry.getMode() + + " linkname:" + entry.getLinkName() + + " username:" + entry.getUserName() + + " userid:" + entry.getUserId() + + " groupname:" + entry.getGroupName() + + " groupid:" + entry.getGroupId() + + " modtime:" + entry.getModTime() + + " md5: " + md5 + ); - pChecksums.append(md5).append(" ").append(entry.getName()).append('\n'); + pChecksums.append(md5).append(" ").append(entry.getName()).append('\n'); - } - }; + } + }; - for (int i = 0; i < pData.length; i++) { - final DataProducer data = pData[i]; - data.produce(receiver); - } + for (int i = 0; i < pData.length; i++) { + final DataProducer data = pData[i]; + data.produce(receiver); + } - outputStream.close(); + outputStream.close(); - console.println("Total size: " + dataSize); + console.println("Total size: " + dataSize); - return dataSize.count; - } + return dataSize.count; + } - private static void addEntry( final String pName, final String pContent, final TarOutputStream pOutput ) throws IOException { - final byte[] data = pContent.getBytes("UTF-8"); + private static void addEntry( final String pName, final String pContent, final TarOutputStream pOutput ) throws IOException { + final byte[] data = pContent.getBytes("UTF-8"); - final TarEntry entry = new TarEntry(pName); - entry.setSize(data.length); + final TarEntry entry = new TarEntry(pName); + entry.setSize(data.length); - pOutput.putNextEntry(entry); - pOutput.write(data); - pOutput.closeEntry(); - } + pOutput.putNextEntry(entry); + pOutput.write(data); + pOutput.closeEntry(); + } } src/main/java/org/vafer/jdeb/Processor.java @@ -38,44 +38,44 @@ import org.vafer.jdeb.producers.DataProducerDirectory; */ public final class Data extends PatternSet implements DataProducer { - private final Collection mapperWrapper = new ArrayList(); + private final Collection mapperWrapper = new ArrayList(); - private File src; - - public void setSrc( final File pSrc ) { - src = pSrc; - } + private File src; + + public void setSrc( final File pSrc ) { + src = pSrc; + } - public void addMapper( final Mapper pMapper ) { - mapperWrapper.add(pMapper); - } - - public void produce( final DataConsumer pReceiver ) throws IOException { - - if (!src.exists()) { - throw new FileNotFoundException("Data source not found : " + src); - } + public void addMapper( final Mapper pMapper ) { + mapperWrapper.add(pMapper); + } + + public void produce( final DataConsumer pReceiver ) throws IOException { + + if (!src.exists()) { + throw new FileNotFoundException("Data source not found : " + src); + } - org.vafer.jdeb.mapping.Mapper[] mappers = new org.vafer.jdeb.mapping.Mapper[mapperWrapper.size()]; - final Iterator it = mapperWrapper.iterator(); - for (int i = 0; i < mappers.length; i++) { - mappers[i] = ((Mapper)it.next()).createMapper(); - } - - if (src.isFile()) { - new DataProducerArchive( - src, - getIncludePatterns(getProject()), - getExcludePatterns(getProject()), - mappers - ).produce(pReceiver); - } else { - new DataProducerDirectory( - src, - getIncludePatterns(getProject()), - getExcludePatterns(getProject()), - mappers - ).produce(pReceiver); - } - } + org.vafer.jdeb.mapping.Mapper[] mappers = new org.vafer.jdeb.mapping.Mapper[mapperWrapper.size()]; + final Iterator it = mapperWrapper.iterator(); + for (int i = 0; i < mappers.length; i++) { + mappers[i] = ((Mapper)it.next()).createMapper(); + } + + if (src.isFile()) { + new DataProducerArchive( + src, + getIncludePatterns(getProject()), + getExcludePatterns(getProject()), + mappers + ).produce(pReceiver); + } else { + new DataProducerDirectory( + src, + getIncludePatterns(getProject()), + getExcludePatterns(getProject()), + mappers + ).produce(pReceiver); + } + } } src/main/java/org/vafer/jdeb/ant/Data.java @@ -38,199 +38,199 @@ import org.vafer.jdeb.producers.FileSetDataProducer; * * @author Torsten Curdt <tcurdt@vafer.org> */ - + public class DebAntTask extends MatchingTask { - /** The Debian package produced */ - private File deb; + /** The Debian package produced */ + private File deb; - /** The directory containing the control files to build the package */ - private File control; + /** The directory containing the control files to build the package */ + private File control; - /** The file containing the PGP keys */ - private File keyring; + /** The file containing the PGP keys */ + private File keyring; - /** The key to use in the keyring */ - private String key; + /** The key to use in the keyring */ + private String key; - /** The passphrase for the key to sign the changes file */ - private String passphrase; + /** The passphrase for the key to sign the changes file */ + private String passphrase; - /** The file to read the changes from */ - private File changesIn; + /** The file to read the changes from */ + private File changesIn; - /** The file where to write the changes to */ - private File changesOut; + /** The file where to write the changes to */ + private File changesOut; - /** The file where to write the changes of the changes input to */ - private File changesSave; + /** The file where to write the changes of the changes input to */ + private File changesSave; - /** The compression method used for the data file (none, gzip or bzip2) */ - private String compression = "gzip"; + /** The compression method used for the data file (none, gzip or bzip2) */ + private String compression = "gzip"; - /** Trigger the verbose mode detailing all operations */ - private boolean verbose; + /** Trigger the verbose mode detailing all operations */ + private boolean verbose; - private Collection dataProducers = new ArrayList(); + private Collection dataProducers = new ArrayList(); - public void setDestfile( File deb ) { - this.deb = deb; + public void setDestfile( File deb ) { + this.deb = deb; } public void setControl( File control ) { - this.control = control; + this.control = control; } public void setChangesIn( File changes ) { - this.changesIn = changes; + this.changesIn = changes; } public void setChangesOut( File changes ) { - this.changesOut = changes; + this.changesOut = changes; } public void setChangesSave( File changes ) { - this.changesSave = changes; + this.changesSave = changes; } public void setKeyring( File keyring ) { - this.keyring = keyring; + this.keyring = keyring; } public void setKey( String key ) { - this.key = key; + this.key = key; } public void setPassphrase( String passphrase ) { - this.passphrase = passphrase; + this.passphrase = passphrase; } - public void setCompression(String compression) { - this.compression = compression; - } + public void setCompression(String compression) { + this.compression = compression; + } - public void setVerbose(boolean verbose) { - this.verbose = verbose; - } + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } - public void addFileSet(FileSet fileset) { - dataProducers.add(new FileSetDataProducer(fileset)); - } + public void addFileSet(FileSet fileset) { + dataProducers.add(new FileSetDataProducer(fileset)); + } - public void addTarFileSet(Tar.TarFileSet fileset) { - dataProducers.add(new FileSetDataProducer(fileset)); - } + public void addTarFileSet(Tar.TarFileSet fileset) { + dataProducers.add(new FileSetDataProducer(fileset)); + } - public void addData( Data data ) { - dataProducers.add(data); + public void addData( Data data ) { + dataProducers.add(data); } private boolean isPossibleOutput( File file ) { - if (file.exists()) { - return file.isFile() && file.canWrite(); - } + if (file.exists()) { + return file.isFile() && file.canWrite(); + } - return true; + return true; } - public void execute() { - - if (control == null || !control.isDirectory()) { - throw new BuildException("You need to point the 'control' attribute to the control directory."); - } - - if (changesIn != null) { - - if (!changesIn.isFile() || !changesIn.canRead()) { - throw new BuildException("The 'changesIn' attribute needs to point to a readable file. " + changesIn + " was not found/readable."); - } - - if (changesOut == null) { - throw new BuildException("A 'changesIn' without a 'changesOut' does not make much sense."); - } - - if (!isPossibleOutput(changesOut)) { - throw new BuildException("Cannot write the output for 'changesOut' to " + changesOut); - } - - if (changesSave != null && !isPossibleOutput(changesSave)) { - throw new BuildException("Cannot write the output for 'changesSave' to " + changesSave); - } - - } else { - if (changesOut != null || changesSave != null) { - throw new BuildException("The 'changesOut' or 'changesSave' attributes may only be used when there is a 'changesIn' specified."); - } - } - - if (!"gzip".equals(compression) && !"bzip2".equals(compression) && !"none".equals(compression)) { - throw new BuildException("The compression method '" + compression + "' is not supported"); - } - - if (dataProducers.size() == 0) { - throw new BuildException("You need to provide at least one reference to a tgz or directory with data."); - } - - if (deb == null) { - throw new BuildException("You need to point the 'destfile' attribute to where the deb is supposed to be created."); - } - - final File[] controlFiles = control.listFiles(); - - final DataProducer[] data = new DataProducer[dataProducers.size()]; - dataProducers.toArray(data); - - final Processor processor = new Processor(new Console() { - public void println(String s) { - if (verbose) { - log(s); - } - } - }, null); - - final PackageDescriptor packageDescriptor; - try { - - log("Creating debian package: " + deb); - - packageDescriptor = processor.createDeb(controlFiles, data, deb, compression); - - } catch (Exception e) { - throw new BuildException("Failed to create debian package " + deb, e); - } - - final TextfileChangesProvider changesProvider; - - try { - if (changesOut == null) { - return; - } - - log("Creating changes file: " + changesOut); - - // for now only support reading the changes form a textfile provider - changesProvider = new TextfileChangesProvider(new FileInputStream(changesIn), packageDescriptor); - - processor.createChanges(packageDescriptor, changesProvider, (keyring!=null)?new FileInputStream(keyring):null, key, passphrase, new FileOutputStream(changesOut)); - - } catch (Exception e) { - throw new BuildException("Failed to create debian changes file " + changesOut, e); - } - - try { - if (changesSave == null) { - return; - } - - log("Saving changes to file: " + changesSave); - - changesProvider.save(new FileOutputStream(changesSave)); - - } catch (Exception e) { - throw new BuildException("Failed to save debian changes file " + changesSave, e); - } - - } + public void execute() { + + if (control == null || !control.isDirectory()) { + throw new BuildException("You need to point the 'control' attribute to the control directory."); + } + + if (changesIn != null) { + + if (!changesIn.isFile() || !changesIn.canRead()) { + throw new BuildException("The 'changesIn' attribute needs to point to a readable file. " + changesIn + " was not found/readable."); + } + + if (changesOut == null) { + throw new BuildException("A 'changesIn' without a 'changesOut' does not make much sense."); + } + + if (!isPossibleOutput(changesOut)) { + throw new BuildException("Cannot write the output for 'changesOut' to " + changesOut); + } + + if (changesSave != null && !isPossibleOutput(changesSave)) { + throw new BuildException("Cannot write the output for 'changesSave' to " + changesSave); + } + + } else { + if (changesOut != null || changesSave != null) { + throw new BuildException("The 'changesOut' or 'changesSave' attributes may only be used when there is a 'changesIn' specified."); + } + } + + if (!"gzip".equals(compression) && !"bzip2".equals(compression) && !"none".equals(compression)) { + throw new BuildException("The compression method '" + compression + "' is not supported"); + } + + if (dataProducers.size() == 0) { + throw new BuildException("You need to provide at least one reference to a tgz or directory with data."); + } + + if (deb == null) { + throw new BuildException("You need to point the 'destfile' attribute to where the deb is supposed to be created."); + } + + final File[] controlFiles = control.listFiles(); + + final DataProducer[] data = new DataProducer[dataProducers.size()]; + dataProducers.toArray(data); + + final Processor processor = new Processor(new Console() { + public void println(String s) { + if (verbose) { + log(s); + } + } + }, null); + + final PackageDescriptor packageDescriptor; + try { + + log("Creating debian package: " + deb); + + packageDescriptor = processor.createDeb(controlFiles, data, deb, compression); + + } catch (Exception e) { + throw new BuildException("Failed to create debian package " + deb, e); + } + + final TextfileChangesProvider changesProvider; + + try { + if (changesOut == null) { + return; + } + + log("Creating changes file: " + changesOut); + + // for now only support reading the changes form a textfile provider + changesProvider = new TextfileChangesProvider(new FileInputStream(changesIn), packageDescriptor); + + processor.createChanges(packageDescriptor, changesProvider, (keyring!=null)?new FileInputStream(keyring):null, key, passphrase, new FileOutputStream(changesOut)); + + } catch (Exception e) { + throw new BuildException("Failed to create debian changes file " + changesOut, e); + } + + try { + if (changesSave == null) { + return; + } + + log("Saving changes to file: " + changesSave); + + changesProvider.save(new FileOutputStream(changesSave)); + + } catch (Exception e) { + throw new BuildException("Failed to save debian changes file " + changesSave, e); + } + + } } src/main/java/org/vafer/jdeb/ant/DebAntTask.java @@ -30,38 +30,38 @@ import org.vafer.jdeb.mapping.PrefixMapper; */ public final class Mapper { - private String mtype; - private String prefix; - private int strip; - private File src; - - public void setType( final String pType ) { - mtype = pType; - } - - public void setPrefix( final String pPrefix ) { - prefix = pPrefix; - } + private String mtype; + private String prefix; + private int strip; + private File src; + + public void setType( final String pType ) { + mtype = pType; + } + + public void setPrefix( final String pPrefix ) { + prefix = pPrefix; + } - public void setStrip( final int pStrip ) { - strip = pStrip; - } - - public void setSrc( final File pSrc ) { - src = pSrc; - } + public void setStrip( final int pStrip ) { + strip = pStrip; + } + + public void setSrc( final File pSrc ) { + src = pSrc; + } - public org.vafer.jdeb.mapping.Mapper createMapper() { - if ("prefix".equalsIgnoreCase(mtype)) { - return new PrefixMapper(strip, prefix); - } else if ("ls".equalsIgnoreCase(mtype)) { - try { - return new LsMapper(new FileInputStream(src)); - } catch (Exception e) { - e.printStackTrace(); - } - } - return new NullMapper(); - } - + public org.vafer.jdeb.mapping.Mapper createMapper() { + if ("prefix".equalsIgnoreCase(mtype)) { + return new PrefixMapper(strip, prefix); + } else if ("ls".equalsIgnoreCase(mtype)) { + try { + return new LsMapper(new FileInputStream(src)); + } catch (Exception e) { + e.printStackTrace(); + } + } + return new NullMapper(); + } + } src/main/java/org/vafer/jdeb/ant/Mapper.java @@ -6,24 +6,24 @@ package org.vafer.jdeb.ar; */ interface ArConstants { - static final byte[] HEADER = "!<arch>\n".getBytes(); + static final byte[] HEADER = "!<arch>\n".getBytes(); - static final byte[] ENTRY_TERMINATOR = "`\012".getBytes(); + static final byte[] ENTRY_TERMINATOR = "`\012".getBytes(); - static final int FIELD_SIZE_NAME = 16; - static final int FIELD_SIZE_LASTMODIFIED = 12; - static final int FIELD_SIZE_UID = 6; - static final int FIELD_SIZE_GID = 6; - static final int FIELD_SIZE_MODE = 8; - static final int FIELD_SIZE_LENGTH = 10; + static final int FIELD_SIZE_NAME = 16; + static final int FIELD_SIZE_LASTMODIFIED = 12; + static final int FIELD_SIZE_UID = 6; + static final int FIELD_SIZE_GID = 6; + static final int FIELD_SIZE_MODE = 8; + static final int FIELD_SIZE_LENGTH = 10; - static final int HEADER_SIZE = - FIELD_SIZE_NAME - + FIELD_SIZE_LASTMODIFIED - + FIELD_SIZE_UID - + FIELD_SIZE_GID - + FIELD_SIZE_MODE - + FIELD_SIZE_LENGTH - + ENTRY_TERMINATOR.length; + static final int HEADER_SIZE = + FIELD_SIZE_NAME + + FIELD_SIZE_LASTMODIFIED + + FIELD_SIZE_UID + + FIELD_SIZE_GID + + FIELD_SIZE_MODE + + FIELD_SIZE_LENGTH + + ENTRY_TERMINATOR.length; } src/main/java/org/vafer/jdeb/ar/ArConstants.java @@ -22,47 +22,47 @@ package org.vafer.jdeb.ar; */ public final class ArEntry { - private final String name; - private int userId; - private int groupId; - private int mode; - private long lastModified; - private long length; + private final String name; + private int userId; + private int groupId; + private int mode; + private long lastModified; + private long length; - public ArEntry(String name, long length) { - this(name, length, 0, 0, 33188, System.currentTimeMillis()); - } + public ArEntry(String name, long length) { + this(name, length, 0, 0, 33188, System.currentTimeMillis()); + } - public ArEntry(String name, long length, int userId, int groupId, int mode, long lastModified) { - this.name = name; - this.length = length; - this.userId = userId; - this.groupId = groupId; - this.mode = mode; - this.lastModified = lastModified; - } + public ArEntry(String name, long length, int userId, int groupId, int mode, long lastModified) { + this.name = name; + this.length = length; + this.userId = userId; + this.groupId = groupId; + this.mode = mode; + this.lastModified = lastModified; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public int getUserId() { - return userId; - } + public int getUserId() { + return userId; + } - public int getGroupId() { - return groupId; - } + public int getGroupId() { + return groupId; + } - public int getMode() { - return mode; - } + public int getMode() { + return mode; + } - public long getLastModified() { - return lastModified; - } + public long getLastModified() { + return lastModified; + } - public long getLength() { - return length; - } + public long getLength() { + return length; + } } src/main/java/org/vafer/jdeb/ar/ArEntry.java @@ -25,76 +25,76 @@ import java.io.InputStream; */ public class ArInputStream extends InputStream implements ArConstants { - private final InputStream input; - private long offset = 0; - - public ArInputStream( final InputStream pInput ) { - input = pInput; - } - - public ArEntry getNextEntry() throws IOException { - - if (offset == 0) { - final byte[] expected = HEADER; - final byte[] realized = new byte[expected.length]; - final int read = input.read(realized); - if (read != expected.length) { - throw new IOException("failed to read header"); - } - for (int i = 0; i < expected.length; i++) { - if (expected[i] != realized[i]) { - throw new IOException("invalid header " + new String(realized)); - } - } - } + private final InputStream input; + private long offset = 0; + + public ArInputStream( final InputStream pInput ) { + input = pInput; + } + + public ArEntry getNextEntry() throws IOException { + + if (offset == 0) { + final byte[] expected = HEADER; + final byte[] realized = new byte[expected.length]; + final int read = input.read(realized); + if (read != expected.length) { + throw new IOException("failed to read header"); + } + for (int i = 0; i < expected.length; i++) { + if (expected[i] != realized[i]) { + throw new IOException("invalid header " + new String(realized)); + } + } + } - if (input.available() == 0) { - return null; - } - - if (offset % 2 != 0) { - read(); - } + if (input.available() == 0) { + return null; + } + + if (offset % 2 != 0) { + read(); + } - final byte[] name = new byte[FIELD_SIZE_NAME]; - final byte[] lastmodified = new byte[FIELD_SIZE_LASTMODIFIED]; - final byte[] userid = new byte[FIELD_SIZE_UID]; - final byte[] groupid = new byte[FIELD_SIZE_GID]; - final byte[] filemode = new byte[FIELD_SIZE_MODE]; - final byte[] length = new byte[FIELD_SIZE_LENGTH]; - - read(name); - read(lastmodified); - read(userid); - read(groupid); - read(filemode); - read(length); + final byte[] name = new byte[FIELD_SIZE_NAME]; + final byte[] lastmodified = new byte[FIELD_SIZE_LASTMODIFIED]; + final byte[] userid = new byte[FIELD_SIZE_UID]; + final byte[] groupid = new byte[FIELD_SIZE_GID]; + final byte[] filemode = new byte[FIELD_SIZE_MODE]; + final byte[] length = new byte[FIELD_SIZE_LENGTH]; + + read(name); + read(lastmodified); + read(userid); + read(groupid); + read(filemode); + read(length); - final byte[] expected = ENTRY_TERMINATOR; - final byte[] realized = new byte[expected.length]; - final int read = input.read(realized); - if (read != expected.length) { - throw new IOException("failed to read entry header"); - } - for (int i = 0; i < expected.length; i++) { - if (expected[i] != realized[i]) { - throw new IOException("invalid entry header. not read the content?"); - } - } - - return new ArEntry(new String(name).trim(), Long.parseLong(new String(length).trim())); - } - - - public int read() throws IOException { - final int ret = input.read(); - offset++; - return ret; - } + final byte[] expected = ENTRY_TERMINATOR; + final byte[] realized = new byte[expected.length]; + final int read = input.read(realized); + if (read != expected.length) { + throw new IOException("failed to read entry header"); + } + for (int i = 0; i < expected.length; i++) { + if (expected[i] != realized[i]) { + throw new IOException("invalid entry header. not read the content?"); + } + } + + return new ArEntry(new String(name).trim(), Long.parseLong(new String(length).trim())); + } + + + public int read() throws IOException { + final int ret = input.read(); + offset++; + return ret; + } - public void close() throws IOException { - input.close(); - super.close(); - } + public void close() throws IOException { + input.close(); + super.close(); + } } src/main/java/org/vafer/jdeb/ar/ArInputStream.java @@ -25,115 +25,115 @@ import java.io.OutputStream; */ public class ArOutputStream extends OutputStream implements ArConstants { - private final OutputStream out; - private long archiveOffset = 0; - private long entryOffset = 0; - private ArEntry prevEntry; - - public ArOutputStream( final OutputStream pOut ) { - out = pOut; - } - - private long writeArchiveHeader() throws IOException { - out.write(HEADER); - return HEADER.length; - } - - private void closeEntry() throws IOException { - if ((entryOffset % 2) != 0) { - write('\n'); - archiveOffset++; - } - } - - public void putNextEntry( final ArEntry pEntry ) throws IOException { - - if (prevEntry == null) { - archiveOffset += writeArchiveHeader(); - } else { - if (prevEntry.getLength() != entryOffset) { - throw new IOException("length does not match entry (" + prevEntry.getLength() + " != " + entryOffset); - } - - closeEntry(); - } - - prevEntry = pEntry; - - archiveOffset += writeEntryHeader(pEntry); - - entryOffset = 0; - } - - /** - * Write the data to the stream and pad the output - * with white spaces up to the specified size. - * - * @param data the value to be written - * @param size the total size of the output - * @param fieldname the name of the field - */ - private void write(String data, int size, String fieldname) throws IOException { - if (data.length() > size) { - throw new IOException(fieldname + " too long"); - } - - long length = size - write(data); - for (int i = 0; i < length; i++) { - write(' '); - } - } - - private long write( final String data ) throws IOException { - final byte[] bytes = data.getBytes("ascii"); - write(bytes); - return bytes.length; - } - - private long writeEntryHeader( final ArEntry entry ) throws IOException { - - String n = entry.getName(); - write(n, FIELD_SIZE_NAME, "filename"); - - String m = "" + (entry.getLastModified() / 1000); - write(m, FIELD_SIZE_LASTMODIFIED, "lastmodified"); - - String u = "" + entry.getUserId(); - write(u, FIELD_SIZE_UID, "userid"); - - String g = "" + entry.getGroupId(); - write(g, FIELD_SIZE_GID, "groupid"); - - String fm = Integer.toString(entry.getMode(), 8); - write(fm, FIELD_SIZE_MODE, "filemode"); - - String s = "" + entry.getLength(); - write(s, FIELD_SIZE_LENGTH, "size"); - - write(ENTRY_TERMINATOR); - - return HEADER_SIZE; - } - - public void write(int b) throws IOException { - out.write(b); - entryOffset++; - } - - public void write(byte[] b, int off, int len) throws IOException { - out.write(b, off, len); - entryOffset += len; - } - - public void write(byte[] b) throws IOException { - out.write(b); - entryOffset += b.length; - } - - public void close() throws IOException { - closeEntry(); - out.close(); - prevEntry = null; - } - + private final OutputStream out; + private long archiveOffset = 0; + private long entryOffset = 0; + private ArEntry prevEntry; + + public ArOutputStream( final OutputStream pOut ) { + out = pOut; + } + + private long writeArchiveHeader() throws IOException { + out.write(HEADER); + return HEADER.length; + } + + private void closeEntry() throws IOException { + if ((entryOffset % 2) != 0) { + write('\n'); + archiveOffset++; + } + } + + public void putNextEntry( final ArEntry pEntry ) throws IOException { + + if (prevEntry == null) { + archiveOffset += writeArchiveHeader(); + } else { + if (prevEntry.getLength() != entryOffset) { + throw new IOException("length does not match entry (" + prevEntry.getLength() + " != " + entryOffset); + } + + closeEntry(); + } + + prevEntry = pEntry; + + archiveOffset += writeEntryHeader(pEntry); + + entryOffset = 0; + } + + /** + * Write the data to the stream and pad the output + * with white spaces up to the specified size. + * + * @param data the value to be written + * @param size the total size of the output + * @param fieldname the name of the field + */ + private void write(String data, int size, String fieldname) throws IOException { + if (data.length() > size) { + throw new IOException(fieldname + " too long"); + } + + long length = size - write(data); + for (int i = 0; i < length; i++) { + write(' '); + } + } + + private long write( final String data ) throws IOException { + final byte[] bytes = data.getBytes("ascii"); + write(bytes); + return bytes.length; + } + + private long writeEntryHeader( final ArEntry entry ) throws IOException { + + String n = entry.getName(); + write(n, FIELD_SIZE_NAME, "filename"); + + String m = "" + (entry.getLastModified() / 1000); + write(m, FIELD_SIZE_LASTMODIFIED, "lastmodified"); + + String u = "" + entry.getUserId(); + write(u, FIELD_SIZE_UID, "userid"); + + String g = "" + entry.getGroupId(); + write(g, FIELD_SIZE_GID, "groupid"); + + String fm = Integer.toString(entry.getMode(), 8); + write(fm, FIELD_SIZE_MODE, "filemode"); + + String s = "" + entry.getLength(); + write(s, FIELD_SIZE_LENGTH, "size"); + + write(ENTRY_TERMINATOR); + + return HEADER_SIZE; + } + + public void write(int b) throws IOException { + out.write(b); + entryOffset++; + } + + public void write(byte[] b, int off, int len) throws IOException { + out.write(b, off, len); + entryOffset += len; + } + + public void write(byte[] b) throws IOException { + out.write(b); + entryOffset += b.length; + } + + public void close() throws IOException { + closeEntry(); + out.close(); + prevEntry = null; + } + } src/main/java/org/vafer/jdeb/ar/ArOutputStream.java @@ -27,75 +27,75 @@ import java.util.Date; */ public final class ChangeSet { - private final String packageName; - private final String version; - private final Date date; - private final String distribution; - private final String urgency; - private final String changedBy; - private final String[] changes; - - public ChangeSet( String pPackageName, String pVersion, Date pDate, String pDistribution, String pUrgency, String pChangedBy, final String[] pChanges ) { - changes = pChanges; - packageName = pPackageName; - version = pVersion; - date = pDate; - distribution = pDistribution; - urgency = pUrgency; - changedBy = pChangedBy; - } - /* + private final String packageName; + private final String version; + private final Date date; + private final String distribution; + private final String urgency; + private final String changedBy; + private final String[] changes; + + public ChangeSet( String pPackageName, String pVersion, Date pDate, String pDistribution, String pUrgency, String pChangedBy, final String[] pChanges ) { + changes = pChanges; + packageName = pPackageName; + version = pVersion; + date = pDate; + distribution = pDistribution; + urgency = pUrgency; + changedBy = pChangedBy; + } + /* package (version) distribution(s); urgency=urgency - [optional blank line(s), stripped] + [optional blank line(s), stripped] * change details more change details - [blank line(s), included in output of dpkg-parsechangelog] + [blank line(s), included in output of dpkg-parsechangelog] * even more change details - [optional blank line(s), stripped] + [optional blank line(s), stripped] -- maintainer name <email address>[two spaces] date */ - - public static DateFormat createDateForma() { - return new SimpleDateFormat("HH:mm dd.MM.yyyy"); - } - - public String getPackage() { - return packageName; - } - - public String getVersion() { - return version; - } - - public Date getDate() { - return date; - } - - public String getDistribution() { - return distribution; - } - - public String getUrgency() { - return urgency; - } - - public String getChangedBy() { - return changedBy; - } - - public String[] getChanges() { - return changes; - } - - public String toString() { - final StringBuffer sb = new StringBuffer(); + + public static DateFormat createDateForma() { + return new SimpleDateFormat("HH:mm dd.MM.yyyy"); + } + + public String getPackage() { + return packageName; + } + + public String getVersion() { + return version; + } + + public Date getDate() { + return date; + } + + public String getDistribution() { + return distribution; + } + + public String getUrgency() { + return urgency; + } + + public String getChangedBy() { + return changedBy; + } + + public String[] getChanges() { + return changes; + } + + public String toString() { + final StringBuffer sb = new StringBuffer(); - sb.append(" ").append(getPackage()).append(" (").append(getVersion()).append(") "); - sb.append(getDistribution()).append("; urgency=").append(getUrgency()); - for (int i = 0; i < changes.length; i++) { - sb.append('\n').append(" * ").append(changes[i]); - } + sb.append(" ").append(getPackage()).append(" (").append(getVersion()).append(") "); + sb.append(getDistribution()).append("; urgency=").append(getUrgency()); + for (int i = 0; i < changes.length; i++) { + sb.append('\n').append(" * ").append(changes[i]); + } - return sb.toString(); - } + return sb.toString(); + } } src/main/java/org/vafer/jdeb/changes/ChangeSet.java @@ -16,5 +16,5 @@ package org.vafer.jdeb.changes; public interface ChangesProvider { - ChangeSet[] getChangesSets(); + ChangeSet[] getChangesSets(); } src/main/java/org/vafer/jdeb/changes/ChangesProvider.java @@ -45,107 +45,107 @@ release date=20:13 17.08.2007,version=1.4+r89114,urgency=low,by=Torsten Curdt <t */ public final class TextfileChangesProvider implements ChangesProvider { - private final ChangeSet[] changeSets; - - public TextfileChangesProvider( final InputStream pInput, final PackageDescriptor pDescriptor ) throws IOException, ParseException { - - final BufferedReader reader = new BufferedReader(new InputStreamReader(pInput)); + private final ChangeSet[] changeSets; + + public TextfileChangesProvider( final InputStream pInput, final PackageDescriptor pDescriptor ) throws IOException, ParseException { + + final BufferedReader reader = new BufferedReader(new InputStreamReader(pInput)); - final DateFormat tdf = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z", Locale.ENGLISH); // RFC 2822 format - final DateFormat sdf = ChangeSet.createDateForma(); + final DateFormat tdf = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z", Locale.ENGLISH); // RFC 2822 format + final DateFormat sdf = ChangeSet.createDateForma(); - String packageName = pDescriptor.get("Package"); - String version = pDescriptor.get("Version"); - Date date = tdf.parse(pDescriptor.get("Date")); - String distribution = pDescriptor.get("Distribution"); - String urgency = pDescriptor.get("Urgency"); - String changedBy = pDescriptor.get("Maintainer"); - final Collection changesColl = new ArrayList(); - final Collection changeSetColl = new ArrayList(); + String packageName = pDescriptor.get("Package"); + String version = pDescriptor.get("Version"); + Date date = tdf.parse(pDescriptor.get("Date")); + String distribution = pDescriptor.get("Distribution"); + String urgency = pDescriptor.get("Urgency"); + String changedBy = pDescriptor.get("Maintainer"); + final Collection changesColl = new ArrayList(); + final Collection changeSetColl = new ArrayList(); - - while(true) { - final String line = reader.readLine(); - if (line == null) { - final String[] changes = (String[]) changesColl.toArray(new String[changesColl.size()]); - final ChangeSet changeSet = new ChangeSet(packageName, version, date, distribution, urgency, changedBy, changes); - changeSetColl.add(changeSet); - break; - } - - if (line.startsWith("release ")) { + + while(true) { + final String line = reader.readLine(); + if (line == null) { + final String[] changes = (String[]) changesColl.toArray(new String[changesColl.size()]); + final ChangeSet changeSet = new ChangeSet(packageName, version, date, distribution, urgency, changedBy, changes); + changeSetColl.add(changeSet); + break; + } + + if (line.startsWith("release ")) { - if (changesColl.size() > 0) { - final String[] changes = (String[]) changesColl.toArray(new String[changesColl.size()]); - final ChangeSet changeSet = new ChangeSet(packageName, version, date, distribution, urgency, changedBy, changes); - changeSetColl.add(changeSet); - changesColl.clear(); - } - - final String[] tokens = line.substring("release ".length()).split(","); - for (int i = 0; i < tokens.length; i++) { - final String token = tokens[i].trim(); - final String[] lr = token.split("="); - final String key = lr[0]; - final String value = lr[1]; - - if ("urgency".equals(key)) { - urgency = value; - } else if ("by".equals(key)) { - changedBy = value; - } else if ("date".equals(key)) { - date = sdf.parse(value); - } else if ("version".equals(key)) { - version = value; - } else if ("distribution".equals(key)) { - distribution = value; - } - } - continue; - } - - if (line.startsWith(" * ")) { - changesColl.add(line.substring(" * ".length())); - continue; - } - - throw new ParseException("Unknown line syntax [" + line + "]", 0); - } - - reader.close(); - - changeSets = (ChangeSet[]) changeSetColl.toArray(new ChangeSet[changeSetColl.size()]); - } - - public void save( final OutputStream pOutput ) throws IOException { - final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(pOutput)); - - final DateFormat df = ChangeSet.createDateForma(); - - for (int i = 0; i < changeSets.length; i++) { - final ChangeSet changeSet = changeSets[i]; - - writer.write("release "); - writer.write("date=" + df.format(changeSet.getDate()) + ","); - writer.write("version=" + changeSet.getVersion() + ","); - writer.write("urgency=" + changeSet.getUrgency() + ","); - writer.write("by=" + changeSet.getChangedBy() + ","); - writer.write("distribution=" + changeSet.getDistribution()); - writer.write("\n"); + if (changesColl.size() > 0) { + final String[] changes = (String[]) changesColl.toArray(new String[changesColl.size()]); + final ChangeSet changeSet = new ChangeSet(packageName, version, date, distribution, urgency, changedBy, changes); + changeSetColl.add(changeSet); + changesColl.clear(); + } + + final String[] tokens = line.substring("release ".length()).split(","); + for (int i = 0; i < tokens.length; i++) { + final String token = tokens[i].trim(); + final String[] lr = token.split("="); + final String key = lr[0]; + final String value = lr[1]; + + if ("urgency".equals(key)) { + urgency = value; + } else if ("by".equals(key)) { + changedBy = value; + } else if ("date".equals(key)) { + date = sdf.parse(value); + } else if ("version".equals(key)) { + version = value; + } else if ("distribution".equals(key)) { + distribution = value; + } + } + continue; + } + + if (line.startsWith(" * ")) { + changesColl.add(line.substring(" * ".length())); + continue; + } + + throw new ParseException("Unknown line syntax [" + line + "]", 0); + } + + reader.close(); + + changeSets = (ChangeSet[]) changeSetColl.toArray(new ChangeSet[changeSetColl.size()]); + } + + public void save( final OutputStream pOutput ) throws IOException { + final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(pOutput)); + + final DateFormat df = ChangeSet.createDateForma(); + + for (int i = 0; i < changeSets.length; i++) { + final ChangeSet changeSet = changeSets[i]; + + writer.write("release "); + writer.write("date=" + df.format(changeSet.getDate()) + ","); + writer.write("version=" + changeSet.getVersion() + ","); + writer.write("urgency=" + changeSet.getUrgency() + ","); + writer.write("by=" + changeSet.getChangedBy() + ","); + writer.write("distribution=" + changeSet.getDistribution()); + writer.write("\n"); - final String[] changes = changeSet.getChanges(); - for (int j = 0; j < changes.length; j++) { - writer.write(" * "); - writer.write(changes[j]); - writer.write("\n"); - } - } - - writer.close(); - } - - public ChangeSet[] getChangesSets() { - return changeSets; - } + final String[] changes = changeSet.getChanges(); + for (int j = 0; j < changes.length; j++) { + writer.write(" * "); + writer.write(changes[j]); + writer.write("\n"); + } + } + + writer.close(); + } + + public ChangeSet[] getChangesSets() { + return changeSets; + } } src/main/java/org/vafer/jdeb/changes/TextfileChangesProvider.java @@ -37,133 +37,133 @@ import org.vafer.jdeb.utils.VariableResolver; * @author Torsten Curdt <tcurdt@vafer.org> */ public abstract class AbstractDescriptor { - - private final Map values = new HashMap(); - private final VariableResolver resolver; - - public AbstractDescriptor( final VariableResolver pResolver ) { - resolver = pResolver; - } + + private final Map values = new HashMap(); + private final VariableResolver resolver; + + public AbstractDescriptor( final VariableResolver pResolver ) { + resolver = pResolver; + } - public AbstractDescriptor( final AbstractDescriptor pDescriptor ) { - values.putAll(pDescriptor.values); - resolver = pDescriptor.resolver; - } + public AbstractDescriptor( final AbstractDescriptor pDescriptor ) { + values.putAll(pDescriptor.values); + resolver = pDescriptor.resolver; + } - protected void parse( final InputStream pInput ) throws IOException, ParseException { - final BufferedReader br = new BufferedReader(new InputStreamReader(pInput)); - StringBuffer buffer = new StringBuffer(); - String key = null; - int linenr = 0; - while(true) { - final String line = br.readLine(); - - if (line == null) { - if (buffer.length() > 0) { - // flush value of previous key - set(key, buffer.toString()); - buffer = null; - } - break; - } + protected void parse( final InputStream pInput ) throws IOException, ParseException { + final BufferedReader br = new BufferedReader(new InputStreamReader(pInput)); + StringBuffer buffer = new StringBuffer(); + String key = null; + int linenr = 0; + while(true) { + final String line = br.readLine(); + + if (line == null) { + if (buffer.length() > 0) { + // flush value of previous key + set(key, buffer.toString()); + buffer = null; + } + break; + } - linenr++; + linenr++; - if (line.length() == 0) { - throw new ParseException("Empty line", linenr); - } - - final char first = line.charAt(0); - if (Character.isLetter(first)) { - - // new key - - if (buffer.length() > 0) { - // flush value of previous key - set(key, buffer.toString()); - buffer = new StringBuffer(); - } - - - final int i = line.indexOf(':'); - - if (i < 0) { - throw new ParseException("Line misses ':' delimitter", linenr); - } - - key = line.substring(0, i); - buffer.append(line.substring(i+1).trim()); - - continue; - } - - // continuing old value - buffer.append('\n').append(line.substring(1)); - } - br.close(); - - } - - public void set( final String pKey, final String pValue ) { + if (line.length() == 0) { + throw new ParseException("Empty line", linenr); + } + + final char first = line.charAt(0); + if (Character.isLetter(first)) { + + // new key + + if (buffer.length() > 0) { + // flush value of previous key + set(key, buffer.toString()); + buffer = new StringBuffer(); + } + + + final int i = line.indexOf(':'); + + if (i < 0) { + throw new ParseException("Line misses ':' delimitter", linenr); + } + + key = line.substring(0, i); + buffer.append(line.substring(i+1).trim()); + + continue; + } + + // continuing old value + buffer.append('\n').append(line.substring(1)); + } + br.close(); + + } + + public void set( final String pKey, final String pValue ) { - if (resolver != null) { - try { - values.put(pKey, Utils.replaceVariables(resolver, pValue, "[[", "]]")); - return; - } catch (ParseException e) { - // FIXME maybe throw an Exception? - } - } - - values.put(pKey, pValue); - } - - public String get( final String pKey ) { - return (String)values.get(pKey); - } + if (resolver != null) { + try { + values.put(pKey, Utils.replaceVariables(resolver, pValue, "[[", "]]")); + return; + } catch (ParseException e) { + // FIXME maybe throw an Exception? + } + } + + values.put(pKey, pValue); + } + + public String get( final String pKey ) { + return (String)values.get(pKey); + } - public abstract String[] getMandatoryKeys(); - - public boolean isValid() { - return invalidKeys().size() == 0; - } - - public Set invalidKeys() { - final Set invalid = new HashSet(); + public abstract String[] getMandatoryKeys(); + + public boolean isValid() { + return invalidKeys().size() == 0; + } + + public Set invalidKeys() { + final Set invalid = new HashSet(); - final String[] mk = getMandatoryKeys(); - for (int i = 0; i < mk.length; i++) { - if (get(mk[i]) == null) { - invalid.add(mk[i]); - } - } - - return invalid; - } - - String toString( final String[] pKeys ) { - final StringBuffer s = new StringBuffer(); - for (int i = 0; i < pKeys.length; i++) { - final String key = pKeys[i]; - final String value = (String) values.get(key); - if (value != null) { - s.append(key).append(":"); + final String[] mk = getMandatoryKeys(); + for (int i = 0; i < mk.length; i++) { + if (get(mk[i]) == null) { + invalid.add(mk[i]); + } + } + + return invalid; + } + + String toString( final String[] pKeys ) { + final StringBuffer s = new StringBuffer(); + for (int i = 0; i < pKeys.length; i++) { + final String key = pKeys[i]; + final String value = (String) values.get(key); + if (value != null) { + s.append(key).append(":"); - try { - BufferedReader reader = new BufferedReader(new StringReader(value)); - String line; - while ((line = reader.readLine()) != null) { - if (line.length() != 0 && !Character.isWhitespace(line.charAt(0))) { - s.append(' '); - } + try { + BufferedReader reader = new BufferedReader(new StringReader(value)); + String line; + while ((line = reader.readLine()) != null) { + if (line.length() != 0 && !Character.isWhitespace(line.charAt(0))) { + s.append(' '); + } - s.append(line).append('\n'); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return s.toString(); - } + s.append(line).append('\n'); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return s.toString(); + } } src/main/java/org/vafer/jdeb/descriptors/AbstractDescriptor.java @@ -24,64 +24,64 @@ import org.vafer.jdeb.changes.ChangeSet; */ public final class ChangesDescriptor extends AbstractDescriptor { - private final static String[] keys = { - "Format", - "Date", - "Source", - "Binary", - "Architecture", - "Version", - "Distribution", - "Urgency", - "Maintainer", - "Changed-By", - "Description", - "Changes", - "Closes", - "Files" - }; - - private final static String[] mandatoryKeys = { - "Format", - "Date", - "Source", - "Binary", - "Architecture", - "Version", - "Distribution", - "Urgency", - "Maintainer", - "Description", - "Changes", - "Files" - }; + private final static String[] keys = { + "Format", + "Date", + "Source", + "Binary", + "Architecture", + "Version", + "Distribution", + "Urgency", + "Maintainer", + "Changed-By", + "Description", + "Changes", + "Closes", + "Files" + }; + + private final static String[] mandatoryKeys = { + "Format", + "Date", + "Source", + "Binary", + "Architecture", + "Version", + "Distribution", + "Urgency", + "Maintainer", + "Description", + "Changes", + "Files" + }; - private final ChangeSet[] changeSets; - - public ChangesDescriptor( final AbstractDescriptor pDescriptor, final ChangeSet[] pChangeSets ) { - super(pDescriptor); - changeSets = pChangeSets; + private final ChangeSet[] changeSets; + + public ChangesDescriptor( final AbstractDescriptor pDescriptor, final ChangeSet[] pChangeSets ) { + super(pDescriptor); + changeSets = pChangeSets; - final ChangeSet lastestChangeSet = changeSets[0]; - - set("Urgency", lastestChangeSet.getUrgency()); - set("Changed-By", lastestChangeSet.getChangedBy()); + final ChangeSet lastestChangeSet = changeSets[0]; + + set("Urgency", lastestChangeSet.getUrgency()); + set("Changed-By", lastestChangeSet.getChangedBy()); - final StringBuffer sb = new StringBuffer(); + final StringBuffer sb = new StringBuffer(); - for (int i = 0; i < 1; i++) { - final ChangeSet changeSet = changeSets[i]; - sb.append(changeSet.toString()); - } + for (int i = 0; i < 1; i++) { + final ChangeSet changeSet = changeSets[i]; + sb.append(changeSet.toString()); + } - set("Changes", sb.toString()); - } - - public String[] getMandatoryKeys() { - return mandatoryKeys; - } - - public String toString() { - return toString(keys); - } + set("Changes", sb.toString()); + } + + public String[] getMandatoryKeys() { + return mandatoryKeys; + } + + public String toString() { + return toString(keys); + } } src/main/java/org/vafer/jdeb/descriptors/ChangesDescriptor.java @@ -2,35 +2,35 @@ package org.vafer.jdeb.descriptors; public final class InvalidDescriptorException extends Exception { - private static final long serialVersionUID = 1L; - private final AbstractDescriptor desc; + private static final long serialVersionUID = 1L; + private final AbstractDescriptor desc; - public InvalidDescriptorException(AbstractDescriptor desc) { - this.desc = desc; - } + public InvalidDescriptorException(AbstractDescriptor desc) { + this.desc = desc; + } - public InvalidDescriptorException(AbstractDescriptor desc, String message) { - super(message); - this.desc = desc; - } + public InvalidDescriptorException(AbstractDescriptor desc, String message) { + super(message); + this.desc = desc; + } - public InvalidDescriptorException(AbstractDescriptor desc, Throwable cause) { - super(cause); - this.desc = desc; - } + public InvalidDescriptorException(AbstractDescriptor desc, Throwable cause) { + super(cause); + this.desc = desc; + } - public InvalidDescriptorException(AbstractDescriptor desc, String message, Throwable cause) { - super(message, cause); - this.desc = desc; - } + public InvalidDescriptorException(AbstractDescriptor desc, String message, Throwable cause) { + super(message, cause); + this.desc = desc; + } - public AbstractDescriptor getDescriptor() { - return desc; - } + public AbstractDescriptor getDescriptor() { + return desc; + } - public String toString() { - return "Invalid keys are " + desc.invalidKeys() + "\n" + desc; - } + public String toString() { + return "Invalid keys are " + desc.invalidKeys() + "\n" + desc; + } - + } src/main/java/org/vafer/jdeb/descriptors/InvalidDescriptorException.java @@ -28,58 +28,58 @@ import org.vafer.jdeb.utils.VariableResolver; */ public final class PackageDescriptor extends AbstractDescriptor { - private final static String[] keys = { - "Package", - "Source", - "Version", - "Section", - "Priority", - "Architecture", - "Essential", - "Depends", - "Pre-Depends", - "Recommends", - "Suggests", - "Breaks", - "Enhances", - "Conflicts", - "Provides", - "Replaces", - "Installed-Size", - "Maintainer", - "Description", - "Homepage", - }; + private final static String[] keys = { + "Package", + "Source", + "Version", + "Section", + "Priority", + "Architecture", + "Essential", + "Depends", + "Pre-Depends", + "Recommends", + "Suggests", + "Breaks", + "Enhances", + "Conflicts", + "Provides", + "Replaces", + "Installed-Size", + "Maintainer", + "Description", + "Homepage", + }; - private final static String[] mandatoryKeys = { - "Package", - "Version", - "Section", - "Priority", - "Architecture", - "Maintainer", - "Description" - }; - - public PackageDescriptor() { - this(null); - } + private final static String[] mandatoryKeys = { + "Package", + "Version", + "Section", + "Priority", + "Architecture", + "Maintainer", + "Description" + }; + + public PackageDescriptor() { + this(null); + } - public PackageDescriptor( final VariableResolver pResolver ) { - super(pResolver); - } + public PackageDescriptor( final VariableResolver pResolver ) { + super(pResolver); + } - public PackageDescriptor( final InputStream pInput, final VariableResolver pResolver ) throws IOException, ParseException { - this(pResolver); - parse(pInput); - } + public PackageDescriptor( final InputStream pInput, final VariableResolver pResolver ) throws IOException, ParseException { + this(pResolver); + parse(pInput); + } - public String[] getMandatoryKeys() { - return mandatoryKeys; - } + public String[] getMandatoryKeys() { + return mandatoryKeys; + } - public String toString() { - return toString(keys); - } + public String toString() { + return toString(keys); + } } src/main/java/org/vafer/jdeb/descriptors/PackageDescriptor.java @@ -34,36 +34,36 @@ import org.apache.tools.tar.TarEntry; */ public final class LsMapper implements Mapper { - private final Map mapping; - - - public final static class ParseError extends Exception { - - private static final long serialVersionUID = 1L; - - public ParseError() { - super(); - } - - public ParseError(String message, Throwable cause) { - super(message, cause); - } - - public ParseError(String message) { - super(message); - } - - public ParseError(Throwable cause) { - super(cause); - } - - }; - - public LsMapper( final InputStream pInput ) throws IOException, ParseError { - mapping = parse(pInput); - } - - /* + private final Map mapping; + + + public final static class ParseError extends Exception { + + private static final long serialVersionUID = 1L; + + public ParseError() { + super(); + } + + public ParseError(String message, Throwable cause) { + super(message, cause); + } + + public ParseError(String message) { + super(message); + } + + public ParseError(Throwable cause) { + super(cause); + } + + }; + + public LsMapper( final InputStream pInput ) throws IOException, ParseError { + mapping = parse(pInput); + } + + /* ./trunk/target/test-classes/org/vafer/dependency: total 176 drwxr-xr-x 23 tcurdt tcurdt 782 Jun 25 03:48 . @@ -74,65 +74,65 @@ drwxr-xr-x 3 tcurdt tcurdt 102 Jun 25 03:48 .. drwxr-xr-x 4 tcurdt tcurdt 136 Jun 25 03:48 classes ./trunk/target/test-classes/org/vafer/dependency/classes: - */ - - final private Pattern basePattern = Pattern.compile("^\\./(.*):$"); - final private Pattern totalPattern = Pattern.compile("^total ([0-9]+)$"); - final private Pattern dirPattern = Pattern.compile("^d([rwx-]{9})\\s+([0-9]+)\\s+(\\S*)\\s+(\\S*)\\s+([0-9]+)\\s+(.*)\\s+[\\.]{1,2}$"); - final private Pattern filePattern = Pattern.compile("^([d-])([rwx-]{9})\\s+([0-9]+)\\s+(\\S*)\\s+(\\S*)\\s+([0-9]+)\\s+(.*)\\s+(.*)$"); - final private Pattern newlinePattern = Pattern.compile("$"); - - private String readBase( final BufferedReader reader ) throws IOException, ParseError { - final String line = reader.readLine(); - if (line == null) { - return null; - } - final Matcher matcher = basePattern.matcher(line); - if (!matcher.matches()) { - throw new ParseError("expected base line but got \"" + line + "\""); - } - return matcher.group(1); - } - - private String readTotal( final BufferedReader reader ) throws IOException, ParseError { - final String line = reader.readLine(); - final Matcher matcher = totalPattern.matcher(line); - if (!matcher.matches()) { - throw new ParseError("expected total line but got \"" + line + "\""); - } - return matcher.group(1); - } - - private TarEntry readDir( final BufferedReader reader, final String base ) throws IOException, ParseError { - final String current = reader.readLine(); - final Matcher currentMatcher = dirPattern.matcher(current); - if (!currentMatcher.matches()) { - throw new ParseError("expected dirline but got \"" + current + "\""); - } - - final String parent = reader.readLine(); - final Matcher parentMatcher = dirPattern.matcher(parent); - if (!parentMatcher.matches()) { - throw new ParseError("expected dirline but got \"" + parent + "\""); - } - - final TarEntry entry = new TarEntry(base); - - entry.setMode(convertModeFromString(currentMatcher.group(1))); - entry.setUserName(currentMatcher.group(3)); - entry.setGroupName(currentMatcher.group(4)); - - return entry; - } - - - private int convertModeFromString( final String mode ) { - - final char[] m = mode.toCharArray(); - /* - -rwxrwxrwx - - 4000 set-user-ID-on-execution bit + */ + + final private Pattern basePattern = Pattern.compile("^\\./(.*):$"); + final private Pattern totalPattern = Pattern.compile("^total ([0-9]+)$"); + final private Pattern dirPattern = Pattern.compile("^d([rwx-]{9})\\s+([0-9]+)\\s+(\\S*)\\s+(\\S*)\\s+([0-9]+)\\s+(.*)\\s+[\\.]{1,2}$"); + final private Pattern filePattern = Pattern.compile("^([d-])([rwx-]{9})\\s+([0-9]+)\\s+(\\S*)\\s+(\\S*)\\s+([0-9]+)\\s+(.*)\\s+(.*)$"); + final private Pattern newlinePattern = Pattern.compile("$"); + + private String readBase( final BufferedReader reader ) throws IOException, ParseError { + final String line = reader.readLine(); + if (line == null) { + return null; + } + final Matcher matcher = basePattern.matcher(line); + if (!matcher.matches()) { + throw new ParseError("expected base line but got \"" + line + "\""); + } + return matcher.group(1); + } + + private String readTotal( final BufferedReader reader ) throws IOException, ParseError { + final String line = reader.readLine(); + final Matcher matcher = totalPattern.matcher(line); + if (!matcher.matches()) { + throw new ParseError("expected total line but got \"" + line + "\""); + } + return matcher.group(1); + } + + private TarEntry readDir( final BufferedReader reader, final String base ) throws IOException, ParseError { + final String current = reader.readLine(); + final Matcher currentMatcher = dirPattern.matcher(current); + if (!currentMatcher.matches()) { + throw new ParseError("expected dirline but got \"" + current + "\""); + } + + final String parent = reader.readLine(); + final Matcher parentMatcher = dirPattern.matcher(parent); + if (!parentMatcher.matches()) { + throw new ParseError("expected dirline but got \"" + parent + "\""); + } + + final TarEntry entry = new TarEntry(base); + + entry.setMode(convertModeFromString(currentMatcher.group(1))); + entry.setUserName(currentMatcher.group(3)); + entry.setGroupName(currentMatcher.group(4)); + + return entry; + } + + + private int convertModeFromString( final String mode ) { + + final char[] m = mode.toCharArray(); + /* + -rwxrwxrwx + + 4000 set-user-ID-on-execution bit 2000 set-user-ID-on-execution bit 1000 sticky bit 0400 allow read by owner. @@ -144,106 +144,106 @@ drwxr-xr-x 4 tcurdt tcurdt 136 Jun 25 03:48 classes 0004 allow read by others. 0002 allow write by others. 0001 execute / search - */ - // TODO: simplified - needs fixing - int sum = 0; - int bit = 1; - for(int i=m.length-1; i>=0 ; i--) { - if (m[i] != '-') { - sum += bit; - } - bit += bit; - } - return sum; - } - - private TarEntry readFile( final BufferedReader reader, final String base ) throws IOException, ParseError { - - while(true) { - final String line = reader.readLine(); - - if (line == null) { - return null; - } - - final Matcher currentMatcher = filePattern.matcher(line); - if (!currentMatcher.matches()) { - final Matcher newlineMatcher = newlinePattern.matcher(line); - if (newlineMatcher.matches()) { - return null; - } - throw new ParseError("expected file line but got \"" + line + "\""); - } - - final String type = currentMatcher.group(1); - if (type.startsWith("-")) { - final TarEntry entry = new TarEntry(base + "/" + currentMatcher.group(8)); - - entry.setMode(convertModeFromString(currentMatcher.group(2))); - entry.setUserName(currentMatcher.group(4)); - entry.setGroupName(currentMatcher.group(5)); - - return entry; - } - } - - } - - private Map parse( final InputStream pInput ) throws IOException, ParseError { - final Map mapping = new HashMap(); - - final BufferedReader reader = new BufferedReader(new InputStreamReader(pInput)); - - boolean first = true; - while(true) { - - final String base; - if (first) { - base = ""; - first = false; - } else { - base = readBase(reader); - if (base == null) { - break; - } - } - - readTotal(reader); - final TarEntry dir = readDir(reader, base); - mapping.put(dir.getName(), dir); - - while(true) { - final TarEntry file = readFile(reader, base); - - if (file == null) { - break; - } - - mapping.put(file.getName(), file); - } - } - - return mapping; - } - - public TarEntry map( final TarEntry pEntry ) { - - final TarEntry entry = (TarEntry) mapping.get(pEntry.getName()); - - if (entry != null) { - - final TarEntry newEntry = new TarEntry(entry.getName()); - newEntry.setUserId(entry.getUserId()); - newEntry.setGroupId(entry.getGroupId()); - newEntry.setUserName(entry.getUserName()); - newEntry.setGroupName(entry.getGroupName()); - newEntry.setMode(entry.getMode()); - newEntry.setSize(entry.getSize()); - - return newEntry; - } - - return pEntry; - } + */ + // TODO: simplified - needs fixing + int sum = 0; + int bit = 1; + for(int i=m.length-1; i>=0 ; i--) { + if (m[i] != '-') { + sum += bit; + } + bit += bit; + } + return sum; + } + + private TarEntry readFile( final BufferedReader reader, final String base ) throws IOException, ParseError { + + while(true) { + final String line = reader.readLine(); + + if (line == null) { + return null; + } + + final Matcher currentMatcher = filePattern.matcher(line); + if (!currentMatcher.matches()) { + final Matcher newlineMatcher = newlinePattern.matcher(line); + if (newlineMatcher.matches()) { + return null; + } + throw new ParseError("expected file line but got \"" + line + "\""); + } + + final String type = currentMatcher.group(1); + if (type.startsWith("-")) { + final TarEntry entry = new TarEntry(base + "/" + currentMatcher.group(8)); + + entry.setMode(convertModeFromString(currentMatcher.group(2))); + entry.setUserName(currentMatcher.group(4)); + entry.setGroupName(currentMatcher.group(5)); + + return entry; + } + } + + } + + private Map parse( final InputStream pInput ) throws IOException, ParseError { + final Map mapping = new HashMap(); + + final BufferedReader reader = new BufferedReader(new InputStreamReader(pInput)); + + boolean first = true; + while(true) { + + final String base; + if (first) { + base = ""; + first = false; + } else { + base = readBase(reader); + if (base == null) { + break; + } + } + + readTotal(reader); + final TarEntry dir = readDir(reader, base); + mapping.put(dir.getName(), dir); + + while(true) { + final TarEntry file = readFile(reader, base); + + if (file == null) { + break; + } + + mapping.put(file.getName(), file); + } + } + + return mapping; + } + + public TarEntry map( final TarEntry pEntry ) { + + final TarEntry entry = (TarEntry) mapping.get(pEntry.getName()); + + if (entry != null) { + + final TarEntry newEntry = new TarEntry(entry.getName()); + newEntry.setUserId(entry.getUserId()); + newEntry.setGroupId(entry.getGroupId()); + newEntry.setUserName(entry.getUserName()); + newEntry.setGroupName(entry.getGroupName()); + newEntry.setMode(entry.getMode()); + newEntry.setSize(entry.getSize()); + + return newEntry; + } + + return pEntry; + } } src/main/java/org/vafer/jdeb/mapping/LsMapper.java @@ -24,6 +24,6 @@ import org.apache.tools.tar.TarEntry; */ public interface Mapper { - public TarEntry map( final TarEntry entry ); - + public TarEntry map( final TarEntry entry ); + } src/main/java/org/vafer/jdeb/mapping/Mapper.java @@ -19,8 +19,8 @@ import org.apache.tools.tar.TarEntry; public final class NullMapper implements Mapper { - public TarEntry map( final TarEntry pEntry ) { - return pEntry; - } + public TarEntry map( final TarEntry pEntry ) { + return pEntry; + } } src/main/java/org/vafer/jdeb/mapping/NullMapper.java @@ -25,28 +25,28 @@ import org.vafer.jdeb.utils.Utils; */ public final class PrefixMapper implements Mapper { - private final int strip; - private final String prefix; - - public PrefixMapper( final int pStrip, final String pPrefix ) { - strip = pStrip; - prefix = pPrefix; - } - - public TarEntry map( final TarEntry pEntry ) { - - final String name = pEntry.getName(); + private final int strip; + private final String prefix; + + public PrefixMapper( final int pStrip, final String pPrefix ) { + strip = pStrip; + prefix = pPrefix; + } + + public TarEntry map( final TarEntry pEntry ) { + + final String name = pEntry.getName(); - final TarEntry newEntry = new TarEntry(prefix + '/' + Utils.stripPath(strip, name)); - - newEntry.setUserId(pEntry.getUserId()); - newEntry.setGroupId(pEntry.getGroupId()); - newEntry.setUserName(pEntry.getUserName()); - newEntry.setGroupName(pEntry.getGroupName()); - newEntry.setMode(pEntry.getMode()); - newEntry.setSize(pEntry.getSize()); + final TarEntry newEntry = new TarEntry(prefix + '/' + Utils.stripPath(strip, name)); + + newEntry.setUserId(pEntry.getUserId()); + newEntry.setGroupId(pEntry.getGroupId()); + newEntry.setUserName(pEntry.getUserName()); + newEntry.setGroupName(pEntry.getGroupName()); + newEntry.setMode(pEntry.getMode()); + newEntry.setSize(pEntry.getSize()); - return newEntry; - } + return newEntry; + } } src/main/java/org/vafer/jdeb/mapping/PrefixMapper.java @@ -22,7 +22,7 @@ import org.apache.maven.project.MavenProject; public abstract class AbstractPluginMojo extends AbstractMojo { - /** + /** * @parameter expression="${project}" * @required * @readonly src/main/java/org/vafer/jdeb/maven/AbstractPluginMojo.java @@ -44,7 +44,7 @@ import org.vafer.jdeb.utils.VariableResolver; */ public final class DebMojo extends AbstractPluginMojo { - /** + /** * @component */ private MavenProjectHelper projectHelper; @@ -96,192 +96,192 @@ public final class DebMojo extends AbstractPluginMojo { * The keyring file. Usually some/path/secring.gpg * * @parameter expression="${keyring}" - */ + */ private File keyring = null; /** * The hex key id to use for signing. * * @parameter expression="${key}" - */ - private String key = null; + */ + private String key = null; /** * The passphrase for the key to sign the changes file. * * @parameter expression="${passhrase}" - */ - private String passphrase = null; + */ + private String passphrase = null; /** * If not defaultPath is specified this * * @parameter expression="${defaultPath}" default-value="/srv/jetty/www" - */ - private String defaultPath = "/srv/jetty/www"; + */ + private String defaultPath = "/srv/jetty/www"; - /** - * TODO: make configurable - */ - private DataProducer[] dataProducers = null; - - - /** + /** + * TODO: make configurable + */ + private DataProducer[] dataProducers = null; + + + /** * Main entry point * @throws MojoExecutionException on error */ public void execute() throws MojoExecutionException { - // expand name pattern - final String debName; - final String changesName; + // expand name pattern + final String debName; + final String changesName; - final Map variables = new HashMap(); - variables.put("name", getProject().getName()); - variables.put("artifactId", getProject().getArtifactId()); - variables.put("groupId", getProject().getGroupId()); - variables.put("version", getProject().getVersion().replace('-', '+')); - variables.put("description", getProject().getDescription()); - variables.put("extension", "deb"); - final VariableResolver resolver = new MapVariableResolver(variables); + final Map variables = new HashMap(); + variables.put("name", getProject().getName()); + variables.put("artifactId", getProject().getArtifactId()); + variables.put("groupId", getProject().getGroupId()); + variables.put("version", getProject().getVersion().replace('-', '+')); + variables.put("description", getProject().getDescription()); + variables.put("extension", "deb"); + final VariableResolver resolver = new MapVariableResolver(variables); - try - { - debName = Utils.replaceVariables(resolver, namePattern, "[[", "]]"); - - variables.put("extension", "changes"); - changesName = Utils.replaceVariables(resolver, namePattern, "[[", "]]"); - } - catch (ParseException e) - { - throw new MojoExecutionException("Failed parsing artifact name pattern", e); - } + try + { + debName = Utils.replaceVariables(resolver, namePattern, "[[", "]]"); + + variables.put("extension", "changes"); + changesName = Utils.replaceVariables(resolver, namePattern, "[[", "]]"); + } + catch (ParseException e) + { + throw new MojoExecutionException("Failed parsing artifact name pattern", e); + } - // if not specified try to the default - if (deb == null) - { - deb = new File(buildDirectory, debName); - } + // if not specified try to the default + if (deb == null) + { + deb = new File(buildDirectory, debName); + } - // if not specified try to the default - if (changesIn == null) - { - final File f = new File(getProject().getBasedir(), "CHANGES.txt"); - if (f.exists() && f.isFile() && f.canRead()) - { - changesIn = f; - } - } - - // if not specified try to the default - if (changesOut == null) - { - changesOut = new File(buildDirectory, changesName); - } - - // if not specified try to the default - if (controlDir == null) - { - controlDir = new File(getProject().getBasedir(), "src/deb/control"); - getLog().info("Using default path to control directory " + controlDir); - } - - // make sure we have at least the mandatory control directory - if (!controlDir.exists() || !controlDir.isDirectory()) - { - throw new MojoExecutionException(controlDir + " needs to be a directory"); - } - - // make sure we have at least the mandatory control file - final File controlFile = new File(controlDir, "control"); - if (!controlFile.exists() || !controlFile.isFile() || !controlFile.canRead()) - { - throw new MojoExecutionException(controlFile + " is mandatory"); - } - - final File file = getProject().getArtifact().getFile(); - final File[] controlFiles = controlDir.listFiles(); - - - if (dataProducers == null) - { - dataProducers = new DataProducer[] { new DataProducer() { - public void produce( final DataConsumer receiver ) { - try { - receiver.onEachFile(new FileInputStream(file), new File(new File(defaultPath), file.getName()).getAbsolutePath(), "", "root", 0, "root", 0, TarEntry.DEFAULT_FILE_MODE, file.length()); - } catch (Exception e) { - getLog().error(e); - } - }}}; - } + // if not specified try to the default + if (changesIn == null) + { + final File f = new File(getProject().getBasedir(), "CHANGES.txt"); + if (f.exists() && f.isFile() && f.canRead()) + { + changesIn = f; + } + } + + // if not specified try to the default + if (changesOut == null) + { + changesOut = new File(buildDirectory, changesName); + } + + // if not specified try to the default + if (controlDir == null) + { + controlDir = new File(getProject().getBasedir(), "src/deb/control"); + getLog().info("Using default path to control directory " + controlDir); + } + + // make sure we have at least the mandatory control directory + if (!controlDir.exists() || !controlDir.isDirectory()) + { + throw new MojoExecutionException(controlDir + " needs to be a directory"); + } + + // make sure we have at least the mandatory control file + final File controlFile = new File(controlDir, "control"); + if (!controlFile.exists() || !controlFile.isFile() || !controlFile.canRead()) + { + throw new MojoExecutionException(controlFile + " is mandatory"); + } + + final File file = getProject().getArtifact().getFile(); + final File[] controlFiles = controlDir.listFiles(); + + + if (dataProducers == null) + { + dataProducers = new DataProducer[] { new DataProducer() { + public void produce( final DataConsumer receiver ) { + try { + receiver.onEachFile(new FileInputStream(file), new File(new File(defaultPath), file.getName()).getAbsolutePath(), "", "root", 0, "root", 0, TarEntry.DEFAULT_FILE_MODE, file.length()); + } catch (Exception e) { + getLog().error(e); + } + }}}; + } - - final Processor processor = new Processor( - new Console() - { - public void println( final String s ) - { - getLog().info(s); - } - }, - resolver - ); - - final PackageDescriptor packageDescriptor; - try - { + + final Processor processor = new Processor( + new Console() + { + public void println( final String s ) + { + getLog().info(s); + } + }, + resolver + ); + + final PackageDescriptor packageDescriptor; + try + { - packageDescriptor = processor.createDeb(controlFiles, dataProducers, deb, "gzip"); + packageDescriptor = processor.createDeb(controlFiles, dataProducers, deb, "gzip"); - getLog().info("Attaching created debian archive " + deb); - projectHelper.attachArtifact( getProject(), "deb-archive", deb.getName(), deb ); - } - catch (Exception e) - { - getLog().error("Failed to create debian package " + deb, e); - throw new MojoExecutionException("Failed to create debian package " + deb, e); - } + getLog().info("Attaching created debian archive " + deb); + projectHelper.attachArtifact( getProject(), "deb-archive", deb.getName(), deb ); + } + catch (Exception e) + { + getLog().error("Failed to create debian package " + deb, e); + throw new MojoExecutionException("Failed to create debian package " + deb, e); + } - if (changesIn == null) - { - return; - } - - - final TextfileChangesProvider changesProvider; - - try - { + if (changesIn == null) + { + return; + } + + + final TextfileChangesProvider changesProvider; + + try + { - // for now only support reading the changes form a text file provider - changesProvider = new TextfileChangesProvider(new FileInputStream(changesIn), packageDescriptor); - - processor.createChanges(packageDescriptor, changesProvider, (keyring!=null)?new FileInputStream(keyring):null, key, passphrase, new FileOutputStream(changesOut)); + // for now only support reading the changes form a text file provider + changesProvider = new TextfileChangesProvider(new FileInputStream(changesIn), packageDescriptor); + + processor.createChanges(packageDescriptor, changesProvider, (keyring!=null)?new FileInputStream(keyring):null, key, passphrase, new FileOutputStream(changesOut)); - getLog().info("Attaching created debian changes file " + changesOut); - projectHelper.attachArtifact( getProject(), "deb-changes", changesOut.getName(), changesOut ); - } - catch (Exception e) - { - getLog().error("Failed to create debian changes file " + changesOut, e); - throw new MojoExecutionException("Failed to create debian changes file " + changesOut, e); - } + getLog().info("Attaching created debian changes file " + changesOut); + projectHelper.attachArtifact( getProject(), "deb-changes", changesOut.getName(), changesOut ); + } + catch (Exception e) + { + getLog().error("Failed to create debian changes file " + changesOut, e); + throw new MojoExecutionException("Failed to create debian changes file " + changesOut, e); + } - try { - if (changesSave == null) { - return; - } + try { + if (changesSave == null) { + return; + } - changesProvider.save(new FileOutputStream(changesSave)); + changesProvider.save(new FileOutputStream(changesSave)); - getLog().info("Saved release information to file " + changesSave); - - } catch (Exception e) { - getLog().error("Failed to save release information to file " + changesSave); - throw new MojoExecutionException("Failed to save release information to file " + changesSave, e); - } + getLog().info("Saved release information to file " + changesSave); + + } catch (Exception e) { + getLog().error("Failed to save release information to file " + changesSave); + throw new MojoExecutionException("Failed to save release information to file " + changesSave, e); + } } } src/main/java/org/vafer/jdeb/maven/DebMojo.java @@ -27,26 +27,26 @@ import org.vafer.jdeb.mapping.Mapper; */ public abstract class AbstractDataProducer implements DataProducer { - private final String[] includes; - private final String[] excludes; - private final Mapper[] mappers; - - - public AbstractDataProducer( final String[] pIncludes, final String[] pExcludes, final Mapper[] pMapper ) { - excludes = (pExcludes != null) ? pExcludes : new String[0]; - includes = (pIncludes != null) ? pIncludes : new String[] { "**" }; - mappers = (pMapper != null) ? pMapper : new Mapper[0]; - } - - public boolean isIncluded( final String pName ) { - if (!isIncluded(pName, includes)) { - return false; - } - if (isExcluded(pName, excludes)) { - return false; - } - return true; - } + private final String[] includes; + private final String[] excludes; + private final Mapper[] mappers; + + + public AbstractDataProducer( final String[] pIncludes, final String[] pExcludes, final Mapper[] pMapper ) { + excludes = (pExcludes != null) ? pExcludes : new String[0]; + includes = (pIncludes != null) ? pIncludes : new String[] { "**" }; + mappers = (pMapper != null) ? pMapper : new Mapper[0]; + } + + public boolean isIncluded( final String pName ) { + if (!isIncluded(pName, includes)) { + return false; + } + if (isExcluded(pName, excludes)) { + return false; + } + return true; + } private boolean isIncluded( String name, String[] includes ) { for (int i = 0; i < includes.length; i++) { @@ -66,15 +66,15 @@ public abstract class AbstractDataProducer implements DataProducer { } return false; } - - public TarEntry map( final TarEntry pEntry ) { - - TarEntry entry = pEntry; + + public TarEntry map( final TarEntry pEntry ) { + + TarEntry entry = pEntry; - for (int i = 0; i < mappers.length; i++) { - entry = mappers[i].map(entry); - } - - return entry; - } + for (int i = 0; i < mappers.length; i++) { + entry = mappers[i].map(entry); + } + + return entry; + } } src/main/java/org/vafer/jdeb/producers/AbstractDataProducer.java @@ -36,66 +36,66 @@ import org.vafer.jdeb.mapping.Mapper; */ public final class DataProducerArchive extends AbstractDataProducer implements DataProducer { - private final File archive; - - public DataProducerArchive( final File pArchive, final String[] pIncludes, final String[] pExcludes, final Mapper[] pMappers ) { - super(pIncludes, pExcludes, pMappers); - archive = pArchive; - } - - public void produce( final DataConsumer receiver ) throws IOException { + private final File archive; + + public DataProducerArchive( final File pArchive, final String[] pIncludes, final String[] pExcludes, final Mapper[] pMappers ) { + super(pIncludes, pExcludes, pMappers); + archive = pArchive; + } + + public void produce( final DataConsumer receiver ) throws IOException { - TarInputStream archiveInputStream = null; - try { - archiveInputStream = new TarInputStream(getCompressedInputStream(new FileInputStream(archive))); + TarInputStream archiveInputStream = null; + try { + archiveInputStream = new TarInputStream(getCompressedInputStream(new FileInputStream(archive))); - while(true) { - - TarEntry entry = archiveInputStream.getNextEntry(); + while(true) { + + TarEntry entry = archiveInputStream.getNextEntry(); - if (entry == null) { - break; - } + if (entry == null) { + break; + } - if (!isIncluded(entry.getName())) { - continue; - } + if (!isIncluded(entry.getName())) { + continue; + } - entry = map(entry); - - if (entry.isDirectory()) { - receiver.onEachDir(entry.getName(), entry.getLinkName(), entry.getUserName(), entry.getUserId(), entry.getGroupName(), entry.getGroupId(), entry.getMode(), entry.getSize()); - continue; - } - receiver.onEachFile(archiveInputStream, entry.getName(), entry.getLinkName(), entry.getUserName(), entry.getUserId(), entry.getGroupName(), entry.getGroupId(), entry.getMode(), entry.getSize()); - } + entry = map(entry); + + if (entry.isDirectory()) { + receiver.onEachDir(entry.getName(), entry.getLinkName(), entry.getUserName(), entry.getUserId(), entry.getGroupName(), entry.getGroupId(), entry.getMode(), entry.getSize()); + continue; + } + receiver.onEachFile(archiveInputStream, entry.getName(), entry.getLinkName(), entry.getUserName(), entry.getUserId(), entry.getGroupName(), entry.getGroupId(), entry.getMode(), entry.getSize()); + } - } finally { - if (archiveInputStream != null) { - archiveInputStream.close(); - } - } - } + } finally { + if (archiveInputStream != null) { + archiveInputStream.close(); + } + } + } - /** - * Guess the compression used by looking at the first bytes of the stream. - */ - private InputStream getCompressedInputStream(InputStream in) throws IOException { - PushbackInputStream pin = new PushbackInputStream(in, 2); - byte[] header = new byte[2]; - if (pin.read(header) != header.length) { - throw new IOException("Could not read header"); - } + /** + * Guess the compression used by looking at the first bytes of the stream. + */ + private InputStream getCompressedInputStream(InputStream in) throws IOException { + PushbackInputStream pin = new PushbackInputStream(in, 2); + byte[] header = new byte[2]; + if (pin.read(header) != header.length) { + throw new IOException("Could not read header"); + } - if (header[0] == (byte) 0x1f && header[1] == (byte) 0x8b) { - pin.unread(header); - return new GZIPInputStream(pin); - } else if (header[0] == 'B' && header[1] == 'Z') { - return new CBZip2InputStream(pin); - } else { - throw new IOException("Unsupported archive format : " + archive); - } - } - + if (header[0] == (byte) 0x1f && header[1] == (byte) 0x8b) { + pin.unread(header); + return new GZIPInputStream(pin); + } else if (header[0] == 'B' && header[1] == 'Z') { + return new CBZip2InputStream(pin); + } else { + throw new IOException("Unsupported archive format : " + archive); + } + } + } src/main/java/org/vafer/jdeb/producers/DataProducerArchive.java @@ -35,94 +35,94 @@ import org.vafer.jdeb.utils.Utils; */ public final class DataProducerDirectory extends AbstractDataProducer implements DataProducer { - private final DirectoryScanner scanner = new DirectoryScanner(); - - public DataProducerDirectory( final File pDir, final String[] pIncludes, final String[] pExcludes, final Mapper[] pMappers ) { - super(pIncludes, pExcludes, pMappers); - scanner.setBasedir(pDir); - scanner.setIncludes(pIncludes); - scanner.setExcludes(pExcludes); - scanner.setCaseSensitive(true); - scanner.setFollowSymlinks(true); - } - - public void produce( final DataConsumer receiver ) throws IOException { - - scanner.scan(); - - final File baseDir = scanner.getBasedir(); - - final String[] dirs = scanner.getIncludedDirectories(); - for (int i = 0; i < dirs.length; i++) { - final File file = new File(baseDir, dirs[i]); - String dirname = getFilename(baseDir, file); - - if ("".equals(dirname)) { - continue; - } - - if (!isIncluded(dirname)) { - continue; - } - - if ('/' != File.separatorChar) { - dirname = dirname.replace(File.separatorChar, '/'); - } - - TarEntry entry = new TarEntry(dirname); - entry.setUserId(0); - entry.setUserName("root"); - entry.setGroupId(0); - entry.setGroupName("root"); - entry.setMode(TarEntry.DEFAULT_DIR_MODE); - - entry = map(entry); - - entry.setSize(0); - - receiver.onEachDir(entry.getName(), entry.getLinkName(), entry.getUserName(), entry.getUserId(), entry.getGroupName(), entry.getGroupId(), entry.getMode(), entry.getSize()); - } - - - final String[] files = scanner.getIncludedFiles(); - - for (int i = 0; i < files.length; i++) { - final File file = new File(baseDir, files[i]); - String filename = getFilename(baseDir, file); - - if (!isIncluded(filename)) { - continue; - } - - if ('/' != File.separatorChar) { - filename = filename.replace(File.separatorChar, '/'); - } - - TarEntry entry = new TarEntry(filename); - entry.setUserId(0); - entry.setUserName("root"); - entry.setGroupId(0); - entry.setGroupName("root"); - entry.setMode(TarEntry.DEFAULT_FILE_MODE); - - entry = map(entry); - - entry.setSize(file.length()); - - final InputStream inputStream = new FileInputStream(file); - try { - receiver.onEachFile(inputStream, entry.getName(), entry.getLinkName(), entry.getUserName(), entry.getUserId(), entry.getGroupName(), entry.getGroupId(), entry.getMode(), entry.getSize()); - } finally { - inputStream.close(); - } - } - } - - private String getFilename( File root, File file ) { - - final String relativeFilename = file.getAbsolutePath().substring(root.getAbsolutePath().length()); - - return Utils.stripLeadingSlash(relativeFilename); - } + private final DirectoryScanner scanner = new DirectoryScanner(); + + public DataProducerDirectory( final File pDir, final String[] pIncludes, final String[] pExcludes, final Mapper[] pMappers ) { + super(pIncludes, pExcludes, pMappers); + scanner.setBasedir(pDir); + scanner.setIncludes(pIncludes); + scanner.setExcludes(pExcludes); + scanner.setCaseSensitive(true); + scanner.setFollowSymlinks(true); + } + + public void produce( final DataConsumer receiver ) throws IOException { + + scanner.scan(); + + final File baseDir = scanner.getBasedir(); + + final String[] dirs = scanner.getIncludedDirectories(); + for (int i = 0; i < dirs.length; i++) { + final File file = new File(baseDir, dirs[i]); + String dirname = getFilename(baseDir, file); + + if ("".equals(dirname)) { + continue; + } + + if (!isIncluded(dirname)) { + continue; + } + + if ('/' != File.separatorChar) { + dirname = dirname.replace(File.separatorChar, '/'); + } + + TarEntry entry = new TarEntry(dirname); + entry.setUserId(0); + entry.setUserName("root"); + entry.setGroupId(0); + entry.setGroupName("root"); + entry.setMode(TarEntry.DEFAULT_DIR_MODE); + + entry = map(entry); + + entry.setSize(0); + + receiver.onEachDir(entry.getName(), entry.getLinkName(), entry.getUserName(), entry.getUserId(), entry.getGroupName(), entry.getGroupId(), entry.getMode(), entry.getSize()); + } + + + final String[] files = scanner.getIncludedFiles(); + + for (int i = 0; i < files.length; i++) { + final File file = new File(baseDir, files[i]); + String filename = getFilename(baseDir, file); + + if (!isIncluded(filename)) { + continue; + } + + if ('/' != File.separatorChar) { + filename = filename.replace(File.separatorChar, '/'); + } + + TarEntry entry = new TarEntry(filename); + entry.setUserId(0); + entry.setUserName("root"); + entry.setGroupId(0); + entry.setGroupName("root"); + entry.setMode(TarEntry.DEFAULT_FILE_MODE); + + entry = map(entry); + + entry.setSize(file.length()); + + final InputStream inputStream = new FileInputStream(file); + try { + receiver.onEachFile(inputStream, entry.getName(), entry.getLinkName(), entry.getUserName(), entry.getUserId(), entry.getGroupName(), entry.getGroupId(), entry.getMode(), entry.getSize()); + } finally { + inputStream.close(); + } + } + } + + private String getFilename( File root, File file ) { + + final String relativeFilename = file.getAbsolutePath().substring(root.getAbsolutePath().length()); + + return Utils.stripLeadingSlash(relativeFilename); + } } \ No newline at end of file src/main/java/org/vafer/jdeb/producers/DataProducerDirectory.java @@ -35,57 +35,55 @@ import org.vafer.jdeb.DataProducer; */ public final class FileSetDataProducer implements DataProducer { - private final FileSet fileset; + private final FileSet fileset; - public FileSetDataProducer( final FileSet pFileset ) { - fileset = pFileset; - } + public FileSetDataProducer( final FileSet pFileset ) { + fileset = pFileset; + } - public void produce( final DataConsumer pReceiver ) throws IOException { - String user = "root"; - int uid = 0; - String group = "root"; - int gid = 0; - int filemode = TarEntry.DEFAULT_FILE_MODE; - int dirmode = TarEntry.DEFAULT_DIR_MODE; - String prefix = ""; + public void produce( final DataConsumer pReceiver ) throws IOException { + String user = "root"; + int uid = 0; + String group = "root"; + int gid = 0; + int filemode = TarEntry.DEFAULT_FILE_MODE; + int dirmode = TarEntry.DEFAULT_DIR_MODE; + String prefix = ""; - if (fileset instanceof Tar.TarFileSet) { - Tar.TarFileSet tarfileset = (Tar.TarFileSet) fileset; - user = tarfileset.getUserName(); - uid = tarfileset.getUid(); - group = tarfileset.getGroup(); - gid = tarfileset.getGid(); - filemode = tarfileset.getMode(); - dirmode = tarfileset.getDirMode(); - prefix = tarfileset.getPrefix(); - } + if (fileset instanceof Tar.TarFileSet) { + Tar.TarFileSet tarfileset = (Tar.TarFileSet) fileset; + user = tarfileset.getUserName(); + uid = tarfileset.getUid(); + group = tarfileset.getGroup(); + gid = tarfileset.getGid(); + filemode = tarfileset.getMode(); + dirmode = tarfileset.getDirMode(); + prefix = tarfileset.getPrefix(); + } - final DirectoryScanner scanner = fileset.getDirectoryScanner(fileset.getProject()); - scanner.scan(); + final DirectoryScanner scanner = fileset.getDirectoryScanner(fileset.getProject()); + scanner.scan(); - final File basedir = scanner.getBasedir(); + final File basedir = scanner.getBasedir(); - final String[] directories = scanner.getIncludedDirectories(); - for (int i = 0; i < directories.length; i++) { - String name = directories[i]; - name = name.replace('\\', '/'); + final String[] directories = scanner.getIncludedDirectories(); + for (int i = 0; i < directories.length; i++) { + final String name = directories[i].replace('\\', '/'); pReceiver.onEachDir(prefix + "/" + name, null, user, uid, group, gid, dirmode, 0); - } + } - final String[] files = scanner.getIncludedFiles(); - for (int i = 0; i < files.length; i++) { - String name = files[i]; - name = name.replace('\\', '/'); - File file = new File(basedir, name); + final String[] files = scanner.getIncludedFiles(); + for (int i = 0; i < files.length; i++) { + final String name = files[i].replace('\\', '/'); + final File file = new File(basedir, name); - final InputStream inputStream = new FileInputStream(file); - try { - pReceiver.onEachFile(inputStream, prefix + "/" + name, null, user, uid, group, gid,filemode, file.length()); - } finally { - inputStream.close(); - } - } - } + final InputStream inputStream = new FileInputStream(file); + try { + pReceiver.onEachFile(inputStream, prefix + "/" + name, null, user, uid, group, gid,filemode, file.length()); + } finally { + inputStream.close(); + } + } + } } src/main/java/org/vafer/jdeb/producers/FileSetDataProducer.java @@ -50,41 +50,41 @@ public final class SigningUtils { final PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(PGPUtil.getDecoderStream(pInput)); - final Iterator rIt = pgpSec.getKeyRings(); - - while (rIt.hasNext()) { - final PGPSecretKeyRing kRing = (PGPSecretKeyRing) rIt.next(); - final Iterator kIt = kRing.getSecretKeys(); - - while (kIt.hasNext()) { - final PGPSecretKey k = (PGPSecretKey) kIt.next(); - - if (k.isSigningKey() && Long.toHexString(k.getKeyID() & 0xFFFFFFFFL).equals(pKey.toLowerCase())) { - return k; - } - } - } - - return null; - } - - /** - * Create a clear sign signature over the input data. (Not detached) - * - * @param pInput - * @param pKeyring - * @param pKey - * @param pPassphrase - * @param pOutput - * @throws IOException - * @throws PGPException - * @throws NoSuchProviderException - * @throws NoSuchAlgorithmException - * @throws SignatureException - */ - public static void clearSign( final InputStream pInput, final InputStream pKeyring, final String pKey, final String pPassphrase, final OutputStream pOutput ) throws IOException, PGPException, NoSuchProviderException, NoSuchAlgorithmException, SignatureException { - - Security.addProvider( new BouncyCastleProvider() ); + final Iterator rIt = pgpSec.getKeyRings(); + + while (rIt.hasNext()) { + final PGPSecretKeyRing kRing = (PGPSecretKeyRing) rIt.next(); + final Iterator kIt = kRing.getSecretKeys(); + + while (kIt.hasNext()) { + final PGPSecretKey k = (PGPSecretKey) kIt.next(); + + if (k.isSigningKey() && Long.toHexString(k.getKeyID() & 0xFFFFFFFFL).equals(pKey.toLowerCase())) { + return k; + } + } + } + + return null; + } + + /** + * Create a clear sign signature over the input data. (Not detached) + * + * @param pInput + * @param pKeyring + * @param pKey + * @param pPassphrase + * @param pOutput + * @throws IOException + * @throws PGPException + * @throws NoSuchProviderException + * @throws NoSuchAlgorithmException + * @throws SignatureException + */ + public static void clearSign( final InputStream pInput, final InputStream pKeyring, final String pKey, final String pPassphrase, final OutputStream pOutput ) throws IOException, PGPException, NoSuchProviderException, NoSuchAlgorithmException, SignatureException { + + Security.addProvider( new BouncyCastleProvider() ); final PGPSecretKey secretKey = getSecretKey(pKeyring, pKey); final PGPPrivateKey privateKey = secretKey.extractPrivateKey(pPassphrase.toCharArray(), "BC"); @@ -101,7 +101,7 @@ public final class SigningUtils { // subpackageGenerator.setSignerUserID(false, (String)it.next()); // signatureGenerator.setHashedSubpackets(subpackageGenerator.generate()); // } - + final ArmoredOutputStream armoredOutput = new ArmoredOutputStream(pOutput); armoredOutput.beginClearText(digest); @@ -113,17 +113,17 @@ public final class SigningUtils { processLine(reader.readLine(), armoredOutput, signatureGenerator); while(true) { - final String line = reader.readLine(); - - if (line == null) { - armoredOutput.write(newline); - break; - } - - armoredOutput.write(newline); - signatureGenerator.update(newline); - - processLine(line, armoredOutput, signatureGenerator); + final String line = reader.readLine(); + + if (line == null) { + armoredOutput.write(newline); + break; + } + + armoredOutput.write(newline); + signatureGenerator.update(newline); + + processLine(line, armoredOutput, signatureGenerator); } armoredOutput.endClearText(); @@ -133,29 +133,29 @@ public final class SigningUtils { signatureGenerator.generate().encode(pgpOutput); armoredOutput.close(); - - } - - - private static void processLine( final String pLine, final ArmoredOutputStream pArmoredOutput, final PGPSignatureGenerator pSignatureGenerator ) throws IOException, SignatureException { - - if (pLine == null) { - return; - } - - final char[] chars = pLine.toCharArray(); - int len = chars.length; - - while(len > 0) { - if (!Character.isWhitespace(chars[len-1])) { - break; - } - len--; - } - - final byte[] data = pLine.substring(0, len).getBytes("UTF-8"); - - pArmoredOutput.write(data); - pSignatureGenerator.update(data); - } + + } + + + private static void processLine( final String pLine, final ArmoredOutputStream pArmoredOutput, final PGPSignatureGenerator pSignatureGenerator ) throws IOException, SignatureException { + + if (pLine == null) { + return; + } + + final char[] chars = pLine.toCharArray(); + int len = chars.length; + + while(len > 0) { + if (!Character.isWhitespace(chars[len-1])) { + break; + } + len--; + } + + final byte[] data = pLine.substring(0, len).getBytes("UTF-8"); + + pArmoredOutput.write(data); + pSignatureGenerator.update(data); + } } src/main/java/org/vafer/jdeb/signing/SigningUtils.java @@ -29,30 +29,30 @@ import java.security.MessageDigest; */ public class InformationOutputStream extends DigestOutputStream { - private final MessageDigest digest; - private long size; - - public InformationOutputStream(OutputStream pStream, MessageDigest pDigest) { - super(pStream, pDigest); - digest = pDigest; - size = 0; - } - - public String getMd5() { - return Utils.toHex(digest.digest()); - } - - public void write(byte[] b, int off, int len) throws IOException { - super.write(b, off, len); - size += len; - } + private final MessageDigest digest; + private long size; + + public InformationOutputStream(OutputStream pStream, MessageDigest pDigest) { + super(pStream, pDigest); + digest = pDigest; + size = 0; + } + + public String getMd5() { + return Utils.toHex(digest.digest()); + } + + public void write(byte[] b, int off, int len) throws IOException { + super.write(b, off, len); + size += len; + } - public void write(int b) throws IOException { - super.write(b); - size++; - } + public void write(int b) throws IOException { + super.write(b); + size++; + } - public long getSize() { - return size; - } + public long getSize() { + return size; + } } \ No newline at end of file src/main/java/org/vafer/jdeb/utils/InformationOutputStream.java @@ -27,14 +27,14 @@ import java.util.Map; public final class MapVariableResolver implements VariableResolver { - private final Map map; - - public MapVariableResolver( final Map pMap ) { - map = pMap; - } - - public String get( final String pKey ) { - return (String) map.get(pKey); - } + private final Map map; + + public MapVariableResolver( final Map pMap ) { + map = pMap; + } + + public String get( final String pKey ) { + return (String) map.get(pKey); + } } src/main/java/org/vafer/jdeb/utils/MapVariableResolver.java @@ -30,7 +30,7 @@ import java.text.ParseException; */ public final class Utils { - public static int copy( final InputStream pInput, final OutputStream pOutput ) throws IOException { + public static int copy( final InputStream pInput, final OutputStream pOutput ) throws IOException { final byte[] buffer = new byte[2048]; int count = 0; int n = 0; @@ -41,113 +41,113 @@ public final class Utils { return count; } - public static String toHex( final byte[] pBytes ) { - final StringBuffer sb = new StringBuffer(); + public static String toHex( final byte[] pBytes ) { + final StringBuffer sb = new StringBuffer(); - for (int i = 0; i < pBytes.length; ++i) { - sb.append(Integer.toHexString((pBytes[i]>>4) & 0x0f)); - sb.append(Integer.toHexString(pBytes[i] & 0x0f)); - } + for (int i = 0; i < pBytes.length; ++i) { + sb.append(Integer.toHexString((pBytes[i]>>4) & 0x0f)); + sb.append(Integer.toHexString(pBytes[i] & 0x0f)); + } + + return sb.toString(); + } + + public static String stripPath( final int p, final String s ) { + + if (p <= 0) { + return s; + } + + int x = 0; + for (int i=0 ; i<p; i++) { + x = s.indexOf('/', x); + if (x < 0) { + return s; + } + } + + return s.substring(x+1); + } - return sb.toString(); + public static String stripLeadingSlash( final String s ) { + if (s == null) { + return s; + } + if (s.length() == 0) { + return s; + } + if (s.charAt(0) == '/') { + return s.substring(1); + } + return s; } - public static String stripPath( final int p, final String s ) { - - if (p <= 0) { - return s; - } - - int x = 0; - for (int i=0 ; i<p; i++) { - x = s.indexOf('/', x); - if (x < 0) { - return s; - } - } - - return s.substring(x+1); - } - - public static String stripLeadingSlash( final String s ) { - if (s == null) { - return s; - } - if (s.length() == 0) { - return s; - } - if (s.charAt(0) == '/') { - return s.substring(1); - } - return s; - } - - + /** - * Substitute the variables in the given expression with the - * values from the resolver - * - * @param pVariables - * @param pExpression - * @return - */ - public static String replaceVariables(final VariableResolver pResolver, final String pExpression, final String pOpen, final String pClose) throws ParseException { - - final char[] s = pExpression.toCharArray(); - - final char[] open = pOpen.toCharArray(); - final char[] close = pClose.toCharArray(); - - final StringBuffer out = new StringBuffer(); - StringBuffer sb = new StringBuffer(); - char[] watch = open; - int w = 0; - for (int i = 0; i < s.length; i++) { - char c = s[i]; - - if (c == watch[w]) { - w++; - if (watch.length == w) { - // found the full token to watch for - - if (watch == open) { - // found open - out.append(sb); - sb = new StringBuffer(); - // search for close - watch = close; - } else if (watch == close) { - // found close - final String variable = (String) pResolver.get(sb.toString()); - if (variable != null) { - out.append(variable); - } else { - throw new ParseException("Unknown variable " + sb, i); - } - sb = new StringBuffer(); - // search for open - watch = open; - } - w = 0; - } - } else { - - if (w > 0) { - sb.append(watch, 0, w); - } - - sb.append(c); - - w = 0; - } - } - - if (watch == close) { - out.append(open); - } - out.append(sb); - - return out.toString(); - } - + * Substitute the variables in the given expression with the + * values from the resolver + * + * @param pVariables + * @param pExpression + * @return + */ + public static String replaceVariables(final VariableResolver pResolver, final String pExpression, final String pOpen, final String pClose) throws ParseException { + + final char[] s = pExpression.toCharArray(); + + final char[] open = pOpen.toCharArray(); + final char[] close = pClose.toCharArray(); + + final StringBuffer out = new StringBuffer(); + StringBuffer sb = new StringBuffer(); + char[] watch = open; + int w = 0; + for (int i = 0; i < s.length; i++) { + char c = s[i]; + + if (c == watch[w]) { + w++; + if (watch.length == w) { + // found the full token to watch for + + if (watch == open) { + // found open + out.append(sb); + sb = new StringBuffer(); + // search for close + watch = close; + } else if (watch == close) { + // found close + final String variable = (String) pResolver.get(sb.toString()); + if (variable != null) { + out.append(variable); + } else { + throw new ParseException("Unknown variable " + sb, i); + } + sb = new StringBuffer(); + // search for open + watch = open; + } + w = 0; + } + } else { + + if (w > 0) { + sb.append(watch, 0, w); + } + + sb.append(c); + + w = 0; + } + } + + if (watch == close) { + out.append(open); + } + out.append(sb); + + return out.toString(); + } + } src/main/java/org/vafer/jdeb/utils/Utils.java @@ -25,5 +25,5 @@ package org.vafer.jdeb.utils; */ public interface VariableResolver { - public String get( final String pKey ); + public String get( final String pKey ); } src/main/java/org/vafer/jdeb/utils/VariableResolver.java @@ -17,7 +17,7 @@ git clone git://github.com/tcurdt/jdeb.git <repository> <id>vafer.org</id> <name>vafer.org Maven Snapshot Repository</name> - <url>https://vafer.org/repository/snaphots</url> + <url>https://vafer.org/repository/snapshots</url> </repository> ... +---------------------- src/site/apt/about.apt @@ -34,66 +34,66 @@ import org.vafer.jdeb.producers.DataProducerDirectory; public final class DataProducerTestCase extends TestCase { - public void testCreation() throws Exception { + public void testCreation() throws Exception { - final Processor processor = new Processor(new Console() { - public void println(String s) { - } - }, null); - - final File control = new File(getClass().getResource("deb/control/control").toURI()); - final File archive1 = new File(getClass().getResource("deb/data.tgz").toURI()); - final File archive2 = new File(getClass().getResource("deb/data.tar.bz2").toURI()); - final File directory = new File(getClass().getResource("deb/data").toURI()); - - final DataProducer[] data = new DataProducer[] { - new DataProducerArchive(archive1, null, null, null), - new DataProducerArchive(archive2, null, null, null), - new DataProducerDirectory(directory, null, new String[] { "**/.svn/**" }, null) - }; - - final File deb = File.createTempFile("jdeb", ".deb"); - - final PackageDescriptor packageDescriptor = processor.createDeb(new File[] { control }, data, deb, "gzip"); - - assertTrue(packageDescriptor.isValid()); - - final Set filesInDeb = new HashSet(); + final Processor processor = new Processor(new Console() { + public void println(String s) { + } + }, null); + + final File control = new File(getClass().getResource("deb/control/control").toURI()); + final File archive1 = new File(getClass().getResource("deb/data.tgz").toURI()); + final File archive2 = new File(getClass().getResource("deb/data.tar.bz2").toURI()); + final File directory = new File(getClass().getResource("deb/data").toURI()); + + final DataProducer[] data = new DataProducer[] { + new DataProducerArchive(archive1, null, null, null), + new DataProducerArchive(archive2, null, null, null), + new DataProducerDirectory(directory, null, new String[] { "**/.svn/**" }, null) + }; + + final File deb = File.createTempFile("jdeb", ".deb"); + + final PackageDescriptor packageDescriptor = processor.createDeb(new File[] { control }, data, deb, "gzip"); + + assertTrue(packageDescriptor.isValid()); + + final Set filesInDeb = new HashSet(); - final ArInputStream ar = new ArInputStream(new FileInputStream(deb)); - while(true) { - final ArEntry arEntry = ar.getNextEntry(); - if (arEntry == null) { - break; - } - - if ("data.tar.gz".equals(arEntry.getName())) { - - final TarInputStream tar = new TarInputStream(new GZIPInputStream(new NonClosingInputStream(ar))); - - while(true) { - final TarEntry tarEntry = tar.getNextEntry(); - if (tarEntry == null) { - break; - } - - filesInDeb.add(tarEntry.getName()); - } - - tar.close(); - break; - } - for (int i = 0; i < arEntry.getLength(); i++) { - ar.read(); - } - } + final ArInputStream ar = new ArInputStream(new FileInputStream(deb)); + while(true) { + final ArEntry arEntry = ar.getNextEntry(); + if (arEntry == null) { + break; + } + + if ("data.tar.gz".equals(arEntry.getName())) { + + final TarInputStream tar = new TarInputStream(new GZIPInputStream(new NonClosingInputStream(ar))); + + while(true) { + final TarEntry tarEntry = tar.getNextEntry(); + if (tarEntry == null) { + break; + } + + filesInDeb.add(tarEntry.getName()); + } + + tar.close(); + break; + } + for (int i = 0; i < arEntry.getLength(); i++) { + ar.read(); + } + } - ar.close(); - - assertTrue("testfile wasn't found in the package", filesInDeb.contains("./test/testfile")); - assertTrue("testfile2 wasn't found in the package", filesInDeb.contains("./test/testfile2")); - assertTrue("testfile3 wasn't found in the package", filesInDeb.contains("./test/testfile3")); + ar.close(); + + assertTrue("testfile wasn't found in the package", filesInDeb.contains("./test/testfile")); + assertTrue("testfile2 wasn't found in the package", filesInDeb.contains("./test/testfile2")); + assertTrue("testfile3 wasn't found in the package", filesInDeb.contains("./test/testfile3")); - assertTrue("Cannot delete the file " + deb, deb.delete()); - } + assertTrue("Cannot delete the file " + deb, deb.delete()); + } } src/test/java/org/vafer/jdeb/DataProducerTestCase.java @@ -30,14 +30,14 @@ public class ProcessorTestCase extends TestCase { * (this test can only fail on Windows) */ public void testBuildDataWithFileSet() throws Exception { - Processor processor = new Processor(new Console() { - public void println(String s) { - } - }, null); + Processor processor = new Processor(new Console() { + public void println(String s) { + } + }, null); Project project = new Project(); project.setCoreLoader(getClass().getClassLoader()); - project.init(); + project.init(); FileSet fileset = new FileSet(); fileset.setDir(new File(getClass().getResource("deb/data").toURI())); src/test/java/org/vafer/jdeb/ProcessorTestCase.java @@ -41,242 +41,242 @@ import org.vafer.jdeb.ar.NonClosingInputStream; */ public final class DebAntTaskTestCase extends TestCase { - private Project project; - - protected void setUp() throws Exception { - project = new Project(); - project.setCoreLoader(getClass().getClassLoader()); - project.init(); - - File buildFile = new File("target/test-classes/testbuild.xml"); - project.setBaseDir(buildFile.getParentFile()); - - final ProjectHelper helper = ProjectHelper.getProjectHelper(); - helper.parse(project, buildFile); - - // remove the package previously build - File deb = new File("target/test.deb"); - if (deb.exists()) { - assertTrue("Unable to remove the test archive", deb.delete()); - } - } - - public void testMissingControl() { - try { - project.executeTarget("missing-control"); - fail("No exception thrown"); - } catch (BuildException e) { - // expected - } - } - - public void testInvalidControl() { - try { - project.executeTarget("invalid-control"); - fail("No exception thrown"); - } catch (BuildException e) { - // expected - } - } - - public void testMissingDestFile() { - try { - project.executeTarget("missing-destfile"); - fail("No exception thrown"); - } catch (BuildException e) { - // expected - } - } - - public void testEmptyPackage() { - try { - project.executeTarget("empty-package"); - fail("No exception thrown"); - } catch (BuildException e) { - // expected - } - } - - public void testPackageWithArchive() { - project.executeTarget("with-archive"); - - assertTrue("package not build", new File("target/test-classes/test.deb").exists()); - } - - public void testPackageWithMissingArchive() { - try { - project.executeTarget("with-missing-archive"); - fail("No exception thrown"); - } catch (BuildException e) { - // expected - } - } - - public void testPackageWithDirectory() { - project.executeTarget("with-directory"); - - assertTrue("package not build", new File("target/test-classes/test.deb").exists()); - } - - public void testPackageWithMissingDirectory() { - try { - project.executeTarget("with-missing-directory"); - fail("No exception thrown"); - } catch (BuildException e) { - // expected - } - } - - /** - * Redirects the Ant output to the specified stream. - */ - private void redirectOutput(OutputStream out) { - DefaultLogger logger = new DefaultLogger(); - logger.setOutputPrintStream(new PrintStream(out)); - logger.setMessageOutputLevel(Project.MSG_INFO); - project.addBuildListener(logger); - } - - public void testVerboseEnabled() { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - redirectOutput(out); - - project.executeTarget("verbose-enabled"); - - assertTrue(out.toString().indexOf("Total size") != -1); - } - - public void testVerboseDisabled() { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - redirectOutput(out); - - project.executeTarget("verbose-disabled"); - - assertTrue(out.toString().indexOf("Total size") == -1); - } - - public void testFileSet() { - project.executeTarget("fileset"); - - assertTrue("package not build", new File("target/test-classes/test.deb").exists()); - } - - public void testTarFileSet() throws Exception { - project.executeTarget("tarfileset"); - - File deb = new File("target/test-classes/test.deb"); - assertTrue("package not build", deb.exists()); - - ArInputStream in = new ArInputStream(new FileInputStream(deb)); - ArEntry entry; - while ((entry = in.getNextEntry()) != null) { - if (entry.getName().equals("data.tar.gz")) { - TarInputStream tar = new TarInputStream(new GZIPInputStream(new NonClosingInputStream(in))); - TarEntry tarentry; - while ((tarentry = tar.getNextEntry()) != null) { - assertTrue("prefix", tarentry.getName().startsWith("./foo/")); - if (tarentry.isDirectory()) { - assertEquals("directory mode (" + tarentry.getName() + ")", 040700, tarentry.getMode()); - } else { - assertEquals("file mode (" + tarentry.getName() + ")", 0100600, tarentry.getMode()); - } - assertEquals("user", "ebourg", tarentry.getUserName()); - assertEquals("group", "ebourg", tarentry.getGroupName()); - } - tar.close(); - } else { - // skip to the next entry - long skip = entry.getLength(); - while(skip > 0) { - long skipped = in.skip(skip); - if (skipped == -1) { - throw new IOException("Failed to skip"); - } - skip -= skipped; - } - } - } - in.close(); - } - - public void testUnkownCompression() throws Exception { - try { - project.executeTarget("unknown-compression"); - fail("No exception thrown"); - } catch (BuildException e) { - // expected - } - } - - public void testBZip2Compression() throws Exception { - project.executeTarget("bzip2-compression"); - - File deb = new File("target/test-classes/test.deb"); - assertTrue("package not build", deb.exists()); - - boolean found = false; - - ArInputStream in = new ArInputStream(new FileInputStream(deb)); - ArEntry entry; - while ((entry = in.getNextEntry()) != null) { - if (entry.getName().equals("data.tar.bz2")) { - found = true; - - assertEquals("header 0", (byte) 'B', in.read()); - assertEquals("header 1", (byte) 'Z', in.read()); - - TarInputStream tar = new TarInputStream(new CBZip2InputStream(in)); - while ((tar.getNextEntry()) != null); - tar.close(); - break; - } else { - // skip to the next entry - long skip = entry.getLength(); - while(skip > 0) { - long skipped = in.skip(skip); - if (skipped == -1) { - throw new IOException("Failed to skip"); - } - skip -= skipped; - } - } - } - in.close(); - - assertTrue("bz2 file not found", found); - } - - public void testNoCompression() throws Exception { - project.executeTarget("no-compression"); - - File deb = new File("target/test-classes/test.deb"); - assertTrue("package not build", deb.exists()); - - boolean found = false; - - ArInputStream in = new ArInputStream(new FileInputStream(deb)); - ArEntry entry; - while ((entry = in.getNextEntry()) != null) { - if (entry.getName().equals("data.tar")) { - found = true; - - TarInputStream tar = new TarInputStream(new NonClosingInputStream(in)); - while ((tar.getNextEntry()) != null); - tar.close(); - } else { - // skip to the next entry - long skip = entry.getLength(); - while(skip > 0) { - long skipped = in.skip(skip); - if (skipped == -1) { - throw new IOException("Failed to skip"); - } - skip -= skipped; - } - } - } - in.close(); - - assertTrue("tar file not found", found); - } + private Project project; + + protected void setUp() throws Exception { + project = new Project(); + project.setCoreLoader(getClass().getClassLoader()); + project.init(); + + File buildFile = new File("target/test-classes/testbuild.xml"); + project.setBaseDir(buildFile.getParentFile()); + + final ProjectHelper helper = ProjectHelper.getProjectHelper(); + helper.parse(project, buildFile); + + // remove the package previously build + File deb = new File("target/test.deb"); + if (deb.exists()) { + assertTrue("Unable to remove the test archive", deb.delete()); + } + } + + public void testMissingControl() { + try { + project.executeTarget("missing-control"); + fail("No exception thrown"); + } catch (BuildException e) { + // expected + } + } + + public void testInvalidControl() { + try { + project.executeTarget("invalid-control"); + fail("No exception thrown"); + } catch (BuildException e) { + // expected + } + } + + public void testMissingDestFile() { + try { + project.executeTarget("missing-destfile"); + fail("No exception thrown"); + } catch (BuildException e) { + // expected + } + } + + public void testEmptyPackage() { + try { + project.executeTarget("empty-package"); + fail("No exception thrown"); + } catch (BuildException e) { + // expected + } + } + + public void testPackageWithArchive() { + project.executeTarget("with-archive"); + + assertTrue("package not build", new File("target/test-classes/test.deb").exists()); + } + + public void testPackageWithMissingArchive() { + try { + project.executeTarget("with-missing-archive"); + fail("No exception thrown"); + } catch (BuildException e) { + // expected + } + } + + public void testPackageWithDirectory() { + project.executeTarget("with-directory"); + + assertTrue("package not build", new File("target/test-classes/test.deb").exists()); + } + + public void testPackageWithMissingDirectory() { + try { + project.executeTarget("with-missing-directory"); + fail("No exception thrown"); + } catch (BuildException e) { + // expected + } + } + + /** + * Redirects the Ant output to the specified stream. + */ + private void redirectOutput(OutputStream out) { + DefaultLogger logger = new DefaultLogger(); + logger.setOutputPrintStream(new PrintStream(out)); + logger.setMessageOutputLevel(Project.MSG_INFO); + project.addBuildListener(logger); + } + + public void testVerboseEnabled() { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + redirectOutput(out); + + project.executeTarget("verbose-enabled"); + + assertTrue(out.toString().indexOf("Total size") != -1); + } + + public void testVerboseDisabled() { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + redirectOutput(out); + + project.executeTarget("verbose-disabled"); + + assertTrue(out.toString().indexOf("Total size") == -1); + } + + public void testFileSet() { + project.executeTarget("fileset"); + + assertTrue("package not build", new File("target/test-classes/test.deb").exists()); + } + + public void testTarFileSet() throws Exception { + project.executeTarget("tarfileset"); + + File deb = new File("target/test-classes/test.deb"); + assertTrue("package not build", deb.exists()); + + ArInputStream in = new ArInputStream(new FileInputStream(deb)); + ArEntry entry; + while ((entry = in.getNextEntry()) != null) { + if (entry.getName().equals("data.tar.gz")) { + TarInputStream tar = new TarInputStream(new GZIPInputStream(new NonClosingInputStream(in))); + TarEntry tarentry; + while ((tarentry = tar.getNextEntry()) != null) { + assertTrue("prefix", tarentry.getName().startsWith("./foo/")); + if (tarentry.isDirectory()) { + assertEquals("directory mode (" + tarentry.getName() + ")", 040700, tarentry.getMode()); + } else { + assertEquals("file mode (" + tarentry.getName() + ")", 0100600, tarentry.getMode()); + } + assertEquals("user", "ebourg", tarentry.getUserName()); + assertEquals("group", "ebourg", tarentry.getGroupName()); + } + tar.close(); + } else { + // skip to the next entry + long skip = entry.getLength(); + while(skip > 0) { + long skipped = in.skip(skip); + if (skipped == -1) { + throw new IOException("Failed to skip"); + } + skip -= skipped; + } + } + } + in.close(); + } + + public void testUnkownCompression() throws Exception { + try { + project.executeTarget("unknown-compression"); + fail("No exception thrown"); + } catch (BuildException e) { + // expected + } + } + + public void testBZip2Compression() throws Exception { + project.executeTarget("bzip2-compression"); + + File deb = new File("target/test-classes/test.deb"); + assertTrue("package not build", deb.exists()); + + boolean found = false; + + ArInputStream in = new ArInputStream(new FileInputStream(deb)); + ArEntry entry; + while ((entry = in.getNextEntry()) != null) { + if (entry.getName().equals("data.tar.bz2")) { + found = true; + + assertEquals("header 0", (byte) 'B', in.read()); + assertEquals("header 1", (byte) 'Z', in.read()); + + TarInputStream tar = new TarInputStream(new CBZip2InputStream(in)); + while ((tar.getNextEntry()) != null); + tar.close(); + break; + } else { + // skip to the next entry + long skip = entry.getLength(); + while(skip > 0) { + long skipped = in.skip(skip); + if (skipped == -1) { + throw new IOException("Failed to skip"); + } + skip -= skipped; + } + } + } + in.close(); + + assertTrue("bz2 file not found", found); + } + + public void testNoCompression() throws Exception { + project.executeTarget("no-compression"); + + File deb = new File("target/test-classes/test.deb"); + assertTrue("package not build", deb.exists()); + + boolean found = false; + + ArInputStream in = new ArInputStream(new FileInputStream(deb)); + ArEntry entry; + while ((entry = in.getNextEntry()) != null) { + if (entry.getName().equals("data.tar")) { + found = true; + + TarInputStream tar = new TarInputStream(new NonClosingInputStream(in)); + while ((tar.getNextEntry()) != null); + tar.close(); + } else { + // skip to the next entry + long skip = entry.getLength(); + while(skip > 0) { + long skipped = in.skip(skip); + if (skipped == -1) { + throw new IOException("Failed to skip"); + } + skip -= skipped; + } + } + } + in.close(); + + assertTrue("tar file not found", found); + } } src/test/java/org/vafer/jdeb/ant/DebAntTaskTestCase.java @@ -22,23 +22,23 @@ import junit.framework.TestCase; public final class ArInputStreamTestCase extends TestCase { - public void testRead() throws Exception { - final File archive = new File(getClass().getResource("data.ar").toURI()); + public void testRead() throws Exception { + final File archive = new File(getClass().getResource("data.ar").toURI()); - final ArInputStream ar = new ArInputStream(new FileInputStream(archive)); - final ArEntry entry1 = ar.getNextEntry(); + final ArInputStream ar = new ArInputStream(new FileInputStream(archive)); + final ArEntry entry1 = ar.getNextEntry(); - assertEquals("data.tgz", entry1.getName()); - assertEquals(148, entry1.getLength()); + assertEquals("data.tgz", entry1.getName()); + assertEquals(148, entry1.getLength()); - for (int i = 0; i < entry1.getLength(); i++) { - ar.read(); - } - - final ArEntry entry2 = ar.getNextEntry(); - - assertNull(entry2); - - ar.close(); - } + for (int i = 0; i < entry1.getLength(); i++) { + ar.read(); + } + + final ArEntry entry2 = ar.getNextEntry(); + + assertNull(entry2); + + ar.close(); + } } src/test/java/org/vafer/jdeb/ar/ArInputStreamTestCase.java @@ -22,14 +22,14 @@ import junit.framework.TestCase; public final class ArOutputStreamTestCase extends TestCase { - public void testWrite() throws Exception { - final File out1 = File.createTempFile("jdeb", ".ar"); + public void testWrite() throws Exception { + final File out1 = File.createTempFile("jdeb", ".ar"); - final ArOutputStream os = new ArOutputStream(new FileOutputStream(out1)); - os.putNextEntry(new ArEntry("data", 4)); - os.write("data".getBytes()); - os.close(); - - assertTrue(out1.delete()); - } + final ArOutputStream os = new ArOutputStream(new FileOutputStream(out1)); + os.putNextEntry(new ArEntry("data", 4)); + os.write("data".getBytes()); + os.close(); + + assertTrue(out1.delete()); + } } src/test/java/org/vafer/jdeb/ar/ArOutputStreamTestCase.java @@ -25,47 +25,47 @@ import java.io.InputStream; */ public final class NonClosingInputStream extends InputStream { - private final InputStream delegate; - - public NonClosingInputStream( final InputStream pDelegate ) { - delegate = pDelegate; - } + private final InputStream delegate; + + public NonClosingInputStream( final InputStream pDelegate ) { + delegate = pDelegate; + } - public int available() throws IOException { - return delegate.available(); - } + public int available() throws IOException { + return delegate.available(); + } - public void close() throws IOException { - // we DON'T close - // delegate.close(); - } + public void close() throws IOException { + // we DON'T close + // delegate.close(); + } - public void mark(int readlimit) { - delegate.mark(readlimit); - } + public void mark(int readlimit) { + delegate.mark(readlimit); + } - public boolean markSupported() { - return delegate.markSupported(); - } + public boolean markSupported() { + return delegate.markSupported(); + } - public int read() throws IOException { - return delegate.read(); - } + public int read() throws IOException { + return delegate.read(); + } - public int read(byte[] b, int off, int len) throws IOException { - return delegate.read(b, off, len); - } + public int read(byte[] b, int off, int len) throws IOException { + return delegate.read(b, off, len); + } - public int read(byte[] b) throws IOException { - return delegate.read(b); - } + public int read(byte[] b) throws IOException { + return delegate.read(b); + } - public void reset() throws IOException { - delegate.reset(); - } + public void reset() throws IOException { + delegate.reset(); + } - public long skip(long n) throws IOException { - return delegate.skip(n); - } - + public long skip(long n) throws IOException { + return delegate.skip(n); + } + } src/test/java/org/vafer/jdeb/ar/NonClosingInputStream.java @@ -23,59 +23,59 @@ import org.vafer.jdeb.descriptors.PackageDescriptor; public final class TextfileChangesProviderTestCase extends TestCase { - public void testParsing() throws Exception { + public void testParsing() throws Exception { - final String input = - " * change1\n" + - " * change2\n" + - "release date=14:00 13.01.2007, version=12324, urgency=low, by=tcurdt@joost.com\n" + - " * change1\n" + - " * change2\n" + - "release date=12:00 10.01.2007, version=10324, urgency=low, by=tcurdt@joost.com\n" + - " * change1\n" + - " * change2\n"; - - final PackageDescriptor descriptor = new PackageDescriptor(); - descriptor.set("Package", "package"); - descriptor.set("Version", "version"); - descriptor.set("Distribution", "distribution"); - descriptor.set("Date", "Mon, 20 Aug 2007 15:25:57 +0200"); - - final TextfileChangesProvider provider = new TextfileChangesProvider(new ByteArrayInputStream(input.getBytes("UTF-8")), descriptor); - final ChangeSet[] changeSets = provider.getChangesSets(); - - assertNotNull(changeSets); - assertEquals(3, changeSets.length); - } + final String input = + " * change1\n" + + " * change2\n" + + "release date=14:00 13.01.2007, version=12324, urgency=low, by=tcurdt@joost.com\n" + + " * change1\n" + + " * change2\n" + + "release date=12:00 10.01.2007, version=10324, urgency=low, by=tcurdt@joost.com\n" + + " * change1\n" + + " * change2\n"; + + final PackageDescriptor descriptor = new PackageDescriptor(); + descriptor.set("Package", "package"); + descriptor.set("Version", "version"); + descriptor.set("Distribution", "distribution"); + descriptor.set("Date", "Mon, 20 Aug 2007 15:25:57 +0200"); + + final TextfileChangesProvider provider = new TextfileChangesProvider(new ByteArrayInputStream(input.getBytes("UTF-8")), descriptor); + final ChangeSet[] changeSets = provider.getChangesSets(); + + assertNotNull(changeSets); + assertEquals(3, changeSets.length); + } - public void testDistributionFromChangesProvider() throws Exception { + public void testDistributionFromChangesProvider() throws Exception { - final String input = - "release distribution=production\n" + - " * change1\n" + - " * change2\n" + - "release distribution=staging, date=14:00 13.01.2007, version=12324, urgency=low, by=tcurdt@joost.com\n" + - " * change1\n" + - " * change2\n" + - "release distribution=development, date=12:00 10.01.2007, version=10324, urgency=low, by=tcurdt@joost.com\n" + - " * change1\n" + - " * change2\n"; - - final PackageDescriptor descriptor = new PackageDescriptor(); - descriptor.set("Package", "package"); - descriptor.set("Version", "version"); - descriptor.set("Date", "Mon, 20 Aug 2007 15:25:57 +0200"); - - final TextfileChangesProvider provider = new TextfileChangesProvider(new ByteArrayInputStream(input.getBytes("UTF-8")), descriptor); - final ChangeSet[] changeSets = provider.getChangesSets(); - - assertNotNull(changeSets); - assertEquals(3, changeSets.length); - - assertEquals("production", changeSets[0].getDistribution()); - assertEquals("staging", changeSets[1].getDistribution()); - assertEquals("development", changeSets[2].getDistribution()); - - } + final String input = + "release distribution=production\n" + + " * change1\n" + + " * change2\n" + + "release distribution=staging, date=14:00 13.01.2007, version=12324, urgency=low, by=tcurdt@joost.com\n" + + " * change1\n" + + " * change2\n" + + "release distribution=development, date=12:00 10.01.2007, version=10324, urgency=low, by=tcurdt@joost.com\n" + + " * change1\n" + + " * change2\n"; + + final PackageDescriptor descriptor = new PackageDescriptor(); + descriptor.set("Package", "package"); + descriptor.set("Version", "version"); + descriptor.set("Date", "Mon, 20 Aug 2007 15:25:57 +0200"); + + final TextfileChangesProvider provider = new TextfileChangesProvider(new ByteArrayInputStream(input.getBytes("UTF-8")), descriptor); + final ChangeSet[] changeSets = provider.getChangesSets(); + + assertNotNull(changeSets); + assertEquals(3, changeSets.length); + + assertEquals("production", changeSets[0].getDistribution()); + assertEquals("staging", changeSets[1].getDistribution()); + assertEquals("development", changeSets[2].getDistribution()); + + } } src/test/java/org/vafer/jdeb/changes/TextfileChangesProviderTestCase.java @@ -27,65 +27,65 @@ import org.vafer.jdeb.utils.MapVariableResolver; public final class PackageDescriptorTestCase extends TestCase { - public void testParse() throws Exception { - - final InputStream is = new ByteArrayInputStream( - ("Key1: Value1\n" + - "Key2: Value2\n" + - " Value2.1\n" + - " Value2.2\n" + - "Key3: Value3\n").getBytes()); - - final PackageDescriptor d = new PackageDescriptor(is, null); - assertFalse(d.isValid()); + public void testParse() throws Exception { + + final InputStream is = new ByteArrayInputStream( + ("Key1: Value1\n" + + "Key2: Value2\n" + + " Value2.1\n" + + " Value2.2\n" + + "Key3: Value3\n").getBytes()); + + final PackageDescriptor d = new PackageDescriptor(is, null); + assertFalse(d.isValid()); - assertEquals("key 1", "Value1", d.get("Key1")); - assertEquals("key 2", "Value2\nValue2.1\nValue2.2", d.get("Key2")); - assertEquals("key 3", "Value3", d.get("Key3")); - } + assertEquals("key 1", "Value1", d.get("Key1")); + assertEquals("key 2", "Value2\nValue2.1\nValue2.2", d.get("Key2")); + assertEquals("key 3", "Value3", d.get("Key3")); + } - public void testToString() throws Exception { - PackageDescriptor descriptor = new PackageDescriptor(); - descriptor.set("Package", "test-package"); - descriptor.set("Description", "This is\na description\non several lines"); - descriptor.set("Version", "1.0"); + public void testToString() throws Exception { + PackageDescriptor descriptor = new PackageDescriptor(); + descriptor.set("Package", "test-package"); + descriptor.set("Description", "This is\na description\non several lines"); + descriptor.set("Version", "1.0"); - String s = descriptor.toString(); + String s = descriptor.toString(); - PackageDescriptor descriptor2 = new PackageDescriptor(new ByteArrayInputStream(s.getBytes()), null); - assertEquals("Package", descriptor.get("Package"), descriptor2.get("Package")); - assertEquals("Description", descriptor.get("Description"), descriptor2.get("Description")); - assertEquals("Version 3", descriptor.get("Version"), descriptor2.get("Version")); - } - - public void testVariableSubstitution() { - - final Map map = new HashMap(); - map.put("VERSION", "1.2"); - map.put("MAINTAINER", "Torsten Curdt <tcurdt@vafer.org>"); + PackageDescriptor descriptor2 = new PackageDescriptor(new ByteArrayInputStream(s.getBytes()), null); + assertEquals("Package", descriptor.get("Package"), descriptor2.get("Package")); + assertEquals("Description", descriptor.get("Description"), descriptor2.get("Description")); + assertEquals("Version 3", descriptor.get("Version"), descriptor2.get("Version")); + } + + public void testVariableSubstitution() { + + final Map map = new HashMap(); + map.put("VERSION", "1.2"); + map.put("MAINTAINER", "Torsten Curdt <tcurdt@vafer.org>"); - final PackageDescriptor d = new PackageDescriptor(new MapVariableResolver(map)); - d.set("Version", "[[VERSION]]"); - d.set("Maintainer", "[[MAINTAINER]]"); - d.set("NoResolve1", "test[[test"); - d.set("NoResolve2", "[[test]]"); - - assertEquals("1.2", d.get("Version")); - assertEquals("Torsten Curdt <tcurdt@vafer.org>", d.get("Maintainer")); - assertEquals("test[[test", d.get("NoResolve1")); - assertEquals("[[test]]", d.get("NoResolve2")); - } - - public void testEmptyLines() throws Exception { - final InputStream is = new ByteArrayInputStream( - ("Key1: Value1\n" + - "Key2: Value2\n" + - "\n").getBytes()); - try { - new PackageDescriptor(is, null); - fail("Should throw a ParseException"); - } catch(ParseException e) { - - } - } + final PackageDescriptor d = new PackageDescriptor(new MapVariableResolver(map)); + d.set("Version", "[[VERSION]]"); + d.set("Maintainer", "[[MAINTAINER]]"); + d.set("NoResolve1", "test[[test"); + d.set("NoResolve2", "[[test]]"); + + assertEquals("1.2", d.get("Version")); + assertEquals("Torsten Curdt <tcurdt@vafer.org>", d.get("Maintainer")); + assertEquals("test[[test", d.get("NoResolve1")); + assertEquals("[[test]]", d.get("NoResolve2")); + } + + public void testEmptyLines() throws Exception { + final InputStream is = new ByteArrayInputStream( + ("Key1: Value1\n" + + "Key2: Value2\n" + + "\n").getBytes()); + try { + new PackageDescriptor(is, null); + fail("Should throw a ParseException"); + } catch(ParseException e) { + + } + } } src/test/java/org/vafer/jdeb/descriptors/PackageDescriptorTestCase.java @@ -24,78 +24,78 @@ import org.vafer.jdeb.mapping.LsMapper.ParseError; public final class LsMapperTestCase extends TestCase { - private final static String output = - "total 0\n" + - "drwxr-xr-x 23 tcurdt tcurdt 782 Jun 25 03:48 .\n" + - "drwxr-xr-x 3 tcurdt tcurdt 102 Jun 25 03:48 ..\n" + - "\n" + - "./trunk/target/test-classes/org/vafer/dependency:\n" + - "total 176\n" + - "drwxr-xr-x 23 tcurdt tcurdt 782 Jun 25 03:48 .\n" + - "drwxr-xr-x 3 tcurdt tcurdt 102 Jun 25 03:48 ..\n" + - "-rw-r--r-- 1 tcurdt tcurdt 2934 Jun 25 03:48 DependenciesTestCase.class\n" + - "-rw-r--r-- 1 tcurdt tcurdt 786 Jun 25 03:48 JarCombiningTestCase$1.class\n" + - "drwxr-xr-x 4 tcurdt tcurdt 136 Jun 25 03:48 classes\n" + - "\n" + - "./trunk/src/test-classes/org/vafer/dependency:\n" + - "total 76\n" + - "drwxr-xr-x 23 tcurdt tcurdt 782 Jun 25 03:48 .\n" + - "drwxr-xr-x 3 tcurdt tcurdt 102 Jun 25 03:48 ..\n" + - "-rw-r--r-- 1 tcurdt tcurdt 2934 Jun 25 03:48 DependenciesTestCase.class\n" + - "-rw-r--r-- 1 tcurdt tcurdt 786 Jun 25 03:48 JarCombiningTestCase$1.class\n" + - "drwxr-xr-x 4 tcurdt tcurdt 136 Jun 25 03:48 classes\n" + - "\n"; - - public void testModes() throws Exception { - final ByteArrayInputStream is = new ByteArrayInputStream(output.getBytes("UTF-8")); - - final Mapper mapper = new LsMapper(is); + private final static String output = + "total 0\n" + + "drwxr-xr-x 23 tcurdt tcurdt 782 Jun 25 03:48 .\n" + + "drwxr-xr-x 3 tcurdt tcurdt 102 Jun 25 03:48 ..\n" + + "\n" + + "./trunk/target/test-classes/org/vafer/dependency:\n" + + "total 176\n" + + "drwxr-xr-x 23 tcurdt tcurdt 782 Jun 25 03:48 .\n" + + "drwxr-xr-x 3 tcurdt tcurdt 102 Jun 25 03:48 ..\n" + + "-rw-r--r-- 1 tcurdt tcurdt 2934 Jun 25 03:48 DependenciesTestCase.class\n" + + "-rw-r--r-- 1 tcurdt tcurdt 786 Jun 25 03:48 JarCombiningTestCase$1.class\n" + + "drwxr-xr-x 4 tcurdt tcurdt 136 Jun 25 03:48 classes\n" + + "\n" + + "./trunk/src/test-classes/org/vafer/dependency:\n" + + "total 76\n" + + "drwxr-xr-x 23 tcurdt tcurdt 782 Jun 25 03:48 .\n" + + "drwxr-xr-x 3 tcurdt tcurdt 102 Jun 25 03:48 ..\n" + + "-rw-r--r-- 1 tcurdt tcurdt 2934 Jun 25 03:48 DependenciesTestCase.class\n" + + "-rw-r--r-- 1 tcurdt tcurdt 786 Jun 25 03:48 JarCombiningTestCase$1.class\n" + + "drwxr-xr-x 4 tcurdt tcurdt 136 Jun 25 03:48 classes\n" + + "\n"; + + public void testModes() throws Exception { + final ByteArrayInputStream is = new ByteArrayInputStream(output.getBytes("UTF-8")); + + final Mapper mapper = new LsMapper(is); - final TarEntry entry1 = mapper.map(new TarEntry("trunk/target/test-classes/org/vafer/dependency")); - - assertEquals(493, entry1.getMode()); - assertEquals("tcurdt", entry1.getUserName()); - assertEquals("tcurdt", entry1.getGroupName()); - - final TarEntry entry2 = mapper.map(new TarEntry("trunk/target/test-classes/org/vafer/dependency/DependenciesTestCase.class")); + final TarEntry entry1 = mapper.map(new TarEntry("trunk/target/test-classes/org/vafer/dependency")); + + assertEquals(493, entry1.getMode()); + assertEquals("tcurdt", entry1.getUserName()); + assertEquals("tcurdt", entry1.getGroupName()); + + final TarEntry entry2 = mapper.map(new TarEntry("trunk/target/test-classes/org/vafer/dependency/DependenciesTestCase.class")); - assertEquals(420, entry2.getMode()); - assertEquals("tcurdt", entry2.getUserName()); - assertEquals("tcurdt", entry2.getGroupName()); - } - - public void testSuccessfulParsing() throws Exception { - final ByteArrayInputStream is = new ByteArrayInputStream(output.getBytes("UTF-8")); - - final Mapper mapper = new LsMapper(is); - - final TarEntry unknown = new TarEntry("xyz"); - assertSame(unknown, mapper.map(unknown)); - - final TarEntry known = new TarEntry("trunk/target/test-classes/org/vafer/dependency"); - final TarEntry knownMapped = mapper.map(known); - - assertNotSame(known, knownMapped); - - } - - public void testPrematureEOF() throws Exception { - final ByteArrayInputStream is = new ByteArrayInputStream(output.substring(0, 200).getBytes("UTF-8")); - - try { - new LsMapper(is); - fail("should fail to parse"); - } catch(ParseError e) { - } - } - - public void testWrongFormat() throws Exception { - final ByteArrayInputStream is = new ByteArrayInputStream("asas\n".getBytes("UTF-8")); - - try { - new LsMapper(is); - fail("should fail to parse"); - } catch(ParseError e) { - } - } + assertEquals(420, entry2.getMode()); + assertEquals("tcurdt", entry2.getUserName()); + assertEquals("tcurdt", entry2.getGroupName()); + } + + public void testSuccessfulParsing() throws Exception { + final ByteArrayInputStream is = new ByteArrayInputStream(output.getBytes("UTF-8")); + + final Mapper mapper = new LsMapper(is); + + final TarEntry unknown = new TarEntry("xyz"); + assertSame(unknown, mapper.map(unknown)); + + final TarEntry known = new TarEntry("trunk/target/test-classes/org/vafer/dependency"); + final TarEntry knownMapped = mapper.map(known); + + assertNotSame(known, knownMapped); + + } + + public void testPrematureEOF() throws Exception { + final ByteArrayInputStream is = new ByteArrayInputStream(output.substring(0, 200).getBytes("UTF-8")); + + try { + new LsMapper(is); + fail("should fail to parse"); + } catch(ParseError e) { + } + } + + public void testWrongFormat() throws Exception { + final ByteArrayInputStream is = new ByteArrayInputStream("asas\n".getBytes("UTF-8")); + + try { + new LsMapper(is); + fail("should fail to parse"); + } catch(ParseError e) { + } + } } src/test/java/org/vafer/jdeb/mapping/LsMapperTestCase.java @@ -24,47 +24,47 @@ import junit.framework.TestCase; public final class SigningTestCase extends TestCase { - public void testClearSign() throws Exception { - - final InputStream ring = getClass().getClassLoader().getResourceAsStream("org/vafer/gpg/secring.gpg"); - - assertNotNull(ring); - - final String inputStr = "TEST1\nTEST2\nTEST3\n"; - final byte[] input = inputStr.getBytes("UTF-8"); - - final String expectedOutputStr = - "-----BEGIN PGP SIGNED MESSAGE-----\n" + - "Hash: SHA1\n" + - "\n" + - "TEST1\r\n" + - "TEST2\r\n" + - "TEST3\r\n" + - "-----BEGIN PGP SIGNATURE-----\n" + - "Version: BCPG v1.29\n" + - "\n" + - "iEYEARECABAFAkax1rgJEHM9pIAuB02PAABIJgCghFmoCJCZ0CGiqgVLGGPd/Yh5\n" + - "FQQAnRVqvI2ij45JQSHYJBblZ0Vv2meN\n" + - "=aAAT\n" + - "-----END PGP SIGNATURE-----\n"; - - final byte[] expectedOutput = expectedOutputStr.getBytes("UTF-8"); + public void testClearSign() throws Exception { + + final InputStream ring = getClass().getClassLoader().getResourceAsStream("org/vafer/gpg/secring.gpg"); + + assertNotNull(ring); + + final String inputStr = "TEST1\nTEST2\nTEST3\n"; + final byte[] input = inputStr.getBytes("UTF-8"); + + final String expectedOutputStr = + "-----BEGIN PGP SIGNED MESSAGE-----\n" + + "Hash: SHA1\n" + + "\n" + + "TEST1\r\n" + + "TEST2\r\n" + + "TEST3\r\n" + + "-----BEGIN PGP SIGNATURE-----\n" + + "Version: BCPG v1.29\n" + + "\n" + + "iEYEARECABAFAkax1rgJEHM9pIAuB02PAABIJgCghFmoCJCZ0CGiqgVLGGPd/Yh5\n" + + "FQQAnRVqvI2ij45JQSHYJBblZ0Vv2meN\n" + + "=aAAT\n" + + "-----END PGP SIGNATURE-----\n"; + + final byte[] expectedOutput = expectedOutputStr.getBytes("UTF-8"); - final ByteArrayOutputStream os = new ByteArrayOutputStream(); + final ByteArrayOutputStream os = new ByteArrayOutputStream(); - SigningUtils.clearSign( - new ByteArrayInputStream(input), - ring, - "2E074D8F", "test", - os); - - final byte[] output = os.toByteArray(); - - final int from = expectedOutputStr.indexOf("iEYEAREC"); - final int until = expectedOutputStr.indexOf("=aAAT") + 5; - Arrays.fill(output, from, until, (byte)'?'); - Arrays.fill(expectedOutput, from, until, (byte)'?'); + SigningUtils.clearSign( + new ByteArrayInputStream(input), + ring, + "2E074D8F", "test", + os); + + final byte[] output = os.toByteArray(); + + final int from = expectedOutputStr.indexOf("iEYEAREC"); + final int until = expectedOutputStr.indexOf("=aAAT") + 5; + Arrays.fill(output, from, until, (byte)'?'); + Arrays.fill(expectedOutput, from, until, (byte)'?'); - assertEquals(new String(expectedOutput), new String(output)); - } + assertEquals(new String(expectedOutput), new String(output)); + } } src/test/java/org/vafer/jdeb/signing/SigningTestCase.java c53d86fd033ff693fa324bc721e6b48ae559e9e8 Torsten Curdt tcurdt@vafer.org http://github.com/tcurdt/jdeb/commit/d808fcb51661e6679dba8511083f7de853c82c71 d808fcb51661e6679dba8511083f7de853c82c71 2009-02-17T01:51:37-08:00 2009-02-17T01:51:37-08:00 tabs -> spaces, nitpicking on finals, rolled back visibility of Processor.buildData() as it does not seem required (or was that really intentional?) 8d6d6b08ab50541cd8bf722cf0517050c4ad562e Torsten Curdt tcurdt@vafer.org