revolt 0.8.0 → 0.8.1

data/README

@@ -132,6 +132,11 @@ the track you want to find. For examples:
 
   rv_find_levels.rb temple
 
+If you want to find a level by it's exact folder name, you can
+prepend with ':' (or use the --id switch), for example:
+
+  rv_find_levels.rb :temple
+
 That would search for all levels whose name contains 'temple' 
 (case insensitive). Another more complex example is to find
 all custom tracks that can be raced in reverse mode that
@@ -172,14 +177,15 @@ For more information and options:
 
 
 === rv_package_levels.rb
-Creates packages of levels. The parameters are the
-folder names of the levels to pack. From each level
-a separate package is created. Matching options can
-be used with -m as with rv_find_levels.rb
+Creates packages of levels. The parameters are, as
+in the above matching level names. Use the ':' in
+front to pack using folder names of the levels. From 
+each level a separate package is created. Matching 
+options can be used with -m as with rv_find_levels.rb
 
 Example:
 
-  rv_package_levels_level.rb rvt chilled
+  rv_package_levels_level.rb :rvt :chilled
 
 This would create rvt.zip and chilled.zip of corresponding
 levels.

data/bin/rv_delete_levels.rb

@@ -48,6 +48,7 @@ class CmdArguments < Hash
     
     self[:base]  = ReVolt::Info::path
     self[:force] = false
+    self[:default_match_with] = :name
     
     matchstrs   = []
     opts = OptionParser.new do |opts|
@@ -70,6 +71,8 @@ class CmdArguments < Hash
       on_match(opts) do |value|
         matchstrs << value
       end
+      on_default_match_modifier(opts)
+      
       opts.on('-d', '--debug',
               'Outputs debug information') do
         self[:debug] = true
@@ -93,8 +96,8 @@ class CmdArguments < Hash
   
     opts.parse!(cmd)
 
-    cmd.each do |n|
-      matchstrs << '%s=~%s' % ['name', n]
+    name_or_id_matches(cmd) do |m|
+      matchstrs << m
     end
 
     # If input file not specified, at least start date is required

data/bin/rv_find_levels.rb

@@ -27,6 +27,8 @@ class CmdArguments < Hash
     super()
     
     self[:base] = ReVolt::Info::path
+    self[:default_match_with] = :name
+    
     matchstrs   = []
     opts = OptionParser.new do |opts|
       opts.banner = "Usage: #$0 [options] [name_match ...]\n"
@@ -50,6 +52,7 @@ class CmdArguments < Hash
       on_match(opts) do |value|
         matchstrs << value
       end
+      on_default_match_modifier(opts)
       
       opts.on('-d', '--debug',
               'Outputs debug information') do
@@ -70,9 +73,20 @@ class CmdArguments < Hash
   
     opts.parse!(cmd)
 
+    name_or_id_matches(cmd) do |m|
+      matchstrs << m
+    end
+
+=begin    
+    ReVolt::Util::CommonCmdArgs
     cmd.each do |n|
-      matchstrs << '%s=~%s' % ['name', n]
+      if n == ':all'
+        matchstrs << 'id=~.'
+      else
+        matchstrs << '%s=~%s' % ['name', n]
+      end
     end
+=end
 
     # If input file not specified, at least start date is required
     if matchstrs.size == 0

data/bin/rv_info_levels.rb

@@ -47,6 +47,7 @@ class CmdArguments < Hash
     
     self[:base] = ReVolt::Info::path
     self[:all]  = false
+    self[:default_match_with] = :name
     
     matchstrs   = []
     opts = OptionParser.new do |opts|
@@ -67,6 +68,8 @@ class CmdArguments < Hash
       on_match(opts) do |value|
         matchstrs << value
       end
+      on_default_match_modifier(opts)
+
       opts.on('-d', '--debug',
               'Outputs debug information') do
         self[:debug] = true
@@ -90,8 +93,8 @@ class CmdArguments < Hash
   
     opts.parse!(cmd)
 
-    cmd.each do |n|
-      matchstrs << '%s=~%s' % ['name', n]
+    name_or_id_matches(cmd) do |m|
+      matchstrs << m
     end
 
     # If input file not specified, at least start date is required

data/bin/rv_install_levels.rb

