Antwrap 0.1 → 0.2

data/lib/antwrap.rb

@@ -20,7 +20,7 @@ module JavaLang
 end
 
 @@log = Logger.new(STDOUT)
-@@log.level = Logger::DEBUG
+@@log.level = Logger::ERROR
 
 class AntTask
   private
@@ -29,6 +29,9 @@ class AntTask
   
   public  
   def initialize(taskname, project, attributes, proc)
+    if(taskname[0,1] == "_")
+      taskname = taskname[1, taskname.length-1]
+    end
     @taskname = taskname
     @project = project
     @unknown_element = ApacheAnt::UnknownElement.new(taskname)
@@ -87,6 +90,7 @@ class AntTask
   def was_executed?
     @executed
   end
+  
 end
 
 class AntProject
@@ -114,13 +118,11 @@ class AntProject
     task.execute if declarative
     if taskname == 'macrodef'
       @@log.debug("Pushing #{attributes[:name]} to tasks")
-      @@tasks.push(attributes[:name]) 
     end
     task
   end
   
   def method_missing(sym, *args)
-    if(@@tasks.include?(sym.to_s) || @@types.include?(sym.to_s))
       begin
         @@log.info("AntProject.method_missing sym[#{sym.to_s}]")
         proc = block_given? ? Proc.new : nil 
@@ -128,9 +130,6 @@ class AntProject
       rescue
         @@log.error("Error instantiating task[#{sym.to_s}]" + $!)
       end
-    else
-      @@log.error("Not an Ant Task[#{sym.to_s}]")
-    end
   end
 
   #overridden. 'mkdir' conflicts wth the rake library.
@@ -144,40 +143,8 @@ class AntProject
   end  
   
   #overridden. 'java' conflicts wth the JRuby library.
-  def jvm(attributes)
+  def jvm(attributes=Hash.new)
     create_task('java', attributes, (block_given? ? Proc.new : nil))
   end  
   
-  @@tasks = [
-  # standard ant tasks
-      'mkdir', 'javac',   'chmod', 'delete', 'copy', 'move', 'jar', 'rmic', 'cvs', 'get', 'unzip', 
-      'unjar', 'unwar', 'echo', 'javadoc', 'zip', 'gzip', 'gunzip', 'replace', 'java', 'tstamp', 'property', 
-      'xmlproperty', 'taskdef', 'ant', 'exec', 'tar', 'untar', 'available', 'filter', 'fixcrlf', 'patch', 
-      'style', 'xslt', 'touch', 'signjar', 'genkey', 'antstructure', 'execon', 'antcall', 'sql', 'mail', 
-      'fail', 'war', 'uptodate', 'apply', 'record', 'cvspass', 'typedef', 'sleep', 'pathconvert', 'ear', 
-      'parallel', 'sequential', 'condition', 'dependset', 'bzip2', 'bunzip2', 'checksum', 'waitfor', 'input', 
-      'loadfile', 'manifest', 'loadproperties', 'basename', 'dirname', 'cvschangelog', 'cvsversion', 'buildnumber', 
-      'concat', 'cvstagdiff', 'tempfile', 'import', 'whichresource', 'subant', 'sync', 'defaultexcludes', 'presetdef', 
-      'macrodef', 'nice', 'length', 
-  # optional tasks
-      'image', 'script', 'netrexxc', 'renameext', 'ejbc', 'ddcreator', 'wlrun', 'wlstop', 'vssadd', 'vsscheckin', 'vsscheckout', 
-      'vsscp', 'vsscreate', 'vssget', 'vsshistory', 'vsslabel', 'ejbjar', 'mparse', 'mmetrics', 'maudit', 'junit', 'cab', 
-      'ftp', 'icontract', 'javacc', 'jjdoc', 'jjtree', 'stcheckout', 'stcheckin', 'stlabel', 'stlist', 'wljspc', 'jlink', 
-      'native2ascii', 'propertyfile', 'depend', 'antlr', 'vajload', 'vajexport', 'vajimport', 'telnet', 'csc', 'ilasm', 
-      'WsdlToDotnet', 'wsdltodotnet', 'importtypelib', 'stylebook', 'test', 'pvcs', 'p4change', 'p4delete', 'p4label', 'p4labelsync', 
-      'p4have', 'p4sync', 'p4edit', 'p4integrate', 'p4resolve', 'p4submit', 'p4counter', 'p4revert', 'p4reopen', 'p4fstat', 'javah', 
-      'ccupdate', 'cccheckout', 'cccheckin', 'ccuncheckout', 'ccmklbtype', 'ccmklabel', 'ccrmtype', 'cclock', 'ccunlock', 'ccmkbl', 
-      'ccmkattr', 'ccmkelem', 'ccmkdir', 'sound', 'junitreport', 'blgenclient', 'rpm', 'xmlvalidate', 'iplanet-ejbc', 'jdepend', 
-      'mimemail', 'ccmcheckin', 'ccmcheckout', 'ccmcheckintask', 'ccmreconfigure', 'ccmcreatetask', 'jpcoverage', 'jpcovmerge', 
-      'jpcovreport', 'p4add', 'jspc', 'replaceregexp', 'translate', 'sosget', 'soscheckin','soscheckout','soslabel', 'echoproperties', 
-      'splash', 'serverdeploy', 'jarlib-display', 'jarlib-manifest', 'jarlib-available', 'jarlib-resolve', 'setproxy', 'vbc', 'symlink', 
-      'chgrp', 'chown', 'attrib', 'scp', 'sshexec', 'jsharpc', 'rexec', 'scriptdef', 'ildasm', 
-  # deprecated ant tasks (kept for back compatibility)
-      'starteam', 'javadoc2', 'copydir', 'copyfile', 'deltree', 'rename'] 
-  
-  @@types = [ 'classfileset', 'description', 'dirset', 'filelist', 'fileset', 'filterchain', 'filterreader', 'filterset', 'mapper', 'redirector', 
-      'identitymapper', 'flattenmapper', 'globmapper', 'mergemapper', 'regexpmapper', 'packagemapper', 'unpackagemapper', 'compositemapper', 
-      'chainedmapper', 'filtermapper', 'path', 'patternset', 'regexp', 'substitution', 'xmlcatalog', 'extensionSet', 'extension', 'libfileset', 
-      'selector', 'zipfileset', 'scriptfilter', 'propertyset', 'assertions', 'concatfilter', 'isfileselected' ]
-  
 end

