sixarma-bt 0.7.4 → 0.8.0

data/README

@@ -5,4 +5,7 @@ Documentation:
 - If the most recent version is tagged as released: false,
 the next time you run the program it will assume that this will be the version to work with.
 If released: true, then it will assume you intend to create the next version.
-- run bt-cli -? for help
+- run bt-cli -? for help
+
+- If you need to change the default settings of sixarma/sixcore modules, please copy their config yaml files into
+PROGRAM_FOLDER\config  and adjust them as you wish.

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.4'
+  s.version = '0.8.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'BuildTools for full conversion Mods for Armed Assault'
@@ -25,8 +25,8 @@ spec = Gem::Specification.new do |s|
   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.add_dependency('sixarma', '>= 0.4.0')
-  s.add_dependency('sixcore', '>= 0.3.0')
+  s.add_dependency('sixarma', '>= 0.5.0')
+  s.add_dependency('sixcore', '>= 0.4.0')
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/lib/sixarma-bt-cli.rb

@@ -15,6 +15,4 @@ builder = SixArma::Bt::Builder.new(
 )
 
 SixCore::log.debug @options.todo
-@options.todo.each do |t|
-  eval "builder.#{t}"
-end
+@options.todo.each do |t| eval "builder.#{t}" end

data/lib/sixarma/bt.rb

@@ -2,11 +2,8 @@
   6thSense.eu ArmA BuildTools (Automation Suite), by Sickboy (sb_at_6thSense.eu)
 
   # TODO: Tweak / Clean / Merge / Split / Optimize
-  # 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
-  # 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
   -- CONFIG_MOD_SUBFOLDERS per mod implemented, but only active for creating addons and signing
@@ -39,6 +36,10 @@ require 'sixarma/bt/sign'
 module SixArma
   # Build Tools Module
   module Bt
+    COMPONENT = 'SixArma::Bt::Builder'
+    TITLE = '6thSense.eu ArmA BuildTools'
+    VERSION = '0.8.0'
+
     # Main Config Structure
     CONFIG = Struct.new(:title, :titlelong, :outroot, :verpath, :veraddon, :changelog, :workdir, :workbin, :workpbo, :work3rd, :work3rd_pbo,
       :workdel, :listbin, :listpbo, :list3rd_pbo, :sign, :nsis, :ftp, :mods)
@@ -67,46 +68,67 @@ 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
+    @@log = Log4r::Logger.new('SixCore::SixArma-Bt')
+    module_function
+    def log
+      @@log
     end
+
     # Main Program Class
     class Builder
       COMPONENT = 'SixArma::Bt::Builder'
 
