Ticket #1527: 1527_ckreleaser_2.patch

_source/ckreleaser.js

@@ -66 +66 @@
 CKRELEASER.sourceDir = arguments[1];
 CKRELEASER.targetDir = arguments[2];
 CKRELEASER.version = arguments[3];
-CKRELEASER.zipName = arguments[4];
-CKRELEASER.targzName = arguments[5];
+CKRELEASER.fileName = arguments[4];
 
-if ( !CKRELEASER.releaseFile || !CKRELEASER.sourceDir || !CKRELEASER.targetDir || !CKRELEASER.version || !CKRELEASER.zipName
-                || !CKRELEASER.targzName )
+if ( !CKRELEASER.releaseFile || !CKRELEASER.sourceDir || !CKRELEASER.targetDir || !CKRELEASER.version || !CKRELEASER.fileName )
 {
-        error( '\nUsage: ' + command + ' release_file source_dir target_dir version zip_name targz_name [-v]' +
+        error( '\nUsage: ' + command + ' release_file source_dir target_dir version file_name [-v]' +
                         '\n' +
                         '\n release_file    Path to CKReleaser configuration file.' +
                         '\n source_dir      Path to the directory with code of application to be released.' +
                         '\n target_dir      Path to the directory, where application will be build.' +
                         '\n                 If directory already exists, CKReleaser will not start.' +
                         '\n version         The version string used to replace the %VERSION% directive.' +
-                        '\n zip_name        Name of the .zip file to create.' +
-                        '\n targz_name      Name of the .tar.gz file to create.' +
+                        '\n file_name       Name of the file to create (without the extension).' +
                         '\n\n -v | --verbose  Enable verbose output.' +
                         '\n                 Display detailed exception information when an error occurs.');
 }

_source/includes/releaser.js

@@ -223 +223 @@
         var regexLib =
         {
                 packagerRemove : Pattern.compile( '(?m-s:^.*?%REMOVE_START%).*?(?m-s:%REMOVE_END%.*?$)', Pattern.DOTALL ),
-                packagerRemoveLine : Pattern.compile( '.*%REMOVE_LINE%.*(?:\\r\\n|\\r|\\n)?' )
+                packagerRemoveLine : Pattern.compile( '.*%REMOVE_LINE%.*(?:\\r\\n|\\r|\\n)?' ),
+                packagerRev : Pattern.compile( '.*Revision: (\\d+).*', Pattern.DOTALL )
         };
 
         /*
          * %VERSION%: 
          *     the "version" string passed to the CKReleaser execution command.
+         * %REV%: 
+         *     the SVN revision number of the source directory.
          * %TIMESTAMP%: 
          *     a four characters string containing the
          *     concatenation of the "Base 36" value of each of the following components
@@ -249 +252 @@
                         text = text.replace( /%VERSION%/g, CKRELEASER.version );
                         replaced = true;
                 }
+                if ( text.indexOf( "%REV%" ) != -1 )
+                {
+                        var o =
+                        {
+                                output : ""
+                        };
+
+                        runCommand( "svn", "info", CKRELEASER.sourceDir, o );
+
+                        if ( o.output.indexOf( "Revision:" ) != -1 )
+                        {
+                                var rev = regexLib.packagerRev.matcher( o.output ).replaceAll( '$1' );
+                                text = text.replace( /%REV%/g, rev );
+                        }
+                        else
+                        {
+                                if ( o.output.indexOf( "not a working" ) != -1 )
+                                        print( "WARNING: Unable to fetch the revision number, source directory is not under version control: "
+                                                        + CKRELEASER.sourceDir );
+                                else
+                                        print( "WARNING: Unable to fetch the revision number, make sure that Subversion’s bin directory is in your system path." );
+                                text = text.replace( /%REV%/g, "UNKNOWN" );
+                        }
+
+                        replaced = true;
+                }
                 if ( text.indexOf( "%TIMESTAMP%" ) != -1 )
                 {
                         text = text.replace( /%TIMESTAMP%/g, CKRELEASER.timestamp );
@@ -492 +521 @@
 
                         print( "\nCreating compressed files...\n" );
 
-                        var zipFile = new File( CKRELEASER.targetDir, CKRELEASER.zipName );
+                        var zipFile = new File( CKRELEASER.targetDir, CKRELEASER.fileName + ".zip" );
                         CKRELEASER.io.zipDirectory( CKRELEASER.releaseDir, zipFile, "ckeditor" );
                         print( "    Created " + zipFile.getName() + "...: " + zipFile.length() + " bytes ("
                                         + Math.round( zipFile.length() / info.size * 100 ) + "% of original)" );
 
-                        var tarFile = new File( CKRELEASER.targetDir, CKRELEASER.targzName );
+                        var tarFile = new File( CKRELEASER.targetDir, CKRELEASER.fileName + ".tar.gz" );
                         CKRELEASER.io.targzDirectory( CKRELEASER.releaseDir, tarFile, "ckeditor" );
                         print( "    Created " + tarFile.getName() + ": " + tarFile.length() + " bytes ("
                                         + Math.round( tarFile.length() / info.size * 100 ) + "% of original)" );