dnnbundler 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b9f2169cf7b0cf3c9f2998da2fbe237522c4ba0
-  data.tar.gz: dfaaef66e533b1ad6433e0daa3aabca7d67b53bb
+  metadata.gz: 38fb92f25f2f1562aa75bc843eefed30a8da7e67
+  data.tar.gz: 75d959d795f88459d38a75d4825cbfed3d235c73
 SHA512:
-  metadata.gz: 7a084e3e6a8aefd2796a3a3b43cfe82c95b4ec84540024bbf36b8abafa6fe4eacdd0e8d5b6a3c1142113facc8bac402711bd6e6e5edc7d6b1b55d1955aa36fd4
-  data.tar.gz: 4900d4dfc6787e31091b0790ce884769f686e180e71876802483c326784f8a0d8a1045a32512c58460a934351a834d9a0679642fd90af9ae788523c82ec60e9f
+  metadata.gz: ea1801bd3d89ec4b032576b978fef3db985ed9bc14f46df557cb2606bd7563f198ed29bbaa6f37b1b035590f3ff02f88573bb3b314afb1276df45a36f3f56158
+  data.tar.gz: 8a5218f18c49447b8fe28fe487eadd284fd082bdbc249d35b9a05d3654169b85fdcdbc85093a420d2140e71c361e2aa28271223ae6ab953b8d34fa15a629d3c4

data/README.md

@@ -25,6 +25,7 @@ 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
@@ -36,6 +37,7 @@ To configure packaging create a json config with the following schema:
             {
                 "type": "zip",            // nested zip archive
                 "name": "test.zip",       // name of nested zip archive, can include directories
+                "ignoreEntries": [ ... ]  // local array of entries to ignore
                 "entries": [              // array of entries for nested zip file, same format as above
                     "file",
                     "dir",
@@ -43,10 +45,9 @@ To configure packaging create a json config with the following schema:
                 ]
             }
         ],
-        "excludeEntries": [
+        "ignoreEntries": [
             ".DS_Store"
-        ],
-        "outFileName": "out.zip"
+        ]
     }
 
 to create package run:

data/lib/dnnbundler/cli.rb

@@ -14,7 +14,7 @@ module Dnnbundler
             input_entries = data_hash["entries"]
             ignore_entries = data_hash["excludeEntries"]
             zip_file_name = data_hash["outFileName"]
-            generator = ZipFileGenerator.new(input_entries, ignore_entries, zip_file_name)
+            generator = ZipFileGenerator.new(data_hash)
             generator.write
         end
     end

data/lib/dnnbundler/jsonConfig.rb

@@ -0,0 +1,10 @@
+module Dnnbundler
+    module JsonConfig
+        Type = "type"
+        Name = "name"
+        Path = "path"
+        Flatten = "flatten"
+        Entries = "entries"
+        IgnoreEntries = "ignoreEntries"
+    end
+end

data/lib/dnnbundler/version.rb

@@ -1,3 +1,3 @@
 module Dnnbundler
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/dnnbundler/zipFileGenerator.rb

@@ -1,28 +1,30 @@
 require "dnnbundler/fileEntryType"
 require "dnnbundler/fileEntry"
+require "dnnbundler/jsonConfig"
 require "zip"
 
 module Dnnbundler
     class ZipFileGenerator
         # Initialize with the directory to zip and the location of the output archive.
-        def initialize(entries, ignore_entries, output_file)
-            @entries = entries
-            @ignore_entries = ignore_entries
-            @output_file = output_file
+        def initialize(data)
+            @entries = data[JsonConfig::Entries]
+            @ignore_entries = data[JsonConfig::IgnoreEntries]
+            @output_file = data[JsonConfig::Name]
         end
 
         # Zip the input directory.
         def write
-            buffer = create_zip @entries
+            buffer = create_zip @entries, @ignore_entries
             File.open(@output_file, "wb") {|f| f.write buffer.string }
         end
 
         private
 
-        # True if +fileEntry+ isn't included into +@ignore_entries+ array'
-        def filter_entries(fileEntry)
-            @ignore_entries.each do |entry|
-                return false if fileEntry.name.include? entry
+        # True if +fileEntry+ isn't included into +ignore_entries+ array'
+        def filter_entries(fileEntry, ignore_entries)
+            return true if ignore_entries == nil
+            ignore_entries.each do |entry|
+                return false if (fileEntry.type.casecmp(FileEntryType::FILE) != 0) && (fileEntry.name.include? entry)
             end
         end
 
@@ -64,7 +66,7 @@ module Dnnbundler
             puts "#{ entries.map{ |x| x.name + ", " + x.path.to_s }.join("\n")}"
             buffer = Zip::File.add_buffer do |zio|
                 entries.each do |file|
-                    if file.type == FileEntryType::FILE
+                    if file.type.casecmp(FileEntryType::FILE) == 0
                         zio.add(file.path == nil ? file.name : file.path, file.name)
                     else
                         zio.get_output_stream(file.path == nil ? file.name : file.path) { |os| os.write file.buffer.string }
@@ -74,18 +76,18 @@ module Dnnbundler
         end
 
         # Creates from json array of entries
-        def create_zip(entries)
+        def create_zip(entries, ignore_entries)
             compress entries.map { |x|
                 if x.is_a? String
                     get_entries x, nil
-                elsif x["type"].casecmp(FileEntryType::FILE) == 0
-                    get_entries x["name"], x["path"]
-                elsif x["type"].casecmp(FileEntryType::ZIP) == 0
-                    zip_file_entry = FileEntry.new x["name"], FileEntryType::ZIP, false, x["path"]
-                    zip_file_entry.add_buffer create_zip x["entries"]
+                elsif x[JsonConfig::Type].casecmp(FileEntryType::FILE) == 0
+                    get_entries x[JsonConfig::Name], x[JsonConfig::Path]
+                elsif x[JsonConfig::Type].casecmp(FileEntryType::ZIP) == 0
+                    zip_file_entry = FileEntry.new x[JsonConfig::Name], FileEntryType::ZIP, false, x[JsonConfig::Path]
+                    zip_file_entry.add_buffer create_zip x[JsonConfig::Entries], x[JsonConfig::IgnoreEntries]
                     result = zip_file_entry
                 end
-            }.flatten.select{ |f| filter_entries f }.uniq{ |f| f.name }
+            }.flatten.select{ |f| filter_entries f, ignore_entries }.uniq{ |f| f.name }
         end
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dnnbundler
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Le0Michine
@@ -102,6 +102,7 @@ files:
 - lib/dnnbundler/cli.rb
 - lib/dnnbundler/fileEntry.rb
 - lib/dnnbundler/fileEntryType.rb
+- lib/dnnbundler/jsonConfig.rb
 - lib/dnnbundler/version.rb
 - lib/dnnbundler/zipFileGenerator.rb
 homepage: https://github.com/Le0Michine/dnnbundler