data/lib/convert.rb

@@ -5,17 +5,34 @@
 # Licensed under the LGPL, see the file COPYING in the distribution
 #
 require 'rexml/document'
-@outfile = File.new('/Users/caleb/projects/antwrap/test/output/Rakefile.rb', 'w+')
-xml = REXML::Document.new(File.open('/Users/caleb/projects/antwrap/test/test-resources/build.xml'))
 
+if ARGV.empty?
+    puts "Usage: #{$0} [antfile] [rakefile]" 
+    exit! 1
+end
+
+@antfile = File.open(ARGV[0])
+@rakefile = File.new(ARGV[1], 'w+')
+@@reserved_words = ['alias',  'and',  'BEGIN',  'begin',  'break',  'case',  'class',  
+                    'def',  'defined',  'do',  'else',  'elsif',  'END',  'end',  'ensure',  
+                    'false',  'for',  'if',  'in',  'module',  'next',  'nil',  'not',  'or',  
+                    'redo',  'rescue',  'retry',  'return',  'self',  'super',  'then',  'true',  
+                    'undef',  'unless',  'until',  'when',  'while',  'yield']
+
+xml = REXML::Document.new(@antfile)
+
+puts "Converting from Ant build script[#{@antfile.path}] == to ==> \n Rakefile[#{@rakefile.path}]"
 
 def create_symbol(str)
     str = rubyize(str)    
     return str.gsub(/(\w*[^,\s])/, ':\1')
 end
+
 def rubyize(str)
   if (str == nil) 
     str = ''
+  elsif (@@reserved_words.index(str) != nil)
+    str = '_' + str
   else
     str = str.gsub(/(\w*)[\-|\.](\w*)/, '\1_\2')
   end
@@ -23,12 +40,12 @@ def rubyize(str)
 end
 
 
-@outfile.print "require_gem 'Antwrap'\n"
-@outfile.print "@ant = AntProject.new()\n"
+@rakefile.print "require_gem 'Antwrap'\n"
+@rakefile.print "@ant = AntProject.new()\n"
 @one_tab= '   '
 def print_task(task, tab=@one_tab, prefix='')
   task_name = rubyize(task.name)
-  @outfile.print "#{tab}#{prefix}#{task_name}("
+  @rakefile.print "#{tab}#{prefix}#{task_name}("
   
   if(task_name == 'macrodef')
     task.attributes['name'] = rubyize(task.attributes['name'])
@@ -36,35 +53,35 @@ def print_task(task, tab=@one_tab, prefix='')
   isFirst = true;
   task.attributes.each do |key, value|
     if !isFirst 
-      @outfile.print(",\n#{tab+@one_tab}")
+      @rakefile.print(",\n#{tab+@one_tab}")
     end
-    @outfile.print ":#{key} => \"#{value}\""
+    @rakefile.print ":#{key} => \"#{value}\""
     isFirst = false;
   end
   
   if task.has_text?
     pcdata = task.texts().join
     if(pcdata.strip() != '')
-      @outfile.print ":pcdata => \"#{pcdata}\""  
+      @rakefile.print ":pcdata => \"#{pcdata}\""  
     end
   end
