revolt 0.8.2 → 0.8.3

data/lib/revolt/level.rb

@@ -167,7 +167,7 @@ module ReVolt
         end
       end
       
-      debug("Returning #{d} and #{f}")
+      debug("Returning #{d.join(' ')} and #{f.join(' ')}")
       [d, f]
     end
     

data/lib/revolt/levels.rb

@@ -329,11 +329,11 @@ module ReVolt
           # Try replacing the start of the match
           # with each known id and see if the
           # result is a match
-          filebase = f.basename.to_s
+          filebase = f.basename.to_s.downcase
           debug("rename_level: inspecting #{filebase}")
           trymatch = filebase[0...oldid.to_s.size]
           if filebase[0...oldid.to_s.size] == oldid.to_s
-            nfname = f.basename.to_s.sub(/^#{oldid}/, newid.to_s)
+            nfname = f.basename.to_s.sub(/^#{oldid}/i, newid.to_s)
             nf = base_path + f.dirname + nfname
             of = base_path + f
             debug("rename_level: #{of} -> #{nf}")

data/lib/revolt/package/archive/analyzer.rb

@@ -15,7 +15,8 @@ module ReVolt::Package::Archive
       
       browser.each do |entry|
         case entry.to_s
-        when /levels\//i: looks_like.add :normalized
+        when /levels\/([^\/]+)\/\1.inf/i: looks_like.add :normalized
+        # when /levels\//i: looks_like.add :normalized
         when /.inf$/i: possible_infs.add entry
         end
       end

data/lib/revolt.rb

@@ -10,5 +10,5 @@ require 'revolt/util/matcher'
 require 'revolt/args'
 
 module ReVolt
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/test/common.rb

@@ -18,17 +18,21 @@ module ReVolt
       # Zips inside, same name
       :zips_inside_sn => 'zips_inside_sn.zip',
       :rickyd_style   => 'rickyd_track.zip',
-      :nodirs_style   => 'nodirs_track.zip'
+      :nodirs_style   => 'nodirs_track.zip',
+      :levels_ok_invalid_files  => 'levels_ok_invalid_files.zip'
     }
     ZIPS_IDS = {
       :standard       => [:levid],
-      :standard_full  => [:levid]
+      :standard_full  => [:levid],
+      :levels_ok_invalid_files => [:userxxx]
     }
     
     module_function
 
     def setup
+      puts "common setup called"
       @output_dir  = Pathname.new(File.dirname(__FILE__)) + 'temp_out'
+      @rv_base_dir = Pathname.new(get_test_output_dir('rv'))# @output_dir + 'rv';    
       clean_working_dir
       @output_dir.mkdir
     end
@@ -55,6 +59,12 @@ module ReVolt
       t.to_s
     end
     
+    def installed_tracks(at = nil)
+      at ||= @rv_base_dir
+      dir = ReVolt::Util::FsBrowser.new(at)
+      dir.map {|f| Pathname.new(f).relative_path_from(at).to_s}
+    end
+    
     def stringify_and_order_structure(c)
       operation_and_order_structure(c) {|a| 
         a = a.to_s

data/test/fixtures/rv/levels/userxxx/UserXXX.inf

@@ -0,0 +1,20 @@
+;----------------------------
+; Revolt .INF file structure
+;----------------------------
+
+NAME            'Level ID'
+STARTPOS        0.000000 -900.000000 0.000000
+STARTPOSREV     0 0 0
+STARTROT        0.80000
+STARTROTREV     0.0
+STARTGRID       3
+STARTGRIDREV    0
+FARCLIP        24000
+FOGSTART        1500
+FOGCOLOR        200 145 65
+VERTFOGSTART   3000
+VERTFOGEND      6000
+WORLDRGBPER     100
+MODELRGBPER     100
+INSTANCERGBPER  100
+REDBOOK          13 13

data/test/tc_level_installer.rb

@@ -199,4 +199,26 @@ class LevelInstaller < Test::Unit::TestCase
                  stringify_and_order_structure(result))
   end
 
+  def test_levels_ok_invalid_files
+    zip_id = :levels_ok_invalid_files
+    ids = @levels.install(get_test_file(ZIPS[zip_id]), @output_dir)
+    result = installed_tracks
+    expect = %w(
+      gfx
+      gfx/userXXX.bmp
+      gfx/userXXX.bmq
+      levels
+      levels/userxxx
+      levels/userxxx/UserXXX.inf
+      levels/userxxx/uSerXxx.w
+      levels/userxxx/usErXxXa.bmp
+      levels/userxxx/readme.txt
+    )
+
+    assert_equal(stringify_and_order_structure(expect), 
+                 stringify_and_order_structure(result))
+    assert_equal(stringify_and_order_structure(ids), 
+                 stringify_and_order_structure(ZIPS_IDS[zip_id]))
+  end
+
 end

data/test/tc_level_package.rb

@@ -60,7 +60,7 @@ class LevelPackage < Test::Unit::TestCase
   def do_package_test(src_pkg)
     # zip_id  = :standard
     package = @rv_package_dir + src_pkg
-    ids1    = @levels1.install(get_test_file(src_pkg), @rv_base_dir1)
+    ids1    = @levels1.install(get_test_file(src_pkg)) # , @rv_base_dir1)
     result1 = installed_tracks(@rv_base_dir1)
     
     # Create package
@@ -74,7 +74,7 @@ class LevelPackage < Test::Unit::TestCase
 
     # Then ensure the package can be installed and results
     # in same files and ids
-    ids2    = @levels2.install(get_test_file(src_pkg), @rv_base_dir2)
+    ids2    = @levels2.install(get_test_file(src_pkg)) # , @rv_base_dir2)
     result3 = installed_tracks(@rv_base_dir2)
     assert_equal(ids1, ids2)
     assert_equal(stringify_and_order_structure(result1),

data/test/tc_levels.rb

@@ -66,4 +66,47 @@ class LevelsTest < Test::Unit::TestCase
     @level.parent = nil
     assert_raise(RuntimeError) { @level.reload }
   end
+  
+  def test_level_rename
+    zip_id = :levels_ok_invalid_files
+    levels = ReVolt::Levels.new(@rv_base_dir)
+    levels.create_dir_structure
+    
+    ids = levels.install(get_test_file(ZIPS[zip_id])) # , @output_dir)
+    result = installed_tracks
+    expect = %w(
+      gfx
+      gfx/userXXX.bmp
+      gfx/userXXX.bmq
+      levels
+      levels/userxxx
+      levels/userxxx/UserXXX.inf
+      levels/userxxx/uSerXxx.w
+      levels/userxxx/readme.txt
+      levels/userxxx/usErXxXa.bmp
+    )
+
+    assert_equal(stringify_and_order_structure(expect), 
+                 stringify_and_order_structure(result))
+    assert_equal(stringify_and_order_structure(ids), 
+                 stringify_and_order_structure(ZIPS_IDS[zip_id]))
+    ReVolt::Logger::enable
+    levels.rename(:userxxx, :renamedlevel)
+
+    result = installed_tracks
+    expect = %w(
+      gfx
+      gfx/renamedlevel.bmp
+      gfx/renamedlevel.bmq
+      levels
+      levels/renamedlevel
+      levels/renamedlevel/renamedlevel.inf
+      levels/renamedlevel/renamedlevel.w
+      levels/renamedlevel/renamedlevela.bmp
+      levels/renamedlevel/readme.txt
+    )
+
+    assert_equal(stringify_and_order_structure(expect), 
+                 stringify_and_order_structure(result))    
+  end  
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: revolt
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
-date: 2007-02-17 00:00:00 +02:00
+  version: 0.8.3
+date: 2007-04-04 00:00:00 +03:00
 summary: Library for managing Re-Volt game, and some Commandline tools
 require_paths: 
 - lib
@@ -79,6 +79,7 @@ files:
 - Rakefile
 - test/fixtures/files
 - test/fixtures/rv
+- test/fixtures/files/levels_ok_invalid_files.zip
 - test/fixtures/files/nodirs_track.zip
 - test/fixtures/files/readme.txt
 - test/fixtures/files/rickyd_track.zip
@@ -91,23 +92,13 @@ files:
 - test/fixtures/files/zips_inside_sn.zip
 - test/fixtures/files/tmp/gfx
 - test/fixtures/files/tmp/levels
-- test/fixtures/files/tmp/gfx/levid.bmp
-- test/fixtures/files/tmp/gfx/levid.bmq
+- test/fixtures/files/tmp/gfx/userXXX.bmp
+- test/fixtures/files/tmp/gfx/userXXX.bmq
 - test/fixtures/files/tmp/levels/levid
-- test/fixtures/files/tmp/levels/levid/Full Custom.inf
-- test/fixtures/files/tmp/levels/levid/install
-- test/fixtures/files/tmp/levels/levid/levid.inf
-- test/fixtures/files/tmp/levels/levid/levid.w
-- test/fixtures/files/tmp/levels/levid/levida.bmp
-- test/fixtures/files/tmp/levels/levid/models
 - test/fixtures/files/tmp/levels/levid/readme.txt
-- test/fixtures/files/tmp/levels/levid/sfx
-- test/fixtures/files/tmp/levels/levid/sounds
-- test/fixtures/files/tmp/levels/levid/install/nhood1.fob
-- test/fixtures/files/tmp/levels/levid/install/nhood1.inf
-- test/fixtures/files/tmp/levels/levid/models/ball.m
-- test/fixtures/files/tmp/levels/levid/sfx/3d sounds
-- test/fixtures/files/tmp/levels/levid/sfx/3d sounds/birds1.wav
+- test/fixtures/files/tmp/levels/levid/UserXXX.inf
+- test/fixtures/files/tmp/levels/levid/uSerXxx.w
+- test/fixtures/files/tmp/levels/levid/usErXxXa.bmp
 - test/fixtures/rv/gfx
 - test/fixtures/rv/levels
 - test/fixtures/rv/gfx/levid.bmp
@@ -115,10 +106,13 @@ files:
 - test/fixtures/rv/gfx/levidrev.bmp
 - test/fixtures/rv/gfx/levidrev.bmq
 - test/fixtures/rv/gfx/tEsT Level.bmp
+- test/fixtures/rv/gfx/userXXX.bmp
+- test/fixtures/rv/gfx/userXXX.bmq
 - test/fixtures/rv/levels/inf_missing_level
 - test/fixtures/rv/levels/levid
 - test/fixtures/rv/levels/levidrev
 - test/fixtures/rv/levels/test lEveL
+- test/fixtures/rv/levels/userxxx
 - test/fixtures/rv/levels/levid/levid.inf
 - test/fixtures/rv/levels/levid/levid.w
 - test/fixtures/rv/levels/levid/levida.bmp
@@ -141,6 +135,10 @@ files:
 - test/fixtures/rv/levels/test lEveL/reversed/TEst level.inf
 - test/fixtures/rv/levels/test lEveL/reversed/TeST level.w
 - test/fixtures/rv/levels/test lEveL/reversed/test LEVELa.bmp
+- test/fixtures/rv/levels/userxxx/readme.txt
+- test/fixtures/rv/levels/userxxx/UserXXX.inf
+- test/fixtures/rv/levels/userxxx/uSerXxx.w
+- test/fixtures/rv/levels/userxxx/usErXxXa.bmp
 - README
 test_files: 
 - test/ts_base.rb