@@ -42,7 +42,6 @@ class CmdArguments < Hash
     
     opts = OptionParser.new do |opts|
       opts.banner = "Usage: #$0 [options] package1 [package2 ...]\n"
-      opts.separator "By default the URLs are read from standard console input"
 
       opts.separator ""  
       opts.separator "Options:"  

data/bin/rv_package_levels.rb

@@ -21,6 +21,15 @@ def main
   end
   
   if pkg_levs.size > 0
+    unless cmd[:force]
+      puts ""
+      print "Create packages of these levels? (y/N) "
+      answer = STDIN.gets.chomp
+      if answer.downcase != 'y'
+        puts "Packages not created"
+        exit(0)
+      end
+    end  
     puts ''
     puts "Creating packages of #{pkg_levs.size} matching levels"
     pkg_levs.each do |l, match|
@@ -42,17 +51,20 @@ class CmdArguments < Hash
     
     self[:base]  = ReVolt::Info::path
     self[:force] = false
+    self[:default_match_with] = :name
     
     matchstrs   = []
     opts = OptionParser.new do |opts|
-      opts.banner = "Usage: #$0 [options] [levelid ...]\n"
+      opts.banner = "Usage: #$0 [options] [name_match ...]\n"
       opts.separator ""
       opts.separator "Creates packages of levels. Each packaged level will be"
-      opts.separator "named by its id"
+      opts.separator "named by its id. By default confirms before creating packages"
       opts.separator ""
       opts.separator "Examples:"
+      opts.separator "  Package all levels whose name contains Chilled:"
+      opts.separator "  #$0 Chilled"  
       opts.separator "  Package a level that is in RV levels sub-directory temple:"
-      opts.separator "  #$0 temple"  
+      opts.separator "  #$0 :temple"  
       opts.separator "  Packages all custom tracks that can be raced in reverse:"
       opts.separator "  #$0 -m 'custom?,reverse?'"  
 
@@ -65,10 +77,16 @@ class CmdArguments < Hash
       on_match(opts) do |value|
         matchstrs << value
       end
+      on_default_match_modifier(opts)
+      
       opts.on('-d', '--debug',
               'Outputs debug information') do
         self[:debug] = true
       end
+      opts.on('-f', '--force',
+              'Force packaging without confirmation') do
+        self[:force] = true
+      end
       
       on_base_path(opts) do |value|
         self[:base] = value
@@ -84,8 +102,8 @@ class CmdArguments < Hash
   
     opts.parse!(cmd)
 
-    cmd.each do |pkgid|
-      matchstrs << 'id=%s' % ['name', cmd[0]]
+    name_or_id_matches(cmd) do |m|
+      matchstrs << m
     end
 
     # If input file not specified, at least start date is required

data/examples/package_all_reverse_custom.rb

@@ -0,0 +1,12 @@
+require 'revolt'
+
+levels = ReVolt::Levels.installed
+
+pack_levels = []
+levels.each_custom do |level|
+  if level.reverse?
+    pack_levels << level
+  end
+end
+
+levels.package('reverse_custom.zip', pack_levels)

data/lib/revolt/level.rb

@@ -153,7 +153,7 @@ module ReVolt
       f = []
       # Level globs, and graphics globs
       globs = [path + '**/*',
-               gfx_path + ReVolt::Util::caseinsensitiveglob(id.to_s + '.bm?')
+               gfx_dir + ReVolt::Util::caseinsensitiveglob(id.to_s + '.bm?')
               ]
       debug("Level gfx glob: #{globs[1]}")
 
@@ -194,10 +194,20 @@ module ReVolt
       inf_file
     end
 
-    # Returns the path to the graphics files of the Level
+    # Returns the directory to the graphics files of the Level
+    def gfx_dir
+      ensure_parent
+      @parent.gfx_dir
+    end
+
+    # Returns the path to the graphics file of this level
+    # or nil if the graphics file does not exist
     def gfx_path
       ensure_parent
-      @parent.gfx_path
+      gfxglob = gfx_dir + ReVolt::Util::caseinsensitiveglob(id.to_s + '.bmp')
+      gfx     = Pathname.glob(gfxglob)
+      return nil if gfx.empty?
+      return gfx[0]
     end
 
     # Convenience function for moving this Level

