sixarma-bt 0.7.2 → 0.7.3

data/Rakefile

@@ -13,7 +13,7 @@ require 'rake/testtask'
 spec = Gem::Specification.new do |s|
   s.name = 'sixarma-bt'
   s.rubyforge_project = s.name
-  s.version = '0.7.2'
+  s.version = '0.7.3'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'BuildTools for full conversion Mods for Armed Assault'
@@ -23,8 +23,8 @@ spec = Gem::Specification.new do |s|
   s.homepage = 'http://6thsense.eu'
   # s.executables = ['your_executable_here']
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{bin,lib,spec}/**/*.rb") + Dir.glob("{bin,lib,spec}/**/*.yaml")
-  s.require_path = "lib"
-  s.bindir = "bin"
+  s.require_path = 'lib'
+  s.bindir = 'bin'
   s.add_dependency('sixarma', '>= 0.4.0')
   s.add_dependency('sixcore', '>= 0.3.0')
 end

data/lib/sixarma/bt/build.rb

@@ -7,15 +7,15 @@ module SixArma
       # folder:: folder config object
       def clear_folders(mod, folder)
         case folder.type
-        when "addons"
+        when 'addons'
           # Remove deleted files
-          SixCore::info "Removing Deleted Files from Full..."
+          SixCore::info 'Removing Deleted Files from Full...'
           delete = File.open("#{mod.changes}/#{@config.workdel}_#{folder.name}.txt") { |file| file.readlines.map { |line| SixCore::clean(line) } }
           delete.each do |item|
             SixCore::filedel("#{@config.outroot}\\files\\full\\#{mod.destination}\\#{folder.name}\\#{item}.*")
           end
 
-          SixCore::info "Cleaning Update folder..."
+          SixCore::info 'Cleaning Update folder...'
           SixCore::filedel("#{@config.outroot}\\files\\update\\#{mod.destination}\\#{folder.name}\\*.pbo")
           SixCore::filedel("#{@config.outroot}\\files\\update\\#{mod.destination}\\#{folder.name}\\*.bisign")
         end
@@ -27,8 +27,8 @@ module SixArma
       # folder:: folder config object
       def copy_stuff(mod, folder)
         case folder.type
-        when "addons"
-          SixCore::info "Copying 3rd_Party_Pbos..."
+        when 'addons'
+          SixCore::info 'Copying 3rd_Party_Pbos...'
           thirdparty_pbo = File.open("#{mod.changes}/#{@config.work3rd_pbo}_#{folder.name}.txt") { |file| file.readlines.map { |line| SixCore::clean(line) } }
           source = "#{mod.path}\\#{mod.source}\\#{folder.name}"
           dest = "#{@config.outroot}\\files\\update\\#{mod.destination}\\#{folder.name}"
@@ -77,30 +77,30 @@ module SixArma
         dest = "#{@config.outroot}\\files\\update\\#{mod.destination}\\#{folder.name}"
 
         # Create folders and mirror SOURCE files
-        SixCore::info "Creating folders and mirroring source files..."
+        SixCore::info 'Creating folders and mirroring source files...'
         combined.each do |item|
           source = check_source(mod, folder, item)
-          SixCore::filemirror(source, "#{@config.workdir}\\#{item}", "/XD .svn")
+          SixCore::filemirror(source, "#{@config.workdir}\\#{item}", '/XD .svn')
           # When using alternate prefixes, also mirror files to prefix folder name
-          prefix = SixArma::PboTools::check_prefix(source, "__AUTO__")
-          unless prefix == "" or prefix != prefix.gsub!("\\", "")
-            SixCore::filemirror(source, "#{@config.workdir}\\#{prefix}", "/XD .svn")
+          prefix = SixArma::PboTools::check_prefix(source, '__AUTO__')
+          unless prefix == '' or prefix != prefix.gsub!('\\', '')
+            SixCore::filemirror(source, "#{@config.workdir}\\#{prefix}", '/XD .svn')
           end
         end
 
         # Build the addons
