six-arma-tools 0.1.2 → 0.1.4

data/Rakefile

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

data/lib/six/arma/tools.rb

@@ -10,7 +10,7 @@ module Six
         Process.exit!
       end
       COMPONENT = 'six-arma-tools'
-      VERSION = "0.1.2"
+      VERSION = "0.1.4"
 
       @@options = Hash.new unless defined?(@@options)
       @@config = Hash.new

data/lib/six/arma/tools/pbodll.rb

@@ -15,6 +15,8 @@ module Six
         attr_accessor(:destination) # allows instance.attribute to be read and written (e.g convert.destination)
 
         def initialize(source, destination = source)
+          source.gsub!("\\", "/")
+          destination.gsub!("\\", "/")
           @source = source
           source[/(.*)\//]
           if destination == $1
@@ -53,9 +55,14 @@ module Six
           log.info "AutoPrefix: #{@source}"
           if FileTest.exist?(File.join(folder, filename, '$PBOPREFIX$'))
             # TODO: .lines might be bugged in 1.8.6 windows
-            File.open(File.join(folder, filename, '$PBOPREFIX$'), 'r') { |file| file.lines.each { |line| tag = "#{$1}_" if line[/x\\(\w*)\\/] } }
+            File.open(File.join(folder, filename, '$PBOPREFIX$'), 'r') { |file| file.lines.each { |line| tag = $1 if line[/x\\(\w*)\\/] } }
           end
-          unless tag == ''
+          if tag.nil? || tag.empty?
+            File.dirname(@source)[/^.*\/x\/(\w*)\//]
+            tag = $1
+          end
+          unless tag.nil? || tag.empty?
+            tag = "#{tag}_"
             mv(File.join(@destination, "#{filename}.pbo"), File.join(@destination,"#{tag}#{filename}.pbo"))
           end
           if FileTest.exist?(File.join(@destination, "#{filename}.log"))
@@ -119,7 +126,7 @@ module Six
           log.info exec
           output = %x[#{exec}]
           log.debug output
-          unless @same
+          unless @same || @destination == File.dirname(@source)
             # TODO: Better to have makepbo accept a destination.. Otherwise it overwrites/removes addons already present in source!
             puts "#{@source} #{@destination}"
             FileUtils::mv("#{@source}.pbo", @destination) if @destination

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: six-arma-tools
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - ""
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +02:00
+date: 2010-06-04 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -44,23 +45,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Your summary here