+      TYPE_PATTERN = [
+        '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'].join '|'
+
+      REGEX_DEVS = /ace_dev_|ace_support_|wgl_support_|wgl_dev_|wgl_supporter_/i
+      REGEX_LONG = /^\s*~?\s*(#{TYPE_PATTERN})\s+-\s*((\w+)(\s*(and|&)\s*(\w+))?(\s*(and|&)\s*(\w+))?):?\s*(.+?)\s*$/i
+      REGEX_PLACE = /^\s*~?\s*(#{TYPE_PATTERN})\s+(\w+_\w+):\s*(.+?)\s*$/i
+      REGEX_TYPE1 = /^\s*~?\s*(#{TYPE_PATTERN})\s*?[\s:]\s*(.+?)\s*$/i
+      REGEX_TYPE2 = /^\s*~?\s*(#{TYPE_PATTERN})\s+(.+?)\s*$/i
+      REGEX_COMMENT1 = /^\s*~\s*(.*?)\s*$/
+      REGEX_COMMENT2 = /^\s*(.*?)\s*$/
+      REGEX_LOCAL = /version tag|buildscripts?|build[_\s+]|readme|credits|\.txt|\.bat|changelog| txt |this/i
+      REGEX_NOGO = /penis|dildo|noob/i
+      REGEX_NIL = /^\s*([:\-\.~,]|\**)\s*/
+      REGEX_FIRST = /^\w+/
+
+      REGEX_TODO = /TODO|RESTORED/i
+      REGEX_CHANGED = /^CH?A?N?G?E?D?/i
+      REGEX_MODIFIED = /^MODIFIED|MOD|RENAMED/i
+      REGEX_ADDED = /^AD?D?E?D?/i
+      REGEX_REMOVED = /^RE?M?O?V?E?D/i
+      REGEX_DELETED = /^DELE?T?E?D?/i
+      REGEX_UPDATED = /^UP?D?A?T?E?D?/i
+      REGEX_FIXED = /^FI?X?E?D?/i
+      REGEX_MOVED = /^MOVE?D?/i
+      REGEX_REVERT = /^LOCAL|REVERTE?D?/i
+
+      REGEX_VERSION = /(.)\.(.)(.)/
+
+      @@log = SixArma::Bt.log
+
       attr_reader(:config, :stats)
       attr_accessor :threads
 
       # yaml:: Yaml configuration file
       # halt:: Wait for user input every step?
       def initialize(yaml, halt)
-        SixCore::info "Start Time: #{Time.now}"
+        @@log.info "Start Time: #{Time.now}"
 
         @halt = halt
         @threads = []
         @stats = STATS.new()
         if FileTest.exist?(yaml)
-          SixCore::info "Reading From Configuration File: #{yaml}"
+          @@log.info "Reading From Configuration File: #{yaml}"
           File.open(yaml) { |yf| @config = YAML::load( yf ) }
         else
-          SixCore::info "Yaml file not found (#{yaml})"
+          @@log.info "Yaml file not found (#{yaml})"
           Process.exit
         end
         read_stats()
@@ -117,11 +139,11 @@ module SixArma
       # source:: Source path
       # destination:: Destination path
       def update_all(source, destination)
-        SixCore::infos('Update_All', COMPONENT) # TODO
-        SixCore::info "Updating *all* files - source: #{source} - destination: #{destination}..."
+        @@log.info SixCore::prep_msg('Update_All', :format => 'title') # TODO
+        @@log.info "Updating *all* files - source: #{source} - destination: #{destination}..."
         SixCore::fileupdate(
-          "#{@config.outroot}\\files\\#{source}\\",
-          "#{@config.outroot}\\files\\#{destination}\\"
+          "#{@config.outroot}/files/#{source}/",
+          "#{@config.outroot}/files/#{destination}/"
         )
       end
 
@@ -129,11 +151,11 @@ module SixArma
       # source:: Source path
       # destination:: Destination path
       def update_sign(source, destination)
-        SixCore::infos('Update_Sign', COMPONENT) # TODO
-        SixCore::info "Updating *sign* files - source: #{source} - destination: #{destination}..."
+        @@log.info SixCore::prep_msg('Update_Sign', :format => 'title') # TODO
+        @@log.info "Updating *sign* files - source: #{source} - destination: #{destination}..."
         SixCore::fileupdate(
-          "#{@config.outroot}\\files\\#{source}\\",
-          "#{@config.outroot}\\files\\#{destination}\\",
+          "#{@config.outroot}/files/#{source}/",
+          "#{@config.outroot}/files/#{destination}/",
           '/IF *.bisign *.bikey'
         )
       end
@@ -157,15 +179,15 @@ module SixArma
       # put:: File to upload
       # type:: Type (update or full)
       def upload(put, type, tmp = true)
-        SixCore::infos('Upload', COMPONENT)
+        @@log.info SixCore::prep_msg('Upload', :format => 'title')
         @config.ftp.each do |f|
           path = eval "f.path#{type}"
-          SixCore::info "Uploading #{put} to #{f.host}/#{path}..."
+          @@log.info "Uploading #{put} to #{f.host}/#{path}..."
           ftp = SixCore::Ftp.new(f.host, f.user, f.pass)
-          ftp.put(put, "#{@config.outroot}\\", path, true, tmp)
+          ftp.put(put, "#{@config.outroot}/", path, true, tmp)
           ftp.ftp.close
         end
-        SixCore::info "Uploading #{put} finished!"
+        @@log.info "Uploading #{put} finished!"
         SixCore::halt() if @halt
       end
 
@@ -175,19 +197,19 @@ module SixArma
         name = eval("@stats.#{type}file")
         tmp = []
         @config.ftp.each do |f|
-          tmp << [f.host, f.user, f.pass, eval("f.path#{type}"), "#{@config.outroot}\\", name]
+          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::info "Uploading #{name}..."
+          @@log.info SixCore::prep_msg('Upload', :format => 'title')
+          @@log.info "Uploading #{name}..."
           ftps.each { |f| upload_raw(*f) }
-          SixCore::info "Uploading #{name} finished..."
+          @@log.info "Uploading #{name} finished..."
         end
       end
 
       # Releases uploaded update/full setup files
       def release()
-        SixCore::info "Releasing #{@stats.newver}..."
+        @@log.info "Releasing #{@stats.newver}..."
         @config.ftp.each do |f|
           begin
             raise 'Error' if @stats.fullfile.nil? && @stats.updatefile.nil?
@@ -204,7 +226,7 @@ module SixArma
           end
         end
         @stats.released = true
-        SixCore::info "Version Info: #{@stats.newver} Released!"
+        @@log.info "Version Info: #{@stats.newver} Released!"
 
         write_stats()
       end
@@ -212,14 +234,14 @@ module SixArma
       # Reads stats from yaml version file
       def read_stats()
         # TODO: Prettify
-        dir = Dir.open("#{@config.outroot}/versions").entries
-        if dir.size > 2
+        dir = Dir["#{@config.outroot}/versions/*.yaml"]
+        if dir.size > 0
           dir.reverse!
-          File.open("#{@config.outroot}/versions/#{dir[0]}") do |yf|
-            SixCore::info "Reading From Stats File: #{dir[0]}"
+          File.open(dir[0]) do |yf|
+            @@log.info "Reading From Stats File: #{dir[0]}"
             stats = YAML::load(yf)
             if stats.released
-              SixCore::info 'Previous version was released; New Version'
+              @@log.info 'Previous version was released; New Version'
               @stats = STATS.new()
               @stats.mods = []
               @stats.oldver = stats.newver.to_s
@@ -228,8 +250,8 @@ module SixArma
               # 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 = /(.)\.(.)(.)/.match(@stats.newver).to_s
-              @stats.oldver = /(.)\.(.)(.)/.match(@stats.oldver).to_s
+              @stats.newver = @stats.newver[REGEX_VERSION].to_s
+              @stats.oldver = @stats.oldver[REGEX_VERSION].to_s
 
               @stats.released = false
               stats.mods.each do |mod|
@@ -237,16 +259,14 @@ module SixArma
                 modstats.subfolders = []
                 mod.subfolders.each do
                   sf = STATS_MOD_SUBFOLDERS.new()
-                  sf.add = []
-                  sf.del = []
-                  sf.change = []
+                  sf.add, sf.del, sf.change = [], [], []
                   modstats.subfolders << sf
                 end
                 modstats.oldrev = mod.newrev
                 @stats.mods << modstats
               end
             else
-              SixCore::info 'Previous version wasn\'t released; Sticking to current version'
+              @@log.info 'Previous version wasn\'t released; Sticking to current version'
               @stats = stats
             end
           end
@@ -255,10 +275,10 @@ module SixArma
           Process.exit
         end
 
-        SixCore::info "Current Version: #{@stats.newver} | Previous Version: #{@stats.oldver}"
+        @@log.info "Current Version: #{@stats.newver} | Previous Version: #{@stats.oldver}"
 
         # update the version files
-        SixCore::info 'Updating version.txt...'
+        @@log.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
@@ -285,20 +305,19 @@ module SixArma
         write_stats()
 
         # Write all in one changelog all versions and mods
+        @@log.info SixCore::prep_msg 'Writing Changelog', :format => 'title'
         write_changelog2()
-        SixCore::infos 'Latest Commits by:'
+        @@log.info 'Latest Commits by:'
         @names.each do |k, v|
-          SixCore::info "#{k}: #{v} commits"
+          @@log.info "#{k}: #{v} commits"
         end
       end
 
       # Experimental: "Replay SVN Log and Reimport"
       def tmp
-        Dir.chdir("#{@config.outroot}/versions")
-
-        Dir.glob('*.yaml') do |f|
-          File.open("#{@config.outroot}/versions/#{f}") do |yf|
-            SixCore::info "Reading From Stats File: #{f}"
+        Dir["#{@config.outroot}/versions/*.yaml"].each do |f|
+          File.open(f) do |yf|
+            @@log.info "Reading From Stats File: #{f}"
             @stats = YAML::load(yf)
             read_changelog(false)
             write_stats()
@@ -309,12 +328,8 @@ module SixArma
       def read_changelog(readrev = true)
         @stats.mods.each_with_index do |mod, idx|
           mod.changelog = STATS_MOD_CHANGELOG.new()
-          mod.changelog.changed = []
-          mod.changelog.removed = []
-          mod.changelog.fixed = []
-          mod.changelog.added = []
-          mod.changelog.updated = []
-          mod.changelog.local = []
+          mod.changelog.changed, mod.changelog.removed, mod.changelog.fixed = [], [], []
+          mod.changelog.added, mod.changelog.updated, mod.changelog.local = [], [], []
           mod2 = @config.mods[idx]
           unless mod2.svn.nil?
             svn = SixCore::Svn.new("#{mod2.path}#{mod2.source}", mod2.svn.user, mod2.svn.pass)
@@ -325,14 +340,13 @@ module SixArma
                 if l[1].size > 0
                   # TODO Pretify
                   name = l[0][1]
-                  name.gsub!(/ace_dev_|ace_support_|wgl_support_|wgl_dev_|wgl_supporter_/i, '')
+                  name.gsub!(REGEX_DEVS, '')
                   name.capitalize!
-                  @names[name] =+ 1
-                  type_pattern = COMMENT_TYPES.join '|'
+                  @names[name] += 1
                   l[1].each do |c|
                     if true #c =~ /^\s*~\s*/
                       is_valid, type, places, comment = case c
-                      when /^\s*~?\s*(#{type_pattern})\s+-\s*((\w+)(\s*(and|&)\s*(\w+))?(\s*(and|&)\s*(\w+))?):?\s*(.+?)\s*$/i
+                      when REGEX_LONG
                         # ~ type - place: comment
                         # ~ type - place comment
                         # ~ type - place
@@ -348,26 +362,26 @@ module SixArma
 
                         [true, $1, found, $10]
 
-                      when /^\s*~?\s*(#{type_pattern})\s+(\w+_\w+):\s*(.+?)\s*$/i
+                      when REGEX_PLACE
                         # ~ type place: comment
                         # type place: comment
                         [true, $1, [$2], $3]
 
-                      when /^\s*~?\s*(#{type_pattern})\s*?[\s:]\s*(.+?)\s*$/i
+                      when REGEX_TYPE1
                         # ~ type comment
                         # type comment
                         # ~ type: comment
                         # type: comment
                         [true, $1, [], $2]
 
-                      when /^\s*~?\s*(#{type_pattern})\s+(.+?)\s*$/i
+                      when REGEX_TYPE2
                         [true, $1, [], $2]
 
-                      when /^\s*~\s*(.*?)\s*$/
+                      when REGEX_COMMENT1
                         # ~ comment
                         [true, 'CHANGED', [], $1]
 
-                      when /^\s*(.*?)\s*$/
+                      when REGEX_COMMENT2
                         # comment
                         [true, 'LOCAL', [], $1]
 
@@ -377,16 +391,16 @@ module SixArma
 
                       if is_valid
                         case comment
-                        when /version tag|buildscripts?|build[_\s+]|readme|credits|\.txt|\.bat|changelog| txt |this/i
+                        when REGEX_LOCAL
                           type = 'LOCAL'
                         end
-                        comment.gsub!(/penis|dildo|noob/i, '****')
-                        comment.gsub!(/^\s*([:\-\.~,]|\**)\s*/, '')
+                        comment.gsub!(REGEX_NOGO, '****')
+                        comment.gsub!(REGEX_NIL, '')
                         # FIXME: Shouldn't this be possible with just 1* regex?
-                        comment.gsub!(/^\s*([:\-\.~,]|\**)\s*/, '')
+                        comment.gsub!(REGEX_NIL, '')
                         comment.gsub!('http', 'ticket: http')
                         unless comment.empty?
-                          f = comment[/^\w+/]
+                          f = comment[REGEX_FIRST]
                           unless f.nil?
                             case f
                               #when /REMOVED|DELETED/i
@@ -394,11 +408,11 @@ module SixArma
                               #  comment.sub!(f, '')
                               #  comment.gsub!(/^[:\-\.~]/, '')
                               #  f = comment[/^\w+/]
-                            when /TODO|RESTORTED/i
+                            when REGEX_TODO
                               type = 'LOCAL'
                             end
                             # Capitalize only first word
-                            comment.gsub!(/^\w+/, '')
+                            comment.gsub!(REGEX_FIRST, '')
                             f.capitalize!
                             comment = "#{f}#{comment}"
                           end
@@ -409,17 +423,17 @@ module SixArma
                           end
                           entry = "#{entry} [#{name}]"
                           case type
-                          when /^CH?A?N?G?E?D?/i, /^MODIFIED|MOD|RENAMED/i
+                          when REGEX_CHANGED, REGEX_MODIFIED
                             mod.changelog.changed << entry
-                          when /^AD?D?E?D?/i
+                          when REGEX_ADDED
                             mod.changelog.added << entry
-                          when /^RE?M?O?V?E?D/i, /^DELE?T?E?D?/i
+                          when REGEX_REMOVED, REGEX_DELETED
                             mod.changelog.removed << entry
-                          when /^UP?D?A?T?E?D?/i
+                          when REGEX_UPDATED
                             mod.changelog.updated << entry
-                          when /^FI?X?E?D?/i
+                          when REGEX_FIXED
                             mod.changelog.fixed << entry
-                          when /^MOVE?D?/i, /^LOCAL|REVERTED/i
+                          when REGEX_MOVED, REGEX_REVERT
                             mod.changelog.local << entry
                           end
                         end
@@ -429,29 +443,20 @@ module SixArma
                 end
               end
             end
-            mod.changelog.changed.uniq!
-            mod.changelog.added.uniq!
-            mod.changelog.removed.uniq!
-            mod.changelog.updated.uniq!
-            mod.changelog.fixed.uniq!
-            mod.changelog.local.uniq!
-
-            mod.changelog.changed.sort!
-            mod.changelog.added.sort!
-            mod.changelog.removed.sort!
-            mod.changelog.updated.sort!
-            mod.changelog.fixed.sort!
-            mod.changelog.local.sort!
-
-            SixCore::info "SVN #{mod2.destination} Current Rev: #{mod.newrev} | Previous Rev: #{mod.oldrev}"
+            mod.changelog.values.each do |log|
+              log.uniq!
+              log.sort!
+            end
+
+            @@log.info "SVN #{mod2.destination} Current Rev: #{mod.newrev} | Previous Rev: #{mod.oldrev}"
           end
         end
       end
 
       # Writes stats to yaml version file
       def write_stats()
-        SixCore::debugs('Writing Version Stats', COMPONENT)
-        SixCore::debug "Current Ver: #{@stats.newver}"
+        @@log.debug SixCore::prep_msg('Writing Version Stats', :format => 'title')
+        @@log.debug "Current Ver: #{@stats.newver}"
 
         File.open("#{@config.outroot}/versions/_version_#{@stats.newver}.yaml", 'w' ) do |out|
           YAML.dump( @stats, out )
@@ -460,23 +465,20 @@ module SixArma
 
 
       def gen_clog(stream)
-        Dir.chdir("#{@config.outroot}/versions")
         ar = []
-        Dir.glob('*.yaml') do |f|
+        Dir["#{@config.outroot}/versions/*.yaml"].each do |f|
           ar << f
         end
         ar.reverse!
-        SixCore::info "Replaying logfiles from Stats Files: #{ar.first} - #{ar.last}"
+        @@log.info "Replaying logfiles from Stats Files: #{ar.first} - #{ar.last}"
         ar.each do |f|
-          File.open("#{@config.outroot}/versions/#{f}") do |yf|
+          File.open(f) do |yf|
             stats = YAML::load(yf)
             stream.puts ''
             stream.puts "== v#{stats.newver} =="
             stats.mods.each_with_index do |mod, idx|
               mod2 = @config.mods[idx]
-              unless mod2.svn.nil?
-                generate_log(mod, mod2, stream, 1)
-              end
+              generate_log(mod, mod2, stream, 1) unless mod2.svn.nil?
             end
           end
         end
@@ -490,9 +492,10 @@ module SixArma
         changelog = mod.changelog
 
         return if changelog.values.inject(true) { |b, a| b and a.empty? }
-        if type == 1
+        case type
+        when 1
           stream.puts "* #{mod2.destination}, Revision: #{mod.newrev} - #{mod.oldrev}"
-        elsif type == 2
+        when 2
           stream.puts "* #{mod2.destination} v#{@stats.newver}, Revision: #{mod.newrev} - #{mod.oldrev}"
         end
         generate_log_entries(changelog.added, 'ADDED', stream)
@@ -500,28 +503,21 @@ module SixArma
         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
-
+        changelog.each do |line| stream.puts "*** #{line}" end
         stream.puts
       end
 
       # Formats and writes changelog for all versions
       def write_changelog2()
-        File.open("#{@config.outroot}/files/update/#{@config.mods[0].destination}/Docs/changelog.txt", 'w') do |lf|
-          SixCore::info 'Writing Changelog'
+        File.open("#{@config.outroot}/files/update/#{@config.mods[0].destination}/Docs/#{@config.changelog}.txt", 'w') do |lf|
           lf.puts '= Changelog ='
           gen_clog(lf)
-          Dir.chdir(SixCore::MAINDIR)
         end
       end
 
@@ -529,11 +525,9 @@ module SixArma
       def write_changelog()
         @stats.mods.each_with_index do |mod, idx|
           mod2 = @config.mods[idx]
-          unless mod2.svn.nil?
-            File.open("#{@config.mods[idx].changes}/changelog.txt", 'w') do |lf|
-              generate_log(mod, mod2, lf, 2)
-            end
-          end
+          File.open("#{@config.mods[idx].changes}/changelog.txt", 'w') do |lf|
+            generate_log(mod, mod2, lf, 2)
+          end unless mod2.svn.nil?
         end
       end
 
@@ -616,10 +610,8 @@ module SixArma
         @threads.each { |t| t.join } if thread
       end
     end
-  end
-end
 
-component = '6thSense.eu ArmA BuildTools'
-version = '0.7.4'
-SixCore::debugs "#{component} #{version} loaded"
-SixCore::infos("v#{version}, by Sickboy (sb_at_6thSense.eu)", component)
+    @@log.debug "#{COMPONENT} #{VERSION} loaded"
+    @@log.info SixCore::prep_msg("#{TITLE} v#{VERSION}, by Sickboy (sb_at_6thSense.eu)", :format => 'title')
+  end
+end

data/lib/sixarma/bt/build.rb

@@ -9,15 +9,15 @@ module SixArma
         case folder.type
         when 'addons'
           # Remove deleted files
-          SixCore::info 'Removing Deleted Files from Full...'
+          @@log.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}.*")
+            FileUtils::rm_f Dir["#{@config.outroot}/files/full/#{mod.destination}/#{folder.name}/#{item}.*"]
           end
 
-          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")
+          @@log.info 'Cleaning Update folder...'
+          FileUtils::rm_f Dir["#{@config.outroot}/files/update/#{mod.destination}/#{folder.name}/*.pbo"]
+          FileUtils::rm_f Dir["#{@config.outroot}/files/update/#{mod.destination}/#{folder.name}/*.bisign"]
         end
       end
 
@@ -28,19 +28,19 @@ module SixArma
       def copy_stuff(mod, folder)
         case folder.type
         when 'addons'
-          SixCore::info 'Copying 3rd_Party_Pbos...'
+          @@log.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}"
-          thirdparty_pbo.each do |item| SixCore::filecopy("#{source}\\#{item}", dest) end
+          source = "#{mod.path}/#{mod.source}/#{folder.name}"
+          dest = "#{@config.outroot}/files/update/#{mod.destination}/#{folder.name}"
+          thirdparty_pbo.each do |item| FileUtils.cp_r "#{source}/#{item}", destination, :preserve => true end
         end
       end
 
       # Verify if altsource exists, if not, use real source
       def check_source(mod, folder, item)
-        source = "#{mod.path}\\#{mod.source}\\#{folder.name}\\#{item}"
+        source = "#{mod.path}/#{mod.source}/#{folder.name}/#{item}"
         unless mod.altsource.nil?
-          tmp = "#{mod.path}\\#{mod.altsource}\\#{folder.name}\\#{item}"
+          tmp = "#{mod.path}/#{mod.altsource}/#{folder.name}/#{item}"
           source = tmp if FileTest.directory?(tmp)
         end
         return source
@@ -53,57 +53,53 @@ module SixArma
         # read files into arrays, strip newline chars
         exclude = []
         tmp = "#{mod.changes}/_exclude_#{folder.name}.txt"
-        if FileTest.exist?(tmp)
-          exclude = File.open(tmp) { |file| file.readlines.map { |line| SixCore::clean(line) } }
-        end
+        exclude = File.open(tmp) do |file| file.readlines.map { |line| SixCore::clean(line) } end if FileTest.exist?(tmp)
 
-        delete = File.open("#{mod.changes}/#{@config.workdel}_#{folder.name}.txt") { |file| file.readlines.map { |line| SixCore::clean(line) } }
+        delete = File.open("#{mod.changes}/#{@config.workdel}_#{folder.name}.txt") do |file| file.readlines.map { |line| SixCore::clean(line) } end
 
-        tmp = File.open("#{mod.changes}/#{@config.workbin}_#{folder.name}.txt") { |file| file.readlines.map { |line| SixCore::clean(line) } }
+        tmp = File.open("#{mod.changes}/#{@config.workbin}_#{folder.name}.txt") do |file| file.readlines.map { |line| SixCore::clean(line) } end
         binfiles = []
-        tmp.each do |e|
-          binfiles << e unless delete.include?(e) || exclude.include?(e)
+        tmp.each do |addon|
+          binfiles << addon unless delete.include?(addon) || exclude.include?(addon)
         end
 
-        tmp = File.open("#{mod.changes}/#{@config.workpbo}_#{folder.name}.txt") { |file| file.readlines.map { |line| SixCore::clean(line) } }
+        tmp = File.open("#{mod.changes}/#{@config.workpbo}_#{folder.name}.txt") do |file| file.readlines.map { |line| SixCore::clean(line) } end
         pbofiles = []
-        tmp.each do |e|
-          pbofiles << e unless delete.include?(e) || exclude.include?(e)
+        tmp.each do |addon|
+          pbofiles << addon unless delete.include?(addon) || exclude.include?(addon)
         end
         combined = []
         combined += pbofiles
         combined += binfiles
 
-        dest = "#{@config.outroot}\\files\\update\\#{mod.destination}\\#{folder.name}"
+        dest = "#{@config.outroot}/files/update/#{mod.destination}/#{folder.name}"
 
         # Create folders and mirror SOURCE files
-        SixCore::info 'Creating folders and mirroring source files...'
+        @@log.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')
+          unless prefix == '' or prefix != prefix.gsub!('/', '')
+            SixCore::filemirror(source, "#{@config.workdir}/#{prefix}", '/XD .svn')
           end
         end
 
         # Build the addons
-        SixCore::info 'Binarizing...'
-        binfiles.each do |item|
-          SixArma::PboTools.binarize("#{@config.workdir}\\#{item}", dest, '__AUTO__')
-        end
+        @@log.info 'Binarizing...'
+        binfiles.each do |item| SixArma::PboTools.binarize("#{@config.workdir}/#{item}", dest, '__AUTO__') end
 
-        SixCore::info 'PBOing...'
-        pbofiles.each do |item|
-          SixArma::PboTools.pack("#{@config.workdir}\\#{item}", dest, '__AUTO__')
-        end
+        @@log.info 'PBOing...'
+        pbofiles.each do |item| SixArma::PboTools.pack("#{@config.workdir}/#{item}", dest, '__AUTO__') end
 
         # CleanUp
-        SixCore::info 'Cleaning up...'
-        SixCore::filemove("#{dest}\\*.log", "#{@config.outroot}\\log\\")
+        @@log.info 'Cleaning up...'
+        FileUtils::mv Dir["#{dest}/*.log"], "#{@config.outroot}/log/", :force => true
+        FileUtils::rm_f Dir["#{dest}/*.log"]
         #      combined.each do |item|
-        #        SixCore::filemove("#{dest}\\#{item}.log", "#{@config.outroot}\\log\\")
+        #        FileUtils::mv "#{dest}/#{item}.log", "#{@config.outroot}/log/", :force => true
+        #        FileUtils::rm_f "#{dest}/#{item}.log"
         #      end
       end
 
@@ -112,7 +108,7 @@ module SixArma
       def clear()
         @config.mods.each do |mod|
           mod.subfolders.each do |folder|
-            SixCore::infos("Clear Addon Folders - #{mod.destination}\\#{folder.name}", COMPONENT)
+            @@log.info SixCore::prep_msg("Clear Addon Folders - #{mod.destination}/#{folder.name}", :format => 'title')
             clear_folders(mod, folder)
           end
         end
@@ -123,7 +119,7 @@ module SixArma
       def addon_changes()
         @config.mods.each do |mod|
           mod.subfolders.each do |folder|
-            SixCore::infos("BuildChanges - #{mod.destination}\\#{folder.name}", COMPONENT)
+            @@log.info SixCore::prep_msg("BuildChanges - #{mod.destination}/#{folder.name}", :format => 'title')
             pbotools_build(mod, folder) if folder.type == 'addons'
             copy_stuff(mod, folder)
           end

data/lib/sixarma/bt/nsis.rb

@@ -4,7 +4,7 @@ module SixArma
       # Build an NSIS setup file
       # type:: update or full
       def nsis_build(type)
-        SixCore::infos("Nsis Build - #{type}", COMPONENT)
+        @@log.info SixCore::prep_msg("Nsis Build - #{type}", :format => 'title')
         cfg = @config.nsis
 
         newdelete = "";
@@ -13,7 +13,7 @@ module SixArma
             del = File.open("#{mod.changes}/#{@config.workdel}_#{folder.name}.txt") do |file|
               file.readlines.map { |line| SixCore::clean(line) }
             end
-            del.each { |item| newdelete += "\n		Delete \"#{mod.nsis.out}\\#{folder.name}\\#{item}.*\"" }
+            del.each { |item| newdelete += "\n		Delete \"#{mod.nsis.out}/#{folder.name}/#{item}.*\"" }
           end
         end
 
@@ -27,11 +27,11 @@ module SixArma
         ]
 
         out = "#{cfg.out}_v#{@stats.newver}#{type}.exe"
-        nsis = SixCore::Nsis.new("#{@config.outroot}\\#{cfg.template}", "#{@config.outroot}\\#{cfg.output}")
-        SixCore::info "Creating Setup File: #{out}..."
+        nsis = SixCore::Nsis.new("#{@config.outroot}/#{cfg.template}", "#{@config.outroot}/#{cfg.output}")
+        @@log.info "Creating Setup File: #{out}..."
         nsis.create_output(replace)
-        size = (File.size("#{@config.outroot}\\#{out}") / 1024) / 1024
-        SixCore::info "Finished Creating Setup File: #{out} (#{size}MB)..."
+        size = (File.size("#{@config.outroot}/#{out}") / 1024) / 1024
+        @@log.info "Finished Creating Setup File: #{out} (#{size}MB)..."
 
         return out
       end

data/lib/sixarma/bt/options.rb

@@ -120,14 +120,16 @@ option_parser = OptionParser.new do |opts|
 
   opts.on_tail('-?', '--help', 'Display this message') do |o|
     puts opts.help
+    Process.exit
   end
 end
 
 option_parser.parse!
 
+
 if ARGV.empty?
-  @options.configfile = 'docs/example.yaml'
-  SixCore::info 'Please use parameter -? for help'
+  @options.configfile = 'example.yaml'
+  SixCore::log.info 'Please use parameter -? for help'
 else
   @options.configfile = ARGV[0]
 end

data/lib/sixarma/bt/sign.rb

@@ -10,8 +10,8 @@ module SixArma
         # create the key
         name = "#{cfg.file}_v#{@stats.newver}"
         r = SixArma::Sign.create(name)
-        SixCore::filecopy("#{r[2]}\\#{r[1]}", "#{@config.outroot}\\files\\#{type}\\keys\\")
-        return r
+        FileUtils::cp_r "#{r[2]}/#{r[1]}", "#{@config.outroot}/files/#{type}/keys/", :preserve => true
+        r
       end
 
       # Alternative signature creator (per folder)
@@ -23,19 +23,19 @@ module SixArma
         # create the key
         name = "#{cfg.file}_#{folder}_v#{@stats.newver}"
         r = SixArma::Sign.create(name)
-        SixCore::filecopy("#{r[2]}\\#{r[1]}", "#{@config.outroot}\\files\\#{type}\\keys\\")
-        return r
+        FileUtils::cp_r "#{r[2]}/#{r[1]}", "#{@config.outroot}/files/#{type}/keys/", :preserve => true
+        r
       end
 
       # Signs addons
       # type:: update or full
       def sign_do(type)
-        SixCore::infos("Sign Do - #{type}", COMPONENT)
+        @@log.info SixCore::prep_msg("Sign Do - #{type}", :format => 'title')
 
         case @config.sign.keytype
         when 'whole'
-          SixCore::filedel("#{@config.outroot}\\files\\update\\Keys\\#{@config.sign.file}_*.bikey")
-          SixCore::filedel("#{@config.outroot}\\files\\full\\Keys\\#{@config.sign.file}_*.bikey")
+          FileUtils::rm_f "#{@config.outroot}/files/update/Keys/#{@config.sign.file}_*.bikey"
+          FileUtils::rm_f "#{@config.outroot}/files/full/Keys/#{@config.sign.file}_*.bikey"
           signfiles = sign_create('full')
           signfiles = sign_create('update') # TODO - Lame, function copies instead of create new one, but still - need to move
 
@@ -43,10 +43,10 @@ module SixArma
           @config.mods.each do |mod|
             mod.subfolders.each do |folder|
               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}..."
-                SixArma::Sign.sign("#{@config.outroot}\\files\\#{type}\\#{mod.destination}\\#{folder.name}", signfiles[0])
+                @@log.info "Clearing signatures - #{type}/#{mod.destination}/#{folder.name}..."
+                FileUtils::rm_f Dir["#{@config.outroot}/files/#{type}/#{mod.destination}/#{folder.name}/*.bisign"]
+                @@log.info "Signing - #{mod.destination}/#{folder.name}..."
+                SixArma::Sign.sign("#{@config.outroot}/files/#{type}/#{mod.destination}/#{folder.name}", signfiles[0])
               end
             end
           end
@@ -61,18 +61,18 @@ module SixArma
               #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")
+              FileUtils::rm_f Dir["#{@config.outroot}/files/update/Keys/#{@config.sign.file}_#{mod.destination}*.bikey"]
+              FileUtils::rm_f Dir["#{@config.outroot}/files/full/Keys/#{@config.sign.file}_#{mod.destination}*.bikey"]
 
               signfiles = sign_create2('full', mod.destination)
               signfiles = sign_create2('update', mod.destination)
 
               mod.subfolders.each do |folder|
                 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}..."
-                  SixArma::Sign.sign("#{@config.outroot}\\files\\#{type}\\#{mod.destination}\\#{folder.name}", signfiles[0])
+                  @@log.info "Clearing signatures - #{type}/#{mod.destination}/#{folder.name}..."
+                  FileUtils::rm_f Dir["#{@config.outroot}/files/#{type}/#{mod.destination}/#{folder.name}/*.bisign"]
+                  @@log.info "Signing - #{mod.destination}/#{folder.name}..."
+                  SixArma::Sign.sign("#{@config.outroot}/files/#{type}/#{mod.destination}/#{folder.name}", signfiles[0])
                 end
               end
             end

data/lib/sixarma/bt/svn.rb

@@ -6,7 +6,7 @@ module SixArma
       # cfg:: Mod Config Object
       # cfg2:: Mod Stats Object
       def svn_write_list(cfg, cfg2)
-        SixCore::info 'Writing SVN Changelog...'
+        @@log.info 'Writing SVN Changelog...'
         cfg.subfolders.each_with_index do |folder,idx|
           folder2 = cfg2.subfolders[idx]
           case folder.type
@@ -60,7 +60,7 @@ module SixArma
             end
 
             if t.size > 0
-              SixCore::info "ABORT: Changed but not found in lists: #{t}"
+              @@log.info "ABORT: Changed but not found in lists: #{t}"
               Process.exit
             end
 
@@ -76,13 +76,13 @@ module SixArma
       # cfg:: Mod Config Object
       # cfg2:: Mod Stats Object
       def svn_generate(cfg, cfg2)
-        SixCore::info 'Generating SVN Changelog...'
+        @@log.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.gsub('/', '\\')}\\#{f.name}\\", '')
             if entrymod != entry
               f2 = cfg2.subfolders[idx]
               if f.type == 'addons'
@@ -118,7 +118,7 @@ module SixArma
       # Meta method, runs generate and write_list for every mod
       def svn_do()
         @config.mods.each_with_index do |mod,idx|
-          SixCore::infos("SVN Sync - #{mod.destination}", COMPONENT)
+          @@log.info SixCore::prep_msg("SVN Sync - #{mod.destination}", :format => 'title')
           # Clean arrays
           @stats.mods[idx].subfolders.each do |f|
             f.add = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sixarma-bt
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors: 
 - Sickboy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-30 00:00:00 +01:00
+date: 2008-12-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: sixcore
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.4.0
     version: 
 description: The program uses a few of my other libraries and tools available for the Armed Assault Game, and subversion, to automate the building process of Full Conversion Mods, while keeping flexibility and configurability in mind
 email: sb@6thsense.eu