-        SixCore::info "Binarizing..."
+        SixCore::info 'Binarizing...'
         binfiles.each do |item|
-          SixArma::PboTools.binarize("#{@config.workdir}\\#{item}", dest, "__AUTO__")
+          SixArma::PboTools.binarize("#{@config.workdir}\\#{item}", dest, '__AUTO__')
         end
 
-        SixCore::info "PBOing..."
+        SixCore::info 'PBOing...'
         pbofiles.each do |item|
-          SixArma::PboTools.pack("#{@config.workdir}\\#{item}", dest, "__AUTO__")
+          SixArma::PboTools.pack("#{@config.workdir}\\#{item}", dest, '__AUTO__')
         end
 
         # CleanUp
-        SixCore::info "Cleaning up..."
+        SixCore::info 'Cleaning up...'
         SixCore::filemove("#{dest}\\*.log", "#{@config.outroot}\\log\\")
         #      combined.each do |item|
         #        SixCore::filemove("#{dest}\\#{item}.log", "#{@config.outroot}\\log\\")
@@ -124,7 +124,7 @@ module SixArma
         @config.mods.each do |mod|
           mod.subfolders.each do |folder|
             SixCore::infos("BuildChanges - #{mod.destination}\\#{folder.name}", COMPONENT)
-            pbotools_build(mod, folder) if folder.type == "addons"
+            pbotools_build(mod, folder) if folder.type == 'addons'
             copy_stuff(mod, folder)
           end
         end

data/lib/sixarma/bt/nsis.rb

@@ -37,17 +37,17 @@ module SixArma
       end
 
       # Build NSIS Update
-      # nsis_build("update")
+      # nsis_build('update')
       def nsis_update()
-        @stats.updatefile = nsis_build("update")
+        @stats.updatefile = nsis_build('update')
         write_stats()
         SixCore::halt() if @halt
       end
 
       # Build NSIS Full
-      # nsis_build("full")
+      # nsis_build('full')
       def nsis_full()
-        @stats.fullfile = nsis_build("full")
+        @stats.fullfile = nsis_build('full')
         write_stats()
         SixCore::halt() if @halt
       end

data/lib/sixarma/bt/sign.rb

@@ -33,14 +33,14 @@ module SixArma
         SixCore::infos("Sign Do - #{type}", COMPONENT)
 
         case @config.sign.keytype
-        when "whole"
-          signfiles = sign_create("full")
-          signfiles = sign_create("update") # TODO - Lame, function copies instead of create new one, but still - need to move
+        when 'whole'
+          signfiles = sign_create('full')
+          signfiles = sign_create('update') # TODO - Lame, function copies instead of create new one, but still - need to move
 
           # process each destination's subfolders
           @config.mods.each do |mod|
             mod.subfolders.each do |folder|
-              if folder.type == "addons"
+              if folder.type == 'addons'
                 SixCore::info "Clearing signatures - #{type}\\#{mod.destination}\\#{folder.name}..."
                 SixCore::filedel("#{@config.outroot}\\files\\#{type}\\#{mod.destination}\\#{folder.name}\\*.bisign")
                 SixCore::info "Signing - #{mod.destination}\\#{folder.name}..."
@@ -49,24 +49,24 @@ module SixArma
             end
           end
 
-        when "folder"
+        when 'folder'
           @config.mods.each_with_index do |mod, idx|
             changes = []
             @stats.mods[idx].subfolders.each do |folder|
-              changes += (folder.add + folder.del + folder.change) # if folder.type == "addons"
+              changes += (folder.add + folder.del + folder.change) # if folder.type == 'addons'
             end
             unless changes.empty?
