revolt 0.5.1 → 0.5.2

data/README

@@ -5,10 +5,7 @@ A library for easy managing of Re-Volt's files in various ways.
   gem install rubyzip
 
 == Install
-Download the gem:
-  http://users.tkk.fi/~ajalkane/ruby/revolt-0.5.0.gem
-Install it:
-  gem install revolt-0.5.0.gem
+  gem install revolt
 
 == Summary
 For the moment the library mostly has functionality related to

data/bin/rv_install_level_urls.rb

@@ -8,6 +8,7 @@ require 'set'
 
 def main
   @cmd = CmdArguments.new(ARGV)
+  ReVolt::Logger.enable if @cmd[:debug]
 
   @summary = {
     :installed => [],
@@ -26,13 +27,15 @@ def main
   tmplevels.base_path.rmtree
   tmplevels.create_dir_structure
   
-  puts "Enter track URLs to install. Press Ctrl+D to install."
-  input_open(@cmd[:input]) do |input|
-    input.each_line do |tracksrc|
-      tmplevels.install_urls tracksrc
+  puts "Enter track URLs to install. Enter '.' on single line or Ctrl+D to install."
+  catch :done do
+    input_open(@cmd[:input]) do |input|
+      input.each_line do |tracksrc|
+        throw :done if tracksrc.chomp == '.'
+        tmplevels.install_urls tracksrc
+      end
     end
   end
-  
   puts "Installing tracks"
   tmplevels.each do |level|
     # Install only levels that do not exist already
@@ -164,6 +167,11 @@ class CmdArguments < Hash
       opts.separator ""  
       opts.separator "Options:"  
 
+      opts.on('-d', '--debug',
+              'Outputs debug information') do
+        self[:debug] = true
+      end
+
       opts.on('-i', '--input [FILE]', 
               'Reads the URLs from given file') do |value|
         self[:input] = value

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

@@ -86,6 +86,17 @@ module ReVolt::Package::Installer
         # Copy as a temporary file and try to install it
         tmpfile  = ReVolt::Util::tmpdir
         tmpfile += File.basename(file.to_s)
+        tmpfile_ext  = tmpfile.extname
+        tmpfile_base = tmpfile.basename(tmpfile_ext)
+        # If the filename already exists, choose another name
+        ndx = 1
+        while tmpfile.exist? do
+          debug("#{tmpfile} exists")
+          tmpfile = Pathname.new(tmpfile_base.to_s + ".#{ndx}" + tmpfile_ext)
+          debug("Using target name #{tmpfile}")
+          ndx += 1
+        end
+        # tmpfile += ReVolt::Util::tmpname(file.to_s); # File.basename(file.to_s)
         browser.copy(file, tmpfile)
         begin
           tmp_ids   = ReVolt::Package.install_track(tmpfile, rv_target, @args)

data/lib/revolt/util.rb

@@ -13,6 +13,10 @@ module ReVolt
       Pathname.new(Dir.tmpdir)
     end
     
+    def tmpfile
+      
+    end
+    
     def caseinsensitiveglob(glob)
       glob.downcase.gsub(/[a-z]/) {|m| '['+m.downcase+m.upcase+']' }
     end

data/lib/revolt.rb

@@ -8,5 +8,5 @@ require 'revolt/util/fs_browser'
 require 'revolt/args'
 
 module ReVolt
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/test/common.rb

@@ -2,6 +2,11 @@
 
 require 'pathname'
 
+# Modify path so that the install path has test library as first
+$:.unshift(File.join(File.dirname(__FILE__), '../lib'))
+
+puts "Path: #{$:.join(' ')}"
+
 module ReVolt
   module Test
     ZIPS = {
@@ -9,6 +14,8 @@ module ReVolt
       :standard_rev   => 'standard_rev_track.zip',
       :standard_multi => 'standard_multi.zip',
       :zips_inside    => 'zips_inside.zip',
+      # Zips inside, same name
+      :zips_inside_sn => 'zips_inside_sn.zip',
       :rickyd_style   => 'rickyd_track.zip',
       :nodirs_style   => 'nodirs_track.zip'
     }

data/test/fixtures/files/tmp/readme.txt

@@ -0,0 +1 @@
+

data/test/tc_level_installer.rb

@@ -85,4 +85,38 @@ class LevelInstaller < Test::Unit::TestCase
                  stringify_and_order_structure(ZIPS_IDS[zip_id]))
   end
 
