dnnbundler 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38fb92f25f2f1562aa75bc843eefed30a8da7e67
-  data.tar.gz: 75d959d795f88459d38a75d4825cbfed3d235c73
+  metadata.gz: 6cbe59e15b822d31c419850068808fed5beff93c
+  data.tar.gz: 81af67b4728e1b4b3faafc7f9e022f2f2f682c26
 SHA512:
-  metadata.gz: ea1801bd3d89ec4b032576b978fef3db985ed9bc14f46df557cb2606bd7563f198ed29bbaa6f37b1b035590f3ff02f88573bb3b314afb1276df45a36f3f56158
-  data.tar.gz: 8a5218f18c49447b8fe28fe487eadd284fd082bdbc249d35b9a05d3654169b85fdcdbc85093a420d2140e71c361e2aa28271223ae6ab953b8d34fa15a629d3c4
+  metadata.gz: cd9620df2a3ea1da99998d72c151c10b2f524dfa91f4a1d1867866953dcfdc3c5e9567c7dec110832d1d438fd77dddec8ae50a2f5ff21b0b497e7c6ed4de4527
+  data.tar.gz: 5a9e95a2486189732827739d50c7545f214fe3882bf4a703924446df7d551c4014d5a1802429bb3eee1ca61686038b691570378a67d36d14038e4fdcd6914e6b

data/README.md

@@ -30,13 +30,13 @@ To configure packaging create a json config with the following schema:
             "path_to_file",
             "path_to_directory",          // real path in file system to file or directory
             {
-                "type": "file",           // type of entry
+                "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
+                "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",

data/lib/dnnbundler/version.rb

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

data/lib/dnnbundler/zipFileGenerator.rb

@@ -21,22 +21,23 @@ module Dnnbundler
         private
 
         # True if +fileEntry+ isn't included into +ignore_entries+ array'
-        def filter_entries(fileEntry, ignore_entries)
+        def filter_entries(fileEntryName, fileEntryType, 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)
+                return false if (fileEntryType.casecmp(FileEntryType::FILE) == 0) && (fileEntryName.include? entry)
             end
+            return true
         end
 
         # Creates +FileEntry+ for file or array of entries for directory and subdirectories
         # Params:
         # +directory_or_file+:: path to directory or file
         # +entry_path+:: path with which the entry should be put into zip
-        def get_entries(directory_or_file, entry_path)
+        def get_entries(directory_or_file, entry_path, ignore_entries)
             if File.directory? directory_or_file
-                get_dir_entries_recursively directory_or_file, entry_path
+                get_dir_entries_recursively directory_or_file, entry_path, ignore_entries
             else
-                FileEntry.new directory_or_file, entry_path
+                FileEntry.new directory_or_file, FileEntryType::FILE, false, entry_path
             end
         end
 
@@ -45,14 +46,13 @@ module Dnnbundler
         # +dir+:: start directory
         # +entry_path+:: path with which file should be placed into zip
         # +replace_path+:: part of path which is being replaced by +entry_path+
-        def get_dir_entries_recursively(dir, entry_path, replace_path = nil)
-            replace_path = dir if replace_path == nil
-            (Dir.entries(dir) - %w(. ..)).map { |v|
-                path = File.join(dir, v)
+        def get_dir_entries_recursively(dir, entry_path, ignore_entries, replace_path = nil)
+            replace_path = dir.clone if replace_path.nil?
+            (Dir.entries(dir) - %w(. ..)).map { |v| File.join(dir, v) }.select { |path| filter_entries path, FileEntryType::FILE, ignore_entries }.map { |path|
                 if File.directory? path
-                    get_dir_entries_recursively(path, entry_path, replace_path)
+                    get_dir_entries_recursively(path, entry_path, ignore_entries, replace_path)
                 else
-                    entry_path_in_zip = path.sub(replace_path, entry_path).gsub(/^[\/\\]+/, "")
+                    entry_path_in_zip = (entry_path.nil? ? path : path.sub(replace_path, entry_path)).gsub(/^[\/\\]+/, "")
                     FileEntry.new path, FileEntryType::FILE, false, entry_path_in_zip
                 end
             }
@@ -62,14 +62,14 @@ module Dnnbundler
         # Params:
         # +entries+:: array of +FileEntry+ objects
         def compress(entries)
-            puts "adding the following entries into zip package"
-            puts "#{ entries.map{ |x| x.name + ", " + x.path.to_s }.join("\n")}"
+            puts "\nadding the following entries into zip package"
+            puts "#{ entries.map{ |x| x.name + ", " + x.path.to_s + ", " + x.type.to_s }.join("\n")}"
             buffer = Zip::File.add_buffer do |zio|
                 entries.each do |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 }
+                        zio.get_output_stream(file.name) { |os| os.write file.buffer.string }
                     end
                 end
             end
@@ -79,15 +79,15 @@ module Dnnbundler
         def create_zip(entries, ignore_entries)
             compress entries.map { |x|
                 if x.is_a? String
-                    get_entries x, nil
-                elsif x[JsonConfig::Type].casecmp(FileEntryType::FILE) == 0
-                    get_entries x[JsonConfig::Name], x[JsonConfig::Path]
+                    get_entries x, nil, ignore_entries
+                elsif x[JsonConfig::Type].nil? || x[JsonConfig::Type].casecmp(FileEntryType::FILE) == 0
+                    get_entries x[JsonConfig::Name], x[JsonConfig::Path], ignore_entries
                 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, ignore_entries }.uniq{ |f| f.name }
+            }.flatten.select{ |f| filter_entries f.name, f.type, 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.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Le0Michine