-              #sf = mod.destination.gsub("@", "")
+              #sf = mod.destination.gsub('@', '')
               #sf = mod.destination if sf.nil? or sf.empty?
               # TODO: Lame update+full processing
               SixCore::filedel("#{@config.outroot}\\files\\update\\Keys\\#{@config.sign.file}_#{mod.destination}*.bikey")
               SixCore::filedel("#{@config.outroot}\\files\\full\\Keys\\#{@config.sign.file}_#{mod.destination}*.bikey")
 
-              signfiles = sign_create2("full", mod.destination)
-              signfiles = sign_create2("update", mod.destination)
+              signfiles = sign_create2('full', mod.destination)
+              signfiles = sign_create2('update', mod.destination)
 
               mod.subfolders.each do |folder|
-                if folder.type == "addons"
+                if folder.type == 'addons'
                   SixCore::info "Clearing signatures - #{type}\\#{mod.destination}\\#{folder.name}..."
                   SixCore::filedel("#{@config.outroot}\\files\\#{type}\\#{mod.destination}\\#{folder.name}\\*.bisign")
                   SixCore::info "Signing - #{mod.destination}\\#{folder.name}..."
@@ -80,16 +80,16 @@ module SixArma
 
       public
       # Sign Update
-      # sign_do("update")
+      # sign_do('update')
       def sign_update()
-        sign_do("update")
+        sign_do('update')
         SixCore::halt() if @halt
       end
 
       # Sign Full
-      # sign_do("full")
+      # sign_do('full')
       def sign_full()
-        sign_do("full")
+        sign_do('full')
         SixCore::halt() if @halt
       end
     end

data/lib/sixarma/bt/svn.rb

@@ -6,11 +6,11 @@ module SixArma
       # cfg:: Mod Config Object
       # cfg2:: Mod Stats Object
       def svn_write_list(cfg, cfg2)
-        SixCore::info "Writing SVN Changelog..."
+        SixCore::info 'Writing SVN Changelog...'
         cfg.subfolders.each_with_index do |folder,idx|
           folder2 = cfg2.subfolders[idx]
           case folder.type
-          when "addons"
+          when 'addons'
             t = folder2.add + folder2.change
             t.uniq!
             t.sort!
@@ -24,7 +24,7 @@ module SixArma
               file.readlines.map { |line| SixCore::clean(line) }
             }
             tmp = []
-            File.open("#{cfg.changes}/#{@config.work3rd_pbo}_#{folder.name}.txt", "w") do |f|
+            File.open("#{cfg.changes}/#{@config.work3rd_pbo}_#{folder.name}.txt", 'w') do |f|
               f.flush
               t.each do |addon|
                 if thirdparty_pbo.include?(addon)
@@ -36,7 +36,7 @@ module SixArma
             end
 
             tmp = []
-            File.open("#{cfg.changes}/#{@config.workbin}_#{folder.name}.txt", "w") do |f|
+            File.open("#{cfg.changes}/#{@config.workbin}_#{folder.name}.txt", 'w') do |f|
               f.flush
               t.each do |addon|
                 if binfiles.include?(addon)
@@ -48,7 +48,7 @@ module SixArma
             end
 
             tmp = []
-            File.open("#{cfg.changes}/#{@config.workpbo}_#{folder.name}.txt", "w") do |f|
+            File.open("#{cfg.changes}/#{@config.workpbo}_#{folder.name}.txt", 'w') do |f|
               f.flush
               t.each do |addon|
                 if pbofiles.include?(addon)
@@ -64,7 +64,7 @@ module SixArma
               Process.exit
             end
 
-            File.open("#{cfg.changes}/#{@config.workdel}_#{folder.name}.txt", "w") do |f|
+            File.open("#{cfg.changes}/#{@config.workdel}_#{folder.name}.txt", 'w') do |f|
               f.flush
               folder2.del.each do |addon| f.puts(addon) end
             end
@@ -76,16 +76,16 @@ module SixArma
       # cfg:: Mod Config Object
       # cfg2:: Mod Stats Object
       def svn_generate(cfg, cfg2)