+  def test_install_zips_same_inside_package
+    zip_id = :zips_inside_sn
+    f = get_test_file(ZIPS[zip_id])
+    # This tests that installing works even with zips inside a zip
+    # with the same name as parent zip. Common case with some old tracks.
+    ids = @levels.install(f, @output_dir)
+    result = installed_tracks
+    expect = %w(
+      gfx
+      gfx/levid.bmp
+      gfx/levid.bmq
+      gfx/levidrev.bmp
+      gfx/levidrev.bmq
+      levels
+      levels/levid
+      levels/levid/levid.inf
+      levels/levid/levid.w
+      levels/levid/levida.bmp
+      levels/levid/readme.txt
+      levels/levidrev
+      levels/levidrev/levidrev.inf
+      levels/levidrev/levidrev.w
+      levels/levidrev/levidreva.bmp
+      levels/levidrev/readme.txt
+      levels/levidrev/reversed
+      levels/levidrev/reversed/levidrev.cam
+      levels/levidrev/reversed/levidrev.fan
+      levels/levidrev/reversed/levidrev.fin
+    )
+
+    assert_equal(stringify_and_order_structure(expect), 
+                 stringify_and_order_structure(result))
+  end
+
 end

data/test/tc_package_track_installer.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/ruby -w
 
-require File.join(File.dirname(__FILE__), '../lib/revolt')
+# require File.join(File.dirname(__FILE__), '../lib/revolt')
 require File.join(File.dirname(__FILE__), 'common')
+require 'revolt'
 
 require 'test/unit'
 require 'fileutils'
@@ -171,4 +172,41 @@ class PackageTrackInstallerTest < Test::Unit::TestCase
     assert_equal(stringify_and_order_structure(expect), 
                  stringify_and_order_structure(result))
   end
+
+  # Zips inside, same name, test for the case that the downloaded
+  # packet is extracted to a (temp) directory and extracted having
+  # the same name as original.
+  def test_zips_same_name_inside_package
+    # First copy to tmp dir
+    tmpfile = ReVolt::Util::tmpdir + ZIPS[:zips_inside_sn]
+    File.copy(get_test_file(ZIPS[:zips_inside_sn]), tmpfile)
+    install_track(tmpfile, @output_dir)
+    result = installed_tracks
+    expect = %w(
+      gfx
+      gfx/levid.bmp
+      gfx/levid.bmq
+      gfx/levidrev.bmp
+      gfx/levidrev.bmq
+      levels
+      levels/levid
+      levels/levid/levid.inf
+      levels/levid/levid.w
+      levels/levid/levida.bmp
+      levels/levid/readme.txt
+      levels/levidrev
+      levels/levidrev/levidrev.inf
+      levels/levidrev/levidrev.w
+      levels/levidrev/levidreva.bmp
+      levels/levidrev/readme.txt
+      levels/levidrev/reversed
+      levels/levidrev/reversed/levidrev.cam
+      levels/levidrev/reversed/levidrev.fan
+      levels/levidrev/reversed/levidrev.fin
+    )
+
+    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.5.1
-date: 2006-09-27 00:00:00 +03:00
+  version: 0.5.2
+date: 2006-12-28 00:00:00 +02:00
 summary: Library for managing Re-Volt game, and some Commandline tools
 require_paths: 
 - lib
@@ -77,7 +77,12 @@ files:
 - test/fixtures/files/standard_multi.zip
 - test/fixtures/files/standard_rev_track.zip
 - test/fixtures/files/standard_track.zip
+- test/fixtures/files/tmp
 - test/fixtures/files/zips_inside.zip
+- test/fixtures/files/zips_inside_sn.zip
+- test/fixtures/files/tmp/readme.txt
+- test/fixtures/files/tmp/standard_rev_track.zip
+- test/fixtures/files/tmp/zips_inside_sn.zip
 - test/fixtures/rv/gfx
 - test/fixtures/rv/levels
 - test/fixtures/rv/gfx/levid.bmp