dnnbundler 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cbe59e15b822d31c419850068808fed5beff93c
-  data.tar.gz: 81af67b4728e1b4b3faafc7f9e022f2f2f682c26
+  metadata.gz: 96c347bb2f330fdeefd588f01d2721339587b80d
+  data.tar.gz: d69601f50871db50d78185c5dbcad341d475eb7b
 SHA512:
-  metadata.gz: cd9620df2a3ea1da99998d72c151c10b2f524dfa91f4a1d1867866953dcfdc3c5e9567c7dec110832d1d438fd77dddec8ae50a2f5ff21b0b497e7c6ed4de4527
-  data.tar.gz: 5a9e95a2486189732827739d50c7545f214fe3882bf4a703924446df7d551c4014d5a1802429bb3eee1ca61686038b691570378a67d36d14038e4fdcd6914e6b
+  metadata.gz: f2e22d533440874f46923a28e58b0ce8f1ca8e50f23fb63ae4a08b5cffe4dea32b7b12d76f447d3678872d205191771a2679718177df31b5f6691dc2e1c65b32
+  data.tar.gz: 148501b005a3fec11644306275be2d60e0eb6d6b7aec9c2571ce0f2f83d0e4fb2579b6c4fa11877015abb3e8d989cf943476149211a9c32d5c4cc630164027b4

data/README.md