-        SixCore::info "Generating SVN Changelog..."
+        SixCore::info 'Generating SVN Changelog...'
         svn = SixCore::Svn.new("#{cfg.path}#{cfg.source}", cfg.svn.user, cfg.svn.pass)
 
         svn.diff(cfg2.oldrev, cfg2.newrev).each do |entry|
           # only want to process folders under the given folder
           cfg.subfolders.each_with_index do |f, idx|
-            entrymod = entry.gsub("#{svn.repos}\\#{f.name}\\", "")
+            entrymod = entry.gsub("#{svn.repos}\\#{f.name}\\", '')
             if entrymod != entry
               f2 = cfg2.subfolders[idx]
-              if f.type == "addons"
+              if f.type == 'addons'
                 folders  = true
               else
                 folders = false

data/lib/sixarma/bt.rb

@@ -5,11 +5,12 @@
   # TODO: log4r support per module instead of all in core?
   # TODO: Implement FATAL, WARN etc loglevels?
   # TODO: Convert all Config/Stats classes from CON_STANT to ConStant variation
-  # FIXME: Look at Keys Cleaning for "whole" processing
+  # TODO: Move Regex into Constants
+  # FIXME: Look at Keys Cleaning for 'whole' processing
   # TODO: List:
-  - More sophisticated svn changes system which goes beyond "Addons" and "Dta" etc
+  - More sophisticated svn changes system which goes beyond 'Addons' and 'Dta' etc
   -- CONFIG_MOD_SUBFOLDERS per mod implemented, but only active for creating addons and signing
-  - Think about how to resolve "Case sensitivity for paths", or should we not at all?
+  - Think about how to resolve 'Case sensitivity for paths', or should we not at all?
   - Finish implementation of Time.now and processed time
   - SVN Update/Commit Functions
 =end
@@ -66,6 +67,26 @@ module SixArma
     # Changelog Structure
     STATS_MOD_CHANGELOG = Struct.new(:added, :updated, :removed, :changed, :fixed, :local)
 
+    COMMENT_TYPES = [
+      'CHANGED', 'CHANGE', 'C', 'MODIFIED', 'MOD',
+      'ADDED', 'ADD', 'A',
+      'FIXED', 'FIX', 'F',
+      'UPDATED', 'UPDATE', 'UPD', 'U',
+      'DELETED', 'DELETE', 'DEL', 'REMOVED',
+      'LOCAL', 'MOVED', 'MOV', 'REVERTED', 'RENAMED', 'R']
+
+    # Log entries class
+    class LogEntries < Array
+      def add_entries(array, type)
+        unless array.empty?
+          push "** #{type}:"
+          array.each do |e|
+            push "*** #{e}"
+          end
+          push ''
+        end
+      end
+    end
     # Main Program Class
     class Builder
       COMPONENT = 'SixArma::Bt::Builder'
@@ -96,7 +117,7 @@ module SixArma
       # source:: Source path
       # destination:: Destination path
       def update_all(source, destination)