-  @outfile.print ")"
+  @rakefile.print ")"
   
   
   if task.elements.size > 0 
-    @outfile.print "{"
+    @rakefile.print "{"
     task.elements.each do |child|
-      @outfile.print "\n"
+      @rakefile.print "\n"
       print_task(child, (tab+@one_tab), '')
     end
-    @outfile.print "\n#{tab}}"
+    @rakefile.print "\n#{tab}}"
   end
 end
 
 xml.elements.each("/project/*") do |node|
   if node.name != 'target'
     print_task(node, '', '@ant.')
-    @outfile.print "\n\n"
+    @rakefile.print "\n\n"
   end
 end
 
@@ -73,12 +90,12 @@ xml.elements.each("/project/target") do |node|
     task = "\ntask " + create_symbol(node.attributes['name']) + 
          " => [" + create_symbol(node.attributes['depends']) + "] do\n"
     
-    @outfile.print task
+    @rakefile.print task
     
     node.elements.each do |child|
       print_task(child, @one_tab, '@ant.')
-      @outfile.print "\n"
+      @rakefile.print "\n"
     end
-    @outfile.print "end\n"
+    @rakefile.print "end\n"
 end
 

data/test/tc_antwrap.rb

@@ -197,6 +197,51 @@ class TestAntwrap < Test::Unit::TestCase
     @ant.echo(:pcdata => "Foobar &amp; <><><>")
   end
   
+  def test_ant_contrib
+    #<if>
+    # <equals arg1="${foo}" arg2="bar" />
+    # <then>
+    #   <echo message="The value of property foo is 'bar'" />
+    # </then>
+    #
+    # <elseif>
+    #  <equals arg1="${foo}" arg2="foo" />
+    #  <then>
+    #   <echo message="The value of property foo is 'foo'" />
+    #  </then>
+    # </elseif>
+    #
+    #
+    # <else>
+    #   <echo message="The value of property foo is not 'foo' or 'bar'" />
+    # </else>
+    #</if>
+    #   
+    @ant.taskdef(:resource => "net/sf/antcontrib/antlib.xml")
+
+    @ant.property(:name => "bar", :value => "bar")
+    @ant._if(){
+      _equals(:arg1 => "${bar}", :arg2 => "bar")
+      _then(){
+        echo(:message => "if 1 is equal")
+      }
+      _else(){
+        echo(:message => "if 1 is not equal")
+      }
+    }
+
+    @ant.property(:name => "baz", :value => "foo")
+    @ant._if(){
+      _equals(:arg1 => "${baz}", :arg2 => "bar")
+      _then(){
+        echo(:message => "if 2 is equal")
+      }
+      _else(){
+        echo(:message => "if 2 is not equal")
+      }
+    }
+
+  end
   private 
   def assert_exists(file_path)
     assert(File.exists?(file_path), "Does not exist[#{file_path}]")

data/test/test-resources/build.xml

@@ -307,4 +307,34 @@
         </sequential>
     </macrodef>
 
+	<taskdef resource="net/sf/antcontrib/antlib.xml"/>
+	<target name="ant-contrib">
+		<if>
+		 <equals arg1="bar" arg2="bar" />
+		 <then>
+		   <echo message="if 1 is equal" />
+		 </then>
+		 <else>
+		   <echo message="if 1 is not equal" />
+		 </else>
+		</if>
+		<if>
+		 <equals arg1="${foo}" arg2="bar" />
+		 <then>
+		   <echo message="if 2 is equal" />
+		 </then>
+		
+		 <elseif>
+		  <equals arg1="foo" arg2="foo" />
+		  <then>
+		   <echo message="if 2.1 is equal" />
+		  </then>
+		 </elseif>
+		 <else>
+		   <echo message="The value of property foo is not 'foo' or 'bar'" />
+		 </else>
+		</if>
+		
+	</target>
+	
 </project>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: Antwrap
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2007-01-20
+  version: "0.2"
+date: 2007-01-30
 summary: A JRuby module that wraps the Apache Ant build tool
 require_paths: 
   - lib
@@ -33,10 +33,10 @@ files:
   - test/tc_antwrap.rb
   - test/tc_convert.rb
   - test/test-resources
-  - test/output/META-INF
-  - test/output/parent
-  - test/output/META-INF/MANIFEST.MF
-  - test/output/parent/FooBarParent.class
+  - test/output/classes
+  - test/output/classes/foo
+  - test/output/classes/foo/bar
+  - test/output/classes/foo/bar/FooBar.class
   - test/test-resources/build.xml
   - test/test-resources/foo.txt
   - test/test-resources/foo.zip

data/test/output/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: 1.5.0_06 (Apple Computer, Inc.)
-