six-arma-builder 0.1.6 → 0.1.7

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-arma-builder'
-  s.version = '0.1.6'
+  s.version = '0.1.7'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/arma/builder/mod.rb

@@ -58,7 +58,33 @@ module Six
               when :addons
                 new = Hash.new
                 new[:type] = change.type
-                change.path[/\A(#{path[:folder]})\/(\w*)\/?(.*)/]
+                change.path[/\A(#{path[:folder]})\/([\w_\.]*)\/?(.*)/]
+                new[:base], new[:folder], new[:file] = $1, $2, $3
+                path = "#{new[:base]}/#{new[:folder]}"
+                unless stat[:changed].include?(path)
+                  #log.info "#{change.typ} #{change.path}"
+                  case new[:type]
+                    when 'deleted'
+                      if FileTest.exist?(File.join(@config[:source], path))
+                        new[:type] = 'modified'
+                      end
+                    #when 'modified'
+                    when 'new'
+                      # if already existed, it was not added but modified, dont matter actually
+                      new[:type] = 'modified'
+                  end
+
+                  case new[:type]
+                    when 'deleted'
+                      stat[:deleted] << path unless stat[:deleted].include?(path)
+                    when 'modified'
+                      stat[:changed] << path
+                  end
+                end
+              when :store
+                new = Hash.new
+                new[:type] = change.type
+                change.path[/\A(#{path[:folder]})\/([\w_\.]*)\/?(.*)/]
                 new[:base], new[:folder], new[:file] = $1, $2, $3
                 path = "#{new[:base]}/#{new[:folder]}"
                 unless stat[:changed].include?(path)
@@ -97,15 +123,15 @@ module Six
           end
 
           # Prepare file diffs
-          @source.diff(@config[:revision][:previous],@config[:revision][:current]).each do |diff|
-            @config[:paths].each_with_index do |path,index|
+          @source.diff(@config[:revision][:previous], @config[:revision][:current]).each do |diff|
+            @config[:paths].each_with_index do |path, index|
               process_change(diff, path, @stats[index])#, 'Addons')
             end
           end
 
           # Process file and comment history
           history = @source.log(LOG_LIMIT)
-          @config[:paths].each_with_index do |path,index|
+          @config[:paths].each_with_index do |path, index|
             # Process Stats
             stat = @stats[index]
             stat[:changed].sort!
@@ -172,7 +198,7 @@ module Six
         def process_files
           puts
           log.info "Processing Files ..."
-          @config[:paths].each_with_index do |path,index|
+          @config[:paths].each_with_index do |path, index|
             puts
             log.info "Path: #{path[:folder]}"
             stat = @stats[index]
@@ -184,6 +210,8 @@ module Six
                 #sign_changed_addons(path, stat)
                 # TODO: Make choice
                 #sign_all_addons(path, stat, true)
+              when :store
+                process_changed_files(path, stat)
             end
           end
         end
@@ -191,7 +219,7 @@ module Six
         def sign_files
           puts
           #log.info "Signing ..."
-          @config[:paths].each_with_index do |path,index|
+          @config[:paths].each_with_index do |path, index|
             puts
             log.info "Path: #{path[:folder]}"
             stat = @stats[index]
@@ -249,7 +277,7 @@ module Six
           end
           stat[:changed].each do |change|
             log.info "Building #{change}"
-            file = File.join(@config[:source],change)
+            file = File.join(@config[:source], change)
             fol_path = File.join(@config[:destination], path[:folder])
             obj = Six::Arma::Tools::Pbo.new(file, fol_path)
             overriden = false
@@ -280,6 +308,46 @@ module Six
           end
         end
 
+        def process_changed_files(path, stat)
+          des_path = File.join(@config[:destination], path[:folder])
+          src_path = File.join(@config[:source], path[:folder])
+
+          FileUtils.mkdir_p des_path unless File.exists?(des_path)
+
+          stat[:deleted].each do |change|
+            log.info "Deleting #{change}"
+            change[/(.*)\/(.*)/]
+            folder, file = $1, $2
+            ppath = File.join(src_path, folder)
+            unless File.exists? ppath
+            # TODO: Add PREFIX_  instead of * ?
+              FileUtils.rm_f File.join(@config[:destination], path[:folder], "#{folder}.tar")
+            end
+          end
+
+          stat[:changed].each do |change|
+            log.info "Building #{change}"
+            file = File.join(@config[:source], change)
+            # TODO: Also for adodn folders!
+            change[/(.*)\/(.*)/]
+            f = $2
+
+            if !File.directory?(file)
+              FileUtils.cp(file, des_path) # TODO: apply proper file date
+              @destination_changed = true
+            else
+              if File.exists?(File.join(file, "$IGNORE$"))
+              else
+                Dir.chdir src_path do
+                  o = %x[tar -c #{f} > #{f}.tar]
+                  FileUtils.mv(File.join(src_path, "#{f}.tar"), des_path)
+                end
+                @destination_changed = true
+              end
+            end
+          end
+        end
+
         # FIXME: !!
         def sign_changed_addons(path, stat)
           if @destination_changed
@@ -315,34 +383,34 @@ module Six
         def sign_all_addons(path, stat, force = false)
           if @destination_changed || force
             if stat[:changed].size > 0
-            if @config[:key]
-            else
-              key = "#{@config[:name]}_b#{@build}"
-              d = "C:/projects/keys"
-              unless File.exists?(File.join(d, "#{key}.biprivatekey"))
-                Dir.chdir d
-                system "C:/tools/dsutils/dsCreateKey #{key}"
+              if @config[:key]
+              else
+                key = "#{@config[:name]}_b#{@build}"
+                d = "C:/projects/keys"
+                unless File.exists?(File.join(d, "#{key}.biprivatekey"))
+                  Dir.chdir d
+                  system "C:/tools/dsutils/dsCreateKey #{key}"
+                end
+                Dir[File.join(@config[:destination], "keys", '*.bikey')].each do |f|
+                  FileUtils.rm_f(f)
+                end
+                FileUtils.cp(File.join(d, "#{key}.bikey"), File.join(@config[:destination], "keys", "#{key}.bikey"))
               end
-              Dir[File.join(@config[:destination], "keys", '*.bikey')].each do |f|
-                FileUtils.rm_f(f)
+              puts
+              log.info "Signing All..."
+              destination = File.join(@config[:destination], path[:folder])
+              Dir.chdir destination
+              Dir[File.join(destination, "*.bisign")].each do |f|
+                FileUtils::rm_f f
               end
-              FileUtils.cp(File.join(d, "#{key}.bikey"), File.join(@config[:destination], "keys", "#{key}.bikey"))
-            end
-            puts
-            log.info "Signing All..."
-            destination = File.join(@config[:destination], path[:folder])
-            Dir.chdir destination
-            Dir[File.join(destination, "*.bisign")].each do |f|
-              FileUtils::rm_f f
-            end
-            Dir['*.pbo'].each do |pbo|
-              log.info "Signing #{pbo}"
-              file = File.join(@config[:destination], path[:folder], pbo)
-              obj = Six::Arma::Tools::Pbo.new(file, File.join(@config[:destination], path[:folder]))
-              obj.sign({:key => File.join(d, "#{key}.biprivatekey")})
-            end
-            @destination_changed = true
+              Dir['*.pbo'].each do |pbo|
+                log.info "Signing #{pbo}"
+                file = File.join(@config[:destination], path[:folder], pbo)
+                obj = Six::Arma::Tools::Pbo.new(file, File.join(@config[:destination], path[:folder]))
+                obj.sign({:key => File.join(d, "#{key}.biprivatekey")})
               end
+              @destination_changed = true
+            end
           end
         end
 
@@ -351,7 +419,7 @@ module Six
             puts
             log.info "Writing Changelog..."
             msgs = ["h2. #{Time.now}\n\nBuild #{@build}\nUpdated to source:@#{@config[:revision][:current]}"]
-            @config[:paths].each_with_index do |path,index|
+            @config[:paths].each_with_index do |path, index|
               stat = @stats[index]
               #msgs << "Path: #{path[:folder]}"
               #msgs += stat[:changelog]

data/lib/six/arma/builder-app.rb

@@ -4,11 +4,11 @@ require 'six/arma/builder/options'
 module Six
   module Arma
     module Builder
-      TEST = false #true
+      TEST = false #false #true
       #parse_options
       initialize
       @config[:mods].each do |config|
-        if true #['six'].include? config[:name]
+        if true #['ace', 'six'].include? config[:name]
           mod = Mod.new(config)
           # TODO: First reset the package repositories ?
           mod.process_diffs

data/lib/six/arma/builder.rb

@@ -18,7 +18,7 @@ require 'six/arma/builder/mod'
 module Six
   module Arma
     module Builder
-      VERSION = '0.1.6'
+      VERSION = '0.1.7'
       COMPONENT = 'six-arma-builder'
       BASE_PATH = Dir.pwd
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: six-arma-builder
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Sickboy