-        SixCore::infos("Update_All", COMPONENT) # TODO
+        SixCore::infos('Update_All', COMPONENT) # TODO
         SixCore::info "Updating *all* files - source: #{source} - destination: #{destination}..."
         SixCore::fileupdate(
           "#{@config.outroot}\\files\\#{source}\\",
@@ -108,12 +129,12 @@ module SixArma
       # source:: Source path
       # destination:: Destination path
       def update_sign(source, destination)
-        SixCore::infos("Update_Sign", COMPONENT) # TODO
+        SixCore::infos('Update_Sign', COMPONENT) # TODO
         SixCore::info "Updating *sign* files - source: #{source} - destination: #{destination}..."
         SixCore::fileupdate(
           "#{@config.outroot}\\files\\#{source}\\",
           "#{@config.outroot}\\files\\#{destination}\\",
-          "/IF *.bisign *.bikey"
+          '/IF *.bisign *.bikey'
         )
       end
 
@@ -136,7 +157,7 @@ module SixArma
       # put:: File to upload
       # type:: Type (update or full)
       def upload(put, type, tmp = true)
-        SixCore::infos("Upload", COMPONENT)
+        SixCore::infos('Upload', COMPONENT)
         @config.ftp.each do |f|
           path = eval "f.path#{type}"
           SixCore::info "Uploading #{put} to #{f.host}/#{path}..."
@@ -157,7 +178,7 @@ module SixArma
           tmp << [f.host, f.user, f.pass, eval("f.path#{type}"), "#{@config.outroot}\\", name]
         end
         @threads << Thread.new(tmp,name) do |ftps,name|
-          SixCore::infos("Upload", COMPONENT)
+          SixCore::infos('Upload', COMPONENT)
           SixCore::info "Uploading #{name}..."
           ftps.each { |f| upload_raw(*f) }
           SixCore::info "Uploading #{name} finished..."
@@ -198,15 +219,15 @@ module SixArma
             SixCore::info "Reading From Stats File: #{dir[0]}"
             stats = YAML::load(yf)
             if stats.released
-              SixCore::info "Previous version was released; New Version"
+              SixCore::info 'Previous version was released; New Version'
               @stats = STATS.new()
               @stats.mods = []
               @stats.oldver = stats.newver.to_s
               @stats.newver = @stats.oldver.to_f + 0.01
               @stats.newver = @stats.newver.to_s
               # TODO: Prettify??
-              @stats.newver << "0" # always append extra 0 due to floating point 0.50 --> 0.5
-              @stats.oldver << "0" # always append extra 0 due to floating point 0.50 --> 0.5
+              @stats.newver << '0' # always append extra 0 due to floating point 0.50 --> 0.5
+              @stats.oldver << '0' # always append extra 0 due to floating point 0.50 --> 0.5
               @stats.newver = /(.)\.(.)(.)/.match(@stats.newver).to_s
               @stats.oldver = /(.)\.(.)(.)/.match(@stats.oldver).to_s
 
@@ -225,19 +246,19 @@ module SixArma
                 @stats.mods << modstats
               end
             else
-              SixCore::info "Previous version wasn't released; Sticking to current version"
+              SixCore::info 'Previous version wasn\'t released; Sticking to current version'
               @stats = stats
             end
           end
         else
-          info "No version yaml found in versions folder, aborting"
+          info 'No version yaml found in versions folder, aborting'
           Process.exit
         end
 
         SixCore::info "Current Version: #{@stats.newver} | Previous Version: #{@stats.oldver}"
 
         # update the version files
-        SixCore::info "Updating version.txt..."
+        SixCore::info 'Updating version.txt...'
         # used by updater setup program
         File.open("#{@config.outroot}/files/update/#{@config.mods[0].destination}/#{@config.verpath}/version.txt", 'w') do |f|
           f << @stats.newver
@@ -253,10 +274,8 @@ module SixArma
           end
         end
 
-        @names = []
-        @names_c = []
-
-#        tmp
+        @names = Hash.new(0)
+        #tmp
 
         read_changelog()
         # Write per mod per version changelog
@@ -268,8 +287,8 @@ module SixArma
         # Write all in one changelog all versions and mods
         write_changelog2()
         SixCore::infos 'Latest Commits by:'
-        @names.each_with_index do |n, idx|
-          SixCore::info "#{n}: #{@names_c[idx]} commits"
+        @names.each do |k, v|
+          SixCore::info "#{k}: #{v} commits"
         end
       end
 
@@ -277,7 +296,7 @@ module SixArma
       def tmp
         Dir.chdir("#{@config.outroot}/versions")
 
-        Dir.glob("*.yaml") do |f|
+        Dir.glob('*.yaml') do |f|
           File.open("#{@config.outroot}/versions/#{f}") do |yf|
             SixCore::info "Reading From Stats File: #{f}"
             @stats = YAML::load(yf)
@@ -306,28 +325,10 @@ module SixArma
                 if l[1].size > 0
                   # TODO Pretify
                   name = l[0][1]
-                  replace = [['ace_dev_', ''], ['ace_support_', ''], ['wgl_support_', ''], ['wgl_dev_', ''], ['wgl_supporter_', '']]
-                  name = SixCore::gsub_ar(name, replace)
+                  name.gsub!(/ace_dev_|ace_support_|wgl_support_|wgl_dev_|wgl_supporter_/i, '')
                   name.capitalize!
-                  if @names.include?(name)
-                    @names.each_with_index do |n, idx|
-                      if n == name
-                        @names_c[idx] = @names_c[idx] + 1
-                      end
-                    end
-                  else
-                    @names_c << 1
-                    @names << name
-                  end
-                  types = [
-                    "CHANGED", "CHANGE", "C", "MODIFIED", "MOD",
-                    "ADDED", "ADD", "A",
-                    "FIXED", "FIX", "F",
-                    "UPDATED", "UPDATE", "UPD", "U",
-                    "DELETED", "DELETE", "DEL", "REMOVED",
-                    "LOCAL", "MOVED", "MOV", "REVERTED", "RENAMED", "R"
-                  ]
-                  type_pattern = types.join '|'
+                  @names[name] =+ 1
+                  type_pattern = COMMENT_TYPES.join '|'
                   l[1].each do |c|
                     if true #c =~ /^\s*~\s*/
                       is_valid, type, places, comment = case c
@@ -338,8 +339,8 @@ module SixArma
                         # type - place: comment
                         # type - place comment
                         # type - place
-                        # where "place" can be "place" or "place and place" or "place and place and place"
-                        # where "and" can be "and" or "&"
+                        # where 'place' can be 'place' or 'place and place' or 'place and place and place'
+                        # where 'and' can be 'and' or '&'
 
                         found = [$3]
                         found.push $6 unless $6.nil?
@@ -348,18 +349,18 @@ module SixArma
                         [true, $1, found, $10]
 
                       when /^\s*~?\s*(#{type_pattern})\s+(\w+_\w+):\s*(.+?)\s*$/i
-                        # ~ place: comment
-                        # place: comment
+                        # ~ type place: comment
+                        # type place: comment
                         [true, $1, [$2], $3]
 
-                      when /^\s*~?\s*(#{type_pattern})\s*:\s*(.+?)\s*$/i
+                      when /^\s*~?\s*(#{type_pattern})\s*?[\s:]\s*(.+?)\s*$/i
+                        # ~ type comment
+                        # type comment
                         # ~ type: comment
                         # type: comment
                         [true, $1, [], $2]
 
                       when /^\s*~?\s*(#{type_pattern})\s+(.+?)\s*$/i
-                        # ~ type comment
-                        # type comment
                         [true, $1, [], $2]
 
                       when /^\s*~\s*(.*?)\s*$/
@@ -371,17 +372,16 @@ module SixArma
                         [true, 'LOCAL', [], $1]
 
                       else
-                        [false, "", "", ""]
+                        [false, '', '', '']
                       end
 
                       if is_valid
                         case comment
-                          
                         when /version tag|buildscripts?|build[_\s+]|readme|credits|\.txt|\.bat|changelog| txt |this/i
                           type = 'LOCAL'
                         end
                         comment.gsub!(/penis|dildo|noob/i, '****')
-                        comment.gsub!(/^\s*([:\-\.~\,]|\**)\s*/, '')
+                        comment.gsub!(/^\s*([:\-\.~,]|\**)\s*/, '')
                         # FIXME: Shouldn't this be possible with just 1* regex?
                         comment.gsub!(/^\s*([:\-\.~,]|\**)\s*/, '')
                         comment.gsub!('http', 'ticket: http')
@@ -390,8 +390,8 @@ module SixArma
                           unless f.nil?
                             case f
                               #when /REMOVED|DELETED/i
-                              #  type = "REMOVED"
-                              #  comment.sub!(f, "")
+                              #  type = 'REMOVED'
+                              #  comment.sub!(f, '')
                               #  comment.gsub!(/^[:\-\.~]/, '')
                               #  f = comment[/^\w+/]
                             when /TODO|RESTORTED/i
@@ -424,7 +424,6 @@ module SixArma
                           end
                         end
                       end
-
                     end
                   end
                 end
@@ -451,7 +450,7 @@ module SixArma
 
       # Writes stats to yaml version file
       def write_stats()
-        SixCore::debugs("Writing Version Stats", COMPONENT)
+        SixCore::debugs('Writing Version Stats', COMPONENT)
         SixCore::debug "Current Ver: #{@stats.newver}"
 
         File.open("#{@config.outroot}/versions/_version_#{@stats.newver}.yaml", 'w' ) do |out|
@@ -460,11 +459,10 @@ module SixArma
       end
 
 
-      def gen_clog()
-        log = []
+      def gen_clog(stream)
         Dir.chdir("#{@config.outroot}/versions")
         ar = []
-        Dir.glob("*.yaml") do |f|
+        Dir.glob('*.yaml') do |f|
           ar << f
         end
         ar.reverse!
@@ -472,86 +470,59 @@ module SixArma
         ar.each do |f|
           File.open("#{@config.outroot}/versions/#{f}") do |yf|
             stats = YAML::load(yf)
-            log << ''
-            log << "== v#{stats.newver} =="
+            stream.puts ''
+            stream.puts "== v#{stats.newver} =="
             stats.mods.each_with_index do |mod, idx|
               mod2 = @config.mods[idx]
               unless mod2.svn.nil?
-                nl = generate_log(mod)
-                unless nl.empty?
-                  log << "* #{mod2.destination }, Revision: #{mod.newrev} - #{mod.oldrev}"
-                  log << nl
-                end
+                generate_log(mod, mod2, stream, 1)
               end
             end
           end
         end
-        return log
       end
 
       # Generates log from svn comments
       # mod:: Object, Mod object
-      def generate_log(mod)
-        log = []
-        unless mod.oldrev == mod.newrev
-          if mod.changelog.added.size > 0
-            log << "** ADDED:"
-            mod.changelog.added.each do |e|
-              e = "*** #{e}"
-              log << e
-            end
-            log << ''
-          end
-          if mod.changelog.updated.size > 0
-            log << "** UPDATED:"
-            mod.changelog.updated.each do |e|
-              e = "*** #{e}"
-              log << e
-            end
-            log << ''
-          end
-          if mod.changelog.removed.size > 0
-            log << "** REMOVED:"
-            mod.changelog.removed.each do |e|
-              e = "*** #{e}"
-              log << e
-            end
-            log << ''
-          end
-          if mod.changelog.changed.size > 0
-            log << "** CHANGED:"
-            mod.changelog.changed.each do |e|
-              e = "*** #{e}"
-              log << e
-            end
-            log << ''
-          end
-          if mod.changelog.fixed.size > 0
-            log << "** FIXED:"
-            mod.changelog.fixed.each do |e|
-              e = "*** #{e}"
-              log << e
-            end
-            log << ''
-          end
+      def generate_log(mod, mod2, stream, type)
+        return if mod.oldrev == mod.newrev
+
+        changelog = mod.changelog
+
+        return if changelog.values.inject(true) { |b, a| b and a.empty? }
+        if type == 1
+          stream.puts "* #{mod2.destination}, Revision: #{mod.newrev} - #{mod.oldrev}"
+        elsif type == 2
+          stream.puts "* #{mod2.destination} v#{@stats.newver}, Revision: #{mod.newrev} - #{mod.oldrev}"
         end
-        return log
+        generate_log_entries(changelog.added, 'ADDED', stream)
+        generate_log_entries(changelog.updated, 'UPDATED', stream)
+        generate_log_entries(changelog.removed, 'REMOVED', stream)
+        generate_log_entries(changelog.changed, 'CHANGED', stream)
+        generate_log_entries(changelog.fixed, 'FIXED', stream)
+        # etc
+      end
+
+      def generate_log_entries(changelog, type, stream)
+        return if changelog.empty?
+
+        stream.puts "** #{type}:"
+
+        changelog.each do |e|
+          stream.puts "*** #{e}"
+        end
+
+        stream.puts
       end
 
       # Formats and writes changelog for all versions
       def write_changelog2()
-        lf = File.new("#{@config.outroot}/files/update/#{@config.mods[0].destination}/Docs/changelog.txt", 'w')
-        lf.puts '= Changelog ='
-        #dir.reverse!
-        log = gen_clog()
-        if log.size > 0
+        File.open("#{@config.outroot}/files/update/#{@config.mods[0].destination}/Docs/changelog.txt", 'w') do |lf|
           SixCore::info 'Writing Changelog'
-          log.each do |l|
-            lf.puts(l)
-          end
+          lf.puts '= Changelog ='
+          gen_clog(lf)
+          Dir.chdir(SixCore::MAINDIR)
         end
-        Dir.chdir(SixCore::MAINDIR)
-        lf.close
       end
 
       # Formats and writes changelog for current version
@@ -559,15 +530,9 @@ module SixArma
         @stats.mods.each_with_index do |mod, idx|
           mod2 = @config.mods[idx]
           unless mod2.svn.nil?
-            lf = File.new("#{@config.mods[idx].changes}/changelog.txt", 'w')
-            lf.puts "* #{mod2.destination} v#{@stats.newver}, Revision: #{mod.newrev} - #{mod.oldrev}"
-            log = generate_log(mod)
-            if log.size > 0
-              log.each do |l|
-                lf.puts(l)
-              end
+            File.open("#{@config.mods[idx].changes}/changelog.txt", 'w') do |lf|
+              generate_log(mod, mod2, lf, 2)
             end
-            lf.close
           end
         end
       end
@@ -581,20 +546,20 @@ module SixArma
       end
 
       # Builds Full
-      # svn_do, clear, addon_changes, update_all("update", "full"), sign_full
+      # svn_do, clear, addon_changes, update_all('update', 'full'), sign_full
       def build_full()
         svn_do()
         clear()
         addon_changes()
-        update_all("update", "full")
+        update_all('update', 'full')
         sign_full()
       end
 
       # Creates Update
-      # build_full, update_sign("full", "update"), nsis_update
+      # build_full, update_sign('full', 'update'), nsis_update
       def create_update()
         build_full()
-        update_sign("full", "update")
+        update_sign('full', 'update')
         nsis_update()
       end
 
@@ -616,9 +581,9 @@ module SixArma
       # thread:: Boolean: Uses seperate thread when set to true
       def dist_update(thread = false)
         if thread
-          upload_thread("update")
+          upload_thread('update')
         else
-          upload(@stats.updatefile, "update")
+          upload(@stats.updatefile, 'update')
         end
       end
 
@@ -626,9 +591,9 @@ module SixArma
       # thread:: Boolean: Uses seperate thread when set to true
       def dist_full(thread = false)
         if thread
-          upload_thread("full")
+          upload_thread('full')
         else
-          upload(@stats.fullfile, "full")
+          upload(@stats.fullfile, 'full')
         end
       end
 
@@ -655,6 +620,6 @@ module SixArma
 end
 
 component = '6thSense.eu ArmA BuildTools'
-version = '0.7.2'
+version = '0.7.3'
 SixCore::debugs "#{component} #{version} loaded"
 SixCore::infos("v#{version}, by Sickboy (sb_at_6thSense.eu)", component)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sixarma-bt
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Sickboy