@@ -25,34 +25,50 @@ Or install it yourself as:
 To configure packaging create a json config with the following schema:
 
     {
-        "name": "out.zip",
-        "entries": [
-            "path_to_file",
-            "path_to_directory",          // real path in file system to file or directory
+        "packages": [
             {
-                "type": "file",           // type of entry, if absent will be treated as 'file'
-                "name": "test.json",      // real path in file system to file or directory
-                "path": "new_path_in_zip" // optional
-            },
-            {
-                "type": "zip",            // nested zip archive
-                "name": "test.zip",       // name of nested zip archive, can include directories. 'path' property is being ignored for this kind of entries
-                "ignoreEntries": [ ... ]  // local array of entries to ignore
-                "entries": [              // array of entries for nested zip file, same format as above
-                    "file",
-                    "dir",
-                    ...
+                "name": "out.[PACKAGE_VERSION].zip", // [PACKAGE_VERSION] is a placeholder for package version which will be taken from manifest file
+                "entries": [
+                    "path_to_file",
+                    "path_to_directory",             // real path in file system to file or directory
+                    {
+                        "type": "file",              // type of entry, if absent will be treated as 'file'
+                        "name": "test.json",         // real path in file system to file or directory
+                        "path": "new_path_in_zip"    // optional
+                    },
+                    {
+                        "type": "zip",               // nested zip archive
+                        "name": "test.zip",          // name of nested zip archive, can include directories. 'path' property is being ignored for this kind of entries
+                        "ignoreEntries": [ ... ]     // local array of entries to ignore
+                        "entries": [                 // array of entries for nested zip file, same format as above
+                            "file",
+                            "dir",
+                            ...
+                        ]
+                    }
+                ],
+                "ignoreEntries": [
+                    ".DS_Store"
                 ]
             }
         ],
-        "ignoreEntries": [
-            ".DS_Store"
+        "manifests": [
+            "path_to_dnn_manifest"                   // dnn manifest file
         ]
     }
 
 to create package run:
 
-    dnnbundler path_to_config.json
+    dnnbundler build path_to_config.json
+
+it is possible to increment build or sprint numbers:
+
+    dnnbundler build path_to_config.json --bumpBuild
+    dnnbundler build path_to_config.json --bumpSprint
+
+it is also possible to specify custom version number:
+
+    dnnbundler build path_to_config.json --targetVersion 2017.08.0004
 
 ## Development
 

data/lib/dnnbundler/cli.rb

@@ -1,21 +1,43 @@
 require "dnnbundler/zipFileGenerator"
+require "dnnbundler/fileStringReplacer/fileStringReplacer"
 require "thor"
 require "json"
 
 module Dnnbundler
     class CLI < Thor
-        desc "build CONFIG", ""
+        desc "build CONFIG [options]", "creates a zip package according to given configuration file"
         option :bumpBuild
+        option :bumpSprint
+        option :targetVersion, :type => :string
         def build( config )
             puts "Build with config #{config}"
             file = File.read(config)
             data_hash = JSON.parse(file)
 
-            input_entries = data_hash["entries"]
-            ignore_entries = data_hash["excludeEntries"]
-            zip_file_name = data_hash["outFileName"]
-            generator = ZipFileGenerator.new(data_hash)
-            generator.write
+            manifest_files = data_hash["manifests"]
+            current_version = Dnnbundler::getVersionFromManifest manifest_files[0]
+            version_numbers = current_version.split(".").map { |x| x.to_i }
+
+            version_numbers[1] = version_numbers[1] + 1 if options[:bumpSprint]
+            version_numbers[2] = 1 if options[:bumpSprint]
+            version_numbers[2] = version_numbers[2] + 1 if options[:bumpBuild]
+            version_numbers = options[:targetVersion].split(".").map { |x| x.to_i } if options[:targetVersion]
+
+            new_version = Dnnbundler::formatVersion(version_numbers)
+            puts "current version is #{current_version}"
+            puts "new version is #{new_version}"
+
+            data_hash["packages"].each do |package|
+                package["name"].sub! "[PACKAGE_VERSION]", new_version
+                Dnnbundler::replaceVersionInManifestFiles manifest_files, new_version
+
+                generator = ZipFileGenerator.new(package)
+                generator.write
+            end
         end
     end
+
+    def self.formatVersion(version)
+        "#{version[0].to_s.rjust(4, "0")}.#{version[1].to_s.rjust(2, "0")}.#{version[2].to_s.rjust(4, "0")}"
+    end
 end

data/lib/dnnbundler/fileStringReplacer/fileStringReplacer.rb

@@ -0,0 +1,26 @@
+module Dnnbundler
+    def self.replaceVersionInManifestFiles(file_names, new_version)
+        file_names.each do |file_name|
+            text = File.read(file_name)
+            replace_expr = '\1' + new_version + '\3'
+            text.gsub!(ManifestVersionRegex::NewManifestRegex, replace_expr )
+            text.gsub!(ManifestVersionRegex::OldManifestRegex, replace_expr )
+
+            # To merely print the contents of the file, use:
+            # puts new_contents
+
+            # To write changes to the file, use:
+            File.open(file_name, "w") {|file| file.puts text }
+        end
+    end
+
+    def self.getVersionFromManifest(file_name)
+        text = File.read(file_name)
+        (ManifestVersionRegex::NewManifestRegex.match(text) || ManifestVersionRegex::OldManifestRegex.match(text)).captures[1]
+    end
+
+    module ManifestVersionRegex
+        OldManifestRegex = /(<version>)(\d*?\.\d*?\.\d*)(<\/version>)/
+        NewManifestRegex = /(<package .*? version=")(\d*?\.\d*?\.\d*)(.*?>)/
+    end
+end

data/lib/dnnbundler/version.rb

@@ -1,3 +1,3 @@
 module Dnnbundler
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/dnnbundler/zipFileGenerator.rb

@@ -15,6 +15,8 @@ module Dnnbundler
         # Zip the input directory.
         def write
             buffer = create_zip @entries, @ignore_entries
+
+            puts "\nwrite file #{@output_file}"
             File.open(@output_file, "wb") {|f| f.write buffer.string }
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dnnbundler
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Le0Michine
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -102,6 +102,7 @@ files:
 - lib/dnnbundler/cli.rb
 - lib/dnnbundler/fileEntry.rb
 - lib/dnnbundler/fileEntryType.rb
+- lib/dnnbundler/fileStringReplacer/fileStringReplacer.rb
 - lib/dnnbundler/jsonConfig.rb
 - lib/dnnbundler/version.rb
 - lib/dnnbundler/zipFileGenerator.rb