sixarma 0.4.4 → 0.5.0

data/Rakefile

@@ -13,7 +13,7 @@ require 'rake/testtask'
 spec = Gem::Specification.new do |s|
   s.name = 'sixarma'
   s.rubyforge_project = s.name
-  s.version = '0.4.4'
+  s.version = '0.5.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Basic function library for the Armed Assault game by Bohemia Interactive Studios'
@@ -25,7 +25,7 @@ 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('sixcore', '>= 0.3.0')
+  s.add_dependency('sixcore', '>= 0.4.0')
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/lib/sixarma.rb

@@ -3,8 +3,25 @@ gem 'sixcore'
 require 'sixcore'
 
 module SixArma
-end
+  COMPONENT = 'SixArma'
+  TITLE = '6thSense.eu ArmA'
+  VERSION = '0.5.0'
+  @@log = Log4r::Logger.new('sixcore::sixarma')
+
+  module_function
+  def read_config(config, path)
+    obj = nil
+    if FileTest.exist?("config/#{config}.yaml")
+      File.open("config/#{config}.yaml") { |yf| obj = YAML::load( yf ) }
+    else
+      File.open("#{File.dirname(__FILE__)}/#{path}/#{config}.yaml") { |yf| obj = YAML::load( yf ) }
+    end
+    obj
+  end
 
-component = '6thSense.eu ArmA'
-version = '0.4.4'
-SixCore::debugs "#{component} #{version} loaded""
+  def log
+    @@log
+  end
+
+  @@log.debug "#{TITLE} #{VERSION} loaded"
+end

data/lib/sixarma/config/pbotools.yaml

@@ -0,0 +1,7 @@
+--- !ruby/struct:SixArma::ConfigPboTools 
+program: C:/Program Files (x86)/Bohemia Interactive/Tools/BinPBO Personal Edition/BINPbo.exe
+temppath: H:/temp/binpbo
+includefile: I:/ACE/trunk/build-scripts/_include.txt
+binpbo_params_bin: -BINARIZE -CLEAR -DEBUG
+binpbo_params_pbo: -CLEAR -DEBUG
+prefix_file: $PBOPREFIX$

data/lib/sixarma/config/sign.yaml

@@ -0,0 +1,2 @@
+--- !ruby/struct:SixArma::ConfigSign 
+path: L:/signing

data/lib/sixarma/pbotools.rb

@@ -4,8 +4,10 @@
 require 'sixcore'
 require 'sixarma'
 module SixArma
+  ConfigPboTools = Struct.new(:program, :temppath, :includefile, :binpbo_params_bin, :binpbo_params_pbo, :prefix_file)
+
   module PboTools
-    require 'sixarma/config/pbotools'
+    @@config = SixArma::read_config('pbotools', 'sixarma/config')
 
     module_function
     # Checks prefix, returns read from file prefix, empty prefix, or given prefix
@@ -13,8 +15,8 @@ module SixArma
     # prefix:: String: Empty, '__AUTO__' or specific prefix can be given
     def check_prefix(source, prefix)
       return prefix unless prefix == '__AUTO__'
-      if FileTest.exist?("#{source}\\#{PREFIX_FILE}")
-        pf = File.open("#{source}\\#{PREFIX_FILE}") do |file|
+      if FileTest.exist?("#{source}/#{@@config.prefix_file}")
+        pf = File.open("#{source}/#{@@config.prefix_file}") do |file|
           file.readlines.map { |line| SixCore::clean(line) }
         end
         if pf[0].empty?
@@ -32,10 +34,10 @@ module SixArma
     # destination:: destination folder without addon name
     # prf:: Prefix, see check_prefix
     def binarize(source, destination, prf = '')
-      params = BINPBOPARAMSBIN
+      params = "#{@@config.binpbo_params_bin} -TEMP #{@@config.temppath} -INCLUDE #{@@config.includefile}"
       prefix = check_prefix(source, prf)
       params += " -PREFIX #{prefix}" unless prefix.empty?
-      SixCore::proc_cmd("#{BINPBO} \"#{source}\" \"#{destination}\" #{params}")
+      SixCore::proc_cmd("#{@@config.program} \"#{source}\" \"#{destination}\" #{params}".gsub('/', '\\'))
     end
 
     # Packs addon
@@ -43,10 +45,10 @@ module SixArma
     # destination:: destination folder without addon name
     # prf:: Prefix, see check_prefix
     def pack(source, destination, prf = "")