data/lib/revolt/levels.rb

@@ -38,7 +38,7 @@ module ReVolt
     include Enumerable
 
     # Pathname objects
-    attr_accessor :path, :gfx_path, :base_path
+    attr_accessor :path, :gfx_dir, :base_path
     
     # Creates new Levels instance with given Re-Volt
     # base path. The actual levels directory
@@ -47,7 +47,7 @@ module ReVolt
     def initialize(base_rv_path, args = {}) 
       @base_path = Pathname.new(base_rv_path)
       @path      = @base_path + "levels"
-      @gfx_path  = @base_path + "gfx"
+      @gfx_dir   = @base_path + "gfx"
       @path_checked = false
 
       @levels = nil
@@ -132,7 +132,7 @@ module ReVolt
     def create_dir_structure
       @base_path.mkdir if !@base_path.exist?
       @path.mkdir      if !@path.exist?
-      @gfx_path.mkdir  if !@gfx_path.exist?
+      @gfx_dir.mkdir  if !@gfx_dir.exist?
 
       ensure_paths      
     end
@@ -417,8 +417,8 @@ module ReVolt
       return if @path_checked
       raise IOError, "#{@path} does not exist"     if !@path.exist?
       raise IOError, "#{@path} is not dir"         if !@path.directory?
-      raise IOError, "#{@gfx_path} does not exist" if !@gfx_path.exist?
-      raise IOError, "#{@gfx_path} is not dir"     if !@gfx_path.directory?
+      raise IOError, "#{@gfx_dir} does not exist" if !@gfx_dir.exist?
+      raise IOError, "#{@gfx_dir} is not dir"     if !@gfx_dir.directory?
       @path_checked = true
     end
     

data/lib/revolt/util/common_cmd_args.rb

@@ -4,6 +4,9 @@ module ReVolt::Util
   # A mixin that can be included to utils that
   # need some of the common options
   module CommonCmdArgs
+    def initialize()
+      super[:default_match_with] = :id
+    end
     
     def on_base_path(opts, args = {}, &block)
       opts.on('-b', '--base [DIR]',
@@ -19,6 +22,35 @@ module ReVolt::Util
       end
     end
 
+    def on_default_match_modifier(opts, args = {})
+      opts.on('--id',
+              'Uses id to match the command-line arguments') do
+        self[:default_match_with] = :id
+        yield if block_given?
+      end
+      opts.on('--name',
+              'Uses name to match the command-line arguments') do
+        self[:default_match_with] = :name
+        yield if block_given?
+      end
+    end
+
+    def name_or_id_matches(strs, &block) 
+      strs.each do |n|
+        mstr = case
+        when n == ':all'
+          'id=~.'
+        when n =~ /^:(.*)/
+          '%s=%s' % ['id', $1]        
+        when self[:default_match_with] == :name
+          '%s=~%s' % ['name', n]
+        else
+          '%s=%s' % ['id', n]
+        end
+        block.call(mstr)
+      end
+    end
+    
     def match_help(opts)
       opts.separator "Match (-m, --match) general form:"
       opts.separator "  key<op>match[,key2<op>match2[,...]]"

data/lib/revolt.rb

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

data/test/tc_level.rb

@@ -93,6 +93,8 @@ class LevelTest < Test::Unit::TestCase
                  strdowncase_and_order_structure(files))
     assert_equal(strdowncase_and_order_structure(dirs_expect), 
                  strdowncase_and_order_structure(dirs))
+    assert_equal('gfx/tEsT Level.bmp', 
+                 @level.gfx_path.relative_path_from(@levels.base_path).to_s)
   end
   
   def test_copy_level

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: revolt
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-date: 2007-01-20 00:00:00 +02:00
+  version: 0.8.1
+date: 2007-02-16 00:00:00 +02:00
 summary: Library for managing Re-Volt game, and some Commandline tools
 require_paths: 
 - lib
@@ -37,6 +37,7 @@ files:
 - bin/rv_rename_level.rb
 - examples/find_rv_track.rb
 - examples/install_rv_track.rb
+- examples/package_all_reverse_custom.rb
 - lib/revolt.rb
 - lib/revolt/args.rb
 - lib/revolt/config.rb