trygvis · roclas · Dec 15, 2014 · Dec 15, 2014 · Dec 22, 2014 · Dec 23, 2014
diff --git a/unix-common/src/main/java/org/codehaus/mojo/unix/PackageParameters.java b/unix-common/src/main/java/org/codehaus/mojo/unix/PackageParameters.java
@@ -58,6 +58,8 @@ public class PackageParameters
 
     public final Option<String> contact;
 
+    public final Option<String> size;
+
     public final Option<String> contactEmail;
 
     public final Option<String> license;
@@ -71,10 +73,11 @@ public class PackageParameters
     public PackageParameters( String groupId, String artifactId, PackageVersion version, String id, String name,
                               FileAttributes defaultFileAttributes, FileAttributes defaultDirectoryAttributes,
                               Option<String> classifier, Option<String> description, Option<String> contact,
+                              Option<String> size,
                               Option<String> contactEmail, Option<String> license, Option<String> architecture )
     {
         validateNotNull( groupId, artifactId, version, id, name, defaultFileAttributes, defaultDirectoryAttributes,
-            classifier, description, contact, contactEmail, license, architecture );
+            classifier, description, contact,size, contactEmail, license, architecture );
 
         this.groupId = groupId;
         this.artifactId = artifactId;
@@ -84,6 +87,7 @@ public PackageParameters( String groupId, String artifactId, PackageVersion vers
         this.classifier = classifier;
         this.description = description;
         this.contact = contact;
+        this.size= size;
         this.contactEmail = contactEmail;
         this.license = license;
         this.architecture = architecture;
@@ -102,13 +106,14 @@ public static PackageParameters packageParameters( String groupId, String artifa
     {
         return new PackageParameters( groupId, artifactId, version, id, name, defaultFileAttributes,
                                       defaultDirectoryAttributes, classifier, Option.<String>none(), Option.<String>none(),
+                                      Option.<String>none(),
                                       Option.<String>none(), Option.<String>none(), Option.<String>none() );
     }
 
     public PackageParameters name( String name )
     {
         return new PackageParameters( groupId, artifactId, version, id, name, defaultFileAttributes,
-                                      defaultDirectoryAttributes, classifier, description, contact, contactEmail,
+                                      defaultDirectoryAttributes, classifier, description, contact,size, contactEmail,
                                       license, architecture );
     }
 
@@ -120,7 +125,7 @@ public PackageParameters description( String description )
     public PackageParameters description( Option<String> description )
     {
         return new PackageParameters( groupId, artifactId, version, id, name, defaultFileAttributes,
-                                      defaultDirectoryAttributes, classifier, description, contact, contactEmail,
+                                      defaultDirectoryAttributes, classifier, description, contact,size, contactEmail,
                                       license, architecture );
     }
 
@@ -132,7 +137,19 @@ public PackageParameters contact( String contact )
     public PackageParameters contact( Option<String> contact )
     {
         return new PackageParameters( groupId, artifactId, version, id, name, defaultFileAttributes,
-                                      defaultDirectoryAttributes, classifier, description, contact, contactEmail,
+                                      defaultDirectoryAttributes, classifier, description, contact,size, contactEmail,
+                                      license, architecture );
+    }
+
+    public PackageParameters size( String size )
+    {
+        return size( fromNull( size ) );
+    }
+
+    public PackageParameters size( Option<String> size )
+    {
+        return new PackageParameters( groupId, artifactId, version, id, name, defaultFileAttributes,
+                                      defaultDirectoryAttributes, classifier, description, contact,size, contactEmail,
                                       license, architecture );
     }
 
@@ -144,7 +161,7 @@ public PackageParameters contactEmail( String contactEmail )
     public PackageParameters contactEmail( Option<String> contactEmail )
     {
         return new PackageParameters( groupId, artifactId, version, id, name, defaultFileAttributes,
-                                      defaultDirectoryAttributes, classifier, description, contact, contactEmail,
+                                      defaultDirectoryAttributes, classifier, description, contact,size, contactEmail,
                                       license, architecture );
     }
 
@@ -156,7 +173,7 @@ public PackageParameters license( String license )
     public PackageParameters license( Option<String> license )
     {
         return new PackageParameters( groupId, artifactId, version, id, name, defaultFileAttributes,
-                                      defaultDirectoryAttributes, classifier, description, contact, contactEmail,
+                                      defaultDirectoryAttributes, classifier, description, contact,size, contactEmail,
                                       license, architecture );
     }
 
@@ -168,7 +185,7 @@ public PackageParameters architecture( String architecture )
     public PackageParameters architecture( Option<String> architecture )
     {
         return new PackageParameters( groupId, artifactId, version, id, name, defaultFileAttributes,
-                                      defaultDirectoryAttributes, classifier, description, contact, contactEmail,
+                                      defaultDirectoryAttributes, classifier, description, contact,size, contactEmail,
                                       license, architecture );
     }
 }
diff --git a/unix-deb/src/main/java/org/codehaus/mojo/unix/deb/ControlFile.java b/unix-deb/src/main/java/org/codehaus/mojo/unix/deb/ControlFile.java
@@ -50,6 +50,8 @@ public class ControlFile
 
     public final Option<String> maintainer;
 
+    public final Option<String> installedSize;
+
     public final Option<String> architecture;
 
     public final Option<String> priority;
@@ -74,14 +76,17 @@ public class ControlFile
 
     public ControlFile( String packageName )
     {
-        this( packageName, Option.<String>none(), Option.<String>none(), Option.<String>none(), Option.<String>none(),
+        this( packageName, Option.<String>none(), Option.<String>none(), Option.<String>none(),
+                Option.<String>none(), Option.<String>none(),
             Option.<String>none(), Option.<String>none(), List.<String>nil(), List.<String>nil(), List.<String>nil(),
             List.<String>nil(), List.<String>nil(), List.<String>nil(), List.<String>nil(),
             TreeMap.<String, String>empty( stringOrd ) );
     }
 
     public ControlFile( String packageName, Option<String> version, Option<String> description,
-                        Option<String> maintainer, Option<String> architecture, Option<String> priority,
+                        Option<String> maintainer,
+                        Option<String> installedSize,
+                        Option<String> architecture, Option<String> priority,
                         Option<String> section, List<String> depends, List<String> recommends, List<String> suggests,
                         List<String> preDepends, List<String> provides, List<String> replaces, List<String> conflicts,
                         TreeMap<String, String> extraFields )
@@ -90,6 +95,7 @@ public ControlFile( String packageName, Option<String> version, Option<String> d
         this.version = version;
         this.description = description;
         this.maintainer = maintainer;
+        this.installedSize= installedSize;
         this.architecture = architecture;
         this.priority = priority;
         this.section = section;
@@ -105,97 +111,114 @@ public ControlFile( String packageName, Option<String> version, Option<String> d
 
     public ControlFile version( Option<String> version )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer, installedSize,architecture, priority,
+                section, depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile description( Option<String> description )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer, installedSize, architecture, priority,
+                section, depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile maintainer( Option<String> maintainer )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
-                                recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
+        return new ControlFile( packageName, version, description, maintainer, installedSize, architecture, priority,
+                section, depends, recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
+    }
+
+    public ControlFile installedSize(Option<String> size) {
+        return new ControlFile( packageName, version, description, maintainer, size, architecture, priority,
+                section, depends, recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile architecture( Option<String> architecture )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer,installedSize, architecture, priority,
+                section, depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile priority( Option<String> priority )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer, installedSize,architecture, priority,
+                section,
+                depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile section( Option<String> section )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer, installedSize, architecture, priority,
+                section, depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile depends( List<String> depends )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer,installedSize, architecture, priority,
+                section, depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile recommends( List<String> recommends )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer,installedSize, architecture, priority,
+                section, depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile suggests( List<String> suggests )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer,installedSize,  architecture, priority, section, depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile preDepends( List<String> preDepends )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer,installedSize,  architecture, priority, section, depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile provides( List<String> provides )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer,installedSize,  architecture, priority, section, depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile replaces( List<String> replaces )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer, installedSize,  architecture, priority, section,
+                depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile conflicts( List<String> conflicts )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer, installedSize,  architecture, priority, section,
+                depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public ControlFile extraFields( TreeMap<String, String> extraFields )
     {
-        return new ControlFile( packageName, version, description, maintainer, architecture, priority, section, depends,
+        return new ControlFile( packageName, version, description, maintainer, installedSize,  architecture, priority, section,
+                depends,
                                 recommends, suggests, preDepends, provides, replaces, conflicts, extraFields );
     }
 
     public List<String> toList()
     {
         List<Option<String>> optionList = single( some( "Package: " + packageName ) ).
             cons( section.map( curry( concat, "Section: " ) ) ).
-            cons( priority.map( curry( concat, "Priority: " ) ) ).
-            cons( maintainer.map( curry( concat, "Maintainer: " ) ) ).
+            cons(priority.map(curry(concat, "Priority: "))).
+            cons(maintainer.map(curry(concat, "Maintainer: "))).
+            cons(installedSize.map(curry(concat, "Installed-Size: "))).
             cons( version.map( curry( concat, "Version: " ) ) ).
             cons( architecture.map( curry( concat, "Architecture: " ) ) ).
-            cons( description.map( curry( concat, "Description: " ) ) );
+            cons(description.map(curry(concat, "Description: ")));
 
         F<String, F<List<String>, List<String>>> f = listToHeader.f( 80 );
 
@@ -289,6 +312,9 @@ public TreeMap<String, String> f( TreeMap<String, String> map, P2<String, String
         controlFile = controlFile.maintainer( map.get( "Maintainer" ) );
         map = map.delete( "Maintainer" );
 
+        controlFile = controlFile.installedSize( map.get( "Installed-Size" ) );
+        map = map.delete( "Installed-Size" );
+
         controlFile = controlFile.architecture( map.get( "Architecture" ) );
         map = map.delete( "Architecture" );
 
@@ -324,4 +350,5 @@ public TreeMap<String, String> f( TreeMap<String, String> map, P2<String, String
 
         return controlFile;
     }
+
 }
diff --git a/unix-deb/src/main/java/org/codehaus/mojo/unix/deb/DpkgDebUtil.java b/unix-deb/src/main/java/org/codehaus/mojo/unix/deb/DpkgDebUtil.java
@@ -49,6 +49,7 @@ public static ControlFile getControlFile( File deb )
             addArgument( "section" ).
             addArgument( "priority" ).
             addArgument( "maintainer" ).
+            addArgument( "installedSize" ).
             addArgument( "package" ).
             addArgument( "version" ).
             addArgument( "architecture" ).

diff --git a/unix-deb/src/test/java/org/codehaus/mojo/unix/deb/DebControlParserTest.java b/unix-deb/src/test/java/org/codehaus/mojo/unix/deb/DebControlParserTest.java
@@ -104,6 +104,7 @@ public void testParseAnt()
         ControlFile expectedControlFile = new ControlFile( "ant" ).
             version( some( "1.7.0-3" ) ).
             maintainer( some( "Ubuntu Core Developers <[email protected]>" ) ).
+            installedSize( some( "1025" ) ).
             architecture( some( "all" ) ).
             priority( some( "optional" ) ).
             section( some( "devel" ) ).
@@ -126,6 +127,7 @@ public void testParseBash()
         ControlFile expectedControlFile = new ControlFile( "bash" ).
             version( some( "3.2-0ubuntu16" ) ).
             maintainer( some( "Ubuntu Core developers <[email protected]>" ) ).
+            installedSize( some( "1316" ) ).
             architecture( some( "amd64" ) ).
             priority( some( "required" ) ).
             section( some( "base" ) ).
@@ -153,6 +155,7 @@ public void testParseLibc6()
         ControlFile expectedControlFile = new ControlFile( "libc6" ).
             version( some( "2.7-10ubuntu3" ) ).
             maintainer( some( "Ubuntu Core developers <[email protected]>" ) ).
+            installedSize( some( "11348" ) ).
             architecture( some( "amd64" ) ).
             priority( some( "required" ) ).
             section( some( "base" ) ).
@@ -204,6 +207,7 @@ private void assertControlFile( String path, ControlFile expectedControlFile )
             assertEquals( "version", expectedControlFile.version, actualControlFile.version ).
             assertEquals( "description", expectedControlFile.description, actualControlFile.description ).
             assertEquals( "maintainer", expectedControlFile.maintainer, actualControlFile.maintainer ).
+            assertEquals( "installedSize", expectedControlFile.installedSize, actualControlFile.installedSize).
             assertEquals( "package", expectedControlFile.packageName, actualControlFile.packageName ).
             assertEquals( "architecture", expectedControlFile.architecture, actualControlFile.architecture ).
             assertEquals( "priority", expectedControlFile.priority, actualControlFile.priority ).

diff --git a/unix-deb/src/test/resources/control/ant.txt b/unix-deb/src/test/resources/control/ant.txt
@@ -1,7 +1,7 @@
 Package: ant
 Priority: optional
 Section: devel
-Installed-Size: 1460
+Installed-Size: 1025
 Maintainer: Ubuntu Core Developers <[email protected]>
 Original-Maintainer: Debian Java Maintainers <[email protected]>
 Architecture: all

diff --git a/unix-handbook/src/main/docbook/examples/basic/dpkg-deb-f.txt b/unix-handbook/src/main/docbook/examples/basic/dpkg-deb-f.txt
@@ -3,6 +3,7 @@ Package: basic
 Section: devel
 Priority: standard
 Maintainer: Acme
+Installed-Size: 1024
 Version: 1.0-20110708.151032
 Architecture: all
 Description: Hudson Solaris Package
diff --git a/unix-handbook/src/main/docbook/examples/basic/pom-deb.xml b/unix-handbook/src/main/docbook/examples/basic/pom-deb.xml
@@ -28,6 +28,7 @@
         <extensions>true</extensions>
         <configuration>
           <contact>Acme</contact>
+	  <size>1024</size>
           <contactEmail>[email protected]</contactEmail>
           <deb>
             <section>devel</section>

diff --git a/unix-handbook/src/main/docbook/examples/basic/pom-pkg.xml b/unix-handbook/src/main/docbook/examples/basic/pom-pkg.xml
@@ -28,6 +28,7 @@
         <extensions>true</extensions>
         <configuration>
           <contact>Acme</contact>
+	  <size>1024</size>
           <contactEmail>[email protected]</contactEmail>
           <assembly>
             <copyArtifact>

diff --git a/unix-handbook/src/main/docbook/examples/basic/pom-rpm.xml b/unix-handbook/src/main/docbook/examples/basic/pom-rpm.xml
@@ -33,6 +33,7 @@
         <extensions>true</extensions>
         <configuration>
           <contact>Acme</contact>
+	  <size>1024</size>
           <contactEmail>[email protected]</contactEmail>
           <rpm>
             <group>Application/Collectors</group>

diff --git a/unix-handbook/src/main/docbook/examples/basic/pom-zip.xml b/unix-handbook/src/main/docbook/examples/basic/pom-zip.xml
@@ -28,6 +28,7 @@
         <extensions>true</extensions>
         <configuration>
           <contact>Acme</contact>
+	  <size>1024</size>
           <contactEmail>[email protected]</contactEmail>
           <assembly>
             <copyArtifact>