-      params = BINPBOPARAMSPBO
+      params = "#{@@config.binpbo_params_pbo} -TEMP #{@@config.temppath}"
       prefix = check_prefix(source, prf)
       params += " -PREFIX #{prefix}" unless prefix.empty?
-      SixCore::proc_cmd("#{BINPBO} \"#{source}\" \"#{destination}\" #{params}")
+      SixCore::proc_cmd("#{BINPBO} \"#{source}\" \"#{destination}\" #{params}".gsub('/', '\\'))
     end
   end
 end

data/lib/sixarma/sign.rb

@@ -4,8 +4,11 @@
 require 'sixarma'
 
 module SixArma
+  ConfigSign = Struct.new(:path)
+
   module Sign
-    require 'sixarma/config/sign'
+    @@log = SixArma::log
+    @@config = SixArma::read_config('sign', 'sixarma/config')
     COMPONENT = 'SixArma::Sign'
 
     module_function
@@ -13,29 +16,31 @@ module SixArma
     # Returns created files
     # name:: String name of key
     def create(name)
-      SixCore::debug('Creating Signature', COMPONENT, name)
+      @@log.debug SixCore::prep_msg('Creating Signature', :component => COMPONENT, :verbose => name, :format => 'title')
 
       # create the key
       signfile = "#{name}.biprivatekey"
       signkey = "#{name}.bikey"
-      unless FileTest.exist?("#{SIGNPATH}\\#{signfile}")
-        Dir.chdir(SIGNPATH)
-        SixCore::proc_cmd("#{DSCREATE} #{name}")
+      unless FileTest.exist?("#{@@config.path}/#{signfile}")
+        Dir.chdir(@@config.path)
+        SixCore::proc_cmd("dscreatekey #{name}")
         Dir.chdir(SixCore::MAINDIR)
       end
-      return [signfile, signkey, SIGNPATH]
+      return [signfile, signkey, @@config.path]
     end
 
     # Signs files in destination
     # destination:: Destination folder
     # signfile:: Signature file name
     def sign(destination, signfile)
-      SixCore::debug('Signing...', COMPONENT, [destination, signfile])
+      @@log.debug SixCore::prep_msg('Signing...', :component => COMPONENT, :verbose => [destination, signfile], :format => 'title')
       if signfile.empty?
         return 1
       else
         Dir.chdir(destination)
-        Dir.glob('*.pbo') { |file| SixCore::proc_cmd "#{DSSIGN} #{SIGNPATH}\\#{signfile} #{file}" }
+        keyfile = "#{@@config.path}/#{signfile}"
+        keyfile.gsub!('/', '\\')
+        Dir['*.pbo'].each { |file| SixCore::proc_cmd "#{@@config.path}/dssignfile #{keyfile} #{file}" }
         Dir.chdir(SixCore::MAINDIR)
         return 0
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sixarma
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.5.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.3.0
+        version: 0.4.0
     version: 
 description: Basic function library for the Armed Assault game by Bohemia Interactive Studios
 email: sb@6thsense.eu
@@ -35,11 +35,11 @@ files:
 - LICENSE
 - README
 - Rakefile
-- lib/sixarma/config/pbotools.rb
-- lib/sixarma/config/sign.rb
 - lib/sixarma/pbotools.rb
 - lib/sixarma/sign.rb
 - lib/sixarma.rb
+- lib/sixarma/config/pbotools.yaml
+- lib/sixarma/config/sign.yaml
 has_rdoc: true
 homepage: http://6thsense.eu
 post_install_message: 

data/lib/sixarma/config/pbotools.rb

@@ -1,6 +0,0 @@
-BINPBO = 'C:\\Program Files (x86)\\Bohemia Interactive\\Tools\\BinPBO Personal Edition\\BINPbo.exe'
-TEMPPATH = 'H:\\temp\\binpbo'
-INCLUDEFILE = 'I:\\ACE\\trunk\\build-scripts\\_include.txt'
-BINPBOPARAMSBIN = "-BINARIZE -CLEAR -TEMP #{TEMPPATH} -DEBUG -INCLUDE #{INCLUDEFILE}"
-BINPBOPARAMSPBO = "-CLEAR -TEMP #{TEMPPATH} -DEBUG"
-PREFIX_FILE = '$PBOPREFIX$'

data/lib/sixarma/config/sign.rb

@@ -1,3 +0,0 @@
-SIGNPATH = 'L:\\signing'
-DSCREATE = "#{SIGNPATH}\\dscreatekey"
-DSSIGN = "#{SIGNPATH}\\dssignfile"